Version bump KDE SC 4.9.5

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x42618354

3 files changed, 101 insertions, 16 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index a87cacecbadd..78c726d2fa9a 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/systemsettings
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.174 2012/12/08 11:53:24 dilfridge Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.175 2013/01/05 20:18:47 creffett Exp $
+
+*systemsettings-4.9.5 (05 Jan 2013)
+
+  05 Jan 2013; <creffett@gentoo.org> +systemsettings-4.9.5.ebuild:
+  Version bump KDE SC 4.9.5
 
   08 Dec 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -systemsettings-4.8.5.ebuild:
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index eee5010ecb51..5369ad88f5b3 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -4,24 +4,16 @@ Hash: SHA256
 AUX systemsettings-4.9.0-parallel-build.patch 946 SHA256 e37e20cce5e8149dd6c5ea38e818c36a76ce16f5298680b7f933f0b49dfe0105 SHA512 f1bdd136fd23a5f770093035a0d06a3031d3b74ba020020d95bbe73b202a50159a2a9257468b96f1957ec14c1dfa913c6808e0d67b80edd042d6a90500fd883d WHIRLPOOL 050246421aed4e31651e47480c9343a11663005168cd291e5222e91a7a6cb42d7e65f4b56ba4af45e7374038e5565e5d0ed4380ae230e092b136cf7f9967755a
 DIST kde-workspace-4.9.3.tar.xz 22313496 SHA256 408cdfbd9d2a691fdd52f7f30b227506a53525d4ece6a516b351c73ae914fb5f SHA512 37186a5ab7f09755ea34b6f2cd38324a74828cbe1d3faccf4e38324153a6a0d95d811ffed01a93053e7fff5fc70a8001096a699ff8f5deba7c9cd80062ae8eca WHIRLPOOL e307923f7ef45e53e0cc96d19e68aca4127306204f99468c3678e79ab56a86b15d1b1f0a47625d789cd6af4afd783779bfb6b41b696003d1601afa2a149a4eee
 DIST kde-workspace-4.9.4.tar.xz 22465172 SHA256 879afa08125dae6d136d1e4161f83a5c57378337c540c474e1321d75545a1cc7 SHA512 d5f601f5db92ccfd3da2684993210b23162b748ed19ef5ed9390de2dc58534f48d0c60034476548cb64cb80bba92af940337a0de34293afbaf965ff164258ad1 WHIRLPOOL 1d77d37d7a053b6cc43fe91b9a1bb090f51c18dc1c89f4762533ec19bfcf9577f359db0142bda0f2628a0909a56ee85ef4bae413184fad69254ffa3619c69f3e
+DIST kde-workspace-4.9.5.tar.xz 22520656 SHA256 073e495c4ef4eb4689c5c666c86fb6f24f57f2c00801f965c60bf8b32adb014a SHA512 1a8802e8c9dcaf1e81276c962dce7d321a26f205f60ccd27fa00780c4c09a8cd404a67b037265a4dd5efdc4ffc386cc31f571ac5ca10c1a14bc59259683a5e54 WHIRLPOOL f6ba18b30f7a5c454c9304d42f50238eac9a90abfc29fb6f7e873675eca89d206045f7277e5732e3faf669d36ec822cae0849813c66d72f7ba3af25bac3130ef
 EBUILD systemsettings-4.9.3.ebuild 1943 SHA256 24a4a7d36997486d6be876bc19c0049fd3d98ccc4d1bb0650a7f40a32346dc09 SHA512 e435403fff0f0ab633977a617b4f67868df3fddba04db58dcc94212ae8187ea8bcf4f9fdc7a247e473ced3abb1a80007db228fbef0bcc566fdbc61166a123604 WHIRLPOOL ee5367ae39ae31ca372bd39859e2ec59383303612ad4838d7acb408828b2d3b2947677bfab6f71507528a10f67c93f55529f21f00d5169afc809e4b438264e51
 EBUILD systemsettings-4.9.4.ebuild 1949 SHA256 66542ffcba0db8c731aef69d74ff6f0c8a0884fe5719c0d0d250f6d19348648d SHA512 11aa440d74187de5488fa402a77fb77269443ae091015b2d8f3ba7189bb543c2051434b8ac6f9877f7ffc58fe694edbbdc4d0029b491b1100b6b2f3aecafb3d6 WHIRLPOOL 966b13b390fccd787e1ff4b5a46bcfce9c4a4714a5d103e3adea6bb5c641d905e3b3fb63e1d26305f50084293effe04181cdcfe064dcdd20d9fb07ea885c97e2
-MISC ChangeLog 24530 SHA256 ec736c31cf462fe271bb450782426762d9c2e6420bd37b33e480262e5ffb95c6 SHA512 9f10a4ac45d49c38b1bd053d685a08bd068e9f231db94c91ff95015bea76fdb9225e38d5f4dd2332ff18725601549d670df52e284d61df8b974a0ad12f2f2e5c WHIRLPOOL 0ebacdb9310df20686b3512c75bac986306caf5014ac12fc5ab67b5d1b0c67157ded6f26e1a3ed8f1fa388b1f491214bc6a5ddda02a25bd95339415e395b26be
+EBUILD systemsettings-4.9.5.ebuild 1951 SHA256 0087f2d39701ab2a495e53898175ac15d4ae27e856f2a844ddae7bba9c7340a3 SHA512 ed42274a2d73cc9da96bed84537fa98f181635c7a261869f6001e70354e9f320c9cb7d3bab994d454c96e93eec9ed2fc9c0a01d7f4f13e4db35224372a2152f2 WHIRLPOOL 3849af94b19fc2862a7c91df9644a203f8f1e6eac054be9967a39b1432b8419a63cfefb391a0f6edc409ed8ca26e384ad7d0d627b4cb3a104433b2dcc01a1caa
+MISC ChangeLog 24662 SHA256 827dd809314185e30861b27d859694257c86f6feb720d344821a8e480def5238 SHA512 ec99e8141ed2503ae0ff3d021f1afbae3d329874759ff5250bf7f02b4234ab9b99358173bb00d0da0f6c83ef4e382c4431ee438c59c52e255c31b4a3efbfc342 WHIRLPOOL 3dbd8793e3de34718947fbf571c5789b161f8ef806dd2f74122c88142965ee5e56d3dc2f1a23fa57d14cb163f6d898cce29bece0d424567fa765130db7161af3
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQwyqUAAoJEEb+UGWnxTyH8HIP/ikIhqqAx3M25tTrqyv2NdpT
-/ATt6GCUEW9uh3Hz38/mIXs6FjoINFLdnP7xu7jxOQZOdFYrk97sAGpkt7tU1lc+
-vIyWALaF9jjP7OE0/u+GikxracPb1LqY+abKWCH81GD/9b0jErwkutEZHCmxGeYP
-/8oOjOKccw8u/uDhleRv9e32fHxC/Bg9InWZgjUhhysttUdFwrU1RnqXCZdhRwkt
-JH20aMYqaiJT7gSlMors8DvL7iPru8zqMtRcG0BS7tAEvdtHeIsZeSiyGYpLxUdV
-0m+7ZQeB/wxeJOJmt2NIsvouKcMyduB+ysb7ngeouBMLgliiTmeOZrSUcrf+onO2
-SGcBoIBdXbOp44wm5FxgL2TaQtlXphlrvFkgjXcd+0Kbi/xeqxdFkxp4BDJLKmcJ
-VUdeOpyHYGl0QX8Y0EM8787cD+Y9Ua6DMqFS5FXbRLIrpBjsU3OGlQU/BDKMYyoB
-L5fZkSsdl0kCYnqwlEI4fDCVyk2yf4FJdK4eiIYz4KldXIJZhC4QL5SpMyVxhQ3k
-/Y5GlNEaLSs96Os9wftMuq4FNQbfj2Z+4nK+jc3GtAnVAzF1Dimp62uM6322Ggob
-cg0m6Jka/shHCzj9n95T2gnUtfbFx/w2sNvC5gS8G16GM5boJxdzTVgVhJRQDSwN
-1tpyyXmcUO+RFGOTLSCX
-=p8mT
+iEYEAREIAAYFAlDoi1IACgkQ23laikJhg1SMhQCdFZsNZ8JI/LzuvMatsaff1r42
+TUgAn03Z8uyV31sdZ1Hf5zXtxa9vm6Xu
+=y8+W
 -----END PGP SIGNATURE-----
diff --git a/kde-base/systemsettings/systemsettings-4.9.5.ebuild b/kde-base/systemsettings/systemsettings-4.9.5.ebuild
new file mode 100644
index 000000000000..ef2b7cbd2db2
--- /dev/null
+++ b/kde-base/systemsettings/systemsettings-4.9.5.ebuild
@@ -0,0 +1,88 @@
+# 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.9.5.ebuild,v 1.1 2013/01/05 20:18:47 creffett Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-meta
+
+DESCRIPTION="System settings utility"
+IUSE="debug gtk +usb"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~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 )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/kbproto
+	x11-proto/xextproto
+"
+RDEPEND="${COMMONDEPEND}
+	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
+	kwin/
+	libs/
+	plasma/
+"
+
+add_blocker kdeaccessibility-colorschemes '<4.6.50'
+
+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
+}