more EAPI5 ebuild cleanups, dropped useless opengl flag, ensured USE=dedicated only installed dedicated server

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 33 insertions, 33 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 5bfb2d456a73..82f3453aa075 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.51 2014/07/07 19:05:33 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.52 2014/07/09 20:17:14 axs Exp $
+
+  09 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  enemy-territory-2.60b-r1.ebuild:
+  more EAPI5 ebuild cleanups, dropped useless opengl flag, ensured USE=dedicated
+  only installed dedicated server
 
 *enemy-territory-2.60b-r1 (07 Jul 2014)
 
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 4eec25c6e486..ecea8032715d 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -4,14 +4,14 @@ Hash: SHA256
 DIST ET-2.60b.zip 4143401 SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8 SHA512 f86d0d172a170cd894f1c60a817d2159768bf7d03cb0146f3470edd54828096a62e890c24bac80a5851adc9356cb2716d5f0c756fab063a9c0eb561b72825b84 WHIRLPOOL 6e4718051b77201b5bdb87efebd492db46ca83cca380b7f4bac2833d3f95700a39801cfcd5b025ed2b4c51d6b3140b7a2021ba8e1056bf4d100e67204768170b
 DIST enemy-territory-all-0.1.tar.bz2 876 SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64
 DIST et-linux-2.60.x86.run 270965248 SHA256 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36 SHA512 7321a3d831dd375c49aff81f30098c5201880e9fc783a25dd7dee3bd2211372e0e07a482e6c78982bc1f27d62bceb769dffc30f820c3144b4a64268fd9ef5cfe WHIRLPOOL 43e4cdced441add2524e07412d06a5530627922b14549f847567b9e558eb7652f7a7c8b6dac26b5ed6c18f55597a8cf898c950026dcd0577731d86257ae59162
-EBUILD enemy-territory-2.60b-r1.ebuild 3896 SHA256 182acf22b412f97f3de9782f59d47386522c50e2afa281ffa088d5bbe73d93d1 SHA512 4a95cfb79aa0e23f8353e81ae33111fc29e86c1278bed181963e1f4604e0add982943540e4615c6b78927311882d9987063a03283931effc2067573ef9041b30 WHIRLPOOL f9a761b4ff0e2a13518d8bda30fd2fba2a62e7dbbe3253af4276bcd5b07713497974fb614e52455d0fae1c127a903546f61ff499cb82ae936dba6a2b95331e48
+EBUILD enemy-territory-2.60b-r1.ebuild 3594 SHA256 15e3256a69eb8c9b99fcea073e5f2aa1ada17ca561227d7f6a14ed9e7129485b SHA512 b11d622b02b5d1099d3d62577328c5b8d3b241b62baa5e47fee33f8d96929a819c725896054f734ae132919b132c029950d90260921c9404daa3336c81451d47 WHIRLPOOL 9ccefdbaa8351e0b9cab05f454c0e7e316789e13d2641fc9a5a6b5b5395a273d0eae4abd80682f9e3754b6a65ac376e139b0fbcb67270969e7c37bb1a22b6bd1
 EBUILD enemy-territory-2.60b.ebuild 3704 SHA256 afa7dc98102fa73f82485286af9fe5c727bc95888c67b248f2a9dd64f07d3e70 SHA512 893c6378cef34263014ad0683218453fb90f64d688c892d168047813486b237073db9e04a1d35bfe4256d56f0e5ca17f4f39988a19d53291c5e7d82e5832bfa1 WHIRLPOOL 10ab9489fa69313a7467f3729f8005cd91d4e1e3ef1459273365258725d86ec361a0b1915b82d5221119e626eb70472593f78f3d1c2a86529d96224b1f12e733
-MISC ChangeLog 8347 SHA256 971228b5407f15ed217905e2ee6020933e0caffb5eaada560f45b34f9aa19a0a SHA512 13a21537acb3f2b419f8f2f1ac27833957fef9dd1ec710712423fca871f9fc5a5ad56512eceb2cc6100341fdd742faff4ec2493241893746bba285a8298d26b7 WHIRLPOOL 91460523ec472af9808cf2dffd0c5d5f9bb3d4e184162be5cfdb2e3e95b9c765dcfe5811f4eea032a474f9ef96dc07d007f9656174688188c102eb9a78b3201c
+MISC ChangeLog 8555 SHA256 ea446c200de896fa51f2564687cdc4e52427f857c0113eb2d86e904adb6cde4f SHA512 3494b515317088797ea4db80ac05a8260f2f0ba83138dfa0facba7ea96c0dd85c5e7661a718b3d711c0b409075cc00e09430ef513069f1c3e966681652d66051 WHIRLPOOL 9fe324ba69096af4a6d88ef5e5bbccbe05af7d0b37b9e774ecf3d2a6bc2457aef9d86787ee10aa036e21b718abd6a4d94e02b29b1e5d41d8748c7cc9f0e094b7
 MISC metadata.xml 953 SHA256 edd65e4b49c67c1da8c9164b86793298a27b9314da5eb486c91e2de3c3563b3a SHA512 a05028c52df8c6ceed827476184d459f62889e692bec747c4a69421dab92d8070c52e6676b4729119683c03bfd7da911f9b94191261ecba5d3fc755603735843 WHIRLPOOL 5e7e1554ad24c60ea2b1a6d8dabab0d3da5057d9ac8f249828917261d2d29075d7d0c07281f2da5123f03e71f0f389fb4b7f7ff13c2f39599013aa8fb62e3b82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlO673gACgkQ2ugaI38ACPD9cwD/Rn196SuoK+25X50jJ+LHzpZw
-es99DNM0Qb1ZNAi4B9IA/RRy3f7keRD3HphG9wBsB9//uqy9vToy6FqNjZt5ByPR
-=yVCp
+iF4EAREIAAYFAlO9o0cACgkQ2ugaI38ACPCoLwD9GpZNFuEwRdwHGKufwrtWIA2g
+7otDB0KOVVjqQYXG9+8A/iSR0639a/VQURlzyszdRA/CQRrCFnpgic3OaRfwhUdm
+=CGLd
 -----END PGP SIGNATURE-----
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
index 0ba0b27510e2..cdc07badd881 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild,v 1.1 2014/07/07 19:05:33 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild,v 1.2 2014/07/09 20:17:14 axs Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -19,22 +19,23 @@ SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
 LICENSE="RTCW-ETEULA"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="dedicated opengl"
+IUSE="dedicated"
 RESTRICT="mirror strip"
 
 DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
 	dedicated? ( app-misc/screen )
-	opengl? ( || ( virtual/opengl[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-	) )
 	!dedicated? ( || (
 		(
+			virtual/opengl[abi_x86_32(-)]
 			x11-libs/libX11[abi_x86_32(-)]
 			x11-libs/libXext[abi_x86_32(-)]
 		)
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		)
 	) )"
 
 S=${WORKDIR}
@@ -54,31 +55,31 @@ QA_EXECSTACK="${dir:1}/et.x86
 QA_FLAGS_IGNORED="${QA_TEXTRELS}
 	${QA_EXECSTACK}
 	${dir:1}/pb/pbweb.x86"
-QA_EXECSTACK_x86=${QA_EXECSTACK}
-QA_EXECSTACK_amd64=${QA_EXECSTACK}
 
 src_unpack() {
 	unpack_makeself et-linux-2.60.x86.run
 	if use dedicated; then
-		unpack ${PN}-all-0.1.tar.bz2 || die
+		unpack ${PN}-all-0.1.tar.bz2
 	fi
 	unpack ET-${PV}.zip
 }
 
 src_install() {
 	exeinto "${dir}"
-	doexe openurl.sh || die "doexe failed"
-	doexe "Enemy Territory 2.60b"/linux/et.x86 || die "doexe et"
+	doexe openurl.sh
+
 	insinto "${dir}"
-	dodoc CHANGES README || die "doins failed"
-	doicon ET.xpm
+	dodoc CHANGES README
 
 	cp -r Docs pb etmain "${Ddir}" || die "cp failed"
 	chmod og+x "${Ddir}"/pb/pbweb.x86 || die "chmod failed"
 
-	games_make_wrapper et ./et.x86 "${dir}" "${dir}"
-
-	if use dedicated ; then
+	if ! use dedicated ; then
+		doicon ET.xpm
+		doexe "Enemy Territory 2.60b"/linux/et.x86 || die "doexe et"
+		games_make_wrapper et ./et.x86 "${dir}" "${dir}"
+		make_desktop_entry et "Enemy Territory" ET
+	else
 		doexe "Enemy Territory 2.60b"/linux/etded.x86 || die "doexe failed"
 		games_make_wrapper et-ded ./etded.x86 "${dir}"
 		newinitd "${S}"/et-ded.rc et-ded || die "newinitd failed"
@@ -94,8 +95,6 @@ src_install() {
 		dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
 	fi
 
-	make_desktop_entry et "Enemy Territory" ET
-
 	prepgamesdirs
 	chmod g+rw "${Ddir}" "${Ddir}/etmain"
 }
@@ -107,10 +106,11 @@ pkg_postinst() {
 	ewarn "other when running as a client."
 	ewarn "For more information, see bug #82149."
 	echo
-	elog "To play the game run:"
-	elog " et"
-	echo
-	if use dedicated; then
+	if ! use dedicated; then
+		elog "To play the game run:"
+		elog " et"
+		echo
+	else
 		elog "To start a dedicated server run:"
 		elog " /etc/init.d/et-ded start"
 		echo
@@ -124,9 +124,4 @@ pkg_postinst() {
 		ewarn "See bug #132795 for more info."
 		echo
 	fi
-	if use amd64; then
-		elog "If you are running an amd64 system and using ALSA, you must have"
-		elog "ALSA 32-bit emulation enabled in your kernel for this to function properly."
-		echo
-	fi
 }