Version bump KDE SC 4.5.5

3 files changed, 102 insertions, 23 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index 4c42bde30a84..04e046da154e 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/systemsettings
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.94 2010/12/02 21:17:53 alexxy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.95 2011/01/10 11:53:50 tampakrap Exp $
+
+*systemsettings-4.5.5 (10 Jan 2011)
+
+  10 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +systemsettings-4.5.5.ebuild:
+  Version bump KDE SC 4.5.5
 
 *systemsettings-4.5.4 (02 Dec 2010)
 
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index 40653957903d..2f0a5b0d1ae0 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX systemsettings-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.5.3.tar.bz2 65677114 RMD160 b7197d8f344db9e433e201fcb27f7d0811029f8b SHA1 7dda7cdd9162ea7ff9fc2a3ae0a1ded6610e8a94 SHA256 c2a675ee64b17e554c53de5c323c89e4455705390153f53b5a3f3e65afdc831c
 DIST kdebase-workspace-4.5.4.tar.bz2 65683870 RMD160 61844ad2d92ec0ee8796d35746077ad4ecd6400c SHA1 e362bceff622f39bf6949657d1e629ef541c6ae2 SHA256 1c629edc3b4a6e3a9606fe8a565907656c9dd7d291100175a364133e94964425
+DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 EBUILD systemsettings-4.4.5.ebuild 2022 RMD160 c8e2e749b602c509ed32a8eddfdb3f499a8e5855 SHA1 97484cf71b39802f6b49e96ea287b00278b707a7 SHA256 bb6aeec3309e7e82e02776147d8fefb5f8787bbbd64bc1885dd0a3a4bc941f14
 EBUILD systemsettings-4.5.3.ebuild 2103 RMD160 2a1225e13410166609c84be3249013f182f7bf09 SHA1 cac1a3150194465f33b8ef89e99cdc82191cf68c SHA256 15b0a5627d3719707e904e1148796f6f9fa2720d245d2e1ddbde664f14b5b4a7
 EBUILD systemsettings-4.5.4.ebuild 2100 RMD160 1cf3c8b3d2b3a016bf89d2efeb4ec98b22b5e769 SHA1 a8ae4790a46be55576465691af301f9a513eb7fa SHA256 9c9cea5b8fb5082192ef3352e37beeac20214369899d79aa1c0f9a8c1934abdc
-MISC ChangeLog 14023 RMD160 8ffa358246b796008e9b12c0c079595f3cc235dd SHA1 0f547f2422375c573d486222a33e365e44140162 SHA256 780ff1cce97512585de097a936ebcc6fcc7e48ebb57bcab081c7d50c2317af6f
+EBUILD systemsettings-4.5.5.ebuild 1987 RMD160 6fad81ef8390fc37f1b827b238967fc6d7e57ffa SHA1 ac1f293def680fdb5442f786e4c5df5d4a19d465 SHA256 f11d4091120a98e4d1bd121dc0b1832445ac3118ff247b95fe4fadd8f6bf0efb
+MISC ChangeLog 14177 RMD160 d9150bc96cfcb7e9a64e9f8c3d6d0a76563dcb5c SHA1 b8129836176cd75446e144185ec8f33362ebb50e SHA256 e0473d1351ad4c4fd78552c9f9694ace3eccf12927578ecf64e96764181f6f53
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJM+A1jAAoJEOf+E+/4L5Lmuc8P/2TcOb9qal7Kf1vV/q/6UAmD
-i5amruHVMir8a1ZwvfuUaLiCMnE6/4230x4yC4+oGnhnXxVTq0+JTVz0oVqAwm3L
-Mnkbz8jv1qBZVDnyEIFVZuti8i0O5XGTGSEfj0Mt+TJCWj9hzr100FUSin3MYoQC
-v+o/DFNIWlTXm6aI1m1v5x0YsEw4uLKxPs9Yn0DkyRiQu3w+wg+bETziWVmqgNJJ
-mp1+g4PUPIRRZyWJEDL8T0j4eD+yoZXFU+nQUvpwIPYgsUPFbzNGl6UEGW0M/APD
-HSjIzTjEqFiKd/YKuE+jv7xVycO8VCdLhtzAieXxO5Z3xsJUESW+NlwLDbfqAiCl
-mGeHzm0at0BcoVCDezDEX5mzAy85vcWtcjkQEnz7OZPbVP6G0nP5MCEw/mrNK0Lf
-Ynw0Vcua8DbbxcO4sY8ssxNSe2azljk6+4vB+usDmVg/sVATanB+y9KNysUcUvba
-T2ko34fP8vBFrvSI5JmfTaU4bzlx9XQhg2tW/EPT2klj+t6/iBe0zfjt07A8s4U0
-kk9mzh6KKE/5hMNhpCzE/abRK+nCuvYEqBdLFS0cmLtKWL+k7+FR224kXtXZIGMm
-GYGodxhHm+6dTb9dITAdNRAwWduGUklUC2vzevXk/5o4kAUaoeVautq9snyK7lQf
-AoiXrErlH4D1VmBqSg+K
-=J8+U
------END PGP SIGNATURE-----
diff --git a/kde-base/systemsettings/systemsettings-4.5.5.ebuild b/kde-base/systemsettings/systemsettings-4.5.5.ebuild
new file mode 100644
index 000000000000..8df6da05e9a3
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.5.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.5.5.ebuild,v 1.1 2011/01/10 11:53:50 tampakrap Exp $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdebase-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug +usb xinerama"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMONDEPEND="
+	dev-libs/glib:2
+	$(add_kdebase_dep libkworkspace)
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	>=x11-libs/libxklavier-3.2
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	opengl? ( virtual/opengl )
+	usb? ( =virtual/libusb-0* )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	sys-libs/timezone-data
+	x11-apps/setxkbmap
+	x11-misc/xkeyboard-config
+"
+
+KMEXTRA="
+	kcontrol/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.kde.krunner.App.xml
+	krunner/dbus/org.kde.screensaver.xml
+	kwin/
+	libs/
+	plasma/
+"
+
+add_blocker kcontrol '<4.3.98'
+add_blocker konqueror '<4.4.70'
+
+PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.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)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+	)
+
+	kde4-meta_src_configure
+}