[gentoo-commits] gentoo-x86 commit in app-admin/gtkdiskfree: ChangeLog gtkdiskfree-1.9.3-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/08/20 17:39:47

  Modified:             ChangeLog gtkdiskfree-1.9.3-r1.ebuild
  Log:
  Fix building with make-3.82 wrt #333499 by Diego E. Pettenò.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 app-admin/gtkdiskfree/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	25 Aug 2009 17:19:25 -0000	1.28
+++ ChangeLog	20 Aug 2010 17:39:46 -0000	1.29
@@ -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@g.o>
+  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@g.o>
   gtkdiskfree-1.9.3-r1.ebuild:



1.12                 app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild?r1=1.11&r2=1.12

Index: gtkdiskfree-1.9.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gtkdiskfree-1.9.3-r1.ebuild	25 Aug 2009 17:19:25 -0000	1.11
+++ gtkdiskfree-1.9.3-r1.ebuild	20 Aug 2010 17:39:46 -0000	1.12
@@ -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 @@
 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
 }