bumped EAPI to 5, adjustd deps for gx86-multilib, dropped useless use flags, made USE=dedicated install only the dedicated server, as it should

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

7 files changed, 222 insertions, 11 deletions

diff --git a/games-fps/quake3-bin/ChangeLog b/games-fps/quake3-bin/ChangeLog
index d1f4dabe6704..a36cd267a0db 100644
--- a/games-fps/quake3-bin/ChangeLog
+++ b/games-fps/quake3-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/quake3-bin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.36 2013/02/01 00:14:12 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-bin/ChangeLog,v 1.37 2014/07/08 21:20:41 axs Exp $
+
+*quake3-bin-1.32c-r2 (08 Jul 2014)
+
+  08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +quake3-bin-1.32c-r2.ebuild:
+  bumped EAPI to 5, adjustd deps for gx86-multilib, dropped useless use flags,
+  made USE=dedicated install only the dedicated server, as it should
 
   01 Feb 2013; Michael Sterrett <mr_bones_@gentoo.org> -quake3-bin-1.32c.ebuild:
   old
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
index b35320f69001..b5c1124a7c29 100644
--- a/games-fps/quake3-bin/Manifest
+++ b/games-fps/quake3-bin/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX q3ded.conf.d 307 SHA256 b9ba53020ff1da7bbd5b8c37d21435ea499b164d7a45c79a2a75d2c96e41f701 SHA512 96eca44d08112317d09d2d7ea5305dbe3122abdd95be1af4c6e41d8946d9fdb94c9650af94e293b67f4229a33d8f2201d598f36161f8fda289ff6c1ef0fa03b3 WHIRLPOOL 6c626bdf1cf7d9b5459f36e31d5c59a2b00027c3f2f3f37ff301d453bc5c0e6179e2632f4083ae347ac28315e9d39f030966df078b1b90aaa43a6070e53f79ae
 AUX q3ded.rc 853 SHA256 29c909b4543700733bf481a8bda756bba1d3a2fd6ed08432c801655b47a5b214 SHA512 1208354c524cccc5c7adbbe45884226dec71f3e5f9dc86b65bd0121eb69d5dde0e14a4ac03dc122816fac70b222425c2da6bb1899feba07db6c3b54e72bb1895 WHIRLPOOL 321446e733cbe0ba891b1756be87a4bbb2308b69d8cb1c6f0695345c4e67ad35d395c25b81a6075d741da4e8b5e4e90ed6e15cda8ac915b395409e227692c5fa
 DIST linuxq3apoint-1.32b-3.x86.run 30923961 SHA256 c36132c5556b35e01950f1e9c646235033a5130f87ad776ba2bc7becf4f4f186 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78 WHIRLPOOL ad1250dbf53e0d5b03b753752e9fc66f361fe2473fc3bd74285a1357e3c1f9fded64806a46766f1bd666b567b8d0fc55a8780633f60af2554abaad9231873cf3
 DIST quake3-1.32c.zip 3056760 SHA256 643ac677892fb58689a86d71f08d6678393efe2939b82c436a5c92368eebb849 SHA512 8bc68d4a1e015e5d5abb88bee1e52cb6375c005d707147869d16383bdbfd37f092a75e8fb3f8678120621433d98de40dcda9dbdbd255a92399caec2c545ff689 WHIRLPOOL 8b55046d002a577087309961074f5b05997d512e6dd666335a38026f006481497a6bb94e5ee9869b0ecdf7767cc26be5f949e157c06e2e477143819d29347f42
 EBUILD quake3-bin-1.32c-r1.ebuild 3435 SHA256 822bb18dae32a135950b9ea6ac40cd9873507d0923062156b5b5ba623495a3fd SHA512 876fcd34c81f9a6604d32b429a7e1f2275db55937f0f62d41c76e3dd0883f4145b5dd87578a0e965c4d190dd17405585b161bf92120334ee0b38ae3948c2b8e8 WHIRLPOOL e400cb1619571eba9b61983681609c95667a3a2c12a9b2d9cefaa2918c48b140b09e73dd59318b7c209ed0b5534365e94c5ef161f51fd2825a89114487e45a4a
-MISC ChangeLog 10461 SHA256 7905e73fed7c803a22db20e3eeac968ab252c7f3fe56613f2d19ea9edcd35f7b SHA512 d7fa24ac2f6477a414398187453d3027cd1e0a52228a11aaaf2eb99348243cc25619bb36e91e6dceff7efcf841e204a9f578e9be253221da6383e361c1c1a4de WHIRLPOOL 09ff93539a0e971b360a62237007963f1567e341424dfd2a0dc7760f17fd8be815dacf549a2d55fad6c2cebd4e50791baf7594d30652f4838a22fa9165671ab5
+EBUILD quake3-bin-1.32c-r2.ebuild 3253 SHA256 945637e8762e0ad05d3c7d179c5175ce6aa25d2c6569fa3989e31846237484c2 SHA512 34f4feb2021dd8c6bf88d1663e4d48c34394b086a62df9b7b1f1ec84b223540de23188966a090c226e3ed8dfa7ee331a1c4cb43dad9b3523373813fe07d8eadc WHIRLPOOL c6e99c60b5aa5cf5bf02a783d68e96d0824a28d59d63a3201ea94d9a72044d4eb284c476535e89522ae32f5512079dabf66f5cd473c55852dd1bf7bc10772b13
+MISC ChangeLog 10728 SHA256 518d947294c6f92bacd2ccde475279e0b3bc7c3655a20440b85bb5083cce2a9a SHA512 d4258c45cc330ee7190c161d006973425e8be8d74088eb4d15b2ad176d8ee42d72f9364ec2c4cd2e8891b2cf050f750119afe5551b221285f554003de35e5fe6 WHIRLPOOL d83ae6f235460c0e54bc5aa65b56642662d1124e606394098e2f963a0b1a392e8018bf74a3da9f3a130992b2bc86a0adb683cee436d18d387f3d621d424a8940
 MISC metadata.xml 1052 SHA256 9552624bd6c0d0ac113dc2d283a41c556bd86948c5a14c98fb06e85948feb2aa SHA512 9a3cb8d3604d7dfe81213508796c837d0a88d92692d42f7ae87de8fae1a0e08e59eb70132a287a7de725a179027494d95d35b61b7a2d9bcea56a6ad48b14e226 WHIRLPOOL 3d1cb950b85c64e6d67a924fbbd3b3dea351dedb748d0ed4e4d5f4cd616c81d063911ef2ccc9074d386bf99af854a3d3d445c0d4be519322feaffe8767f83ccb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlO8YKUACgkQ2ugaI38ACPA+6QEArjMP5TNprBOjlSMnvbwF61kX
+9b9lkVybdT+xiF4aMw0A/Anow8m7FpLeOu1WiMUQym9rEvwE9t1bSZ4jXJOqW2AO
+=FRzD
+-----END PGP SIGNATURE-----
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
new file mode 100644
index 000000000000..ba5d54d2ec22
--- /dev/null
+++ b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/07/08 21:20:41 axs Exp $
+
+EAPI=5
+inherit eutils unpacker games
+
+DESCRIPTION="3rd installment of the classic id 3D first-person shooter"
+HOMEPAGE="http://www.idsoftware.com/"
+SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
+	mirror://idsoftware/quake3/quake3-1.32c.zip"
+
+LICENSE="Q3AEULA GPL-2" #gpl for init script bug #425942
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cdinstall dedicated teamarena"
+RESTRICT="strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND="sys-libs/glibc
+	amd64? ( sys-libs/glibc[multilib] )
+	cdinstall? (
+		games-fps/quake3-data[cdinstall]
+		teamarena? ( games-fps/quake3-teamarena )
+	)
+	dedicated? ( app-misc/screen )
+	!dedicated? ( || (
+		(
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		)
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		)
+	) )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/quake3
+Ddir=${D}/${dir}
+
+QA_TEXTRELS="${dir:1}/pb/pbag.so
+	${dir:1}/pb/pbcl.so
+	${dir:1}/pb/pbsv.so"
+
+src_unpack() {
+	unpack_makeself linuxq3apoint-1.32b-3.x86.run
+	unpack quake3-1.32c.zip
+}
+
+src_install() {
+	dodir "${dir}"/{baseq3,missionpack}
+	if use cdinstall ; then
+		dosym "${GAMES_DATADIR}"/quake3/baseq3/pak0.pk3 "${dir}"/baseq3/pak0.pk3
+		use teamarena && dosym "${GAMES_DATADIR}"/quake3/missionpack/pak0.pk3 \
+			"${dir}"/missionpack/pak0.pk3
+	fi
+	for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do
+		dosym "${GAMES_DATADIR}"/quake3/${pk3} "${dir}"/${pk3}
+	done
+
+	insinto "${dir}"
+	doins -r Docs pb || die "ins docs/pb"
+
+	exeinto "${dir}"
+	doins quake3.xpm README* Q3A_EULA.txt
+	if ! use dedicated ; 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)"
+		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
+	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
+	newconfd "${FILESDIR}"/q3ded.conf.d quake3-ded
+
+	prepgamesdirs
+}
+
+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, please see bug #82149."
+
+	if ! use dedicated; then
+		echo
+		elog "To start the game, run:"
+		elog " quake3-bin"
+	fi
+	echo
+	elog "To start a dedicated server, run"
+	elog "  /etc/init.d/quake3-ded start"
+	elog
+	elog "The dedicated server is started under the ${GAMES_USER_DED} user account."
+
+	# IA32 Emulation required for amd64
+	if use amd64 ; then
+		echo
+		ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Quake3 to run."
+	fi
+}
diff --git a/games-fps/quake3-demo/ChangeLog b/games-fps/quake3-demo/ChangeLog
index 9713b38de876..79bf6c304b7e 100644
--- a/games-fps/quake3-demo/ChangeLog
+++ b/games-fps/quake3-demo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/quake3-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.25 2012/12/25 19:07:03 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.26 2014/07/08 21:21:11 axs Exp $
+
+*quake3-demo-1.11-r1 (08 Jul 2014)
+
+  08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +quake3-demo-1.11-r1.ebuild, metadata.xml:
+  bumped EAPI to 5, adjustd deps for gx86-multilib, dropped useless use flags,
+  made USE=dedicated install only the dedicated server, as it should
 
   25 Dec 2012; Tupone Alfredo <tupone@gentoo.org> quake3-demo-1.11.ebuild:
   Use QA_PREBUILT. Bug #430374 by Diego Elio Pettenò
diff --git a/games-fps/quake3-demo/Manifest b/games-fps/quake3-demo/Manifest
index 811a2aa506ca..f7b382aee324 100644
--- a/games-fps/quake3-demo/Manifest
+++ b/games-fps/quake3-demo/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA256
 
 DIST linuxq3ademo-1.11-6.x86.gz.sh 49289300 SHA256 64dee3f69b6e792d1da4fe0ac98fedc7eb1e37ea1027fb609a9fadd06150a4ec SHA512 aa74f8e1e8b5036fd68761e5f38cbc3d771e9bd0d5c3cc1f5d89d7eba8fd4fda8108dfd4f31d2b846114e4ec89f6aa15849b95232e0570181a104563ec0faeb5 WHIRLPOOL 558a84cf97c142befa4585eeeeca609f3b5c1880f6fda32a79de415d28779cbe2f69e9c901f4a7d8e0f60acd6279a7a9be69834cb6acded7d31ad630ffd3847f
+EBUILD quake3-demo-1.11-r1.ebuild 1710 SHA256 da99cf07c7a7fac05fa7add9fabd403ece84832653131cd4e726214b6c93d4b7 SHA512 bddf30e6f822dd1a394c93879c6c9c1c1b8c7ec04e2325fde1a15b24676ba5bf8bf50dcfa2948d9db5c25d24979ad68e739128fa358dbcb2f034d83c8757ccba WHIRLPOOL 6a3fbe2f21e5279bc50a682e3908cf9c2fb8a5fe7129cbafa8c2ed99db0e7a62f202a3413a5da77e1fc88b5630f2a5ab519fe37ecc3249b081b4b951461f8680
 EBUILD quake3-demo-1.11.ebuild 1682 SHA256 6e7249e0b8c9fdff9b4807b2a8fee09adfed2a602b290970229bcc26c52435c4 SHA512 876dcc3166e3c499f4ac22274492717fe5d7109f81c15c46e57867e02f32f47b4088160551e932d145b3037f1eb4038378fc297ea1537119a2d9f48fb80ed35a WHIRLPOOL 6ffc544a1525eb052215531bce5b8f74fc921db75aaacdd4c0be1e3cc221f15406dd4529d4722a74dd3e56057c708165f19959482363a5045896898cb86b4ea6
-MISC ChangeLog 3581 SHA256 6604c17eee81025ea24287d034643ea78bbfe4fcbe66fbb0cfd957f9b612cd82 SHA512 770ce3b81d0301b1ac36dc49434c87bcdaefe783eda775715e97c7cbe1abc6aca53d98093abd520f53997ff40498470ecd36576ab1bbe275b18860eea39db23a WHIRLPOOL 5b96a5a9d432adac4a7ee1ecdbcf7b94d28a49785cd944c8e80d57da84613faf339236f7a46d71457e46e7dde8f7e074ac66f8b124130b6e384cada2cc032165
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+MISC ChangeLog 3865 SHA256 c93a8ea1c4fb0a524556c3e78a85ca30fad833abf053672f71820668ee5c110b SHA512 b083385a382b04f8e34d75a9875966d4986da4f24eca165e757bf0719d6035ffdcbb8f612d5fea200b98f783f87a14da2718076b7d384ab61b168631d6ea21a6 WHIRLPOOL 7bfb7b2517e1fbc8e83c26cce89ad92ed5735ccf346c605500373ed187bf51f8d876316ea3de66a2193dbeacd596f4960816490654653580c0b41cc85e878761
+MISC metadata.xml 241 SHA256 0e7f58b01778d4b45074e6fa0bb0068a1a4ea232364390f2a8dd7fe778440b26 SHA512 426d91b739d3f9b92343d9c64d574116aa08280dfb6d3b59bc3587c5f3a8e9fd52c1f3ec5424ef19a0b5d85f31579a64e0d86d194fd044f0bd480bc4cb3c4cbe WHIRLPOOL 9ad05f4802b60a62dbd3abd242395dd79f4191937b6e6b0310ab3d278c19f2a2e9f0b8ab534089683a70ded6a318a2861edce190e6aab75e75d5885d06b4bbbf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlDZ+V4ACgkQIY77eQFFFC0bRQCgronYOAevWimsqxQfD4OZ2mME
-7c8An3e8z5tM0frxRWIAkIUTDoD8DyWv
-=issh
+iF4EAREIAAYFAlO8YMIACgkQ2ugaI38ACPBLVwD/UCm3WsmAFPpo4V060b+Sg1yg
+Gzdexe9TpP9CzZMARiABAIP1qhMsVgT2TXN+HSQ94VrXx5wmV9chfFxqt2qaQHHu
+=J89m
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake3-demo/metadata.xml b/games-fps/quake3-demo/metadata.xml
index d3c2cc926f0b..69805c6e0030 100644
--- a/games-fps/quake3-demo/metadata.xml
+++ b/games-fps/quake3-demo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
+<use>
+	<flag name='dedicated'>install only as a dedicated game serer</flag>
+</use>
 </pkgmetadata>
diff --git a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
new file mode 100644
index 000000000000..a2a41dc4ed64
--- /dev/null
+++ b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild,v 1.1 2014/07/08 21:21:11 axs Exp $
+
+EAPI=5
+inherit eutils unpacker games
+
+DESCRIPTION="the playable demo of Quake III Arena by Id Software"
+HOMEPAGE="http://www.idsoftware.com/games/quake/quake3-arena/"
+SRC_URI="mirror://idsoftware/quake3/linux/linuxq3ademo-${PV}-6.x86.gz.sh
+	mirror://3dgamers/quake3arena/linuxq3ademo-${PV}-6.x86.gz.sh"
+
+LICENSE="Q3AEULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated"
+RESTRICT="strip"
+
+RDEPEND="sys-libs/glibc
+	amd64? ( sys-libs/glibc[multilib] )
+	dedicated? ( app-misc/screen )
+	!dedicated? ( || (
+		(
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		)
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		)
+	) )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/q3ded.x86
+	${dir:1}/q3demo.x86"
+
+src_unpack() {
+	unpack_makeself
+}
+
+src_install() {
+	insinto "${dir}"
+	doins -r Help demoq3
+	doins README icon.*
+
+	exeinto "${dir}"
+	newexe bin/x86/glibc-2.0/q3ded q3ded.x86
+	games_make_wrapper q3ded ./q3ded.x86 "${dir}" "${dir}"
+	if ! use dedicated; then
+		newexe bin/x86/glibc-2.0/q3demo q3demo.x86
+		games_make_wrapper q3demo ./q3demo.x86 "${dir}" "${dir}"
+		make_desktop_entry q3demo "Quake III (Demo)"
+	fi
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! use dedicated; then
+	elog "To play the game run:"
+	elog " q3demo"
+	fi
+	echo
+	elog "To start the gameserver, run:"
+	elog " q3ded"
+}