use games_get_libdir

Package-Manager: portage-2.1.2.3

3 files changed, 36 insertions, 23 deletions

diff --git a/games-roguelike/noegnud-nethack/Manifest b/games-roguelike/noegnud-nethack/Manifest
index f929b8438d73..24507629e602 100644
--- a/games-roguelike/noegnud-nethack/Manifest
+++ b/games-roguelike/noegnud-nethack/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX noegnud-nethack-0.8.2-gcc41.patch 595 RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 SHA1 924664d5aa93a7f0233022bd63fde4ac85e0952f SHA256 fd8e7afb1f36775b0d042031c14e194b875eff01db8cfc929e63a6eccabb66e7
 MD5 66aea45f1586f38fc4696cc34e8ef1d9 files/noegnud-nethack-0.8.2-gcc41.patch 595
 RMD160 ceeceb9ef8d7e386cb1e2d314a0e6d7d77761987 files/noegnud-nethack-0.8.2-gcc41.patch 595
@@ -10,14 +13,14 @@ DIST nethack-342.tgz 3475583 RMD160 ecf334ce49c950121b9df6f86bce808b66a94e97 SHA
 DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
 DIST noegnud-0.8.2_linux_src-minimal.tar.bz2 4801644 RMD160 527cd14212b3c8556c3e566a2ec8cde4602de2f0 SHA1 3e76405ae99bc7ed721039e78201521e28cc136a SHA256 4efa6a865226ff63e8e42b1e6a712407064ace10ac6fcae56bd0e309a6d1d903
 DIST noegnud-0.8.3_linux_src-minimal.tar.bz2 4794245 RMD160 cf0234c6272b17594de24d7f2d4d1e0fa1f0624d SHA1 1214b18097a47959a73e24475e87f31d6e47f343 SHA256 226109eeafc7f54b46b8e239e90b71550b01494dc41e450ed929f26feb2a4433
-EBUILD noegnud-nethack-0.8.2.ebuild 2027 RMD160 be1bb4c12981e56bddd69dea2f3989c52ea50d7f SHA1 2ad47436200baf265abb45096d77f02e72b76064 SHA256 c6fe4dd63ef0c43cc1e18b1d47c122d4356e70ed483feff7ba839883ba1ddaf6
-MD5 d45cd3effd9e103055aec41947c81b12 noegnud-nethack-0.8.2.ebuild 2027
-RMD160 be1bb4c12981e56bddd69dea2f3989c52ea50d7f noegnud-nethack-0.8.2.ebuild 2027
-SHA256 c6fe4dd63ef0c43cc1e18b1d47c122d4356e70ed483feff7ba839883ba1ddaf6 noegnud-nethack-0.8.2.ebuild 2027
-EBUILD noegnud-nethack-0.8.3.ebuild 2027 RMD160 2f42854f939f8141279e43f135dfe652deac1a9a SHA1 6420f56939cd51e632d5124c49d7ea2cd2ac4558 SHA256 7e43b9f8d6edcd3ed9661fe8197cfa6f3817ee00888c6f9c03f19e6190d7abba
-MD5 eee38a932754f74c639ef2c20214d63e noegnud-nethack-0.8.3.ebuild 2027
-RMD160 2f42854f939f8141279e43f135dfe652deac1a9a noegnud-nethack-0.8.3.ebuild 2027
-SHA256 7e43b9f8d6edcd3ed9661fe8197cfa6f3817ee00888c6f9c03f19e6190d7abba noegnud-nethack-0.8.3.ebuild 2027
+EBUILD noegnud-nethack-0.8.2.ebuild 2038 RMD160 c6961963326759d0d0c8c3832012720cd81bdd18 SHA1 408010d2ca31f9547aad18dfe23ba87fb1ea996b SHA256 7fe864df0880c2497bcc0c5ce13991e612611a63a7510551166aee6b4127f84e
+MD5 c7cbfdb63e3f9b9eb12586494a93fe31 noegnud-nethack-0.8.2.ebuild 2038
+RMD160 c6961963326759d0d0c8c3832012720cd81bdd18 noegnud-nethack-0.8.2.ebuild 2038
+SHA256 7fe864df0880c2497bcc0c5ce13991e612611a63a7510551166aee6b4127f84e noegnud-nethack-0.8.2.ebuild 2038
+EBUILD noegnud-nethack-0.8.3.ebuild 2039 RMD160 aca448d1aadaa05e71e4ec6deabe7c933e21d4b2 SHA1 6c2606d29dd806f9fb3f541558c64ee162e22545 SHA256 67792c08e2dc8279a7170be2cb0e49e750bcfbc682551a1bac8863407a3d4e43
+MD5 f800345993cf141674bf06f83d78329c noegnud-nethack-0.8.3.ebuild 2039
+RMD160 aca448d1aadaa05e71e4ec6deabe7c933e21d4b2 noegnud-nethack-0.8.3.ebuild 2039
+SHA256 67792c08e2dc8279a7170be2cb0e49e750bcfbc682551a1bac8863407a3d4e43 noegnud-nethack-0.8.3.ebuild 2039
 MISC ChangeLog 1410 RMD160 25cfa3d7625106846270a1702f289c9cb588bf27 SHA1 a235a2bbb65b9ca7cdc7878b960e7a49c078a649 SHA256 7dd54d8dd7df781cd1d15837877cc6b3fc8bd78bf5f6a3e03e8c5aa248cdd422
 MD5 68295e6605f3313641f7d868e4b02bf2 ChangeLog 1410
 RMD160 25cfa3d7625106846270a1702f289c9cb588bf27 ChangeLog 1410
@@ -32,3 +35,10 @@ SHA256 21eca2f8734dd02501720c3dd3764d6d9cb773708c6801046782be4cec39813a files/di
 MD5 617e9a5f87c2c55dacb27687fa069e24 files/digest-noegnud-nethack-0.8.3 542
 RMD160 fb9e80e6e019713cfc96110b147d56fe3cfceeae files/digest-noegnud-nethack-0.8.3 542
 SHA256 0ebc817ecf16e2482bff138f6c8641a972f589604569a3c5d10363b1641d6b42 files/digest-noegnud-nethack-0.8.3 542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGGppTdz7hIScOURERAmBzAKDAbaL7DqdBdjjkcRbYJY5ay2D+HACdEBh/
+LTwYJVe8QibtmhlHla6fuKg=
+=Xwb2
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
index 572ef46edd52..38a7820441a9 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.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-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.10 2007/03/14 18:19:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.2.ebuild,v 1.11 2007/04/09 19:55:56 nyhm Exp $
 
 inherit eutils games
 
@@ -49,14 +49,14 @@ src_install() {
 	local tver="`ls noegnud-*-${VAR_NAME}-${VAR_DVER} | cut -d- -f2`"
 	rm noegnud-${VAR_NAME}-${VAR_DVER}
 	mv noegnud-${tver}-${VAR_NAME}-${VAR_DVER} noegnud-${VAR_NAME}
-	dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" "${GAMES_BINDIR}/noegnud-${VAR_NAME}"
+	dosed "/^HACKDIR/s:=.*:=$(games_get_libdir)/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" "${GAMES_BINDIR}/noegnud-${VAR_NAME}"
 
 	dodir "${GAMES_DATADIR}/noegnud_data"
 	cp -r "${S}/../data/"* "${D}/${GAMES_DATADIR}/noegnud_data/"
-	dosym "${GAMES_DATADIR}/noegnud_data" "${GAMES_LIBDIR}/noegnud-${tver}/data"
+	dosym "${GAMES_DATADIR}/noegnud_data" "$(games_get_libdir)/noegnud-${tver}/data"
 
-	keepdir "${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save"
+	keepdir "$(games_get_libdir)/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save"
 
 	prepgamesdirs
-	chmod -R g+w "${D}/${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}"
+	chmod -R g+w "${D}/$(games_get_libdir)/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}"
 }
diff --git a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
index 017adff28f8a..e2a04f9986e2 100644
--- a/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild
+++ b/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.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-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.2 2007/03/14 18:19:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/noegnud-nethack/noegnud-nethack-0.8.3.ebuild,v 1.3 2007/04/09 19:55:56 nyhm Exp $
 
 inherit eutils games
 
@@ -27,13 +27,13 @@ RDEPEND="media-libs/libsdl
 	virtual/opengl
 	games-roguelike/noegnud-data"
 
-S="${WORKDIR}/noegnud-${PV}/variants"
+S=${WORKDIR}/noegnud-${PV}/variants
 
 src_unpack() {
 	unpack noegnud-${PV}_linux_src-minimal.tar.bz2
-	ln -s "${DISTDIR}/${VAR_TAR}" noegnud-${PV}/variants/tarballs/${VAR_TAR}
+	ln -s "${DISTDIR}"/${VAR_TAR} noegnud-${PV}/variants/tarballs/${VAR_TAR}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
@@ -49,14 +49,17 @@ src_install() {
 	local tver="`ls noegnud-*-${VAR_NAME}-${VAR_DVER} | cut -d- -f2`"
 	rm noegnud-${VAR_NAME}-${VAR_DVER}
 	mv noegnud-${tver}-${VAR_NAME}-${VAR_DVER} noegnud-${VAR_NAME}
-	dosed "/^HACKDIR/s:=.*:=${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" "${GAMES_BINDIR}/noegnud-${VAR_NAME}"
+	sed -i \
+		-e "/^HACKDIR/s:=.*:=$(games_get_libdir)/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}:" \
+		noegnud-${VAR_NAME} \
+		|| die "sed failed"
 
-	dodir "${GAMES_DATADIR}/noegnud_data"
-	cp -r "${S}/../data/"* "${D}/${GAMES_DATADIR}/noegnud_data/"
-	dosym "${GAMES_DATADIR}/noegnud_data" "${GAMES_LIBDIR}/noegnud-${tver}/data"
+	insinto "${GAMES_DATADIR}"/noegnud_data
+	doins -r "${S}"/../data/* || die "doins failed"
+	dosym "${GAMES_DATADIR}"/noegnud_data "$(games_get_libdir)"/noegnud-${tver}/data
 
-	keepdir "${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save"
+	keepdir "$(games_get_libdir)"/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}/save
 
 	prepgamesdirs
-	chmod -R g+w "${D}/${GAMES_LIBDIR}/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}"
+	fperms -R g+w "$(games_get_libdir)"/noegnud-${tver}/${VAR_NAME}-${VAR_DVER}
 }