Migrate to EAPI 2 in order to nuke built_with_use.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 29 insertions, 39 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index e665e1e3a1ea..e3faf4774419 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-rpg/nwn
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.70 2008/08/13 19:09:26 calchan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.71 2009/09/24 16:21:07 betelgeuse Exp $
+
+  24 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> nwn-1.69.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   13 Aug 2008; Denis Dupeyron <calchan@gentoo.org> nwn-1.69.ebuild:
   Fixed LINGUAS issue, thanks to Michael Sterrett. Fixed QA warnings.
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index cd3063a0519d..9166b71d1242 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fixinstall 2534 RMD160 9f9ae60341fcc61fbf9e8d47738d07bd96694718 SHA1 0cdba82b96b749d6f4b8b4c925f045a588ce10ed SHA256 9a8724de422b26fc02620323745cf78846b6781902b9a7160ae1fa438e2d783a
 DIST English_linuxclient168_orig.tar.gz 130569338 RMD160 0622599a07c113ae69fed80416f7a6f16e9e715e SHA1 5677e8ae04f6f12f776e13105a8401e55053862b SHA256 03687bff0469cb08a7e5a14316e076a6bfe698121ccee4e2116f0bf119988092
 DIST English_linuxclient168_xp1.tar.gz 134673662 RMD160 5e9227ad86c183f90666b4ef10378227a0e1193a SHA1 4060faa4839180b4823ae4669cacc6bf91b1b551 SHA256 e78716a83add4980674f86fd648d374b6086365620bde478b678edfdd4e7e82c
@@ -21,6 +24,13 @@ DIST nwn-libelf-0.1.tar.bz2 35932 RMD160 8865c8b2b1915f85eade6ccd2835502519184b1
 DIST nwn-libsdl-1.2.13.tar.bz2 151293 RMD160 6e001bff0182867e633c00307d8c84b6b668f4eb SHA1 07c79dc2d852ead0fdc96a2626c00b19edbe6fbc SHA256 c8c0ccb382f99b0203ff284e19459d0b03ebd342e0e41410b55393de59e0dd8c
 EBUILD nwn-1.68-r1.ebuild 7498 RMD160 e5be0ec7ad59ab08b43d7a013a96c05e8aeee89c SHA1 299bf4d69fbe86d06c5dafb90978ed3fdb240e5b SHA256 3c9730ca57d2ae73ccf92bf17a735563cda27a3d383c0e08cae218ec252acda6
 EBUILD nwn-1.68-r4.ebuild 6815 RMD160 f06ad12238df99d7c52264d060180edae6a58efd SHA1 47b7e4e7401a5ed2e73ab9ececeb80e71cfdd08b SHA256 dd6415b53e33a4a4a58a97c4b84af0f02732616c239eb7a0b1b16837d243f276
-EBUILD nwn-1.69.ebuild 4076 RMD160 46cda961a1ca8ede91b43175a78ee50bd4273dda SHA1 538d200d7e1543f73fed22bf9b6ba6a3910a9e8c SHA256 f2abeb2960249cb36fc7f340dad8b3c9489ed28a0b7f6080f540082c3aa40d4b
-MISC ChangeLog 12580 RMD160 4b473faabd63b4f0640a3b1f0b54b0fa70fd9513 SHA1 aaf997c26d6b8e8d2cd60aa8c83778c9ec731b91 SHA256 97204bcf4560b65318ae9c2602578a01f2bf4eeaac3fb4bd4c3f0b9b769a6d3e
+EBUILD nwn-1.69.ebuild 3372 RMD160 3e6e2cf5fbaba8747505f6ac0eb363056fa5b33d SHA1 822ca710e153f18cc963d3a6e8ba9d55b1c6169b SHA256 dee011f285e5ff71c788171914c506b65b93c71b525251a0398e8f2ab1f64905
+MISC ChangeLog 12707 RMD160 4cf98d46f9074610bee6d36eacba62ac1112394e SHA1 fe5d02917715255deda533ebc9f9179da97459d7 SHA256 a423937631cbea042f9d157602f4c5b7b2f10a4c85a5cf26c885495b023c0d13
 MISC metadata.xml 435 RMD160 57ca0a3136e9c0edf3c1cc5e13f0661f38d4879c SHA1 3e0e513cd5b6910cc4c1bb2bc8556753c4dda722 SHA256 1548515a46157153d708117cfe4fb01d2ba73a5f32a49967d2b70b4702b95604
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq7nH0ACgkQcxLzpIGCsLQv9gCcCtkj4wcAVge9gvoR8QaYAXFA
+iPkAn1mwAKgVvQ7fyro9VepE1xcvrlys
+=qWaQ
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/nwn/nwn-1.69.ebuild b/games-rpg/nwn/nwn-1.69.ebuild
index dc80411b2331..198143606cf4 100644
--- a/games-rpg/nwn/nwn-1.69.ebuild
+++ b/games-rpg/nwn/nwn-1.69.ebuild
@@ -1,6 +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-rpg/nwn/nwn-1.69.ebuild,v 1.2 2008/08/13 19:09:26 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69.ebuild,v 1.3 2009/09/24 16:21:07 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils games
 
@@ -23,7 +25,14 @@ RESTRICT="mirror strip"
 
 QA_DT_HASH="/opt/nwn/en/nwserver /opt/nwn/en/nwmain /opt/nwn/lib/libSDL-1.2.so.0.11.2 /opt/nwn/lib/libelf.so.1"
 
-RDEPEND=">=games-rpg/nwn-data-1.29-r3
+NWN_DATA=">=games-rpg/nwn-data-1.29-r3[sou?,hou?"
+
+# ${P} requires games-rpg/nwn-data emerged with at least LINGUAS=en or none at all
+RDEPEND="
+	|| (
+		${NWN_DATA},linguas_en]
+		${NWN_DATA},-linguas_fr,-linguas_de,-linguas_es,-linguas_it]
+	)
 	virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	!<games-rpg/nwmouse-0.1-r1
@@ -43,38 +52,6 @@ GAMES_LICENSE_CHECK="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
-die_from_busted_nwn-data() {
-	local use=$*
-	ewarn "You must emerge games-rpg/nwn-data with USE=$use. You can fix this"
-	ewarn "by doing the following:"
-	echo
-	elog "mkdir -p /etc/portage"
-	elog "echo 'games-rpg/nwn-data $use' >> /etc/portage/package.use"
-	elog "emerge --oneshot games-rpg/nwn-data"
-	die "nwn-data requires USE=$use"
-}
-
-pkg_setup() {
-	games_pkg_setup
-	if use sou
-	then
-		built_with_use games-rpg/nwn-data sou || die_from_busted_nwn-data sou
-	fi
-	if use hou
-	then
-		built_with_use games-rpg/nwn-data hou || die_from_busted_nwn-data hou
-	fi
-
-	if ! built_with_use games-rpg/nwn-data linguas_en && \
-		( built_with_use games-rpg/nwn-data linguas_fr \
-		|| built_with_use games-rpg/nwn-data linguas_de \
-		|| built_with_use games-rpg/nwn-data linguas_es \
-		|| built_with_use games-rpg/nwn-data linguas_it )
-	then
-		die "${P} requires games-rpg/nwn-data emerged with at least LINGUAS=en or none at all"
-	fi
-}
-
 src_unpack() {
 	mkdir -p "${S}"/en
 	cd "${S}"/en