From: Tristan Heaven <tristan@gentoo.org>
Date: Mon, 9 Apr 2007 20:50:51 +0000 (+0000)
Subject: use games_get_libdir
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4166849eb1b60b08cea81813abb0ee56cb6c51af;p=gentoo.git

use games_get_libdir
Package-Manager: portage-2.1.2.3
---

diff --git a/games-roguelike/slashem/Manifest b/games-roguelike/slashem/Manifest
index a7fd62d35ae7..8950174cd903 100644
--- a/games-roguelike/slashem/Manifest
+++ b/games-roguelike/slashem/Manifest
@@ -108,14 +108,14 @@ SHA256 3c2e408764f93d46c024f309e20379bb5f87ddd3518a078029ba2532bd5d8554 files/0.
 DIST conf12s.tar.gz 4788 RMD160 3ca60651585d2377c1eeea60dd398eae00a8ad16 SHA1 581261315cd7dd005bdabcbd275b772371487a47 SHA256 76b5d0527434276db4876610651a0dc73698012b1cf93449c63a516355cd06f5
 DIST se007e6f3.tar.gz 5213184 RMD160 4bdd871d3e0fd11b070538b3f4c644b77fb77212 SHA1 cb00126375189b0772996b408ad3a6933c50a5cc SHA256 64ef8b5c44f006dc3201d64c0265f83080246ac890360393be2d8ba80554d24c
 DIST se007e7f2.tar.gz 5218698 RMD160 805198ea444a2e0e3b0218f09cf47198784435a0 SHA1 b71911bfded49b0e71c796b5ceac4032acbd139e SHA256 a520817f1fe19302f27db22a9c1762c27a669f7491e84bd22790ea4f67136b49
-EBUILD slashem-0.0.760.ebuild 4650 RMD160 02b37d3778d3caa0b4f171313fb1eb29c5e671a4 SHA1 79bf9758f5babbe99a5a3e694cdc163b93cad219 SHA256 a105ef39d89f91f37379ef997e23b159d7c57afc2ea489370ccd6c0cb6816595
-MD5 0b05249bb03ef929b34afb945478c72c slashem-0.0.760.ebuild 4650
-RMD160 02b37d3778d3caa0b4f171313fb1eb29c5e671a4 slashem-0.0.760.ebuild 4650
-SHA256 a105ef39d89f91f37379ef997e23b159d7c57afc2ea489370ccd6c0cb6816595 slashem-0.0.760.ebuild 4650
-EBUILD slashem-0.0.772.ebuild 4894 RMD160 d98c3725c7700561c99ea02430cb44daede00806 SHA1 8285ee794bd9a371b302a198b7f2d5644ca19931 SHA256 7e81fe14ce9b71ac2df269d9328f997e698e9874565153536fe7f7735a31105e
-MD5 a5428d53a7b22d3b26db5978642d64f8 slashem-0.0.772.ebuild 4894
-RMD160 d98c3725c7700561c99ea02430cb44daede00806 slashem-0.0.772.ebuild 4894
-SHA256 7e81fe14ce9b71ac2df269d9328f997e698e9874565153536fe7f7735a31105e slashem-0.0.772.ebuild 4894
+EBUILD slashem-0.0.760.ebuild 4665 RMD160 8c796b5a1e0f87379291d895da6fa1c66d55867a SHA1 3446c1382bf2b3193b2f71fd637c7bf058e83e74 SHA256 3bc84a583af9577e0bc68e71b1d5b8969d5be19006aff4735e92f491f2d6ed93
+MD5 4f34256bbb819b24501f4223ec015d12 slashem-0.0.760.ebuild 4665
+RMD160 8c796b5a1e0f87379291d895da6fa1c66d55867a slashem-0.0.760.ebuild 4665
+SHA256 3bc84a583af9577e0bc68e71b1d5b8969d5be19006aff4735e92f491f2d6ed93 slashem-0.0.760.ebuild 4665
+EBUILD slashem-0.0.772.ebuild 4958 RMD160 56a52fa6282d09dd807149b795847ea825cfeb55 SHA1 a328f1d906481a9a592e61c3cd75ba875657b340 SHA256 5efeba2caecb363bf7af2e6d595699ce1dcafc034c14ccec02f4b7be676bd20e
+MD5 8e861e8d544f518ca250790315ea9141 slashem-0.0.772.ebuild 4958
+RMD160 56a52fa6282d09dd807149b795847ea825cfeb55 slashem-0.0.772.ebuild 4958
+SHA256 5efeba2caecb363bf7af2e6d595699ce1dcafc034c14ccec02f4b7be676bd20e slashem-0.0.772.ebuild 4958
 MISC ChangeLog 3351 RMD160 ec1567e7b4f09d1ad9a7b7f10aa7ad207de7a5d3 SHA1 738e99e5395659533a566b6f637396818f679e4f SHA256 f82af99a7ff882d0270cf6790226af716c505530abec7c506eef62970fbf58a3
 MD5 3856ad4d2acb348ae7fb424c72f9d1c5 ChangeLog 3351
 RMD160 ec1567e7b4f09d1ad9a7b7f10aa7ad207de7a5d3 ChangeLog 3351
@@ -131,9 +131,9 @@ MD5 26802a2e60b4b841ea13488af424b515 files/digest-slashem-0.0.772 449
 RMD160 a50fcfcbdb8c20021f11678145725f3cfec994ff files/digest-slashem-0.0.772 449
 SHA256 a9cde26c65c5a9fbef997e01cbfdf7f725302adddc4485d6f4a3e5c442b51e40 files/digest-slashem-0.0.772 449
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9YxZ6J2i8a8J4okRAqXSAJ9Eh4fJ2fXFM8szYA+lyBdMIn7cIQCgkIP+
-frIDATFqusEDFGEFF9oa+k8=
-=NcT5
+iD8DBQFGGqcydz7hIScOURERAsmjAKDnXTIvi5kqpp9wEhm2RIKeoiQqyQCg4KN9
+IMuiNOjLv8Fn5puMWDvr5EY=
+=pdbx
 -----END PGP SIGNATURE-----
diff --git a/games-roguelike/slashem/slashem-0.0.760.ebuild b/games-roguelike/slashem/slashem-0.0.760.ebuild
index 0bf280fc7f40..dfb2e50e4c84 100644
--- a/games-roguelike/slashem/slashem-0.0.760.ebuild
+++ b/games-roguelike/slashem/slashem-0.0.760.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/slashem/slashem-0.0.760.ebuild,v 1.9 2007/03/12 17:18:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/slashem-0.0.760.ebuild,v 1.10 2007/04/09 20:50:51 nyhm Exp $
 
 inherit eutils flag-o-matic games
 
@@ -78,10 +78,10 @@ src_unpack() {
 		-e "s:^\(CFLAGS =\).*:\1 ${CFLAGS}:" \
 		src/Makefile || die "src/makefile sed"
 	sed -i \
-		-e "s:^\(FILE_AREA_UNSHARE =\).*:\1 ${GAMES_LIBDIR}/${PN}:" \
+		-e "s:^\(FILE_AREA_UNSHARE =\).*:\1 $(games_get_libdir)/${PN}:" \
 		Makefile || die "makefile sed"
 	sed -i \
-		-e "s:^\(\#define FILE_AREA_UNSHARE	\).*:\1\"${GAMES_LIBDIR}/${PN}/\":" \
+		-e "s:^\(\#define FILE_AREA_UNSHARE	\).*:\1\"$(games_get_libdir)/${PN}/\":" \
 		include/unixconf.h || die "unixconf.h sed"
 }
 
@@ -97,7 +97,7 @@ src_install() {
 		FILE_AREA_VAR=${D}/${HACKDIR} \
 		FILE_AREA_SAVE=${D}/${HACKDIR}/save \
 		FILE_AREA_SHARE=${D}/${GAMES_DATADIR}/${PN} \
-		FILE_AREA_UNSHARE=${D}/${GAMES_LIBDIR}/${PN} \
+		FILE_AREA_UNSHARE=${D}/$(games_get_libdir)/${PN} \
 		FILE_AREA_DOC=${D}/usr/share/doc/${PF} \
 		install || die "make install failed"
 	dodoc doc/*.txt
@@ -107,7 +107,7 @@ src_install() {
 	# The final /usr/bin/slashem is a sh script.  This fixes the hard-coded
 	# HACKDIR directory so it doesn't point to ${D}/usr/share/slashemdir
 	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" ${GAMES_BINDIR}/${PN}
-	dosed "s:^\(HACK=\).*:\1${GAMES_LIBDIR}/${PN}/${PN}:" ${GAMES_BINDIR}/${PN}
+	dosed "s:^\(HACK=\).*:\1$(games_get_libdir)/${PN}/${PN}:" ${GAMES_BINDIR}/${PN}
 
 	newgamesbin util/recover recover-slashem || die "recover install"
 
diff --git a/games-roguelike/slashem/slashem-0.0.772.ebuild b/games-roguelike/slashem/slashem-0.0.772.ebuild
index 8feeb1c080cd..8d16dc5a6843 100644
--- a/games-roguelike/slashem/slashem-0.0.772.ebuild
+++ b/games-roguelike/slashem/slashem-0.0.772.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/slashem/slashem-0.0.772.ebuild,v 1.4 2007/03/12 17:18:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/slashem/slashem-0.0.772.ebuild,v 1.5 2007/04/09 20:50:51 nyhm Exp $
 
 inherit eutils flag-o-matic games
 
@@ -54,17 +54,17 @@ src_unpack() {
 	unpack ${SE_PN}
 	cd "${S}"
 	EPATCH_SUFFIX="patch"
-	epatch ${FILESDIR}/${SE_VER}
+	epatch "${FILESDIR}"/${SE_VER}
 
 	# This copies the /sys/unix Makefile.*s to their correct places for
 	# seding and compiling.
 	append-flags -I../include -I/usr/X11R6/include
 
-	cd ${S}/sys/unix
+	cd "${S}"/sys/unix
 	source setup.sh || die
 
 	unpack ${SE_CONF}
-	cp -f ${FILESDIR}/${SE_VER}/*.configure . || die
+	cp -f "${FILESDIR}"/${SE_VER}/*.configure . || die
 	for c in RedHat9 FHS20 Gentoo prepare-gui Proxy ; do
 		./config ${c} ../..
 	done
@@ -92,52 +92,53 @@ src_unpack() {
 		-e "s:^\(CFLAGS =\).*:\1 ${CFLAGS}:" \
 		src/Makefile || die "src/makefile sed"
 	sed -i \
-		-e "s:^\(FILE_AREA_UNSHARE =\).*:\1 ${GAMES_LIBDIR}/${PN}:" \
+		-e "s:^\(FILE_AREA_UNSHARE =\).*:\1 $(games_get_libdir)/${PN}:" \
 		Makefile || die "makefile sed"
 	sed -i \
-		-e "s:^\(\#define FILE_AREA_UNSHARE	\).*:\1\"${GAMES_LIBDIR}/${PN}/\":" \
+		-e "s:^\(\#define FILE_AREA_UNSHARE	\).*:\1\"$(games_get_libdir)/${PN}/\":" \
 		include/unixconf.h || die "unixconf.h sed"
 }
 
 src_compile() {
 	make all || die "make all"
-	cd ${S}/util
+	cd "${S}"/util
 	make recover || die "make recover"
 }
 
 src_install() {
-	make GAMEPERM=0750 \
-		SHELLDIR=${D}/${GAMES_BINDIR} \
-		FILE_AREA_VAR=${D}/${HACKDIR} \
-		FILE_AREA_SAVE=${D}/${HACKDIR}/save \
-		FILE_AREA_SHARE=${D}/${GAMES_DATADIR}/${PN} \
-		FILE_AREA_UNSHARE=${D}/${GAMES_LIBDIR}/${PN} \
-		FILE_AREA_DOC=${D}/usr/share/doc/${PF} \
-		install || die "make install failed"
+	emake \
+		GAMEPERM=0750 \
+		SHELLDIR="${D}/${GAMES_BINDIR}" \
+		FILE_AREA_VAR="${D}/${HACKDIR}" \
+		FILE_AREA_SAVE="${D}/${HACKDIR}"/save \
+		FILE_AREA_SHARE="${D}/${GAMES_DATADIR}"/${PN} \
+		FILE_AREA_UNSHARE="${D}/$(games_get_libdir)"/${PN} \
+		FILE_AREA_DOC="${D}"/usr/share/doc/${PF} \
+		install || die "emake install failed"
 	dodoc doc/*.txt
 	dodoc dat/license
 	doman doc/slashem.6
 
 	# The final /usr/bin/slashem is a sh script.  This fixes the hard-coded
 	# HACKDIR directory so it doesn't point to ${D}/usr/share/slashemdir
-	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" ${GAMES_BINDIR}/${PN}
-	dosed "s:^\(HACK=\).*:\1${GAMES_LIBDIR}/${PN}/${PN}:" ${GAMES_BINDIR}/${PN}
+	dosed "s:^\(HACKDIR=\).*:\1${HACKDIR}:" "${GAMES_BINDIR}"/${PN}
+	dosed "s:^\(HACK=\).*:\1$(games_get_libdir)/${PN}/${PN}:" "${GAMES_BINDIR}"/${PN}
 
 	newgamesbin util/recover recover-slashem || die "recover install"
 
 	if use X ; then
 		# install slashem fonts
-		dodir ${GAMES_DATADIR}/${PN}/fonts
-		cd ${S}/win/X11
+		dodir "${GAMES_DATADIR}"/${PN}/fonts
+		cd "${S}"/win/X11
 		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
 		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto ${GAMES_DATADIR}/${PN}/fonts
+		insinto "${GAMES_DATADIR}"/${PN}/fonts
 		doins *.pcf
-		cd ${D}${GAMES_DATADIR}/${PN}/fonts
+		cd "${D}${GAMES_DATADIR}"/${PN}/fonts
 		mkfontdir || die "The action mkfontdir ${D}{GAMES_DATADIR}/${PN}/fonts failed"
 
 		# copy slashem X application defaults
-		cd ${S}/win/X11
+		cd "${S}"/win/X11
 		sed -i \
 			-e 's/^\(SlashEM\*font:\).*/\1 				fixed/' \
 			-e 's/^\(SlashEM\*map\*font:\).*/\1 			fixed/' \
@@ -148,8 +149,8 @@ src_install() {
 		newins SlashEM.ad SlashEM || die "app-defaults failed"
 	fi
 
-	insinto ${GAMES_DATADIR}/${PN}
-	doins ${FILESDIR}/${SE_VER}/dot.slashemrc
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins "${FILESDIR}"/${SE_VER}/dot.slashemrc
 
 	local windowtypes="tty"
 	#use qt     && windowtypes="${windowtypes} qt"
@@ -157,15 +158,15 @@ src_install() {
 	use sdl    && windowtypes="${windowtypes} sdl"
 	use opengl && windowtypes="${windowtypes} gl"
 	set -- ${windowtypes}
-	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" ${GAMES_DATADIR}/${PN}/dot.slashemrc
+	dosed "s:GENTOO_WINDOWTYPES:${windowtypes}:" "${GAMES_DATADIR}"/${PN}/dot.slashemrc
 	insinto /etc/skel
-	newins ${D}/${GAMES_DATADIR}/${PN}/dot.slashemrc .slashemrc
+	newins "${D}/${GAMES_DATADIR}"/${PN}/dot.slashemrc .slashemrc
 	insinto /etc/slashem
-	doins ${FILESDIR}/${SE_VER}/proxy.slashemrc
+	doins "${FILESDIR}"/${SE_VER}/proxy.slashemrc
 
-	keepdir ${HACKDIR}/save
+	keepdir "${HACKDIR}"/save
 	prepgamesdirs
-	chmod -R g+w ${D}/${HACKDIR}
+	fperms -R g+w "${HACKDIR}"
 }
 
 pkg_postinst() {