summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2012-07-26 20:48:25 +0000
committerMichael Weber <xmw@gentoo.org>2012-07-26 20:48:25 +0000
commit3dc89c2a39d86cb8ad75d2e9b767fbbd051228e4 (patch)
tree96efbcef99c77e11ca2ffc06d562af79e122f621 /app-admin
parentsys-kernel/genkernel: pax-utils dependency (bug #427686) (diff)
downloadgentoo-2-3dc89c2a39d86cb8ad75d2e9b767fbbd051228e4.tar.gz
gentoo-2-3dc89c2a39d86cb8ad75d2e9b767fbbd051228e4.tar.bz2
gentoo-2-3dc89c2a39d86cb8ad75d2e9b767fbbd051228e4.zip
Fix CFLAGS, add USE gtk3 (bug 428186)
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/gtkdiskfree/ChangeLog6
-rw-r--r--app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild20
-rw-r--r--app-admin/gtkdiskfree/metadata.xml6
3 files changed, 25 insertions, 7 deletions
diff --git a/app-admin/gtkdiskfree/ChangeLog b/app-admin/gtkdiskfree/ChangeLog
index 5a17a6d849bf..2046d3162560 100644
--- a/app-admin/gtkdiskfree/ChangeLog
+++ b/app-admin/gtkdiskfree/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/gtkdiskfree
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.37 2012/06/06 08:03:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.38 2012/07/26 20:48:25 xmw Exp $
+
+ 26 Jul 2012; Michael Weber <xmw@gentoo.org> gtkdiskfree-2.0.1.ebuild,
+ metadata.xml:
+ Fix CFLAGS, add USE gtk3 (bug 428186)
06 Jun 2012; Jeff Horelick <jdhore@gentoo.org> gtkdiskfree-2.0.1.ebuild:
marked x86 per bug 418491
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
index 06b5c849f18b..91c2aa0c2500 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.5 2012/06/06 08:03:41 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-2.0.1.ebuild,v 1.6 2012/07/26 20:48:25 xmw Exp $
EAPI=4
+inherit autotools
+
DESCRIPTION="Graphical tool to show free disk space"
HOMEPAGE="https://gitorious.org/gtkdiskfree"
SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -11,15 +13,25 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="nls"
+IUSE="gtk3 nls"
-RDEPEND="x11-libs/gtk+:3"
+RDEPEND="gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:3 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
S=${WORKDIR}/${PN}-master
+src_prepare() {
+ sed -e '/^CFLAGS=/s:=" -Wall -O2 :+=" :' \
+ -i configure.in || die
+ eautoreconf
+}
+
src_configure() {
- econf $(use_enable nls) --without-gtk2
+ local my_econf="--with-gtk2"
+ use gtk3 && my_econf="--without-gtk2"
+ econf $(use_enable nls) \
+ ${my_econf}
}
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 2b8845160196..0ac921858496 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<herd>proxy-maintainers</herd>
<maintainer>
<email>samuel.bauer@yahoo.fr</email>
<name>Samuel Bauer</name>
- <description>Maintainer. Assign bugs to him</description>
</maintainer>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
- <description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<use>
+ <flag name="gtk3">Use GTK+3 instead of 2</flag>
+</use>
<longdescription>
gtkdiskfree is a gtk extension to the cli tool df, does the same and more
</longdescription>