EAPI=2; add use-based dep

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

3 files changed, 22 insertions, 39 deletions

diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index e89eb4e74415..f3ae4c453f67 100644
--- a/games-fps/quake3-bin/ChangeLog
+++ b/games-fps/quake3-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.27 2008/09/26 18:47:42 zmedico Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.28 2009/02/09 03:50:14 mr_bones_ Exp $
+
+  09 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  quake3-bin-1.32c-r1.ebuild:
+  EAPI=2; add use-based dep
 
   26 Sep 2008; Zac Medico <zmedico@gentoo.org> quake3-bin-1.32c.ebuild,
   quake3-bin-1.32c-r1.ebuild:
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index e1b6ddbca191..3e54fb921abd 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX q3ded.conf.d 307 RMD160 8abab77c1ef7e7fd57c42094e8870ab5f918d21f SHA1 6ca3555b4141c0fca5c037d5fbec33d9b0be2194 SHA256 b9ba53020ff1da7bbd5b8c37d21435ea499b164d7a45c79a2a75d2c96e41f701
 AUX q3ded.rc 853 RMD160 6b8e81f7ef2107f163f319769db4a00c33d445f0 SHA1 dbd451e40b39651dabd983da061aafeeaf7e3a96 SHA256 29c909b4543700733bf481a8bda756bba1d3a2fd6ed08432c801655b47a5b214
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 RMD160 eb63177fc0a30cda4976d8b68e065efb6dc41e50 SHA1 802d84af0d515db50a496c4c55d1f1c4f40a9239 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186
 DIST quake3-1.32c.zip 3056760 RMD160 d53f3b5a44e1b2871b0a6f1f6e93d9b0ad6d5d10 SHA1 82c52c12682aa4c47628ccfc067e07a56bc65da1 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849
-EBUILD quake3-bin-1.32c-r1.ebuild 3666 RMD160 2259301d896be23e1eb08f06f7139263db2b29f2 SHA1 f765dca588a2889f6480aa9b6614aebbdf308ae6 SHA256 330f178ac763c6b8095dfd2a9ab8d62c6163f5bd9468b3aa35d2dfd0cb86010f
+EBUILD quake3-bin-1.32c-r1.ebuild 3472 RMD160 62f36269029d187e207f7d0cb58e3d43914ac3d9 SHA1 9c85cd9babcb1089669b747b9b7ca659fb192250 SHA256 fa49b88b7ed4601c31cfbcb7ec8555c0bbed892f24a9d6ce65dd72c5f61881e9
 EBUILD quake3-bin-1.32c.ebuild 3444 RMD160 adf87f284f00a702361efc266a68ceed20e91756 SHA1 3ee58e60fa2b81e71d2408c85a008d686635e4aa SHA256 84d5e1d727d4085cfe2787bd6d110c2a0d95e6d59c384cad532f82171d128d4a
-MISC ChangeLog 9132 RMD160 41dd5b6d0d2f5ba419f6897e957d4b9ca4168ce5 SHA1 de26d2c22f26b4c02c4a27abcbe691fae739d1a9 SHA256 33442b723b99300da9a9394d2ddc3296b4eac7c311fc807a3f6fe439e415e42f
+MISC ChangeLog 9248 RMD160 971efc939d20c071364aa4214bd426dccf02e1c3 SHA1 9e649be6487622a95bf2f829ba029caf5360829a SHA256 3636d0c02d44de93cc406d00cc6dfba863c2c4c60535191567ff299a592f6d5f
 MISC metadata.xml 1052 RMD160 47127dc28337531fc3907c9d95f9d7d35d8e2d15 SHA1 08386bbbd1d751866a0201708cabfc8cbdfee975 SHA256 9552624bd6c0d0ac113dc2d283a41c556bd86948c5a14c98fb06e85948feb2aa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjdLk4ACgkQ/ejvha5XGaPxswCggOamaFfFCOQ+25ibATCoYjem
-I0kAn1SpGfaxXtu7WtPyBJXNnK1xsA9K
-=e+Qk
------END PGP SIGNATURE-----
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
index 7121989348a6..19a0d64b02de 100644
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r1.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-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.7 2008/09/26 18:47:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/quake3-bin-1.32c-r1.ebuild,v 1.8 2009/02/09 03:50:14 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="3rd installment of the classic id 3D first-person shooter"
@@ -36,8 +37,10 @@ RDEPEND="sys-libs/glibc
 	dedicated? ( app-misc/screen )
 	amd64? ( app-emulation/emul-linux-x86-baselibs )
 	opengl? ( ${UIDEPEND} )
-	cdinstall? ( games-fps/quake3-data )
-	cdinstall? ( teamarena? ( games-fps/quake3-teamarena ) )
+	cdinstall? (
+		games-fps/quake3-data[cdinstall]
+		teamarena? ( games-fps/quake3-teamarena )
+	)
 	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
 
 S=${WORKDIR}
@@ -51,22 +54,11 @@ QA_TEXTRELS="${dir:1}/pb/pbag.so
 	${dir:1}/pb/pbsv.so"
 
 default_client() {
-	if use opengl || ! use dedicated
-	then
-		# Use opengl by default
+	# Use opengl by default
+	if use opengl || ! use dedicated ; then
 		return 0
-	else
-		return 1
-	fi
-}
-
-pkg_setup() {
-	if use cdinstall
-	then
-		built_with_use games-fps/quake3-data cdinstall \
-			|| die "You must install quake3-data with USE=cdinstall to get the required data."
 	fi
-	games_pkg_setup
+	return 1
 }
 
 src_unpack() {
@@ -90,22 +82,19 @@ src_install() {
 
 	exeinto "${dir}"
 	doins quake3.xpm README* Q3A_EULA.txt
-	if default_client
-	then
+	if default_client ; then
 		doexe "Quake III Arena 1.32c"/linux/quake3*.x86 || die "doexe"
 		games_make_wrapper ${PN} ./quake3.x86 "${dir}" "${dir}"
 		newicon quake3.xpm ${PN}.xpm
 		make_desktop_entry ${PN} "Quake III Arena (binary)" ${PN}.xpm
-		if use teamarena
-		then
+		if use teamarena ; then
 			games_make_wrapper ${PN}-teamarena \
 				"./quake3.x86 +set fs_game missionpack" "${dir}" "${dir}"
 			make_desktop_entry ${PN}-teamarena \
 				"Quake III Team Arena (binary)" quake3-bin
 		fi
 	fi
-	if use dedicated
-	then
+	if use dedicated ; then
 		doexe "Quake III Arena 1.32c"/linux/q3ded || die "doexe q3ded"
 		games_make_wrapper quake3-ded ./q3ded "${dir}" "${dir}"
 		newinitd "${FILESDIR}"/q3ded.rc quake3-ded
@@ -122,7 +111,7 @@ pkg_postinst() {
 	ewarn "denial of service. One affects the game when running a server, the"
 	ewarn "other when running as a client."
 	ewarn "For more information, please see bug #82149."
-	if use dedicated; then
+	if use dedicated ; then
 		echo
 		elog "To start a dedicated server, run"
 		elog "  /etc/init.d/quake3-ded start"