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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

2 files changed, 17 insertions, 15 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/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}"