Bump KDE to 4.1.1

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 42618354)

3 files changed, 156 insertions, 1 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 74434ca99522..5ad85c42da33 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.220 2013/08/21 19:04:02 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.221 2013/09/03 19:04:52 creffett Exp $
+
+*systemsettings-4.11.1 (03 Sep 2013)
+
+  03 Sep 2013; Chris Reffett <creffett@gentoo.org>
+  +files/systemsettings-4.11.1-deps.patch, +systemsettings-4.11.1.ebuild,
+  files/systemsettings-4.10.1-noplasmalock.patch:
+  Bump KDE to 4.1.1
 
   21 Aug 2013; Michael Palimaka <kensington@gentoo.org>
   systemsettings-4.10.5.ebuild, systemsettings-4.11.0.ebuild:
diff --git a/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch b/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch
new file mode 100644
index 000000000000..63ff37a593fb
--- /dev/null
+++ b/kde-base/systemsettings/files/systemsettings-4.11.1-deps.patch
@@ -0,0 +1,49 @@
+From 9dba719eb2c8d563eb512bb05451f8939d5d0b4b Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Mon, 2 Sep 2013 00:21:24 +1000
+Subject: [PATCH] Remove unused CMake qimageblitz includes and links.
+
+REVIEW: 112200
+---
+ kcontrol/desktoptheme/CMakeLists.txt | 2 +-
+ kcontrol/style/CMakeLists.txt        | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/kcontrol/desktoptheme/CMakeLists.txt b/kcontrol/desktoptheme/CMakeLists.txt
+index cc8fd99..a93fb41 100644
+--- a/kcontrol/desktoptheme/CMakeLists.txt
++++ b/kcontrol/desktoptheme/CMakeLists.txt
+@@ -5,7 +5,7 @@ set(kcmdesktoptheme_SRCS kcmdesktoptheme.cpp desktopthemedetails.cpp thememodel.
+ kde4_add_ui_files(kcmdesktoptheme_SRCS DesktopTheme.ui DesktopThemeDetails.ui)
+ 
+ kde4_add_plugin(kcm_desktoptheme ${kcmdesktoptheme_SRCS})
+-target_link_libraries(kcm_desktoptheme ${QIMAGEBLITZ_LIBRARIES} ${X11_LIBRARIES}
++target_link_libraries(kcm_desktoptheme ${X11_LIBRARIES}
+     ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
+     ${KDE4_KCMUTILS_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+ 
+diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt
+index 6e93bed..d832b20 100644
+--- a/kcontrol/style/CMakeLists.txt
++++ b/kcontrol/style/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ KDE4_NO_ENABLE_FINAL(styles)
+ 
+-include_directories( ${QIMAGEBLITZ_INCLUDES} )
+ # needed for including kdecoration.h
+ include_directories (
+     ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/libkwineffects
+@@ -17,8 +16,8 @@ kde4_add_ui_files(kcm_style_PART_SRCS stylepreview.ui finetuning.ui)
+ 
+ kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
+ 
+-target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${QIMAGEBLITZ_LIBRARIES}
+-    ${X11_LIBRARIES} ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
++target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
++    ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
+ if(NOT WIN32)
+     target_link_libraries(kcm_style kdecorations)
+ endif(NOT WIN32)
+-- 
+1.8.3.2
+
diff --git a/kde-base/systemsettings/systemsettings-4.11.1.ebuild b/kde-base/systemsettings/systemsettings-4.11.1.ebuild
new file mode 100644
index 000000000000..cad5bb72db03
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.11.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.11.1.ebuild,v 1.1 2013/09/03 19:04:52 creffett Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+HOMEPAGE+=" http://userbase.kde.org/System_Settings"
+IUSE="debug gtk +usb"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	app-misc/strigi
+	dev-libs/glib:2
+	$(add_kdebase_dep kwin)
+	$(add_kdebase_dep libkworkspace)
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep nepomuk)
+	sys-libs/timezone-data
+	x11-apps/setxkbmap
+	x11-misc/xkeyboard-config
+	gtk? ( kde-misc/kde-gtk-config )
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	ksmserver/screenlocker/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.1-noplasmalock.patch"
+	"${FILESDIR}/${P}-deps.patch"
+)
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kcontrol
+			doc/kfontview
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
+		systemsettings/CMakeLists.txt \
+		|| die "Failed to fix systemsettingsrc install location"
+
+	kde4-meta_src_prepare
+}
+
+# FIXME: is have_openglxvisual found without screensaver
+src_configure() {
+	# Old keyboard-detection code is unmaintained,
+	# so we force the new stuff, using libxklavier.
+	mycmakeargs=(
+		-DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
+		-DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with usb)
+	)
+
+	kde4-meta_src_configure
+}