Updated the ebuild with some changes from Paul Bredbury <brebs@sent.com> and closing bug #154506.

Package-Manager: portage-2.1.2_rc1-r6

3 files changed, 62 insertions, 52 deletions

diff --git a/games-fps/americas-army/ChangeLog b/games-fps/americas-army/ChangeLog
index 3a5f0ca6f3e2..6f99ed6f14b3 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.50 2006/10/26 13:59:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.51 2006/11/14 18:21:32 wolf31o2 Exp $
+
+  14 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  americas-army-250.ebuild:
+  Updated the ebuild with some changes from Paul Bredbury <brebs@sent.com> and
+  closing bug #154506.
 
   26 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   americas-army-250.ebuild:
diff --git a/games-fps/americas-army/Manifest b/games-fps/americas-army/Manifest
index ed13ec2fbba4..8aeadf4fc181 100644
--- a/games-fps/americas-army/Manifest
+++ b/games-fps/americas-army/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST americas-army-all-0.2.tar.bz2 541 RMD160 b656db65993e0d1410e1bfaa5a0dcad1c3712ded SHA1 a26bb53dc64ab574e4dcdfe33879ad0dbd46ced4 SHA256 fe040b1b61da46fd800b87f2d3d6be5907a5ed1a780a6c293658f4f82b4834d1
 DIST armyops250-linux.run 813453963 RMD160 d8755bf6642be87b15978616f1ff9d24dd184ab6 SHA1 40fbeeff8921a28774c55394e6db64110878d0b8 SHA256 8bdefe819d8039bfd57c2d654167d1042995afc71f04bd6b2b6ab24e883f3d1f
-EBUILD americas-army-250.ebuild 2663 RMD160 7799ce62da0303640370aee8c20a9731653c83b3 SHA1 476f634f4393a53d4408b972d45907475e335a94 SHA256 a478091994dafa6062a4af39378768408dfe8a6bbc36f9905217ff7aacafc2b6
-MD5 d1e81d8b7178291bb9cdd1e4bd09462e americas-army-250.ebuild 2663
-RMD160 7799ce62da0303640370aee8c20a9731653c83b3 americas-army-250.ebuild 2663
-SHA256 a478091994dafa6062a4af39378768408dfe8a6bbc36f9905217ff7aacafc2b6 americas-army-250.ebuild 2663
-MISC ChangeLog 9041 RMD160 d571fbc823bd5e8188cd4407bac37e918f3e3313 SHA1 f3eb2adc794b519f688709db020d7cf317836db5 SHA256 1612361a8dd1757e85d31e3efe3a048577aefcaf0d878e7709ee30dcce191f22
-MD5 7103978cf1e35661c3484ec502e566b5 ChangeLog 9041
-RMD160 d571fbc823bd5e8188cd4407bac37e918f3e3313 ChangeLog 9041
-SHA256 1612361a8dd1757e85d31e3efe3a048577aefcaf0d878e7709ee30dcce191f22 ChangeLog 9041
+EBUILD americas-army-250.ebuild 2852 RMD160 7f3e6c38eb802d4a558004ee448cf8b0a83b2328 SHA1 6042243f1c2af0142f3fb2aa7febe418e9646340 SHA256 14e7dce13df3b05ccc1e2f69f71d8c784d691e007ca38bd96cdb5feb62a50296
+MD5 62a3b424bf62c01cf5c1ff045263d133 americas-army-250.ebuild 2852
+RMD160 7f3e6c38eb802d4a558004ee448cf8b0a83b2328 americas-army-250.ebuild 2852
+SHA256 14e7dce13df3b05ccc1e2f69f71d8c784d691e007ca38bd96cdb5feb62a50296 americas-army-250.ebuild 2852
+MISC ChangeLog 9226 RMD160 dba5c5e7239765a84bbf648cbbea16d1339d1722 SHA1 0b6ddd8409eea47498cc7d20fce460885fff2e6d SHA256 2bccfccb0566385d032cd8eec8f91921ee9e13ce9e4bcb55d535aecc29bd1740
+MD5 f7e2ba6adef35c32dd477eb5fd9ce1d7 ChangeLog 9226
+RMD160 dba5c5e7239765a84bbf648cbbea16d1339d1722 ChangeLog 9226
+SHA256 2bccfccb0566385d032cd8eec8f91921ee9e13ce9e4bcb55d535aecc29bd1740 ChangeLog 9226
 MISC metadata.xml 672 RMD160 302d5e0ad7ce419af1fc3b9515a31c40d89ff45b SHA1 3188b4044324490838e0fc89f23187e1766066de SHA256 f6c57c86ecedf3a7c6707fb47acd0d4f084c6d6725e11d924081d38da599830a
 MD5 f1a9a44e85e58296a3710c291666ab78 metadata.xml 672
 RMD160 302d5e0ad7ce419af1fc3b9515a31c40d89ff45b metadata.xml 672
@@ -21,7 +21,7 @@ SHA256 4b20fd8190a09ad663fd0e6fcbcbda3b9fc3777b1fbf5e7876d84aa7b7869dd3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQL9TkT4lNIS36YERAtROAKCD/KJh2wrBSE5K1uHKGrs/QO+wngCfazv3
-eeH+qeaufPEIwmWUc/uvZko=
-=WdsX
+iD8DBQFFWgm7kT4lNIS36YERAm6NAJwK1PyVsLv4Zn1SCyHrM5k1vsWQYQCgtmpS
+qVhRTMDpICs1fjcvYxJDFM0=
+=fYPz
 -----END PGP SIGNATURE-----
diff --git a/games-fps/americas-army/americas-army-250.ebuild b/games-fps/americas-army/americas-army-250.ebuild
index 6bf4a5ab9d40..d2c335ed8b16 100644
--- a/games-fps/americas-army/americas-army-250.ebuild
+++ b/games-fps/americas-army/americas-army-250.ebuild
@@ -1,29 +1,29 @@
 # Copyright 1999-2006 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.13 2006/10/26 13:59:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-250.ebuild,v 1.14 2006/11/14 18:21:32 wolf31o2 Exp $
 
 inherit eutils games
 
+DED_PV="0.2"
+DED_FILE="${PN}-all-${DED_PV}.tar.bz2"
 MY_P="armyops${PV}-linux.run"
+
 DESCRIPTION="military simulations by the U.S. Army to provide civilians with insights on soldiering"
 HOMEPAGE="http://www.americasarmy.com/"
 SRC_URI="http://treefort.icculus.org/armyops/${MY_P}
 	http://0day.icculus.org/armyops/${MY_P}
 	mirror://3dgamers/${PN/-/}/${MY_P}
 	dedicated? (
-		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.2.tar.bz2
-		mirror://gentoo/${PN}-all-0.2.tar.bz2 )"
+		http://dev.gentoo.org/~wolf31o2/sources/dump/${DED_FILE}
+		mirror://gentoo/${DED_FILE} )"
 
 LICENSE="Army-EULA"
 SLOT="0"
 KEYWORDS="amd64 x86"
-RESTRICT="strip mirror"
-
-IUSE="opengl dedicated"
+RESTRICT="mirror strip"
+IUSE="dedicated opengl"
 
-RDEPEND="sys-libs/glibc
-	opengl? (
-		virtual/opengl
+UIDEPEND="virtual/opengl
 		amd64? (
 			app-emulation/emul-linux-x86-xlibs
 			|| (
@@ -34,67 +34,72 @@ RDEPEND="sys-libs/glibc
 				>=x11-drivers/ati-drivers-8.8.25-r1 ) )
 		x86? (
 			x11-libs/libXext
-			x11-libs/libX11 ) )
-	amd64? (
-			app-emulation/emul-linux-x86-compat )
+			x11-libs/libX11 )"
+RDEPEND="sys-libs/glibc
+	opengl? ( ${UIDEPEND} )
+	!opengl? ( !dedicated? ( ${UIDEPEND} ) )
+	amd64? ( app-emulation/emul-linux-x86-compat )
 	x86? ( =virtual/libstdc++-3.3 )"
 
 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"
-	ewarn "2.4GB of space in ${PORTAGE_TMPDIR} to build!"
+	einfo "The installed game takes about 1.6GB of space when installed and"
+	einfo "2.4GB of space in ${PORTAGE_TMPDIR} to build!"
+	echo
 }
 
 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
+	unpack_makeself "${DISTDIR}/${MY_P}" || die "unpacking game"
+	unpack ./setupstuff.tar.gz
+	if use dedicated ; then
+		unpack "${DED_FILE}"
 	fi
 }
 
 src_install() {
-	einfo "This will take a while ... go get a pizza or something"
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+	local Ddir=${D}/${dir}
 
-	dodir ${dir}
+	einfo "This will take a while... go get a pizza or something."
 
-	tar -jxf armyops${PV}.tar.bz2 -C ${Ddir}/ || die "armyops untar failed"
-	tar -jxf binaries.tar.bz2 -C ${Ddir}/ || die "binaries untar failed"
+	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}
+	insinto "${dir}"
 	doins ArmyOps.xpm README.linux ArmyOps${PV}_EULA.txt || die "doins failed"
-	newicon ArmyOps.xpm armyops.xpm || die "doins failed"
-	exeinto ${dir}
+	newicon ArmyOps.xpm armyops.xpm || die "newicon failed"
+	exeinto "${dir}"
 	doexe bin/armyops || die "doexe failed"
-	fperms ug+x ${dir}/System/pb/pbweb.x86
+	fperms ug+x "${dir}"/System/pb/pbweb.x86
 
-	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
+	if use dedicated ; then
+		newinitd "${S}"/armyops-ded.rc armyops-ded || die
+		newconfd "${S}"/armyops-ded.conf.d armyops-ded || die
+		games_make_wrapper armyops-ded ./server-bin "${dir}"/System
 	fi
 
-	games_make_wrapper armyops ./armyops "${dir}" "${dir}"
+	if use opengl || ! use dedicated ; then
+		games_make_wrapper armyops ./armyops "${dir}" "${dir}"
+		make_desktop_entry armyops "America's Army" armyops.xpm
+	fi
 
 	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"
+
+	if use dedicated ; then
+		elog "To start a dedicated server, run:"
+		elog "   /etc/init.d/armyops-ded start"
 		echo
 	fi
-	if use opengl; then
-		einfo "To play the game run:"
-		einfo " armyops"
+	if use opengl || ! use dedicated ; then
+		elog "To play the game, run:  armyops"
 		echo
 	fi
 }