Bumped EAPI to 5, adjusted deps for gx86-multilib

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

3 files changed, 148 insertions, 19 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index 74143d7651f0..5bfb2d456a73 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/enemy-territory
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.50 2012/09/24 00:33:35 vapier Exp $
+# 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 $
+
+*enemy-territory-2.60b-r1 (07 Jul 2014)
+
+  07 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +enemy-territory-2.60b-r1.ebuild:
+  Bumped EAPI to 5, adjusted deps for gx86-multilib
 
   24 Sep 2012; Mike Frysinger <vapier@gentoo.org> enemy-territory-2.60b.ebuild:
   QA_DT_HASH (old/deprecated) -> QA_FLAGS_IGNORED (new hotness).
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index e5828e7708d9..4eec25c6e486 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ET-2.60b.zip 4143401 SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8
+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
+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.ebuild 3704 SHA256 afa7dc98102fa73f82485286af9fe5c727bc95888c67b248f2a9dd64f07d3e70 SHA512 893c6378cef34263014ad0683218453fb90f64d688c892d168047813486b237073db9e04a1d35bfe4256d56f0e5ca17f4f39988a19d53291c5e7d82e5832bfa1 WHIRLPOOL 10ab9489fa69313a7467f3729f8005cd91d4e1e3ef1459273365258725d86ec361a0b1915b82d5221119e626eb70472593f78f3d1c2a86529d96224b1f12e733
-MISC ChangeLog 8163 SHA256 3efb7220f5253bf72687cfe5ab52183c82067900cccf5ea12551b0c4d4215bf1 SHA512 961767d8ba6176762b23eab01edf6c8376c7217a6504a1dd00aec8cbe05ad17c2a12e558d4c4f81280753a24c0bf0be6871bfca3d5c99dd189395f5a7d35fede WHIRLPOOL f1c7e2297c751bf5249622d6fb3396d222d9b8621b8ac9276b160ae6924ee8d476fa380fa6a83b20fdec355e3c4f80c87203f5c714b2885502a2529eaf589b43
+MISC ChangeLog 8347 SHA256 971228b5407f15ed217905e2ee6020933e0caffb5eaada560f45b34f9aa19a0a SHA512 13a21537acb3f2b419f8f2f1ac27833957fef9dd1ec710712423fca871f9fc5a5ad56512eceb2cc6100341fdd742faff4ec2493241893746bba285a8298d26b7 WHIRLPOOL 91460523ec472af9808cf2dffd0c5d5f9bb3d4e184162be5cfdb2e3e95b9c765dcfe5811f4eea032a474f9ef96dc07d007f9656174688188c102eb9a78b3201c
 MISC metadata.xml 953 SHA256 edd65e4b49c67c1da8c9164b86793298a27b9314da5eb486c91e2de3c3563b3a SHA512 a05028c52df8c6ceed827476184d459f62889e692bec747c4a69421dab92d8070c52e6676b4729119683c03bfd7da911f9b94191261ecba5d3fc755603735843 WHIRLPOOL 5e7e1554ad24c60ea2b1a6d8dabab0d3da5057d9ac8f249828917261d2d29075d7d0c07281f2da5123f03e71f0f389fb4b7f7ff13c2f39599013aa8fb62e3b82
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQX6pnAAoJELEHsLL7fEFWgYoQAI4MpSovrzCMNbW6rypUxLzS
-1cXYUhY9qzlGchO8pdc7/CUdPmMDKWKfPrPXR6gX9BdGIIXJokxDUAAsEH80DKJ6
-o4xgAFUVwqMyDMSlYPqI3kW7ebI2uXeLzYmKqYtG7n2sdFLrKTdOZ17mEytnD5BC
-wOHomDlm8QjDJk2aZn/UGQ6p8b0fH09P99+IMXVkGsBj3y8qn7RkpdKiPG1qULd0
-IbWXj+1LkLOoS7r3CWIRCTBfJVkueJJ5hls1i/TMIghr68o4vHKT3KGQFGUbrmpC
-D7uMKVGkDtDmo9ewmP6efqm98iUla2xcs+r5stT0bF/pwe2Y+VoItRZ1J4SYjsyy
-IKgXNoDkWDa3dlhbx4iPQTbce3a3OOzrgLvSRa664svubOg5Z4UKUxFXu38Uh4+0
-b1cWn7gN5OyHb/kW8/nU13sdrnrxfagKjNruD1lvlEhflwB67ag7tGfFOwoT7CNu
-iTmSxdx9LZ92flZ+zo2Fkih+OI1hCuDPOas4dpHECYgrRFwyzN+trD4tB+Zw91A1
-aI0sq+1xITC9pyI/9lR5h6/QOuYPbgDC6LYGOz2R5e9jwbX49Et7cpxPaXofpwuI
-d3cRbYEhVjcAGNf5Uald3fCzqDLflfYKeUNM8ITHbsbrBlojAW6fwsazutUPeyRy
-G8Dcd2vocu6NW+PP+GdI
-=n1Ad
+iF4EAREIAAYFAlO673gACgkQ2ugaI38ACPD9cwD/Rn196SuoK+25X50jJ+LHzpZw
+es99DNM0Qb1ZNAi4B9IA/RRy3f7keRD3HphG9wBsB9//uqy9vToy6FqNjZt5ByPR
+=yVCp
 -----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
new file mode 100644
index 000000000000..0ba0b27510e2
--- /dev/null
+++ b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
@@ -0,0 +1,132 @@
+# 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 $
+
+EAPI=5
+inherit eutils unpacker games
+
+DESCRIPTION="standalone multi-player game based on Return to Castle Wolfenstein"
+HOMEPAGE="http://www.idsoftware.com/"
+SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
+	mirror://idsoftware/et/linux/et-linux-2.60.x86.run
+	ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run
+	mirror://idsoftware/et/ET-${PV}.zip
+	dedicated? (
+		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
+		mirror://gentoo/${PN}-all-0.1.tar.bz2
+	)"
+
+LICENSE="RTCW-ETEULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated opengl"
+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? ( || (
+		(
+			x11-libs/libX11[abi_x86_32(-)]
+			x11-libs/libXext[abi_x86_32(-)]
+		)
+		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+	) )"
+
+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
+	${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}/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
+	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"
+	insinto "${dir}"
+	dodoc CHANGES README || die "doins failed"
+	doicon ET.xpm
+
+	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
+		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"
+		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"
+		# TODO: move this to /var/ perhaps ?
+		keepdir "${dir}/etwolf-homedir"
+		chmod g+rw "${Ddir}/etwolf-homedir"
+		dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
+	fi
+
+	make_desktop_entry et "Enemy Territory" ET
+
+	prepgamesdirs
+	chmod g+rw "${Ddir}" "${Ddir}/etmain"
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	ewarn "There are two possible security bugs in this package, both causing a"
+	ewarn "denial of service.  One affects the game when running a server, the"
+	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
+		elog "To start a dedicated server run:"
+		elog " /etc/init.d/et-ded start"
+		echo
+		elog "To run the dedicated server at boot, type:"
+		elog " rc-update add et-ded default"
+		echo
+		elog "The dedicated server is started under the ${GAMES_USER_DED} user account."
+		echo
+		ewarn "Store your configurations under ${dir}/etwolf-homedir or they"
+		ewarn "will be erased on the next upgrade."
+		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
+}