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

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

4 files changed, 36 insertions, 7 deletions

diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 6be5a5e86afb..5489fb03d217 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/lgeneral
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.29 2009/10/30 11:23:04 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.30 2010/09/25 13:27:11 ssuominen Exp $
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  lgeneral-1.2_beta13.ebuild, +files/lgeneral-1.2_beta13-make-382.patch:
+  Fix building with make >= 3.82 wrt #337610 by Diego E. Pettenò.
 
   30 Oct 2009; Markus Meier <maekke@gentoo.org> lgeneral-1.2_beta13.ebuild:
   amd64/x86 stable, bug #290055
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
index c6073dd755db..25376534dbb8 100644
--- a/games-strategy/lgeneral/Manifest
+++ b/games-strategy/lgeneral/Manifest
@@ -2,8 +2,9 @@ AUX lgeneral-1.2_beta13-64bit.patch 339 RMD160 e68c24f17b82a16db0623032336275659
 AUX lgeneral-1.2_beta13-as-needed.patch 623 RMD160 af27d4d75b94958d7fd5068dd1ddc781227212d9 SHA1 583b46cd7600337ceaf662cfaef5b63a54007b34 SHA256 6f1ebf7fc00acc9c910d3d52616044df6612702c2e7f9f5ac9ac3c22f5d7a9d5
 AUX lgeneral-1.2_beta13-build.patch 472 RMD160 b9694335c28b81e92f7995ff73529f756342c049 SHA1 a0804f805405459d1e4922190e026163a62b1452 SHA256 96571a738c37d03f8b5c638fe857dbd136622d8e671e1972e96681b9dfaeec58
 AUX lgeneral-1.2_beta13-gentoo-path.patch 2393 RMD160 8bf62ea88afb1e0e480436eb298aa1f0abc3f07e SHA1 3f2b6e0463b04b9b929d196c838aa9fc4d82a84d SHA256 199427f23522583fa6a97776bb0710841f961d3528afb8cc3c610e7eed082933
+AUX lgeneral-1.2_beta13-make-382.patch 794 RMD160 a382f445a74ac9dbdb33345688307068edac1ad8 SHA1 2ce71c111c6e090f12cac95cf577b8f561a9d8a3 SHA256 5d3d878b1188973158cd1ca15abbfcc585353a112da5a1e72c6163dad5807346
 DIST lgeneral-1.2beta-13.tar.gz 1601598 RMD160 8a00ef60ca77af5d7895823a8a2e7585a07df792 SHA1 381389be3c35e1c4474e48f10557fa8f7a7bc1f6 SHA256 a30ddc8a16e75c6454b5f0aa5ff02837cae8d9194d7673e35650ddfeb84f781e
 DIST pg-data.tar.gz 410454 RMD160 0f05a0a521639cdf04c8fe6ac8950d5794ccdb0a SHA1 d78db7705e55751332fd1163311311ec36fff3ea SHA256 f2f74022cf8c279451911dda0a57cffab26ebf11429d61a6596310340ed23f76
-EBUILD lgeneral-1.2_beta13.ebuild 2271 RMD160 4d753e735804744ff32a156b4f8d535d1a4deb29 SHA1 3f3068fd888b740cc203bab1dd6a638933016a21 SHA256 293bf50eb7d75f743847f2e136574a984507b2cd9bd8af569c7ffa9b8ae87114
-MISC ChangeLog 5799 RMD160 2ebde52cadb488f4e8693f8658edb94d0a10d52d SHA1 87dbb1ca9b7e483171b782ce9e7f05658ee22858 SHA256 5ce3befc7d4102d3bcf16f739e97a9619c003b36c5ac811ffcae994825968604
+EBUILD lgeneral-1.2_beta13.ebuild 2312 RMD160 d515b59bd9fc5b68db8ef8275eab01721f65ac0c SHA1 b3257883bb1daa2bd139d4a22f1584b8741f30b8 SHA256 4627228c0ddbfde0a4bd0bd999cd0f99affb353c8d11e3c600fc2fdb3e20b7ca
+MISC ChangeLog 5997 RMD160 9c5d3d6682f6c119464f7949e1850f6f80340bf9 SHA1 6d7313dd985ff9f3cb4a9e5dd6502f2a2f3cebcb SHA256 35453cf656d1e7b09078aaab2483c837b0a5f5e969334851a144c0c199f84c1f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch
new file mode 100644
index 000000000000..f4eed33c2bdb
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta13-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/337610
+
+--- intl/Makefile.in
++++ intl/Makefile.in
+@@ -206,12 +206,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-strategy/lgeneral/lgeneral-1.2_beta13.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild
index dee0eb733fc8..95d1e8beb398 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta13.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-strategy/lgeneral/lgeneral-1.2_beta13.ebuild,v 1.3 2009/10/30 11:23:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta13.ebuild,v 1.4 2010/09/25 13:27:11 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools games
@@ -30,7 +30,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gentoo-path.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
 		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-make-382.patch
 
 	cp /usr/share/gettext/config.rpath .
 	rm -f missing