adjusted for erroneous gx86-multilib dependency versions; dropped use flags as opengl is required and there is no dedicated server

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

3 files changed, 22 insertions, 20 deletions

diff --git a/games-fps/doom3-demo/ChangeLog b/games-fps/doom3-demo/ChangeLog
index 89a01ce9fc89..d523ba05cbc6 100644
--- a/games-fps/doom3-demo/ChangeLog
+++ b/games-fps/doom3-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3-demo
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.32 2014/07/08 20:47:13 axs Exp $
+
+  08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  doom3-demo-1.1.1286-r1.ebuild:
+  adjusted for erroneous gx86-multilib dependency versions; dropped use flags as
+  opengl is required and there is no dedicated server
 
 *doom3-demo-1.1.1286-r1 (03 Jul 2014)
 
diff --git a/games-fps/doom3-demo/Manifest b/games-fps/doom3-demo/Manifest
index 319231b4c5ba..f6e2b3e942a4 100644
--- a/games-fps/doom3-demo/Manifest
+++ b/games-fps/doom3-demo/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 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-r1.ebuild 1731 SHA256 341bc5025048a1b747c4d0bb3ccdcc26486e234871a6a33192665782ef0be60f SHA512 3ec405d5e48e97342d12debe1dd9d523f3d851967517dc844c589aef17da9d7026de64f90ae3b31e523a6192f814aee74015b742977c23d6ce4b641f472a2a57 WHIRLPOOL bcb7ebd649eba27ba7b9af0b78259112da92f9a27f01a6bfb9863b002c6ccbcd299527ff7a43884188efdc9244a2603061a87435816fa7cd5d3bcadbcb330a62
 EBUILD doom3-demo-1.1.1286.ebuild 1842 SHA256 7dfb857ae52f38243b993c4a43a5f8047b2a9bf16639b464afa552c02b38a6be SHA512 fc2e8706d4fa85bb90e5bdebc286e180657444d86dfedf469d011b2fafc1fc4ee73fbc566c27935668888ed702e869fdeaa5e33565a6c487974458ac53f0295f WHIRLPOOL dc6aed4a16bb6f88cb9e7d3420e80a978ee53b4ae9d30f5b52335d962be9d6e66f18f5ea8687b9ab58702c3bbce492b7217bf5dc247bb7aeac21e994252a8abe
-MISC ChangeLog 4934 SHA256 ad3e7d3c2e7b79623aab7af91b67905fab8c1f2b84926137e322774dc1feca18 SHA512 cd0117f76a7bfc1b3bc03d2e8ddbedec12a22004ad3d9fa6146879557406b58cf31503ceefe0445af176780df94b69f3261e0679af76772fa624569242adadc4 WHIRLPOOL f2fd4a346ea4a64bb5a2c3ccb0c93223d36fa9ec3e892470c0d1c3011a18cf58ee04d3962e9c994a8b6508fee4c3fbdf7e6c669de60f767aaac53b87badba2b1
+MISC ChangeLog 5160 SHA256 5cca49dedf3aee5b8b9c793a19f3d83a55840a1e45afab6a7e6afea084daba28 SHA512 4839b91f1ad36615121865b844a09a72f3e8ff80f03317af136a4fa32d68af6eca131e8dc72c1fd83504c12d323bdbeab1dd903ac7c85410d26f58efdca08f3d WHIRLPOOL 0e478a657b9e0569f7985eb4877c7ca9ee9566d5e934156e1e2fef10acb1e8e8710e66b18df79b3ccdadaa672183bab2a8a4dec2d8e1ea05f486fa4d0e6d44a7
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlO11CoACgkQ2ugaI38ACPA57gD/X8NLJPw4OSgYgq1M87GplXOL
-LBvutIW7HtUJQ7KR6QcA/0MAQhgmDv9E3bB7HCVMkUBkb1OgLKUzJRGs027A5NZ/
-=RofH
+iF4EAREIAAYFAlO8WM0ACgkQ2ugaI38ACPDMswD/aQXu9FoxmMM7kQYiRSNnEa+l
+1LVTJt1cFKM65vVgmEAA/A8zVlWh7iy8ry8rw7qcznIrcuIuyA2W/MAiBGafRD/a
+=M7q1
 -----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
index 601ead2c810a..64ac10ff7f15 100644
--- a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
+++ b/games-fps/doom3-demo/doom3-demo-1.1.1286-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/doom3-demo/doom3-demo-1.1.1286-r1.ebuild,v 1.1 2014/07/03 22:07:43 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild,v 1.2 2014/07/08 20:47:13 axs Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -14,7 +14,7 @@ SRC_URI="mirror://3dgamers/doom3/doom3-linux-${PV}-demo.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="opengl dedicated"
+IUSE=""
 RESTRICT="strip mirror"
 QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/*"
 
@@ -25,16 +25,15 @@ RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
 	|| (
 		(
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 			>=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 )"
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		)
+	)"
 
 S=${WORKDIR}
 
@@ -46,17 +45,15 @@ src_unpack() {
 }
 
 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"
 
+	exeinto "${dir}"
+	doexe gamex86.so bin/Linux/x86/doom.x86
+
 	newicon "${DISTDIR}"/doom3.png ${PN}.png
 
 	games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"