Bumped EAPI to 5, converted deps to gx86-multilib, dropped bundled glibc/libstdc++, dropped x11-drivers specific deps. Seems odd that there is no requirement for alsa/emul-*-soundlibs like there is in games-fps/doom3

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

3 files changed, 94 insertions, 23 deletions

diff --git a/games-fps/doom3-demo/ChangeLog b/games-fps/doom3-demo/ChangeLog
index 4ef53b4911c9..89a01ce9fc89 100644
--- a/games-fps/doom3-demo/ChangeLog
+++ b/games-fps/doom3-demo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/doom3-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.30 2012/02/05 06:02:06 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.31 2014/07/03 22:07:43 axs Exp $
+
+*doom3-demo-1.1.1286-r1 (03 Jul 2014)
+
+  03 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +doom3-demo-1.1.1286-r1.ebuild:
+  Bumped EAPI to 5, converted deps to gx86-multilib, dropped bundled
+  glibc/libstdc++, dropped x11-drivers specific deps.  Seems odd that there is
+  no requirement for alsa/emul-*-soundlibs like there is in games-fps/doom3
 
   05 Feb 2012; Mike Frysinger <vapier@gentoo.org> doom3-demo-1.1.1286.ebuild:
   Move to new unpacker eclass for unpack_makeself.
@@ -121,4 +129,3 @@
   07 Oct 2004; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +doom3-demo-1.1.1282.ebuild:
   Initial import.  Ebuild by vapier.  Closing bug #66352.
-
diff --git a/games-fps/doom3-demo/Manifest b/games-fps/doom3-demo/Manifest
index c13fc76444c7..319231b4c5ba 100644
--- a/games-fps/doom3-demo/Manifest
+++ b/games-fps/doom3-demo/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST doom3-linux-1.1.1286-demo.x86.run 485257318 RMD160 7d6a789be22b48a20c0826c6ce2391d50d3cea04 SHA1 b6954f7ecbd6dbfa616de445a92a122d0734a1d0 SHA256 b42260fd08feb13c2f035a3746f8c1e3472151f0f781b8a2d1da231dae818083
-DIST doom3.png 6502 RMD160 4d8a692621c9bbe6c85f0508ade4c35b06abb46f SHA1 815c92ded2f0a58e44607ee4076aa965abdd1d5b SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b
-EBUILD doom3-demo-1.1.1286.ebuild 1842 RMD160 1f87ad3436d6f21ae75cce3028486ccf3526da8f SHA1 3e2e5c77b986bfe6af4ad2f8063b3914ddc5f4e2 SHA256 7dfb857ae52f38243b993c4a43a5f8047b2a9bf16639b464afa552c02b38a6be
-MISC ChangeLog 4583 RMD160 01ef2c803033f4cbdeaaf98394c3e02712b3c086 SHA1 424022e58272aab2e872ea0fb8f576b0c0098f8d SHA256 f271dcb9890d608534e5b4e43b3f13b52edda204eb69dde12cf06545515da79d
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST doom3-linux-1.1.1286-demo.x86.run 485257318 SHA256 b42260fd08feb13c2f035a3746f8c1e3472151f0f781b8a2d1da231dae818083 SHA512 9eeada64b60ef06c8380411050ea794a863c9672578bf4593a35835c6d4b7dc5d0ba8e8cb5e5c46cbbdfd7410483e5f6321ac1393655f29b481aea99dc00b3db WHIRLPOOL 090ecbb4a049a6def58cedea831c4595026087bd6f5ae2920d7a82f269fa26972aad1b383e7a004cc7d9f131f66967b604a85230dddcd72ee5fb4a15938a58f1
+DIST doom3.png 6502 SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b SHA512 9a2b3831babbf3fa0d354e1a4a779c972676edbcc0b287de9b9f3eb830e0a00d557ba9645fbf0e58e07d5705efb0ef2b7ab96cd92493e2a0afc30c8842c0043b WHIRLPOOL e568cdcf3ea510b9865a4c1f1577713c6a63954a22e572311a321c8c73cf70ca68b76134d45a9f1c77e2d6b464ec29e098b7fe39ce1eb38889f83fc3c9bfc05f
+EBUILD doom3-demo-1.1.1286-r1.ebuild 1864 SHA256 8d28cbd68ecf4bef71f898d33a04e01c76427b56033ec4a7b41f81ad161a5ed4 SHA512 607920b12bfee81283868e3c6cc4007cd5216935067792c8ad16c2fe29aa559ccb0da73c42955653c2f291f653d2ba7232fced3a00e05bc4a8ee7a2ba379259c WHIRLPOOL a20234dd11b0dbfcc9c36ac1abfdd50600d2dbccb0a26f4721e93fb1057efdbb876e700b73c0ea99bc7674536dfe0ae355eb1c1beb1c1d11fb1a81a344dd7236
+EBUILD doom3-demo-1.1.1286.ebuild 1842 SHA256 7dfb857ae52f38243b993c4a43a5f8047b2a9bf16639b464afa552c02b38a6be SHA512 fc2e8706d4fa85bb90e5bdebc286e180657444d86dfedf469d011b2fafc1fc4ee73fbc566c27935668888ed702e869fdeaa5e33565a6c487974458ac53f0295f WHIRLPOOL dc6aed4a16bb6f88cb9e7d3420e80a978ee53b4ae9d30f5b52335d962be9d6e66f18f5ea8687b9ab58702c3bbce492b7217bf5dc247bb7aeac21e994252a8abe
+MISC ChangeLog 4934 SHA256 ad3e7d3c2e7b79623aab7af91b67905fab8c1f2b84926137e322774dc1feca18 SHA512 cd0117f76a7bfc1b3bc03d2e8ddbedec12a22004ad3d9fa6146879557406b58cf31503ceefe0445af176780df94b69f3261e0679af76772fa624569242adadc4 WHIRLPOOL f2fd4a346ea4a64bb5a2c3ccb0c93223d36fa9ec3e892470c0d1c3011a18cf58ee04d3962e9c994a8b6508fee4c3fbdf7e6c669de60f767aaac53b87badba2b1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPLht4AAoJELEHsLL7fEFWafQP/1IiAPntGS1WOriW++ADpK/0
-7bJ+i/5tDLZNMs7c3phqmdH+blVQ1R5uRdWWV56K3eV8G6ytMKOwMheg7kF592op
-5wu5Q5myGpCzLNDNE80R6SE1jLoXLZQBnl25IAdo3eZuFoz47VKY2o7BLXPubKf0
-K3MAanWmQShvlFa9GoyFaKimFul7+/SHsUa/U1plEwbchE6k3J8g00GgG6a3Q3gA
-PXbR7dYx2ABGqv8jGEPmlL9j+ww1p0LP3oA45T1jllvsJSLtKa+DsApGuT6gmeQV
-w4KmyH5Lc8dIKSCv2ffPTSK44sj96bK7XvUIIaUo/u2jO/H58FPESmtywAMirQZk
-argKtOQIPXvnSkR0kOtwqsPwajxD71fC+nVb1T7aitC+fWM+FP04g/XCiY2ECZmr
-DnJ7jsTQW6uP2lfyarUP/E7yoLQfOsMpL62JdWzFK3D8CmShmoadTUZPwLiRanYH
-7Nbvy4SqsbzYp5QjoaDcUjjv/DkMLN5xz22f8QLit3812WDt+rHVbTMlFobdLwXh
-PlN1kN4Fv/YlXVX3xVEA0kmZ05x14y1C+3qFY8zgAvJAeNVjuC5PEey+eoChHSq2
-lgRPZDD4oeTUBShQAGlgFGvEm/ro/xy6EJhlrWXfBgBl+aJjr0DY0FnskdSWsryW
-2tIrHpinesKxksbtwpXx
-=lcZK
+iF4EAREIAAYFAlO11CoACgkQ2ugaI38ACPA57gD/X8NLJPw4OSgYgq1M87GplXOL
+LBvutIW7HtUJQ7KR6QcA/0MAQhgmDv9E3bB7HCVMkUBkb1OgLKUzJRGs027A5NZ/
+=RofH
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
new file mode 100644
index 000000000000..601ead2c810a
--- /dev/null
+++ b/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild,v 1.1 2014/07/03 22:07:43 axs Exp $
+
+EAPI=5
+inherit eutils unpacker games
+
+DESCRIPTION="Doom III - 3rd installment of the classic id 3D first-person shooter"
+HOMEPAGE="http://www.doom3.com/"
+SRC_URI="mirror://3dgamers/doom3/doom3-linux-${PV}-demo.x86.run
+	mirror://idsoftware/doom3/linux/doom3-linux-${PV}-demo.x86.run
+	mirror://gentoo/doom3.png"
+
+LICENSE="DOOM3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="opengl dedicated"
+RESTRICT="strip mirror"
+QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/*"
+
+# Do not remove the amd64 dep unless you are POSITIVE that it is not necessary.
+# See bug #88227 for more.
+RDEPEND="sys-libs/glibc
+	sys-libs/libstdc++-v3:5
+	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
+	|| (
+		(
+			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		)
+		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+	)
+	opengl? ( || (
+		virtual/opengl[abi_x86_32(-)]
+		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+	) )
+	dedicated? ( app-misc/screen )"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_unpack() {
+	unpack_makeself doom3-linux-${PV}-demo.x86.run
+}
+
+src_install() {
+	dodir "${dir}"
+
+	insinto "${dir}"
+	doins License.txt README version.info
+	exeinto "${dir}"
+	#doexe gamex86.so libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
+	doexe gamex86.so bin/Linux/x86/doom.x86
+
+	insinto "${dir}"/demo
+	doins demo/* || die "doins base"
+
+	newicon "${DISTDIR}"/doom3.png ${PN}.png
+
+	games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
+	make_desktop_entry ${PN} "Doom III (Demo)"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	elog "To play the game run:"
+	elog " doom3-demo"
+}