Fixed amd64 dependencies for bug #113046 and marking stable on x86 and amd64.

Package-Manager: portage-2.0.53_rc7

5 files changed, 14 insertions, 102 deletions

diff --git a/games-fps/americas-army/ChangeLog b/games-fps/americas-army/ChangeLog
index cd8830ebf9e6..cd6527f6f711 100644
--- a/games-fps/americas-army/ChangeLog
+++ b/games-fps/americas-army/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/americas-army
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.40 2005/11/12 22:22:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.41 2005/11/20 18:31:53 wolf31o2 Exp $
+
+  20 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -americas-army-230.ebuild, americas-army-250.ebuild:
+  Fixed amd64 dependencies for bug #113046 and marking stable on x86 and amd64.
 
   12 Nov 2005; Luca Barbato <lu_zero@gentoo.org> americas-army-230.ebuild:
   Dependency update: media-video/ati-drivers -> x11-drivers/ati-drivers.
diff --git a/games-fps/americas-army/Manifest b/games-fps/americas-army/Manifest
index c6c2ce6e70f1..d528579302eb 100644
--- a/games-fps/americas-army/Manifest
+++ b/games-fps/americas-army/Manifest
@@ -1,6 +1,4 @@
-MD5 771141bf89c51bff235a0b5087752a2e ChangeLog 7062
-MD5 d64fdbf9e8ddb4263026b0f16b9dd835 americas-army-230.ebuild 2436
-MD5 a5cc08c84dd904b07a48bd189e1e54ed americas-army-250.ebuild 2564
-MD5 4aa3b4250bc4806b912b21cd3ac638ea files/digest-americas-army-230 139
+MD5 ac6ea5dedd80cfa8fc491839953a5b30 ChangeLog 7550
+MD5 bcbed113ead4db95d954b48521c30598 americas-army-250.ebuild 2580
 MD5 2dea6766074a1e9b43ce971b4a7882b2 files/digest-americas-army-250 139
 MD5 f1a9a44e85e58296a3710c291666ab78 metadata.xml 672
diff --git a/games-fps/americas-army/americas-army-230.ebuild b/games-fps/americas-army/americas-army-230.ebuild
deleted file mode 100644
index 17dd7fe09167..000000000000
--- a/games-fps/americas-army/americas-army-230.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-230.ebuild,v 1.10 2005/11/12 22:22:12 lu_zero Exp $
-
-inherit eutils games
-
-MY_P="armyops${PV}-linux.run"
-DESCRIPTION="America's Army: Special Forces - military simulations by the U.S. Army to provide civilians with insights on soldiering"
-HOMEPAGE="http://www.americasarmy.com/"
-SRC_URI="mirror://3dgamers/${PN/-/}/${MY_P}
-	dedicated? (
-		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
-		mirror://gentoo/${PN}-all-0.1.tar.bz2 )"
-
-LICENSE="Army-EULA"
-SLOT="0"
-KEYWORDS="x86 amd64"
-RESTRICT="nostrip nomirror"
-
-IUSE="opengl dedicated"
-
-DEPEND="virtual/libc
-	app-arch/unzip"
-RDEPEND="virtual/libc
-	opengl? ( virtual/opengl )
-	amd64? ( app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-compat
-		|| ( >=media-video/nvidia-glx-1.0.6629-r3
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) )
-	dedicated? ( app-misc/screen )"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-	ewarn "The installed game takes about 1.6GB of space when installed and 2.4GB of space in ${PORTAGE_TMPDIR} to build!"
-}
-
-src_unpack() {
-	unpack_makeself ${DISTDIR}/${MY_P} || die "unpacking game"
-	tar -zxf setupstuff.tar.gz || die
-	if use dedicated; then
-		unpack ${PN}-all-0.1.tar.bz2 || die
-	fi
-}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-
-	dodir ${dir}
-
-	tar -jxf armyops${PV}.tar.bz2 -C ${Ddir}/ || die "armyops untar failed"
-	tar -jxf binaries.tar.bz2 -C ${Ddir}/ || die "binaries untar failed"
-
-	dodoc README.linux
-	insinto ${dir}
-	doins ArmyOps.xpm README.linux ArmyOps${PV}_EULA.txt || die "doins failed"
-	newicon ArmyOps.xpm armyops.xpm || die "doins failed"
-	exeinto ${dir}
-	doexe bin/armyops || die "doexe failed"
-
-	if use dedicated; then
-		newinitd ${S}/armyops-ded.rc armyops-ded
-		newconfd ${S}/armyops-ded.conf. armyops-ded
-		games_make_wrapper armyops-ded ./server-bin ${dir}/System
-	fi
-
-	games_make_wrapper armyops ./armyops "${dir}" "${dir}"
-
-	prepgamesdirs
-	make_desktop_entry armyops "America's Army" armyops.xpm
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if use dedicated; then
-		einfo "To start a dedicated server, run"
-		einfo "	/etc/init.d/armyops-ded start"
-		echo
-	fi
-	if use opengl; then
-		einfo "To play the game run:"
-		einfo " armyops"
-		echo
-	fi
-}
diff --git a/games-fps/americas-army/americas-army-250.ebuild b/games-fps/americas-army/americas-army-250.ebuild
index 8505b4cf18bb..5610d2b10dea 100644
--- a/games-fps/americas-army/americas-army-250.ebuild
+++ b/games-fps/americas-army/americas-army-250.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-250.ebuild,v 1.3 2005/11/12 22:21:08 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-250.ebuild,v 1.4 2005/11/20 18:31:53 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -16,19 +16,19 @@ SRC_URI="http://treefort.icculus.org/armyops/${MY_P}
 
 LICENSE="Army-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="nostrip nomirror"
 
 IUSE="opengl dedicated"
 
-DEPEND="virtual/libc
+DEPEND="sys-libs/glibc
 	app-arch/unzip"
-RDEPEND="virtual/libc
+RDEPEND="sys-libs/glibc
 	opengl? ( virtual/opengl )
 	amd64? ( app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-compat
-		|| ( >=media-video/nvidia-glx-1.0.6629-r3
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) )
+		opengl? ( app-emulation/emul-linux-x86-compat
+			|| ( >=media-video/nvidia-glx-1.0.6629-r3
+				>=x11-drivers/ati-drivers-8.8.25-r1 ) ) )
 	dedicated? ( app-misc/screen )"
 
 S=${WORKDIR}
diff --git a/games-fps/americas-army/files/digest-americas-army-230 b/games-fps/americas-army/files/digest-americas-army-230
deleted file mode 100644
index d358bced05b7..000000000000
--- a/games-fps/americas-army/files/digest-americas-army-230
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a0df99cc9933120905f2de51f2ad613b armyops230-linux.run 781095534
-MD5 e60202fcd14a192d64d2522e205afdb4 americas-army-all-0.1.tar.bz2 680