Fix building with make >= 3.82 wrt #340599 by Diego E. Pettenò

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

4 files changed, 38 insertions, 19 deletions

diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog
index c1a0b8e90633..6a1105565606 100644
--- a/games-kids/lletters/ChangeLog
+++ b/games-kids/lletters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/lletters
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.21 2009/01/12 17:45:17 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.22 2010/10/12 07:59:14 ssuominen Exp $
+
+  12 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  lletters-0.1.95-r2.ebuild, +files/lletters-0.1.95-make-382.patch:
+  Fix building with make >= 3.82 wrt #340599 by Diego E. Pettenò
 
   12 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   lletters-0.1.95-r2.ebuild:
diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
index 675b20098537..bb57e37abd32 100644
--- a/games-kids/lletters/Manifest
+++ b/games-kids/lletters/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lletters-0.1.95-build-2.patch 2433 RMD160 a288c68363a304cbcdab1bb073580ce4f7c1cc1f SHA1 eb1774c045d528b03bb66ca082b33141edcd293e SHA256 4fbde2c0d4060278155cca9bb186791401b9b98e64aa323d33e0f75aa0b74633
+AUX lletters-0.1.95-make-382.patch 794 RMD160 ac2c3e5443f94bf3da5a6971a524788f7a8ed795 SHA1 a23666f0e164804a3faf00e5578f12c7debe960c SHA256 d699be3e008cd026f8794c09a5be7e98fef9bef462db2688ede103c11d2af061
 DIST lletters-media-0.1.9a.tar.gz 1966275 RMD160 7a09ecffcff7464986a28aeac9d735c0b864a7c9 SHA1 edff4a39b8490d21c8affdd254ec2b46cdafe604 SHA256 5456457083fe026bbc818da307a000401d7a4903bd56b018e9a23526871b4c76
 DIST lletters_0.1.95+gtk2-3.diff.gz 457812 RMD160 0cd3829642f61883a0f9434ef4603ece1bb51227 SHA1 4ccf1a2eb5e4226d33d6868e4a8dd8d2c7eff1b0 SHA256 f94b282ca699b0be3071335813e295df0650c9473f569ff5a255ca1bde1219d7
 DIST lletters_0.1.95+gtk2.orig.tar.gz 180896 RMD160 83bb950f64a6f026e3abc99899ea70d6a9f8e4da SHA1 1aa4e963939158d46ce0f56f088732753a28bd52 SHA256 abcdb9448064972e2d0c4a4ca473c8e3ccb795458aa84c87438ecd29ef05e8c6
-EBUILD lletters-0.1.95-r2.ebuild 1290 RMD160 3bae98838d4abe4f7299d22641586def6b21e31a SHA1 bec137e52f27ec064e951c46b3109f1e5cecd353 SHA256 a5606c503d677115e3e49cc1df7e39289774ee72c9c3b6738e9e1e5db4037e3a
-MISC ChangeLog 3383 RMD160 351c896c7becac3add2f1a98643053ee74d31d9e SHA1 a07be78511005ecdcc5b62ae220ca7d2a39976a1 SHA256 686b53c4d98d5b5f87d5c89549f304d139680ba1782779aed07c84324cc94068
+EBUILD lletters-0.1.95-r2.ebuild 1268 RMD160 5f1823fde2d0314c26c6eccef45b7e528c13a11f SHA1 66aa0f3e61d36c7fb2e334934ec63394b5651cbe SHA256 4d48c7f4da1e6c48dfdbcc510e1a113be086b4fea5eccc2815d6aa760c6ded46
+MISC ChangeLog 3572 RMD160 95abbf14ed9e01977257566f58a6a82002e51d57 SHA1 92f7e6c4ddabb15e547faa22a14915590390d9d6 SHA256 3970d7c2ed86118e8da3cd5bfc377faaa553badf14e442ec99da0fe662674767
 MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoz/ZUACgkQdz7hIScOUREu0gCg0yt0yZA0DYW0IOczU35CY25j
-I24AoPYuPvvvp5UboRNRk+YX2sTZOVgU
-=ZH6g
------END PGP SIGNATURE-----
diff --git a/games-kids/lletters/files/lletters-0.1.95-make-382.patch b/games-kids/lletters/files/lletters-0.1.95-make-382.patch
new file mode 100644
index 000000000000..2a5ee9ecc4a7
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/340599
+
+--- intl/Makefile.in
++++ intl/Makefile.in
+@@ -202,12 +202,12 @@
+ # The dependency for intlh.inst is different in gettext and all other
+ # packages.  Because we cannot you GNU make features we have to solve
+ # the problem while rewriting Makefile.in.
+-@GT_YES@intlh.inst: intlh.inst.in ../config.status
+-@GT_YES@	cd .. \
+-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+-@GT_YES@	  $(SHELL) ./config.status
+-@GT_NO@.PHONY: intlh.inst
+-@GT_NO@intlh.inst:
++intlh.inst: intlh.inst.in ../config.status
++	cd .. \
++	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
++	  $(SHELL) ./config.status
++.PHONY: intlh.inst
++intlh.inst:
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-kids/lletters/lletters-0.1.95-r2.ebuild b/games-kids/lletters/lletters-0.1.95-r2.ebuild
index 2fbfc7177f98..a5dafb0638fd 100644
--- a/games-kids/lletters/lletters-0.1.95-r2.ebuild
+++ b/games-kids/lletters/lletters-0.1.95-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r2.ebuild,v 1.6 2009/01/12 17:45:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r2.ebuild,v 1.7 2010/10/12 07:59:14 ssuominen Exp $
 
 EAPI=2
 inherit eutils games
@@ -26,8 +26,9 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff \
-		"${FILESDIR}"/${P}-build-2.patch
-	cp -r "${WORKDIR}"/{images,sounds} . || die "copying images and sounds failed."
+		"${FILESDIR}"/${P}-build-2.patch \
+		"${FILESDIR}"/${P}-make-382.patch
+	cp -r "${WORKDIR}"/{images,sounds} . || die
 }
 
 src_configure() {
@@ -35,7 +36,7 @@ src_configure() {
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog CREDITS NEWS README* TODO
 	newdoc debian/changelog ChangeLog.debian
 	doicon debian/${PN}.xpm