use-based deps for sdl-related packages

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 17 insertions, 23 deletions

diff --git a/games-strategy/castle-combat/Manifest b/games-strategy/castle-combat/Manifest
index 5bfe745e2236..1b90aca1c5da 100644
--- a/games-strategy/castle-combat/Manifest
+++ b/games-strategy/castle-combat/Manifest
@@ -1,6 +1,6 @@
 DIST castle-combat-0.7.4.tar.gz 1694096 RMD160 d96e58960042168761b329480a2df0fee4c74cf6 SHA1 3ec87f8f1a8436d56f8808a61dcfc8a0dfad53e6 SHA256 ad8cd11b9222f04f26e343433f05b0dd7964569b91b317847344b058355731b3
 DIST castle-combat-0.8.1.tar.gz 1721393 RMD160 484aa420d5e571dee38c7907e6ef61204e0873dd SHA1 5634593207c9676bdd759a7ee61eb0f40edbc510 SHA256 33eefc1402363a77b1a02dd33cc38d14c997a78ab81148c84b1221f95af1e4c2
 EBUILD castle-combat-0.7.4.ebuild 992 RMD160 7678236a3dcb28139601bc07b99a965f9e7d9402 SHA1 0fa90aa63e56351f51209c9d6dcd68a3a89014be SHA256 5e84c36b54a93ace833eca3f4178c83ba763ec1988ec44fb00c8fac61691eea7
-EBUILD castle-combat-0.8.1.ebuild 1320 RMD160 884bad097ffdb8d285e1ca78a20d9849a41cfcd6 SHA1 4ca09129f0b40abf8f777ceca58c9a0e11c88c12 SHA256 4b2ff42195a2576bf419fca8aaaf25dba255df60c93228515e8942ebd105cf4f
-MISC ChangeLog 1297 RMD160 245149a81d6a28f48becb76990fda83838f3edd1 SHA1 fa1fe68e5dd7b74c02811086df6bd30bad117b5f SHA256 593c8c008ccd3b621650390bc81287191c28fb04d1cce8cb520f16bd3a754cd4
+EBUILD castle-combat-0.8.1.ebuild 1208 RMD160 1e7ad536eb2361d5225ac871a7d25c2f19ea5e3d SHA1 fec0da3eefd95589a05dd25588b06ace243da50b SHA256 b8fe4195b6b5455e9421d7a154b4e71381f04deb51836d97fbe6dc88be514cb2
+MISC ChangeLog 1432 RMD160 ae100e87b04cb20eb905166fa4b67661fa1832e0 SHA1 fae168c400cb6446310c8bc37f996b00c8c1ba1e SHA256 ee4859cb7d3cb2958d88ce794b37d794d357813f070933d27945e0b3a90311ce
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 43ea58062408..68af11bc4631 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/wesnoth
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.134 2008/12/14 11:02:42 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.135 2009/01/03 21:48:08 mr_bones_ Exp $
+
+  03 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.4.7.ebuild:
+  use-based deps for sdl-related packages
 
 *wesnoth-1.4.7 (14 Dec 2008)
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 35bce1211603..f635e6fec93b 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,6 +2,6 @@ AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad
 DIST wesnoth-1.4.4.tar.bz2 152425432 RMD160 d32161d67002dc12197a6a8667dfb734bb208157 SHA1 c903160cdf1ecbfef6e668772ad5fe15f599ac7d SHA256 77cff07ed8e5cef314c347381e8a2b4bfd7e8b1c22a609d0b1035e48583a9eb4
 DIST wesnoth-1.4.7.tar.bz2 155052245 RMD160 8a515aca790424a550505512eb42b101860e87b2 SHA1 f8eb17e7a7aaff5d8fff1e18a1479efcf932fd27 SHA256 63c85889ef8c08e6dd5ea977edd057d64ce65a4934e661e222d2b0dd89e26847
 EBUILD wesnoth-1.4.4.ebuild 3235 RMD160 33902c1fcedc933c7268dfba065544cb285ff75b SHA1 6a7beb3a217ed28711aa3f939ecff53a1c163485 SHA256 e75b4babb391e52d469907ef313b231c8c7654b7b96bacff463cd5ea9d8ebb2c
-EBUILD wesnoth-1.4.7.ebuild 3531 RMD160 381a0276018ef44e02634c1c2689dff6954fbd65 SHA1 4ac7a34c1d49adf162ba0123e79d0c6eaf887edd SHA256 831be4efe7fc503482e2c26105e15f8478f0dc5a49040364a95c656bb038d49c
-MISC ChangeLog 17535 RMD160 15accd3681ab6010a8d878115212381e8198039d SHA1 181c819794c430d8d885291bb84d78bc29a1cf70 SHA256 cbd5fdc531ee11820e975d3506086e28f51ad3880e686c87f9f0f3bfaf8bf420
+EBUILD wesnoth-1.4.7.ebuild 3178 RMD160 7f5e202aa4c8c4f052230c76a94e8f6ad8f10273 SHA1 72234b8d48e8824395105298f85dad8d8ac32ac5 SHA256 f9778145c331760fa3242c87a07c2730bc5dec127eb4eb3195b0db81abb6e9b6
+MISC ChangeLog 17655 RMD160 0b4785aee405ffb68dc81c978f17f92599ea6c30 SHA1 7ebb071728552585d33a156d9dcc797f30ac804a SHA256 6319dc83be805946ac6a73b988edc38ed81254d9c9f6a074b72313c99e644b0e
 MISC metadata.xml 612 RMD160 f14f4748e1c611b41864ee5e1bdaa9e56de55d4a SHA1 f77e1b84262e73a7ab77b13666e6e00a0cbe593c SHA256 0c38c6a5c0cd5fee19c6c57c52f50c4e383581af23098aabbe4bbf43c9f5f2f7
diff --git a/games-strategy/wesnoth/wesnoth-1.4.7.ebuild b/games-strategy/wesnoth/wesnoth-1.4.7.ebuild
index f83ddc74a754..7b85bd867f25 100644
--- a/games-strategy/wesnoth/wesnoth-1.4.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.4.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.7.ebuild,v 1.1 2008/12/14 11:02:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.4.7.ebuild,v 1.2 2009/01/03 21:48:08 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils toolchain-funcs flag-o-matic games
 
 MY_PV=${PV/_/}
@@ -14,13 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="dedicated editor lite nls server smallgui static tinygui tools"
 
-RDEPEND=">=media-libs/libsdl-1.2.7
+RDEPEND=">=media-libs/libsdl-1.2.7[X]
 	media-libs/sdl-net
 	dev-libs/boost
 	!dedicated? (
 		x11-libs/libX11
-		>=media-libs/sdl-mixer-1.2
-		>=media-libs/sdl-image-1.2
+		>=media-libs/sdl-mixer-1.2[vorbis]
+		>=media-libs/sdl-image-1.2[png]
 		dev-lang/python
 		>=media-libs/freetype-2 )
 	nls? ( virtual/libintl )"
@@ -34,24 +35,14 @@ DEPEND="${RDEPEND}
 		tinygui? ( media-gfx/imagemagick )
 	)
 	dedicated? (
-		>=media-libs/sdl-mixer-1.2
-		>=media-libs/sdl-image-1.2
+		>=media-libs/sdl-mixer-1.2[vorbis]
+		>=media-libs/sdl-image-1.2[png]
 		>=media-libs/freetype-2 )
 	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_setup() {
-	if ! built_with_use media-libs/sdl-mixer vorbis ; then
-		die "Please emerge media-libs/sdl-mixer with USE=vorbis"
-	fi
-	if ! built_with_use media-libs/sdl-image png ; then
-		die "Please emerge media-libs/sdl-image with USE=png"
-	fi
-	# dedicated also needs USE=X for libsdl: bug #222033
-	if ! built_with_use media-libs/libsdl X ; then
-		die "Please emerge media-libs/libsdl with USE=X"
-	fi
 	if use !dedicated && use smallgui && use tinygui ; then
 		ewarn "USE=tinygui overrides USE=smallgui"
 		ebeep