use games_get_libdir

(Portage version: 2.1.2.3)

2 files changed, 35 insertions, 34 deletions

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() {