tidy; use QA_PREBUILT

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 23 insertions, 31 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 82f3453aa075..caab120cfdc9 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,10 @@
 # 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.52 2014/07/09 20:17:14 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.53 2014/09/17 21:41:22 mr_bones_ Exp $
+
+  17 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  enemy-territory-2.60b-r1.ebuild:
+  tidy; use QA_PREBUILT
 
   09 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   enemy-territory-2.60b-r1.ebuild:
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index ecea8032715d..dd4ca2f65751 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 3594 SHA256 15e3256a69eb8c9b99fcea073e5f2aa1ada17ca561227d7f6a14ed9e7129485b SHA512 b11d622b02b5d1099d3d62577328c5b8d3b241b62baa5e47fee33f8d96929a819c725896054f734ae132919b132c029950d90260921c9404daa3336c81451d47 WHIRLPOOL 9ccefdbaa8351e0b9cab05f454c0e7e316789e13d2641fc9a5a6b5b5395a273d0eae4abd80682f9e3754b6a65ac376e139b0fbcb67270969e7c37bb1a22b6bd1
+EBUILD enemy-territory-2.60b-r1.ebuild 3402 SHA256 dcffccf56c31b4d5ca6cec284271983de5e147a0f68e764c2411b9660eb322f9 SHA512 147452dee161aed30cfc82f640b7eb8c49eee887e449ababace7ae3e6b0cd7a45ec0b3db5be4a7baa3967beb4212eddde32ac09a797963d030bac025dff5187a WHIRLPOOL ba646322b16cf4155d81cadd2a2cdffa5448a06960592fc9cbc3625e4575dfca28d32cf81cfa6a33afb240f0603a8083b2b6930a9bac1f0ae695e4314371f6bd
 EBUILD enemy-territory-2.60b.ebuild 3704 SHA256 afa7dc98102fa73f82485286af9fe5c727bc95888c67b248f2a9dd64f07d3e70 SHA512 893c6378cef34263014ad0683218453fb90f64d688c892d168047813486b237073db9e04a1d35bfe4256d56f0e5ca17f4f39988a19d53291c5e7d82e5832bfa1 WHIRLPOOL 10ab9489fa69313a7467f3729f8005cd91d4e1e3ef1459273365258725d86ec361a0b1915b82d5221119e626eb70472593f78f3d1c2a86529d96224b1f12e733
-MISC ChangeLog 8555 SHA256 ea446c200de896fa51f2564687cdc4e52427f857c0113eb2d86e904adb6cde4f SHA512 3494b515317088797ea4db80ac05a8260f2f0ba83138dfa0facba7ea96c0dd85c5e7661a718b3d711c0b409075cc00e09430ef513069f1c3e966681652d66051 WHIRLPOOL 9fe324ba69096af4a6d88ef5e5bbccbe05af7d0b37b9e774ecf3d2a6bc2457aef9d86787ee10aa036e21b718abd6a4d94e02b29b1e5d41d8748c7cc9f0e094b7
+MISC ChangeLog 8676 SHA256 6b9e54d93533c3abc7f6174ca4e9d4b0642d37b9c9db239231d3cae05f4c440b SHA512 fc1a47b46a5dbf4868e3ca01c83f612ce59c585b537735722ca7e972b0f253b411ee5a7d081db10fe8a38da90a236b869a94d6c27dcf99cb642c90d0809bb50d WHIRLPOOL d08f45137184d6d03ac01386ab8f2008dcc16fc5776bd34a731f8e8f53e2fcafa56fea71c29501560397984fc23e97b0cd3587e570861480f381f87402b72c11
 MISC metadata.xml 953 SHA256 edd65e4b49c67c1da8c9164b86793298a27b9314da5eb486c91e2de3c3563b3a SHA512 a05028c52df8c6ceed827476184d459f62889e692bec747c4a69421dab92d8070c52e6676b4729119683c03bfd7da911f9b94191261ecba5d3fc755603735843 WHIRLPOOL 5e7e1554ad24c60ea2b1a6d8dabab0d3da5057d9ac8f249828917261d2d29075d7d0c07281f2da5123f03e71f0f389fb4b7f7ff13c2f39599013aa8fb62e3b82
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-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 cdc07badd881..04df1d812f20 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.2 2014/07/09 20:17:14 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild,v 1.3 2014/09/17 21:41:22 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -43,17 +43,16 @@ S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
-QA_TEXTRELS="${dir:1}/pb/pbags.so
-	${dir:1}/pb/pbcls.so
-	${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbsv.so"
-QA_EXECSTACK="${dir:1}/et.x86
+QA_PREBUILT="
+	${dir:1}/et.x86
 	${dir:1}/etmain/cgame.mp.i386.so
 	${dir:1}/etmain/qagame.mp.i386.so
-	${dir:1}/etmain/ui.mp.i386.so"
-QA_FLAGS_IGNORED="${QA_TEXTRELS}
-	${QA_EXECSTACK}
+	${dir:1}/etmain/ui.mp.i386.so
+	${dir:1}/pb/pbag.so
+	${dir:1}/pb/pbags.so
+	${dir:1}/pb/pbcl.so
+	${dir:1}/pb/pbcls.so
+	${dir:1}/pb/pbsv.so
 	${dir:1}/pb/pbweb.x86"
 
 src_unpack() {
@@ -71,24 +70,23 @@ src_install() {
 	insinto "${dir}"
 	dodoc CHANGES README
 
-	cp -r Docs pb etmain "${Ddir}" || die "cp failed"
-	chmod og+x "${Ddir}"/pb/pbweb.x86 || die "chmod failed"
+	cp -r Docs pb etmain "${Ddir}" || die
+	chmod og+x "${Ddir}"/pb/pbweb.x86 || die
 
 	if ! use dedicated ; then
 		doicon ET.xpm
-		doexe "Enemy Territory 2.60b"/linux/et.x86 || die "doexe et"
+		doexe "Enemy Territory 2.60b"/linux/et.x86
 		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"
+		doexe "Enemy Territory 2.60b"/linux/etded.x86
 		games_make_wrapper et-ded ./etded.x86 "${dir}"
-		newinitd "${S}"/et-ded.rc et-ded || die "newinitd failed"
+		newinitd "${S}"/et-ded.rc et-ded
 		sed -i \
 			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
 			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}"/etc/init.d/et-ded \
-			|| die "sed failed"
-		newconfd "${S}"/et-ded.conf.d et-ded || die "newconfd failed"
+			"${D}"/etc/init.d/et-ded || die
+		newconfd "${S}"/et-ded.conf.d et-ded
 		# TODO: move this to /var/ perhaps ?
 		keepdir "${dir}/etwolf-homedir"
 		chmod g+rw "${Ddir}/etwolf-homedir"