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

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

4 files changed, 38 insertions, 17 deletions

diff --git a/app-editors/lpe/ChangeLog b/app-editors/lpe/ChangeLog
index 5eb2ed0e911a..2cac583f54b7 100644
--- a/app-editors/lpe/ChangeLog
+++ b/app-editors/lpe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/lpe
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/ChangeLog,v 1.23 2010/04/05 04:10:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/ChangeLog,v 1.24 2010/09/23 15:53:11 ssuominen Exp $
+
+  23 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> lpe-1.2.6.13.ebuild,
+  +files/lpe-1.2.6.13-make-382.patch:
+  Fix building with make >= 3.82 wrt #335324 by Diego E. Pettenò.
 
   05 Apr 2010; Jonathan Callen <abcd@gentoo.org> lpe-1.2.6.13.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest
index 1181a5f9454f..458bcc0d78f8 100644
--- a/app-editors/lpe/Manifest
+++ b/app-editors/lpe/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX lpe-1.2.6.13-make-382.patch 794 RMD160 bb6125dc7d5fa5db9f23380fb2ce168ca2f9cf2c SHA1 beee7d3f7317b865235ae454b242b4fd09155c0d SHA256 95f7bdbd2f5394e1f1d9c14c88c3ebb96bb0e55976cf0711b4f01709ad7bb8f8
 DIST lpe_1.2.6.13-0.1.tar.gz 600523 RMD160 7439e666e4927c686ba654ded2e61da47ec22944 SHA1 66c2d51ce35095dc32f1b3f3c1d57392371ae993 SHA256 7828147e8b8bcf518e6d7f2241b480fe3bbaa1285d3c7c74b8c7160222d76816
-EBUILD lpe-1.2.6.13.ebuild 927 RMD160 ec89fab2556228d215a44ed202e089212c904bc3 SHA1 611094dccd61efa0d54ea85a3bbec32263deeb5c SHA256 35c5b97ab6fc4d3e17d126e08609f5571253b5505834f7c76e6347c968956ff4
-MISC ChangeLog 2612 RMD160 6c03b524a6a1681739506a41a755643140353ba5 SHA1 05647669ba583373407a1d580db1de506987c4d3 SHA256 9cde2c07975949decfd834cf06fa206f9a8ac448716eca3e732795393587613a
+EBUILD lpe-1.2.6.13.ebuild 997 RMD160 08fa41ca2028a61dd799dd297667027e6c444dd7 SHA1 82bb84831426b019db824a4ac6fd645dd5b438bc SHA256 dc8e01b24d12c0794637ddbe205696410a1d111a1e2762d2d9c911456c985e96
+MISC ChangeLog 2798 RMD160 46a16f510d8b35059c13ab4bfe4d0709c15551a8 SHA1 2056460d78b2fc9e8d694de6640cb95fb21385d0 SHA256 2c4755756d3191b61414ee8cf9875d6ed859eb8474a82bfb301ecba7b6584336
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku5YqMACgkQOypDUo0oQOoSDQCdG5gTBc5M6oaQ1CdXOa9IgQbx
-2PkAnjCg+fCpiE4X16wh90gbxH6+zgos
-=MVx4
------END PGP SIGNATURE-----
diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
new file mode 100644
index 000000000000..f8d96ef087e9
--- /dev/null
+++ b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/335324
+
+--- 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/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild
index 3769cbb01b03..a4d387e6bce7 100644
--- a/app-editors/lpe/lpe-1.2.6.13.ebuild
+++ b/app-editors/lpe/lpe-1.2.6.13.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/lpe-1.2.6.13.ebuild,v 1.10 2010/04/05 04:10:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lpe/lpe-1.2.6.13.ebuild,v 1.11 2010/09/23 15:53:11 ssuominen Exp $
 
-EAPI="3"
-
-inherit multilib
+EAPI=3
+inherit eutils multilib
 
 DESCRIPTION="a lightweight programmers editor"
 HOMEPAGE="http://packages.qa.debian.org/l/lpe.html"
@@ -19,6 +18,10 @@ RDEPEND=">=sys-libs/slang-2.1.3"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }