use games_get_libdir

Package-Manager: portage-2.1.2.3

3 files changed, 19 insertions, 27 deletions

diff --git a/games-strategy/freecnc/Manifest b/games-strategy/freecnc/Manifest
index a26c71455960..4a7f6a546346 100644
--- a/games-strategy/freecnc/Manifest
+++ b/games-strategy/freecnc/Manifest
@@ -17,10 +17,6 @@ AUX 0.2.1.31072003-remove-root.patch 555 RMD160 7bd7afe0241e83308b8531ae09af974c
 MD5 a95fe9ff48a57f7d2afaf10e0932faab files/0.2.1.31072003-remove-root.patch 555
 RMD160 7bd7afe0241e83308b8531ae09af974c04db2822 files/0.2.1.31072003-remove-root.patch 555
 SHA256 b9450649620c70a2c4c11fcc4a16c2782d611f11c3e6eab802e4e057383ce207 files/0.2.1.31072003-remove-root.patch 555
-AUX freecnc 44 RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 SHA1 2a86ec97c739e2c0a8d124cc24186a4c7f49c096 SHA256 94b017b779b59a349a752d3663864058c4036ffbfa453216f3212fe5eda9aeae
-MD5 190952f0b1cd7f8ebd7385c01e0b70db files/freecnc 44
-RMD160 449158ab5e3bf2d4025cc6a7d7e108115776a709 files/freecnc 44
-SHA256 94b017b779b59a349a752d3663864058c4036ffbfa453216f3212fe5eda9aeae files/freecnc 44
 AUX freecnc-0.2.1.31072003-gcc4.patch 403 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 SHA1 3f884ae37f843ea8320f0e5e1f12695db661731c SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1
 MD5 b7a2487d3f2a0c36ab831cc34f300c15 files/freecnc-0.2.1.31072003-gcc4.patch 403
 RMD160 2aa4b9ecfe762cbb6599ad8a502d384bb75c8816 files/freecnc-0.2.1.31072003-gcc4.patch 403
@@ -28,10 +24,10 @@ SHA256 bfe4b998ae938a1b3f87d394ddc13e745ec85736b4594dd7ab66ee48e5b34ae1 files/fr
 DIST cc1demo1.zip 9367945 RMD160 a51eaee5f738e058f9c0f10689d8a81dc3c8e316 SHA1 fce488d0f9090cd96e6b064f0821ecf299b71962 SHA256 29d33849cb450a87262426cc59b25baa5e033b94c2e3495ec94f813f3bc09f87
 DIST cc1demo2.zip 17797920 RMD160 f59fb2ab7a0bbcae89c361ad97372f2b2e017985 SHA1 a154a12f2479b76601081f2bdb49286b5bb040dc SHA256 a42804b84e4015c26eaf7a9439398fdc609bfd6a7ba7b272567f187aad7b3c48
 DIST freecnc++-0.2.1.31072003-src.tar.bz2 271980 RMD160 e249a600a54a5a0aa791219360011724b8e273f2 SHA1 40d742f4acc9d175bb3b7ef1deddd1cdb18ba285 SHA256 512f55708791742093703b5ebe7ebe7b3e0c3ca46562aa9fb8f526bafc514cc5
-EBUILD freecnc-0.2.1.31072003.ebuild 2280 RMD160 d06bb13661c2a1d1238af726fa61d9fc9af8e803 SHA1 cfb026df7d1615be2893b750826ebfdc7b73925c SHA256 7f848d9a3c55637d4d49c25cd5dc2e833ab245ddd2d8d2ab7838f9fc64a6b9d6
-MD5 3ab523780335172b2bfd0441f94e6f10 freecnc-0.2.1.31072003.ebuild 2280
-RMD160 d06bb13661c2a1d1238af726fa61d9fc9af8e803 freecnc-0.2.1.31072003.ebuild 2280
-SHA256 7f848d9a3c55637d4d49c25cd5dc2e833ab245ddd2d8d2ab7838f9fc64a6b9d6 freecnc-0.2.1.31072003.ebuild 2280
+EBUILD freecnc-0.2.1.31072003.ebuild 2267 RMD160 1c2a41d9fb16029ce62bdebc04fca6bbce3f5d9e SHA1 1452661d8491b5116ec047a653bfa67ef6f7bada SHA256 9f8d5224ab78dac912f2e96df1eef6924f241d0017e51d00f66d3183d802e62e
+MD5 fe1b62b01a6e9ffc2bcd5479768cfde0 freecnc-0.2.1.31072003.ebuild 2267
+RMD160 1c2a41d9fb16029ce62bdebc04fca6bbce3f5d9e freecnc-0.2.1.31072003.ebuild 2267
+SHA256 9f8d5224ab78dac912f2e96df1eef6924f241d0017e51d00f66d3183d802e62e freecnc-0.2.1.31072003.ebuild 2267
 MISC ChangeLog 1533 RMD160 7671cee5500e5d928a380fc9b7e04fed25e67523 SHA1 92607f8e696c96416a237d32a278daa2b0cacbd9 SHA256 1e081f746ffab8781636a65003d08f2dfd93773d25cc968535b2dfcb306a3ea9
 MD5 fe566abd198725f259752201c92dd99f ChangeLog 1533
 RMD160 7671cee5500e5d928a380fc9b7e04fed25e67523 ChangeLog 1533
@@ -46,7 +42,7 @@ SHA256 4b3c8208e11a10196c1a16c81f493db49aa8739cb9cc10b83227c28b234bf342 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9ZeB6J2i8a8J4okRAuDSAJ9PTZ+NSvoMhFK8WCdFdSD8Uy5ZVgCg3vyT
-jez7Vqcz73DlshpAjWJTsRI=
-=ljSe
+iD8DBQFGFAiAdz7hIScOURERAmOIAJ0f9l8wmq3mgha+kYBp28e4V9m9/gCgrfD6
+auRYAq7A7B7XxfJg4hhAaAc=
+=HOlW
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freecnc/files/freecnc b/games-strategy/freecnc/files/freecnc
deleted file mode 100644
index 5cbf438349b8..000000000000
--- a/games-strategy/freecnc/files/freecnc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./freecnc "$@"
diff --git a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild b/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
index 953d1fe38894..5dad06da3724 100644
--- a/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild
+++ b/games-strategy/freecnc/freecnc-0.2.1.31072003.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-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.11 2007/03/12 18:05:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecnc/freecnc-0.2.1.31072003.ebuild,v 1.12 2007/04/04 20:20:07 nyhm Exp $
 
 inherit flag-o-matic eutils games
 
@@ -14,11 +14,10 @@ SRC_URI="mirror://gentoo/freecnc++-${PV}-src.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
-IUSE="zlib nocd"
+IUSE="nocd"
 
 RDEPEND="media-libs/libsdl
-	media-libs/sdl-net
-	zlib? ( sys-libs/zlib )"
+	media-libs/sdl-net"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -34,10 +33,11 @@ src_unpack() {
 		done
 	fi
 	cd "${S}"
-	epatch ${FILESDIR}/${PV}-makefile-cflags.patch \
-		${FILESDIR}/${PV}-remove-root.patch \
-		${FILESDIR}/${PV}-gentoo-paths.patch \
-		"${FILESDIR}/${P}"-gcc4.patch
+	epatch \
+		"${FILESDIR}"/${PV}-makefile-cflags.patch \
+		"${FILESDIR}"/${PV}-remove-root.patch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
 	sed -i \
 		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
 		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}/:" \
@@ -51,14 +51,13 @@ src_compile() {
 }
 
 src_install() {
-	exeinto "${GAMES_LIBDIR}"/${PN}
+	exeinto "$(games_get_libdir)"/${PN}
 	doexe freecnc *.vfs audplay shpview tmpinied || die "doexe failed"
-	dogamesbin "${FILESDIR}"/freecnc
-	dosed "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/freecnc
+	games_make_wrapper ${PN} ./freecnc "$(games_get_libdir)"/${PN}
 	insinto "${GAMES_DATADIR}"/${PN}/conf
-	doins conf/*
+	doins conf/* || die "doins failed"
 	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins conf/*
+	doins conf/* || die "doins failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	if use nocd ; then
 		cd "${WORKDIR}"/data