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

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

4 files changed, 48 insertions, 10 deletions

diff --git a/dev-util/vdkbuilder/ChangeLog b/dev-util/vdkbuilder/ChangeLog
index 6dba9f5c13ba..76f91513c942 100644
--- a/dev-util/vdkbuilder/ChangeLog
+++ b/dev-util/vdkbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/vdkbuilder
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.25 2009/07/14 09:27:27 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/ChangeLog,v 1.26 2010/09/26 14:00:21 ssuominen Exp $
+
+  26 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  vdkbuilder-2.4.0.ebuild, +files/vdkbuilder-2.4.0-make-382.patch:
+  Fix building with make >= 3.82 wrt #334847 by Diego E. Pettenò.
 
   14 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   vdkbuilder-2.4.0.ebuild:
diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest
index 780fa7d3a6c8..bb9ff388e480 100644
--- a/dev-util/vdkbuilder/Manifest
+++ b/dev-util/vdkbuilder/Manifest
@@ -1,4 +1,5 @@
+AUX vdkbuilder-2.4.0-make-382.patch 794 RMD160 bc0a8b64ba5b29451944aec1f62f25fe4921715d SHA1 aa60b84c44bf950a8d32b9a5f95bcc2d5a3fd11b SHA256 a534bf88727c1e78f869274d3963a48fde8506be736c0e6f6051e6646badface
 DIST vdkbuilder2-2.4.0.tar.gz 1079112 RMD160 7ba318776bcbfcc2b28dfbc618a224b9e80edbf8 SHA1 4ad6162c3a559e87e4eb5458ba21b0be1aeaae8a SHA256 549a298214f314933d7b8d0e7785c98a388faad3ea0725a0dffc08d660174381
-EBUILD vdkbuilder-2.4.0.ebuild 1116 RMD160 c5e5819b2d9551fdef213877cf9a36731357fe7a SHA1 f8acbb68ad4295052d346c898153d461aebfbc52 SHA256 a5b6116504bf3ffa06e4f4790e51517439e3f9aa818f543d4261b9f638e9c296
-MISC ChangeLog 2993 RMD160 2c09f11ac56c7b094c447fff57f602c94e13e11f SHA1 48c940b0d5a9fd7a2433d84ce1f4c266306ea642 SHA256 64d459f737535859eb01e35d46c158581c807351048682662400724bc813c74e
+EBUILD vdkbuilder-2.4.0.ebuild 1239 RMD160 d046ff1774467a5bf650dcd835fa633d6479d529 SHA1 0a62e3ba70b613a9ba8f312d52c4cc0c3c82434b SHA256 ffaf1f309e2134e961fe6584eb72a7910df84202f3797e44d7ac682d649667a4
+MISC ChangeLog 3182 RMD160 816246e3c85ab280d4dde06e49d5df02f35ce57f SHA1 bc02e2ebd94d9dfc198a660f304ad03b86832c67 SHA256 9d57a53793854eb12ef04cdbe9e7332e7f177fbab099fcd73dcdb6d468cf8541
 MISC metadata.xml 163 RMD160 dbf348506ebb668dddded053b5d6fe8040923312 SHA1 f00deef1c74f500abb6bc8d8be5916ae5890008d SHA256 fefe3536313f95ac1f13a5f513a6f10ed99c9f3c322bb18be3bdad2ef07e8f41
diff --git a/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch
new file mode 100644
index 000000000000..4b0dc099607c
--- /dev/null
+++ b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/334847
+
+--- 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/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild
index 2833fe5ec453..36a7a202e7f8 100644
--- a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild
+++ b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild
@@ -1,20 +1,24 @@
-# 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/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild,v 1.9 2009/10/12 08:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild,v 1.10 2010/09/26 14:00:21 ssuominen Exp $
 
-IUSE="nls debug"
+inherit eutils
 
 MY_P=${PN}2-${PV}
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="The Visual Development Kit used for VDK Builder."
 HOMEPAGE="http://vdkbuilder.sf.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="ppc sparc x86"
+IUSE="nls debug"
+
+RDEPEND=">=dev-libs/vdk-2.4.0"
+DEPEND="${RDEPEND}"
 
-DEPEND=">=dev-libs/vdk-2.4.0"
+S=${WORKDIR}/${MY_P}
 
 custom_cflags() {
 	for files in *
@@ -27,6 +31,12 @@ custom_cflags() {
 	done
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-make-382.patch
+}
+
 src_compile() {
 	local myconf=""