Add nls dependencies

Package-Manager: portage-2.1.2_rc1-r3

3 files changed, 38 insertions, 23 deletions

diff --git a/games-action/heroes/ChangeLog b/games-action/heroes/ChangeLog
index 8cf42f588285..b9603c6bd914 100644
--- a/games-action/heroes/ChangeLog
+++ b/games-action/heroes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/heroes
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.13 2006/09/20 12:26:36 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.14 2006/11/04 05:36:43 nyhm Exp $
+
+  04 Nov 2006; Tristan Heaven <nyhm@gentoo.org> heroes-0.21-r1.ebuild:
+  Add nls dependencies
 
   20 Sep 2006; Danny van Dyk <kugelfang@gentoo.org> heroes-0.21-r1.ebuild:
   Marked stable on amd64 wrt bug #148335.
diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
index 6644a40cf45b..35089eaafd89 100644
--- a/games-action/heroes/Manifest
+++ b/games-action/heroes/Manifest
@@ -13,14 +13,14 @@ DIST heroes-0.21.tar.bz2 709079 RMD160 4d189160ee8b4e2f306ecc3086f50cd564590a8a
 DIST heroes-data-1.5.tar.bz2 391970 RMD160 7bcbbc57537318db2e4c661f46dd951947a5d58d SHA1 2aa90ac7c1760f5b137e5ee175729572d9c93d26 SHA256 f3fa8bd0dd15795b906a8b0cfcfdf0d077404c8577a694347f9e3b1115c231ae
 DIST heroes-sound-effects-1.0.tar.bz2 389883 RMD160 5b696068614f2c9259a41b63fa6876c57d26ee82 SHA1 a265bc8b9ee2923e3c7539ac02346b10e767f95b SHA256 400439d4c6d031ed55ebbb18a8c99928e8b7a99c220ab8ccd3a21eca04f2072c
 DIST heroes-sound-tracks-1.0.tar.bz2 1245613 RMD160 e1ddc451b79947c2e34be8a67360411174c1840a SHA1 a05c5e232d62c5b80c8b9d25639e65b9ade3c5b2 SHA256 2a20bd584a97881421b1c5ef0575284f3dae2a6c0866b9d5faedc47b524cd573
-EBUILD heroes-0.21-r1.ebuild 1573 RMD160 2792610316520a9efdc7c680844657548ef92e50 SHA1 f7133878052d4bb27361dd1bf491b5d9acdc5967 SHA256 d0a829558bde87a4f01d2e1fc05ec8d999778b41603504f7d625d2b2f8f16252
-MD5 9d48c767f550bbac377af8e3d2e4cd11 heroes-0.21-r1.ebuild 1573
-RMD160 2792610316520a9efdc7c680844657548ef92e50 heroes-0.21-r1.ebuild 1573
-SHA256 d0a829558bde87a4f01d2e1fc05ec8d999778b41603504f7d625d2b2f8f16252 heroes-0.21-r1.ebuild 1573
-MISC ChangeLog 3033 RMD160 7615986631f67bd860a14b455a964ca093674689 SHA1 2d924d897bf4f6a6fb513fffd2f400b6389d9874 SHA256 18cc46a0b8bc417bcd09c93a7fc6dd7c582de1474761f3fc2bac773d4f46c2df
-MD5 27c606e2f4cc0ea3777dc7ec2414bc22 ChangeLog 3033
-RMD160 7615986631f67bd860a14b455a964ca093674689 ChangeLog 3033
-SHA256 18cc46a0b8bc417bcd09c93a7fc6dd7c582de1474761f3fc2bac773d4f46c2df ChangeLog 3033
+EBUILD heroes-0.21-r1.ebuild 1829 RMD160 d9b3fa0f992bd670127a578902de515cc602df4a SHA1 565ee78e682c53fe25e3124a2240913d9bdd812d SHA256 a20720ffbec63df573fb8103c1e2ef2cf853b6a9e9f6976ef9f761cfcbb072e0
+MD5 8b5f65b1ad15b6a09e8214cb94e0fb77 heroes-0.21-r1.ebuild 1829
+RMD160 d9b3fa0f992bd670127a578902de515cc602df4a heroes-0.21-r1.ebuild 1829
+SHA256 a20720ffbec63df573fb8103c1e2ef2cf853b6a9e9f6976ef9f761cfcbb072e0 heroes-0.21-r1.ebuild 1829
+MISC ChangeLog 3123 RMD160 54b6cbf8adae6b5fba67696297da5a79d3d75cf9 SHA1 37a4cc3447df7fc4f4d95b68957cc5eaa0f0c9c5 SHA256 6d409237db41ff6a999b85ee7e7ff9464c7ace960f469ce45fc53f8dcb09ef49
+MD5 31ed67893306e3b21ae58b9879848bfb ChangeLog 3123
+RMD160 54b6cbf8adae6b5fba67696297da5a79d3d75cf9 ChangeLog 3123
+SHA256 6d409237db41ff6a999b85ee7e7ff9464c7ace960f469ce45fc53f8dcb09ef49 ChangeLog 3123
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -29,9 +29,9 @@ MD5 69ae36e14d1c81c9fa019aa005ebe471 files/digest-heroes-0.21-r1 1042
 RMD160 80e21d4dce50b03710ad1d83f0bdb1c1ae11f4ac files/digest-heroes-0.21-r1 1042
 SHA256 1f3fda92a35b7d482cfc81fc8f96a7450242c8ceeb66350b6c23acb98144619a files/digest-heroes-0.21-r1 1042
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFETZm5mJXAu5GbtIRAmKsAJ9DC7jX4Kuxpx512ODF9HJ0aIx3FwCeJi2/
-bPmwwUcwkehsFsMhfMoBuzw=
-=UFJT
+iD8DBQFFTCbxdz7hIScOURERAiyWAKCthr305X96yxmk8LD0r4inakfG0gCePiLs
+haVZAWVW3wRDCz5YWt0FObI=
+=gnZB
 -----END PGP SIGNATURE-----
diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild
index d0a4c191fa25..ed685842db0a 100644
--- a/games-action/heroes/heroes-0.21-r1.ebuild
+++ b/games-action/heroes/heroes-0.21-r1.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-action/heroes/heroes-0.21-r1.ebuild,v 1.6 2006/09/20 12:26:36 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.7 2006/11/04 05:36:43 nyhm Exp $
 
 inherit eutils games
 
@@ -20,22 +20,27 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="sdl nls ggi"
 
-DEPEND="nls? ( sys-devel/gettext )
+RDEPEND="nls? ( virtual/libintl )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
 	ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod )
 	!sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	cd ${WORKDIR}/${P}
-	epatch ${FILESDIR}/${PV}-cvs-segfault-fix.patch #56118
+	cd "${WORKDIR}"/${P}
+	epatch "${FILESDIR}"/${PV}-cvs-segfault-fix.patch #56118
 	epatch "${FILESDIR}/${P}"-gcc4.patch
+	sed -i 's:$(localedir):/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') \
+		|| die "sed failed"
 }
 
 src_compile() {
-	local myconf="--disable-heroes-debug $(use_enable nls)"
+	local myconf
 
 	if use sdl || ! use ggi ; then
 		myconf="${myconf} --with-sdl --with-sdl-mixer"
@@ -43,17 +48,24 @@ src_compile() {
 		myconf="${myconf} --with-ggi --with-mikmod"
 	fi
 
+	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd ${S}/${pkg}
-		egamesconf ${myconf}
-		make || die "unable to compile ${pkg}"
+		cd "${S}"/${pkg}
+		egamesconf \
+			--disable-heroes-debug \
+			--disable-optimizations \
+			$(use_enable nls) \
+			${myconf} \
+			|| die
+		emake || die "unable to compile ${pkg}"
 	done
 }
 
 src_install() {
+	local pkg
 	for pkg in ${A//.tar.bz2} ; do
-		cd ${S}/${pkg}
-		make DESTDIR=${D} install || die
+		cd "${S}"/${pkg}
+		emake DESTDIR="${D}" install || die "emake install failed"
 	done
 	prepgamesdirs
 }