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

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

diff --git a/games-mud/mmucl/mmucl-1.5.2-r1.ebuild b/games-mud/mmucl/mmucl-1.5.2-r1.ebuild
index 3a51b9c8498e..63d2c7b8dcc2 100644
--- a/games-mud/mmucl/mmucl-1.5.2-r1.ebuild
+++ b/games-mud/mmucl/mmucl-1.5.2-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-mud/mmucl/mmucl-1.5.2-r1.ebuild,v 1.4 2007/03/12 17:03:58 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/mmucl/mmucl-1.5.2-r1.ebuild,v 1.5 2007/04/09 18:41:29 nyhm Exp $
 
 inherit games
 
@@ -20,34 +20,32 @@ DEPEND=">=dev-lang/tk-8.4
 
 src_unpack() {
 	unpack ${A}
-
+	cd "${S}"
 	sed -i \
 		-e "/^BASE_DIR/ s:=.*:=/usr:" \
 		-e "/^BIN_DIR/ s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^LIB_DIR/ s:=.*:=${GAMES_LIBDIR}/${PN}:" \
-		-e "" "${S}/Makefile" \
+		-e "/^LIB_DIR/ s:=.*:=$(games_get_libdir)/${PN}:" \
+		Makefile \
 		|| die "sed Makefile failed"
 }
 
 src_install () {
-	local LIBDIR="${GAMES_LIBDIR}/${PN}"
-
-	dogamesbin mmucl2                 || die "dogamesbin failed"
-	insinto ${LIBDIR}/lib
-	doins lib/*.tcl                   || die "doins failed (lib)"
-	insinto ${LIBDIR}/images
-	doins images/*.gif                || die "doins failed (images)"
-	insinto ${LIBDIR}/interface
-	doins interface/*.tcl             || die "doins failed (interface)"
-	insinto ${LIBDIR}/script
-	doins script/*.{tcl,rc}           || die "doins failed (script)"
-	insinto ${LIBDIR}/script/contrib
-	doins script/contrib/*            || die "doins failed (contrib)"
-	insinto ${LIBDIR}/test
-	doins test/*.test                 || die "doins failed (test)"
-	doinfo mmucl.info                 || die "doinfo failed"
-	dodoc CHANGES TODO README || die "dodoc failed"
-	dohtml mmucl.html                 || die "dohtml failed"
+	dogamesbin mmucl2 || die "dogamesbin failed"
+	insinto "$(games_get_libdir)"/${PN}/lib
+	doins lib/*.tcl || die "doins failed (lib)"
+	insinto "$(games_get_libdir)"/${PN}/images
+	doins images/*.gif || die "doins failed (images)"
+	insinto "$(games_get_libdir)"/${PN}/interface
+	doins interface/*.tcl || die "doins failed (interface)"
+	insinto "$(games_get_libdir)"/${PN}/script
+	doins script/*.{tcl,rc} || die "doins failed (script)"
+	insinto "$(games_get_libdir)"/${PN}/script/contrib
+	doins script/contrib/* || die "doins failed (contrib)"
+	insinto "$(games_get_libdir)"/${PN}/test
+	doins test/*.test || die "doins failed (test)"
+	doinfo mmucl.info
+	dodoc CHANGES TODO README
+	dohtml mmucl.html
 	prepgamesdirs
 }
 
diff --git a/games-mud/tkmoo/tkmoo-0.3.32.ebuild b/games-mud/tkmoo/tkmoo-0.3.32.ebuild
index 0696da2852ab..ab0f8557279c 100644
--- a/games-mud/tkmoo/tkmoo-0.3.32.ebuild
+++ b/games-mud/tkmoo/tkmoo-0.3.32.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-mud/tkmoo/tkmoo-0.3.32.ebuild,v 1.12 2007/03/13 01:31:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tkmoo/tkmoo-0.3.32.ebuild,v 1.13 2007/04/09 18:43:53 nyhm Exp $
 
 inherit eutils games
 
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
@@ -30,17 +30,17 @@ src_unpack() {
 src_compile() {
 	emake \
 		WISH="$(type -P wish)" \
-		TKMOO_LIB_DIR="${GAMES_LIBDIR}/${MY_PN}" \
+		TKMOO_LIB_DIR="$(games_get_libdir)/${MY_PN}" \
 		TKMOO_BIN_DIR="${GAMES_BINDIR}" \
 		|| die "emake failed"
 }
 
 src_install() {
-	make \
-		TKMOO_LIB_DIR="${D}/${GAMES_LIBDIR}/${MY_PN}" \
+	emake \
+		TKMOO_LIB_DIR="${D}/$(games_get_libdir)/${MY_PN}" \
 		TKMOO_BIN_DIR="${D}/${GAMES_BINDIR}" \
 		install \
-		|| die "make install failed"
+		|| die "emake install failed"
 	dodoc README dot.tkmoolightrc bugsmail.txt
 	dosym tkMOO-lite "${GAMES_BINDIR}/tkmoo"
 	prepgamesdirs