use doins

Package-Manager: portage-2.1.2.2

2 files changed, 21 insertions, 23 deletions

diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
index 601c439d99d7..14691703b4cf 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -2,10 +2,10 @@
 Hash: SHA1
 
 DIST battalion1.4b.tar.bz2 942342 RMD160 6c389c1c2aeb327d65ab2d739e6edd8b501fb1a4 SHA1 797790431396bf471f4788145410ef4cd114cbc7 SHA256 983db152b44b33396ab242946b51d33c405e0bef8649e2cc9e38d6229d9735f7
-EBUILD battalion-1.4b.ebuild 1723 RMD160 7d4c471740be7d02e63fb58797d6e67e7695d582 SHA1 7dd48bd6eb41077b33481d6e09c1bef71bb58a59 SHA256 4d57259ce2e054cd352a34bf2f11e4a1ef8af968f19a6a7447b0883f2878c6a5
-MD5 48530530f993a87e8443a203517f4799 battalion-1.4b.ebuild 1723
-RMD160 7d4c471740be7d02e63fb58797d6e67e7695d582 battalion-1.4b.ebuild 1723
-SHA256 4d57259ce2e054cd352a34bf2f11e4a1ef8af968f19a6a7447b0883f2878c6a5 battalion-1.4b.ebuild 1723
+EBUILD battalion-1.4b.ebuild 1756 RMD160 e786713f5d914cd591366664bf6ed727cd99fd48 SHA1 4883d836c4ed2fa53e1581c3d5fe190c0b04ab1d SHA256 7f961f33853e5f0578e944ab0e53f7aa43e84f8e8f2211cb3232ba286b5e8c06
+MD5 94f331cc13a2380469c6e0d0017782aa battalion-1.4b.ebuild 1756
+RMD160 e786713f5d914cd591366664bf6ed727cd99fd48 battalion-1.4b.ebuild 1756
+SHA256 7f961f33853e5f0578e944ab0e53f7aa43e84f8e8f2211cb3232ba286b5e8c06 battalion-1.4b.ebuild 1756
 MISC ChangeLog 1278 RMD160 7449cb148e778226b5e5e57aa8ecd01b09b49487 SHA1 564dd31e0a6da981cc6bab21f9416c6ba2cb6ee1 SHA256 107438ca33ceebb854d74cc7eaaada47d6503053359cd43e6dbf93bdd6178f76
 MD5 1f166339e7fb2d0cd05a30a9ede7664b ChangeLog 1278
 RMD160 7449cb148e778226b5e5e57aa8ecd01b09b49487 ChangeLog 1278
@@ -18,9 +18,9 @@ MD5 c7e2d273b061cd3166bba29bef791b94 files/digest-battalion-1.4b 244
 RMD160 b3ef7cfdfa51bd72baecd90bdc7d2f48293f9b9f files/digest-battalion-1.4b 244
 SHA256 9a2c3dde50115f3118c4164d8c0d9327fe5f424e071b5e9a784573e61639e4f3 files/digest-battalion-1.4b 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9VMY6J2i8a8J4okRAr7AAJ4xOAa7JffKraOeXzo2xFf8X3+eVgCcCYPF
-SyXhZDKt5QIdVfBgFZznLyI=
-=PIMw
+iD8DBQFF9rZcdz7hIScOURERArLUAJ9sGdPlWhYdlClAlF91QK8dHiGB8QCgg2uw
+UQ6YAh8JCAnzRWFKNk2yv/w=
+=RSGa
 -----END PGP SIGNATURE-----
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index 05585e957289..7497786de7b9 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.12 2007/03/12 13:13:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.13 2007/03/13 14:33:58 nyhm Exp $
 
 inherit games
 
@@ -13,11 +13,10 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXext
-	virtual/opengl"
+DEPEND="virtual/opengl
+	virtual/glu"
 
-S="${WORKDIR}/${PN}${PV}"
-dir="${GAMES_DATADIR}/${PN}"
+S=${WORKDIR}/${PN}${PV}
 
 src_unpack() {
 	unpack ${A}
@@ -25,15 +24,15 @@ src_unpack() {
 
 	# Modify data paths
 	sed -i \
-		-e "s:SOUNDS/:${dir}/SOUNDS/:" \
-		-e "s:MUSIC/:${dir}/MUSIC/:" \
+		-e "s:SOUNDS/:${GAMES_DATADIR}/${PN}/SOUNDS/:" \
+		-e "s:MUSIC/:${GAMES_DATADIR}/${PN}/MUSIC/:" \
 		audio.c || die "sed audio.c failed"
 	sed -i \
-		-e "s:DATA/:${dir}/DATA/:" \
+		-e "s:DATA/:${GAMES_DATADIR}/${PN}/DATA/:" \
 		-e "s:/usr/tmp:${GAMES_STATEDIR}:" \
 		battalion.c || die "sed battalion.c failed"
 	sed -i \
-		-e "s:TEXTURES/:${dir}/TEXTURES/:" \
+		-e "s:TEXTURES/:${GAMES_DATADIR}/${PN}/TEXTURES/:" \
 		graphics.c || die "sed graphics.c failed"
 
 	# Modify Makefile and add CFLAGS
@@ -41,25 +40,24 @@ src_unpack() {
 		-e "s:-O2:${CFLAGS}:" \
 		Makefile || die "sed Makefile failed"
 	# Only .raw sound files are used on Linux. The .au files are not needed.
-	rm {SOUNDS,MUSIC}/*.au
+	rm -f {SOUNDS,MUSIC}/*.au
 }
 
 src_install() {
 	dogamesbin battalion || die "dogamesbin failed"
-	dodir "${dir}"
-	cp -r DATA MUSIC SOUNDS TEXTURES "${D}${dir}" || die "cp failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r DATA MUSIC SOUNDS TEXTURES || die "doins failed"
 	dodoc README
 
 	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/battalion_hiscore"
-	fperms 660 "${GAMES_STATEDIR}/battalion_hiscore"
+	touch "${D}${GAMES_STATEDIR}"/battalion_hiscore
+	fperms 660 "${GAMES_STATEDIR}"/battalion_hiscore
 
 	prepgamesdirs
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	echo
 	elog "Sound and music are not enabled by default."
 	elog "Use the S and M keys to enable them in-game, or start the game with"
 	elog "the -s and -m switches: battalion -s -m"