[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     b8bb161dce309f475e582ec6fd2c56fb581c64f4
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 03:40:56 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 03:40:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b8bb161d

Move the backported udisks2 support behind the udisks2 use flag.

---
 kde-base/kdelibs/kdelibs-4.8.95.ebuild |   15 +++++++++++----
 kde-base/kdelibs/metadata.xml          |    1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/kde-base/kdelibs/kdelibs-4.8.95.ebuild b/kde-base/kdelibs/kdelibs-4.8.95.ebuild
index 57b1d34..069202c 100644
--- a/kde-base/kdelibs/kdelibs-4.8.95.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.8.95.ebuild
@@ -21,10 +21,11 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
 IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
 mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
-+upower upnp zeroconf"
++udisks2 +upower upnp zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
+	udisks2? ( udisks )
 	upower? ( udev )
 "
 
@@ -99,7 +100,10 @@ RDEPEND="${COMMONDEPEND}
 		x11-apps/iceauth
 		x11-apps/rgb
 		>=x11-misc/xdg-utils-1.0.2-r3
-		udisks? ( sys-fs/udisks:2 )
+		udisks? (
+			udisks2? ( sys-fs/udisks:2 )
+			!udisks2? ( sys-fs/udisks:0 )
+		)
 		upower? ( sys-power/upower )
 	)
 "
@@ -129,8 +133,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.8.2-calculator_key.patch"
 	"${FILESDIR}/${PN}-4.8.4-bytecode.patch"
-	"${FILESDIR}/${PN}-4.8.95-udisks2.patch"
-	"${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch"
 )
 
 pkg_pretend() {
@@ -145,6 +147,11 @@ src_prepare() {
 	kde4-base_src_prepare
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
 
+	if use udisks2; then
+		epatch "${FILESDIR}/${PN}-4.8.95-udisks2.patch"
+		epatch "${FILESDIR}/${PN}-4.8.95-udisks2-includes.patch"
+	fi
+
 	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
 	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
 		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."

diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index f9776ea..3392c34 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -5,6 +5,7 @@
   <use>
 	<flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag>
 	<flag name="udisks">Use udisks for block device access (e.g., automounting)</flag>
+	<flag name="udisks2">Use the udisks2 support backported from kf5</flag>
 	<flag name="upower">Use upower for power management</flag>
 	<flag name="upnp">Enable UPnP support</flag>
   </use>