From 85332e0c28eb25489591feaf0cd6b3c48252d102 Mon Sep 17 00:00:00 2001 From: eroen Date: Thu, 7 Feb 2013 16:15:44 +0100 Subject: [PATCH 1/2] kdelibs-4.10.0: make udisks2 optional --- kde-base/kdelibs/kdelibs-4.10.0.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.10.0.ebuild b/kde-base/kdelibs/kdelibs-4.10.0.ebuild index dae19bf..3bd2d8d 100644 --- a/kde-base/kdelibs/kdelibs-4.10.0.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.0.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" LICENSE="LGPL-2.1" IUSE="3dnow acl alsa altivec +bzip2 debug doc fam jpeg2k kerberos lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev -+upower upnp zeroconf" +udisks2 +upower upnp zeroconf" REQUIRED_USE=" upower? ( udev ) @@ -98,10 +98,11 @@ RDEPEND="${COMMONDEPEND} $(add_kdebase_dep kde-env) sys-apps/dbus[X] !aqua? ( - sys-fs/udisks:2 x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 + udisks2? ( sys-fs/udisks:2 ) + !udisks2? ( sys-fs/udisks:0 ) upower? ( sys-power/upower ) ) udev? ( app-misc/media-player-info ) @@ -191,7 +192,6 @@ src_configure() { -DWITH_HSPELL=OFF -DWITH_ASPELL=OFF -DWITH_DNSSD=OFF - -DWITH_SOLID_UDISKS2=ON -DKDE_DEFAULT_HOME=.kde4 -DKAUTH_BACKEND=POLKITQT-1 -DBUILD_libkactivities=OFF @@ -217,6 +217,7 @@ src_configure() { $(cmake-utils_use_with spell ENCHANT) $(cmake-utils_use_with ssl OpenSSL) $(cmake-utils_use_with udev UDev) + $(cmake-utils_use_with udisks2 SOLID_UDISKS2) $(cmake-utils_use_with upnp HUpnp) $(cmake-utils_use_with zeroconf Avahi) ) -- 1.8.1.2