[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/files/, kde-base/systemsettings/

[gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/files/, kde-base/systemsettings/

[Michael Palimaka]

commit:     f7f5d84c85b6c7f946b94808849648b4cb6ea667
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  2 18:44:18 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  2 18:44:18 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f7f5d84c

[kde-base/systemsettings] Introduce kscreen USE flag to disable randr KCM in favour of kde-misc/kscreen wrt bug #524266.

Package-Manager: portage-2.2.12

---
 .../files/systemsettings-kcm-randr.patch             | 20 ++++++++++++++++++++
 kde-base/systemsettings/metadata.xml                 |  1 +
 .../systemsettings-4.11.49.9999.ebuild               |  6 +++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/kde-base/systemsettings/files/systemsettings-kcm-randr.patch b/kde-base/systemsettings/files/systemsettings-kcm-randr.patch
new file mode 100644
index 0000000..43019fc
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-kcm-randr.patch
@@ -0,0 +1,20 @@
+Adds option to disable the randr KCM (to use KScreen instead) wrt bug #524266.
+
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/plain/kde-workspace-4.10.2-BUILD_KCM_RANDR.patch
+
+diff -up kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR kde-workspace-4.10.2/kcontrol/CMakeLists.txt
+--- kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR	2013-03-01 00:32:25.040847159 -0600
++++ kde-workspace-4.10.2/kcontrol/CMakeLists.txt	2013-04-18 08:58:31.086753204 -0500
+@@ -6,9 +6,10 @@ macro_log_feature(FREETYPE_FOUND "FreeTy
+ set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
+ 
+ 
+-if( X11_Xrandr_FOUND )
++OPTION(BUILD_KCM_RANDR "Build kcontrol/randr module" ON)
++if(BUILD_KCM_RANDR AND X11_Xrandr_FOUND)
+    add_subdirectory( randr )
+-endif(X11_Xrandr_FOUND )
++endif(BUILD_KCM_RANDR AND X11_Xrandr_FOUND)
+ 
+ if(X11_Xkb_FOUND)
+     add_subdirectory( keyboard )

diff --git a/kde-base/systemsettings/metadata.xml b/kde-base/systemsettings/metadata.xml
index 2d94d9b..e8fa71c 100644
--- a/kde-base/systemsettings/metadata.xml
+++ b/kde-base/systemsettings/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
+		<flag name="kscreen">Use <pkg>kde-misc/kscreen</pkg> for screen management</flag>
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
index 706193d..4ee7da0 100644
--- a/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.49.9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-meta
 
 DESCRIPTION="System settings utility"
 HOMEPAGE+=" http://userbase.kde.org/System_Settings"
-IUSE="debug gtk nepomuk +usb"
+IUSE="debug gtk +kscreen nepomuk +usb"
 KEYWORDS=""
 
 COMMONDEPEND="
@@ -45,6 +45,7 @@ RDEPEND="${COMMONDEPEND}
 	x11-apps/setxkbmap
 	x11-misc/xkeyboard-config
 	gtk? ( kde-misc/kde-gtk-config )
+	kscreen? ( kde-misc/kscreen )
 	nepomuk? ( $(add_kdebase_dep nepomuk) )
 "
 
@@ -62,6 +63,8 @@ KMEXTRACTONLY="
 # fails to connect to a kded instance
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -88,6 +91,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		-DBUILD_KCM_RANDR=$(usex !kscreen)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
 	)