Removing 2.0.0 version and updating 2.0.0a to fix broken mirrors. Closing bug #40598.

6 files changed, 20 insertions, 88 deletions

diff --git a/games-fps/americas-army/ChangeLog b/games-fps/americas-army/ChangeLog
index 092be3f5b386..4059d0fe59de 100644
--- a/games-fps/americas-army/ChangeLog
+++ b/games-fps/americas-army/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/americas-army
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.5 2004/01/09 16:16:21 wolf31o2 Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.6 2004/02/08 22:15:24 wolf31o2 Exp $
+
+  08 Feb 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  americas-army-200.ebuild, americas-army-200a.ebuild:
+  Removing 2.0.0 version and updating 2.0.0a to fix broken mirrors. Closing bug
+  #40598.
 
 *americas-army-200a (09 Jan 2004)
 
diff --git a/games-fps/americas-army/Manifest b/games-fps/americas-army/Manifest
index dc05e45b8b63..78ac6a6f55f4 100644
--- a/games-fps/americas-army/Manifest
+++ b/games-fps/americas-army/Manifest
@@ -1,7 +1,5 @@
-MD5 ce27c3df9fd688ed2ead11280031c953 americas-army-200a.ebuild 2149
-MD5 ab73fd5023faf629c5364911a8a7cc88 ChangeLog 2124
-MD5 0a1bc2d87e646de4e4e7f5b8b48f179e americas-army-200.ebuild 1787
+MD5 b09786bf10dfcefe9107e5383aa93d7c americas-army-200a.ebuild 1833
+MD5 6dd6aa6e9b9e3b5d7a8c5f05fe491a9d ChangeLog 2324
 MD5 f1a9a44e85e58296a3710c291666ab78 metadata.xml 672
-MD5 1b97ba8018f2f04fd92c73858c345da5 files/digest-americas-army-200a 147
+MD5 a6ce37c42a8c963d4f98e375b4c40f76 files/digest-americas-army-200a 69
 MD5 ecd9684b31f56c72a9554791fee4f77c files/armyops 40
-MD5 59db7df8268f3fa6c578becfdf0579cc files/digest-americas-army-200 66
diff --git a/games-fps/americas-army/americas-army-200.ebuild b/games-fps/americas-army/americas-army-200.ebuild
deleted file mode 100644
index f9063bf5121a..000000000000
--- a/games-fps/americas-army/americas-army-200.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-200.ebuild,v 1.1 2003/11/28 15:14:19 wolf31o2 Exp $
-
-inherit games
-
-DESCRIPTION="America's Army: Operations - military simulations by the U.S. Army to provide civilians with insights on soldiering"
-HOMEPAGE="http://www.americasarmy.com/"
-SRC_URI="ftp://3dgamers.in-span.net/pub/3dgamers4/games/americasarmy/armyops${PV}-lnx.run
-	ftp://theuser:9K5ya@ftp4.3dgamers.com/pub/3dgamers/games/americasarmy/armyops${PV}-lnx.run
-	ftp://armyops:ftp@2dollar.unixwhore.com:69/armyops${PV}-lnx.run
-	http://www.biot.com/misc/armyops${PV}-lnx.run"
-
-LICENSE="Army-EULA"
-SLOT="0"
-KEYWORDS="x86"
-RESTRICT="nostrip nomirror"
-
-DEPEND="virtual/glibc"
-RDEPEND="media-sound/esound
-	virtual/x11
-	virtual/opengl"
-
-S=${WORKDIR}
-
-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
-	tar -zxf setupstuff.tar.gz || die
-}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	dodir ${dir}
-
-	tar -jxf armyops${PV}.tar.bz2 -C ${D}/${dir}/ || die
-	tar -jxf binaries.tar.bz2 -C ${D}/${dir}/ || die
-
-	dodoc README.linux
-	insinto ${dir} ; doins ArmyOps.xpm
-	insinto /usr/share/pixmaps ; doins ArmyOps.xpm
-	exeinto ${dir} ; doexe bin/armyops
-
-	sed -e "s:GENTOO_DIR:${dir}:" ${FILESDIR}/armyops > armyops
-	dogamesbin armyops
-	dosym ${dir}/armyops ${GAMES_BINDIR}/armyops
-
-	prepgamesdirs
-	make_desktop_entry armyops "AA: Operations" ArmyOps.xpm
-
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "To play the game run:"
-	einfo " armyops"
-}
diff --git a/games-fps/americas-army/americas-army-200a.ebuild b/games-fps/americas-army/americas-army-200a.ebuild
index a69bbf1d07a4..9e189ff5ea61 100644
--- a/games-fps/americas-army/americas-army-200a.ebuild
+++ b/games-fps/americas-army/americas-army-200a.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-200a.ebuild,v 1.1 2004/01/09 16:16:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-200a.ebuild,v 1.2 2004/02/08 22:15:24 wolf31o2 Exp $
 
 inherit games
 
-MY_P="armyops200-lnx.run"
+MY_P="armyops200a-linux.bin"
 DESCRIPTION="America's Army: Operations - military simulations by the U.S. Army to provide civilians with insights on soldiering"
 HOMEPAGE="http://www.americasarmy.com/"
-SRC_URI="http://www.biot.com/misc/${MY_P}
-	http://ftp.freenet.de/pub/4players/hosted/americasarmy/AAO_Full/${MY_P}
-	http://sjcredirvip.xlontech.net/100083/games/americasarmy/armyops-lnx-patch-200to200a.tar.bz2
-	ftp://3dgamers.in-span.net/pub/3dgamers4/games/americasarmy/armyops-lnx-patch-200to200a.tar.bz2
-	http://3dgamers.gameservers.net/pub/3dgamers/games/americasarmy/armyops-lnx-patch-200to200a.tar.bz2"
+SRC_URI="ftp://3dgamers.in-span.net/pub/3dgamers4/games/${PN}/${MY_P}
+	http://3dgamers.reliableservers.net/pub/3dgamers/games/${PN}/${MY_P}
+	http://3dgamers.gameservers.net/pub/3dgamers/games/${PN}/${MY_P}
+	http://3dgamers.planetmirror.com/pub/3dgamers/games/${PN}/${MY_P}"
 
 LICENSE="Army-EULA"
 SLOT="0"
@@ -31,9 +30,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack armyops-lnx-patch-200to200a.tar.bz2 || die
-	unpack_makeself ${DISTDIR}/${MY_P} || die
-	unpack_makeself armyops-lnx-patch-200to200a.run || die
+	unpack_makeself || die "Unpacking game"
 
 	tar -zxf setupstuff.tar.gz || die
 }
@@ -44,7 +41,7 @@ src_install() {
 	local dir=${GAMES_PREFIX_OPT}/${PN}
 	dodir ${dir}
 
-	tar -jxf armyops200.tar.bz2 -C ${D}/${dir}/ || die
+	tar -jxf armyops200a.tar.bz2 -C ${D}/${dir}/ || die
 	tar -jxf binaries.tar.bz2 -C ${D}/${dir}/ || die
 
 	dodoc README.linux
@@ -56,9 +53,6 @@ src_install() {
 	dogamesbin armyops
 	dosym ${dir}/armyops ${GAMES_BINDIR}/armyops
 
-	# Patch
-	bin/Linux/x86/loki_patch patch.dat ${D}/${dir} || die "patching"
-
 	prepgamesdirs
 	make_desktop_entry armyops "AA: Operations" ArmyOps.xpm
 
diff --git a/games-fps/americas-army/files/digest-americas-army-200 b/games-fps/americas-army/files/digest-americas-army-200
deleted file mode 100644
index 23c3b2502943..000000000000
--- a/games-fps/americas-army/files/digest-americas-army-200
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f0d447ecc971a12edc09bd0c16bdd92e armyops200-lnx.run 686456601
diff --git a/games-fps/americas-army/files/digest-americas-army-200a b/games-fps/americas-army/files/digest-americas-army-200a
index 2f63ce0b7711..b7e5cbfae23a 100644
--- a/games-fps/americas-army/files/digest-americas-army-200a
+++ b/games-fps/americas-army/files/digest-americas-army-200a
@@ -1,2 +1 @@
-MD5 f0d447ecc971a12edc09bd0c16bdd92e armyops200-lnx.run 686456601
-MD5 bc88900e894ff45028ffaae123936f64 armyops-lnx-patch-200to200a.tar.bz2 9077020
+MD5 1c35c2922a61faa0b2468c2eb83615a7 armyops200a-linux.bin 689600292