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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 38 insertions, 12 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/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
 }