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

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

diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
index 8694a5780aa3..d231d3b9a7ca 100644
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ b/games-fps/quake3/quake3-1.34_rc3.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-fps/quake3/quake3-1.34_rc3.ebuild,v 1.5 2007/01/31 07:59:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.6 2007/04/09 18:07:58 nyhm Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -71,7 +71,7 @@ src_compile() {
 		ARCH=$(tc-arch-kernel) \
 		OPTIMIZE="${CFLAGS}" \
 		DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
-		DEFAULT_LIBDIR="${GAMES_LIBDIR}/quake3" \
+		DEFAULT_LIBDIR="$(games_get_libdir)/quake3" \
 		|| die
 }
 
@@ -92,9 +92,9 @@ src_install() {
 		newgamesbin ${old_x} ${x} || die "newgamesbin ${x}"
 		dosym ${x} "${GAMES_BINDIR}"/${x/io}
 	done
-	exeinto "${GAMES_LIBDIR}"/${PN}/baseq3
+	exeinto "$(games_get_libdir)"/${PN}/baseq3
 	doexe baseq3/*.so || die "baseq3 .so"
-	exeinto "${GAMES_LIBDIR}"/${PN}/missionpack
+	exeinto "$(games_get_libdir)"/${PN}/missionpack
 	doexe missionpack/*.so || die "missionpack .so"
 
 	prepgamesdirs
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index 67f6f5e56841..82e7351580ba 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.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-fps/quake3/quake3-9999.ebuild,v 1.11 2007/01/31 08:04:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.12 2007/04/09 18:07:58 nyhm Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -71,7 +71,7 @@ src_compile() {
 		ARCH=$(tc-arch-kernel) \
 		OPTIMIZE="${CFLAGS}" \
 		DEFAULT_BASEDIR="${GAMES_DATADIR}/quake3" \
-		DEFAULT_LIBDIR="${GAMES_LIBDIR}/quake3" \
+		DEFAULT_LIBDIR="$(games_get_libdir)/quake3" \
 		|| die
 }
 
@@ -92,9 +92,9 @@ src_install() {
 		newgamesbin ${old_x} ${x} || die "newgamesbin ${x}"
 		dosym ${x} "${GAMES_BINDIR}"/${x/io}
 	done
-	exeinto "${GAMES_LIBDIR}"/${PN}/baseq3
+	exeinto "$(games_get_libdir)"/${PN}/baseq3
 	doexe baseq3/*.so || die "baseq3 .so"
-	exeinto "${GAMES_LIBDIR}"/${PN}/missionpack
+	exeinto "$(games_get_libdir)"/${PN}/missionpack
 	doexe missionpack/*.so || die "missionpack .so"
 
 	prepgamesdirs
diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild
index 18c4e6273e2b..4a6d057b4f35 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5-r1.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-fps/quakeforge/quakeforge-0.5.5-r1.ebuild,v 1.2 2007/03/12 15:05:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild,v 1.3 2007/04/09 18:10:52 nyhm Exp $
 
 inherit eutils autotools games
 
@@ -78,7 +78,7 @@ src_compile() {
 		&& svgaconf="--with-svga=/usr" \
 		|| svgaconf="--without-svga"
 
-	addpredict ${GAMES_LIBDIR}
+	addpredict "$(games_get_libdir)"
 	egamesconf \
 		$(use_enable ncurses curses) \
 		$(use_enable vorbis) \
@@ -96,8 +96,8 @@ src_compile() {
 		--enable-sound \
 		--disable-optimize \
 		${debugopts} \
-		--with-global-cfg=${GAMES_SYSCONFDIR}/quakeforge.conf \
-		--with-sharepath=${GAMES_DATADIR}/quake1 \
+		--with-global-cfg="${GAMES_SYSCONFDIR}"/quakeforge.conf \
+		--with-sharepath="${GAMES_DATADIR}"/quake1 \
 		--with-clients=${clients} \
 		--with-servers=${servers} \
 		--with-tools=${tools} \
@@ -106,8 +106,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	mv ${D}/${GAMES_PREFIX}/include ${D}/usr/
+	emake DESTDIR="${D}" install || die "install failed"
+	mv "${D}/${GAMES_PREFIX}"/include "${D}"/usr/
 	dodoc ChangeLog NEWS TODO doc/*
 	prepgamesdirs
 }
diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index 5f6b7705a5e6..fe9ebcdb5f68 100644
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.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-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.17 2007/03/12 15:05:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.18 2007/04/09 18:10:52 nyhm Exp $
 
 inherit eutils games
 
@@ -77,7 +77,7 @@ src_compile() {
 		&& svgaconf="--with-svga=/usr" \
 		|| svgaconf="--without-svga"
 
-	addpredict ${GAMES_LIBDIR}
+	addpredict $(games_get_libdir)
 	egamesconf \
 		$(use_enable ncurses curses) \
 		$(use_enable vorbis) \
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 8cde20af065d..2b6d6ad7dab4 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.6 2007/03/12 15:07:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.7 2007/04/09 18:15:05 nyhm Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -39,7 +39,6 @@ DEPEND="${UIDEPEND}"
 
 S=${WORKDIR}/${FILE_STEM}
 dir=${GAMES_DATADIR}/${MY_PN}
-libdir=${GAMES_LIBDIR}/${PN}
 
 default_client() {
 	if use opengl || use sdl || ! use dedicated ; then
@@ -105,7 +104,7 @@ src_unpack() {
 	# Change default sound driver and its location
 	sed -i src/client/snd_dma.c \
 		-e "s:\"oss\":\"${snd_drv}\":" \
-		-e "s:\"\./snd:\"${libdir}/snd:" \
+		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
 		|| die "sed snd_dma.c failed"
 }
 
@@ -132,7 +131,7 @@ src_compile() {
 		TYPE="${type}" \
 		DATADIR="${dir}" \
 		LOCALBASE=/usr \
-		LIBDIR="${GAMES_LIBDIR}/${PN}" \
+		LIBDIR="$(games_get_libdir)"/${PN} \
 		WITH_QMAX=$(yesno qmax) \
 		BUILD_3ZB2=$(yesno mods) \
 		BUILD_CTF=$(yesno mods) \
@@ -166,11 +165,11 @@ src_install() {
 			|| die "newgamesbin QuDos-ded failed"
 	fi
 
-	insinto "${libdir}"
+	insinto "$(games_get_libdir)"/${PN}
 	doins -r ${MY_PN}/* || die "doins libs failed"
-	rm "${D}/${libdir}"/QuDos
+	rm "${D}/$(games_get_libdir)"/${PN}/QuDos
 
-	insinto "${libdir}"/baseq2
+	insinto "$(games_get_libdir)"/${PN}/baseq2
 	newins "${DISTDIR}/${PK3_FILE}" qudos.pk3 || die "doins ${PK3_FILE} failed"
 
 	dodoc $(find docs -name \*.txt) docs/q2_orig/README*
diff --git a/games-fps/qudos/qudos-9999.ebuild b/games-fps/qudos/qudos-9999.ebuild
index cdef1d512f07..e3e16e0041e9 100644
--- a/games-fps/qudos/qudos-9999.ebuild
+++ b/games-fps/qudos/qudos-9999.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-fps/qudos/qudos-9999.ebuild,v 1.5 2007/03/12 15:07:20 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-9999.ebuild,v 1.6 2007/04/09 18:15:05 nyhm Exp $
 
 inherit eutils subversion toolchain-funcs games
 
@@ -40,7 +40,6 @@ DEPEND="${UIDEPEND}"
 
 S=${WORKDIR}
 dir=${GAMES_DATADIR}/${MY_PN}
-libdir=${GAMES_LIBDIR}/${PN}
 
 default_client() {
 	if use opengl || use sdl || ! use dedicated ; then
@@ -105,7 +104,7 @@ src_unpack() {
 	# Change default sound driver and its location
 	sed -i src/client/snd_dma.c \
 		-e "s:\"oss\":\"${snd_drv}\":" \
-		-e "s:\"\./snd:\"${libdir}/snd:" \
+		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
 		|| die "sed snd_dma.c failed"
 }
 
@@ -132,7 +131,7 @@ src_compile() {
 		TYPE="${type}" \
 		DATADIR="${dir}" \
 		LOCALBASE=/usr \
-		LIBDIR="${GAMES_LIBDIR}/${PN}" \
+		LIBDIR="$(games_get_libdir)"/${PN} \
 		WITH_QMAX=$(yesno qmax) \
 		BUILD_3ZB2=$(yesno mods) \
 		BUILD_CTF=$(yesno mods) \
@@ -165,11 +164,11 @@ src_install() {
 			|| die "newgamesbin QuDos-ded failed"
 	fi
 
-	insinto "${libdir}"
+	insinto "$(games_get_libdir)"/${PN}
 	doins -r ${MY_PN}/* || die "doins libs failed"
-	rm "${D}/${libdir}"/QuDos
+	rm "${D}/$(games_get_libdir)"/${PN}/QuDos
 
-	insinto "${libdir}"/baseq2
+	insinto "$(games_get_libdir)"/${PN}/baseq2
 	doins data/qudos.pk3 || die "doins qudos.pk3 failed"
 
 	dodoc $(find docs -name \*.txt) docs/q2_orig/README*
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 753d7b441864..acdd8174f80b 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.10 2006/12/05 17:55:35 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.11 2007/04/09 18:19:41 nyhm Exp $
 
 inherit eutils games
 
@@ -22,36 +22,38 @@ S=${WORKDIR}/quake2-3.21/linux
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	cd quake2-3.21
 	epatch "${FILESDIR}/${P}"-gcc41.patch
 	cd linux
-	sed -i "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" sys_linux.c
-	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" sys_linux.c vid_so.c
+	sed -i "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c \
+		|| die "sed failed"
+	sed -i "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
+		sys_linux.c vid_so.c \
+		|| die "sed failed"
 }
 
 src_compile() {
 	mkdir -p releasei386-glibc/ref_soft
-	make \
+	emake \
 		GENTOO_CFLAGS="${CFLAGS}" \
 		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release || die
+		build_release \
+		|| die "emake failed"
 }
 
 src_install() {
 	cd release*
 
-	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe gamei386.so ref_softx.so || die
-	exeinto ${GAMES_LIBDIR}/${PN}/ctf
-	doexe ctf/gamei386.so || die
-	newgamesbin quake2 red-blue-quake2 || die
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe gamei386.so ref_softx.so || die "doexe failed"
+	exeinto "$(games_get_libdir)"/${PN}/ctf
+	doexe ctf/gamei386.so || die "doexe failed"
+	newgamesbin quake2 red-blue-quake2 || die "newgamesbin failed"
 
-	dodir ${GAMES_DATADIR}/quake2
-
-	insinto ${GAMES_SYSCONFDIR}
-	echo ${GAMES_LIBDIR}/${PN} > ${PN}.conf
-	doins ${PN}.conf
+	insinto "${GAMES_SYSCONFDIR}"
+	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
+	doins ${PN}.conf || die "doins failed"
 
 	prepgamesdirs
 }
diff --git a/games-fps/wmquake/wmquake-1.1.ebuild b/games-fps/wmquake/wmquake-1.1.ebuild
index 71e037091f88..65b98d24e0bf 100644
--- a/games-fps/wmquake/wmquake-1.1.ebuild
+++ b/games-fps/wmquake/wmquake-1.1.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-fps/wmquake/wmquake-1.1.ebuild,v 1.7 2007/03/12 15:47:00 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/wmquake/wmquake-1.1.ebuild,v 1.8 2007/04/09 18:23:25 nyhm Exp $
 
 inherit games
 
@@ -25,9 +25,9 @@ src_unpack() {
 }
 
 src_install() {
-	exeinto "${GAMES_LIBDIR}/wmquake"
+	exeinto "$(games_get_libdir)/wmquake"
 	doexe wmquake || die "doexe failed"
-	games_make_wrapper wmquake "${GAMES_LIBDIR}/wmquake/wmquake" "${GAMES_DATADIR}/quake1/"
+	games_make_wrapper wmquake "$(games_get_libdir)/wmquake/wmquake" "${GAMES_DATADIR}/quake1/"
 	dodoc README*
 	prepgamesdirs
 }