summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2014-11-13 17:07:38 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2014-11-13 17:07:38 +0000
commit1b0356982a0452275c40ac5dee01e9c324791c99 (patch)
tree9ec17b066b742796fea65ac328e66ae7e6aeb40e /net-misc/dhcpcd-ui
parentVersion bump. (diff)
downloadgentoo-2-1b0356982a0452275c40ac5dee01e9c324791c99.tar.gz
gentoo-2-1b0356982a0452275c40ac5dee01e9c324791c99.tar.bz2
gentoo-2-1b0356982a0452275c40ac5dee01e9c324791c99.zip
Drop icons useflag and reword configure code
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'net-misc/dhcpcd-ui')
-rw-r--r--net-misc/dhcpcd-ui/ChangeLog6
-rw-r--r--net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild18
-rw-r--r--net-misc/dhcpcd-ui/metadata.xml2
3 files changed, 13 insertions, 13 deletions
diff --git a/net-misc/dhcpcd-ui/ChangeLog b/net-misc/dhcpcd-ui/ChangeLog
index 3f6ef904ccd1..05ce8c8bcbca 100644
--- a/net-misc/dhcpcd-ui/ChangeLog
+++ b/net-misc/dhcpcd-ui/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/dhcpcd-ui
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/ChangeLog,v 1.11 2014/11/12 19:28:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/ChangeLog,v 1.12 2014/11/13 17:07:38 hwoarang Exp $
+
+ 13 Nov 2014; Markos Chandras <hwoarang@gentoo.org> dhcpcd-ui-0.7.4.ebuild,
+ metadata.xml:
+ Drop icons useflag and reword configure code
12 Nov 2014; Markos Chandras <hwoarang@gentoo.org> dhcpcd-ui-0.7.4.ebuild:
Allow building without gtk/gtk3/qt4 in order to get only the dhcpcd-online
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
index f12b3ddcc94e..b0295d62827c 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild,v 1.4 2014/11/12 19:28:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.4.ebuild,v 1.5 2014/11/13 17:07:38 hwoarang Exp $
EAPI=5
@@ -13,10 +13,9 @@ SRC_URI="http://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug gtk gtk3 +icons qt4 libnotify"
+IUSE="debug gtk gtk3 qt4 libnotify"
REQUIRED_USE="?? ( gtk gtk3 qt4 )
- gtk3? ( !gtk ) gtk? ( !gtk3 )
- icons? ( || ( gtk gtk3 qt4 ) )"
+ gtk3? ( !gtk ) gtk? ( !gtk3 )"
DEPEND="${DEPEND}
virtual/libintl
@@ -29,8 +28,7 @@ DEPEND="${DEPEND}
gtk3? ( x11-libs/gtk+:3 )
qt4? ( dev-qt/qtgui:4 )"
-RDEPEND=">=net-misc/dhcpcd-6.4.4
- !icons? ( x11-themes/hicolor-icon-theme )"
+RDEPEND=">=net-misc/dhcpcd-6.4.4"
src_prepare()
{
@@ -41,12 +39,12 @@ src_configure()
{
local myeconfargs=(
$(use_enable debug)
- $(use_with icons)
- $(usex gtk '--with-gtk=gtk+-2.0' '')
- $(usex gtk3 '--with-gtk=gtk+-3.0' '')
- $(use_with qt4 qt)
+ $(usex gtk '--with-gtk=gtk+-2.0 --with-icons' '')
+ $(usex gtk3 '--with-gtk=gtk+-3.0 --with-icons' '')
+ $(usex qt4 '--with-qt --with-icons' '')
$(use_enable libnotify notification)
$(use gtk || use gtk3 || echo '--without-gtk')
+ $(use gtk || use gtk3 || use qt4 || echo '--without-icons')
)
econf "${myeconfargs[@]}"
}
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 329cce68c7fe..8605a1493a92 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -10,7 +10,5 @@
<flag name="gtk3">
Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
</flag>
- <flag name="icons">
- Install bundled-in user interface icons</flag>
</use>
</pkgmetadata>