[kde-base/kdelibs] Add patch by Franz Fellner <alpine.art.de@googlemail.com> to make udisks support optional, wrt bug #455792.

Package-Manager: portage-2.1.11.50

4 files changed, 63 insertions, 7 deletions

diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
new file mode 100644
index 00000000000..7de5ec960ea
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch
@@ -0,0 +1,51 @@
+udisks1 is deprecated and going away, so removing this clause
+will permit us to build without udisks at all.
+
+--- solid/solid/CMakeLists.txt
++++ solid/solid/CMakeLists.txt
+@@ -283,20 +283,6 @@
+            backends/udisks2/udisksgenericinterface.cpp
+            backends/udisks2/dbus/manager.cpp
+            )
+-       else ( WITH_SOLID_UDISKS2 )
+-           message(STATUS "Building Solid UDisks backend." )
+-           set(solid_LIB_SRCS ${solid_LIB_SRCS}
+-           backends/udisks/udisksmanager.cpp
+-           backends/udisks/udisksdevice.cpp
+-           backends/udisks/udisksblock.cpp
+-           backends/udisks/udisksstoragevolume.cpp
+-           backends/udisks/udisksdeviceinterface.cpp
+-           backends/udisks/udisksopticaldisc.cpp
+-           backends/udisks/udisksopticaldrive.cpp
+-           backends/udisks/udisksstoragedrive.cpp
+-           backends/udisks/udisksstorageaccess.cpp
+-           backends/udisks/udisksgenericinterface.cpp
+-          )
+        endif ( WITH_SOLID_UDISKS2 )
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+--- solid/solid/managerbase.cpp
++++ solid/solid/managerbase.cpp
+@@ -33,8 +33,6 @@
+ #include "backends/hal/halmanager.h"
+ #if defined (WITH_SOLID_UDISKS2)
+ #include "backends/udisks2/udisksmanager.h"
+-#else
+-#include "backends/udisks/udisksmanager.h"
+ #endif
+ #include "backends/upower/upowermanager.h"
+ 
+@@ -88,11 +86,9 @@
+                     m_backends << new Solid::Backends::UDev::UDevManager(0);
+ #               endif
+ #		if defined(WITH_SOLID_UDISKS2)
+-                m_backends << new Solid::Backends::UDisks2::Manager(0)
+-#		else
+-                m_backends << new Solid::Backends::UDisks::UDisksManager(0)
++                m_backends << new Solid::Backends::UDisks2::Manager(0);
+ #		endif
+-                           << new Solid::Backends::UPower::UPowerManager(0)
++                m_backends << new Solid::Backends::UPower::UPowerManager(0)
+                            << new Solid::Backends::Fstab::FstabManager(0);
+             }
+ #        endif
diff --git a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
index ca8a960b76d..7aabd7e2ed7 100644
--- a/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.10.49.9999.ebuild
@@ -10,17 +10,18 @@ OPENGL_REQUIRED="optional"
 KDE_HANDBOOK="optional"
 inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
 
-EGIT_BRANCH="master"
+EGIT_BRANCH="KDE/4.10"
 
 DESCRIPTION="KDE libraries needed by all KDE programs."
 
 KEYWORDS=""
 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
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
 +upower upnp zeroconf"
 
 REQUIRED_USE="
+	udisks? ( udev )
 	upower? ( udev )
 "
 
@@ -98,7 +99,7 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep kde-env)
 	sys-apps/dbus[X]
 	!aqua? (
-		sys-fs/udisks:2
+		udisks? ( sys-fs/udisks:2 )
 		x11-apps/iceauth
 		x11-apps/rgb
 		>=x11-misc/xdg-utils-1.0.2-r3
@@ -137,6 +138,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
 )
 
 pkg_pretend() {
@@ -191,7 +193,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 +218,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 udisks SOLID_UDISKS2)
 		$(cmake-utils_use_with upnp HUpnp)
 		$(cmake-utils_use_with zeroconf Avahi)
 	)
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index ca8a960b76d..ed576e65597 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -17,10 +17,11 @@ DESCRIPTION="KDE libraries needed by all KDE programs."
 KEYWORDS=""
 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
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
 +upower upnp zeroconf"
 
 REQUIRED_USE="
+	udisks? ( udev )
 	upower? ( udev )
 "
 
@@ -98,7 +99,7 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep kde-env)
 	sys-apps/dbus[X]
 	!aqua? (
-		sys-fs/udisks:2
+		udisks? ( sys-fs/udisks:2 )
 		x11-apps/iceauth
 		x11-apps/rgb
 		>=x11-misc/xdg-utils-1.0.2-r3
@@ -137,6 +138,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
+	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
 )
 
 pkg_pretend() {
@@ -191,7 +193,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 +218,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 udisks SOLID_UDISKS2)
 		$(cmake-utils_use_with upnp HUpnp)
 		$(cmake-utils_use_with zeroconf Avahi)
 	)
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 5f0250fe8cb..ea382c50d1f 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/metadata.xml
@@ -4,6 +4,7 @@
   <herd>kde</herd>
   <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="upower">Use upower for power management</flag>
 	<flag name="upnp">Build the Solid backend to provide information about UPnP devices on the network</flag>
   </use>