Fix building with make-3.82 wrt #333499 by Diego E. Pettenò.

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

4 files changed, 41 insertions, 14 deletions

diff --git a/app-admin/gtkdiskfree/ChangeLog b/app-admin/gtkdiskfree/ChangeLog
index 59bce002f23f..9370ac99c136 100644
--- a/app-admin/gtkdiskfree/ChangeLog
+++ b/app-admin/gtkdiskfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gtkdiskfree
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.28 2009/08/25 17:19:25 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.29 2010/08/20 17:39:46 ssuominen Exp $
+
+  20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gtkdiskfree-1.9.3-r1.ebuild, +files/gtkdiskfree-1.9.3-make-382.patch:
+  Fix building with make-3.82 wrt #333499 by Diego E. Pettenò.
 
   25 Aug 2009; Raúl Porcel <armin76@gentoo.org>
   gtkdiskfree-1.9.3-r1.ebuild:
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index faaef904504a..f13cfe8f111e 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,6 +1,7 @@
 AUX 1.9.3-makefile-DESTDIR.patch 663 RMD160 8731ef43126b88b04be07c0e5cd6772128ba7b9b SHA1 dabb28f9c3db8d8b8b6897460b0ad03b8121d20b SHA256 0df516e1874b5e4b2e83a070f8a31ed4b150e6cf5e12e6ddbaeaa4cedc49b6d8
+AUX gtkdiskfree-1.9.3-make-382.patch 960 RMD160 ebeaa162d100bc6037cd23e9fd5515ae0c4caf78 SHA1 3fa9379cdf91026e0d8d3e885840a133dcd2a8fa SHA256 c112d8cf7c0f9c5810ac05a4476eb272767dd51b0a12c3f9920856f98260ddfd
 AUX gtkdiskfree-1.9.3-tempfile.patch 1220 RMD160 1d7a3e5d4bb704201333cf313943ffa11e0dd00c SHA1 9c1e0dca543bbcbb3f19788ba4609d92c04245a2 SHA256 fbc59b683501458a467b7fae9b0b175609d72a2953de450a65d2cda0fb2feb6d
 DIST gtkdiskfree-1.9.3.tar.gz 255448 RMD160 5ea6843d7e05e99eed536792ef88e725f01df27c SHA1 1bc309da843fdf54b0384902b11f36176746c576 SHA256 88ddccc51a060590476db7ed29137e474b70cca94ad28220d3122ab4b143d120
-EBUILD gtkdiskfree-1.9.3-r1.ebuild 933 RMD160 f30660b5488122427fb4c541d8e684450b0c7c51 SHA1 5a79db905a38f419f3901875e206775d9ee7b5b0 SHA256 a69ebe96093d92002094e912c1304ac4c600844061ab42aaa015cc69d511e115
-MISC ChangeLog 3468 RMD160 c421e9a407af3e72f866452b30f58a5ad7eb709d SHA1 d026288111f3c884b2ccb1e9a351f723b0508e4d SHA256 fa9ccd520fe25db879660675a9470b9c704959eabfcc9a61e8324656cf87ba38
+EBUILD gtkdiskfree-1.9.3-r1.ebuild 911 RMD160 99d9e38db395c9cbc811a04e03ec784ca250df44 SHA1 b5e14791ae2fe3ce862a7e6ca72476de4fb042a9 SHA256 2e421cbbc78883f1c6ed511d78ca64dc03bf862f00d1ecbde1e1235308f5fa88
+MISC ChangeLog 3661 RMD160 8140f0332616451a4b2a746af5d343673c5945ef SHA1 509af5e171285316b397f16c1bc38f2a43fbeee5 SHA256 d18092506593ddf4dc75cac7abc55c086b2f3cc74c16e51785f914e048bb801e
 MISC metadata.xml 337 RMD160 d7f26e381e36c056a890079f53d593270e429048 SHA1 cee54fef737ef73714f33ab37d60cffe21e3ce36 SHA256 3662b0f7504d8419e701b4988225944f7384733a76686718caa92c11750eb63c
diff --git a/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-make-382.patch b/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-make-382.patch
new file mode 100644
index 000000000000..bbad1b6c5f2c
--- /dev/null
+++ b/app-admin/gtkdiskfree/files/gtkdiskfree-1.9.3-make-382.patch
@@ -0,0 +1,22 @@
+diff -ur gtkdiskfree-1.9.3.orig/intl/Makefile.in gtkdiskfree-1.9.3/intl/Makefile.in
+--- gtkdiskfree-1.9.3.orig/intl/Makefile.in	2002-11-16 13:34:20.000000000 +0200
++++ gtkdiskfree-1.9.3/intl/Makefile.in	2010-08-20 20:38:58.000000000 +0300
+@@ -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-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild
index 2b406a59feba..2395766d352d 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild
@@ -1,7 +1,8 @@
-# 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/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild,v 1.11 2009/08/25 17:19:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild,v 1.12 2010/08/20 17:39:46 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Graphical tool to show free disk space"
@@ -13,24 +14,23 @@ SLOT="0"
 KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="nls"
 
-RDEPEND=">=x11-libs/gtk+-2"
+RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-tempfile.patch #104565
 	epatch "${FILESDIR}"/${PV}-makefile-DESTDIR.patch
+	epatch "${FILESDIR}"/${P}-make-382.patch
 }
 
-src_compile() {
-	econf $(use_enable nls)
-	emake || die "emake failed."
+src_configure() {
+	econf \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }