Bump KDE to 4.1.1

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 104 insertions, 9 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 975ddd1ff83b..c0a1e2b0e39b 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.212 2013/08/19 13:28:47 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.213 2013/09/03 19:04:29 creffett Exp $
+
+*marble-4.11.1 (03 Sep 2013)
+
+  03 Sep 2013; Chris Reffett <creffett@gentoo.org> +marble-4.11.1.ebuild:
+  Bump KDE to 4.1.1
 
   19 Aug 2013; Michael Palimaka <kensington@gentoo.org> marble-4.11.0.ebuild,
   metadata.xml:
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index f2068d4aadc0..362d00873fac 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 DIST marble-4.10.5.tar.xz 19436748 SHA256 c4ef4e1dd6aea9589e907e3ed7a81272af227f8c1b7be9dc8b152aab25009e11 SHA512 9965fa453652f448e36677116517bb7da07f796ba3a7231a7450cd557a1794c8b0b27df12e8c13065e15fb7d8d7405c8f48139518ebeb8d7fe8fb854859070f4 WHIRLPOOL 035e779dd9cec32229e8cb55dffe7892926f341bba8b237c4a5bec52a70a710cb5d17ddadcabb5cbbba550d3c2ebdc320ada4c70b4ae0d301f82d3168c8188a6
 DIST marble-4.11.0.tar.xz 18956648 SHA256 7e7310c53b385d527c00147b6f68ca0a7c87b69ff0eedf0beadb7fbc60c96250 SHA512 711c6881d909cc4195898a64446dc62cc731da81f460962619e1b8dcdcaddad7968405b7c5d3f7179e8387fc58bd07d4aa2e34db1b0d68d5fb222f00f569e17f WHIRLPOOL 22daddd60fcd48b20b2ca59b6766f87d608258d6a1d940bb653eda2423dd0f0ba6fa529058c4b50e0a21618fa2c8ac4f4949aefba15bb9bc066f019b748b41c0
+DIST marble-4.11.1.tar.xz 19052144 SHA256 781e5fa795d8173a90893718b4d35a874a25079cd0299d119584cadedddd436a SHA512 f6edeb3229799b4ff372065c400efbcee3bcda6f61da577cd4f856755282acf3230151cf7e2fc8c8958641b8e7acf3c79b07fd0386e8c6edb6d5cb4ddf9f3892 WHIRLPOOL f3824a81a9a8e338db30a494943a5dd39fc1938fdeb700bd2eed19173b20b97afdb120b049a7890a0923f5a8efa58445dd4b84287972a93ea19ab48deb629855
 EBUILD marble-4.10.5.ebuild 2088 SHA256 4d669c654110668003cdf1842f33e6f19667cda347d720bc3c3ce5db241050d2 SHA512 d4fe1d00d1be8448f544c16344c419683f5c9e5c01f09412ded94fb38f1746d05e5c5494e779c018e14693f8b5abf9a989a2154af4c3b278eecee3805d944880 WHIRLPOOL f0fc834128eb8eb17719ca3eb7035cab9d464efded5e24a519fd04889e904db0d518455d84242f16e604d46c348b7aaa3af44ccd1a8af81763625f5c20676496
 EBUILD marble-4.11.0.ebuild 2166 SHA256 b79e83e53fb304d8b4a45fc683bc59cd7c830018a2149990472cfd7537626eb1 SHA512 919c8a2cd75b14768475770c3dce592f7663a9317215d57a9b0cebc4b3a0a0c5e26b043725ac04f89b19e44bd2f6ab3b4e9c237d7d53bc036d51b27a768f8ef0 WHIRLPOOL b4ca3dd1f395866f04d1fcb63d9552ab9e9487e4eb719ff2defdd9d483a899cda4b524c9c1e8ea0b5a7764e772d4110f514719924292eefd48bd7b04b6068790
-MISC ChangeLog 26164 SHA256 a2fdfab75696fba84e92ff24387a5f9a8fcbdc9674af8bc1f48298d8a8399af5 SHA512 f44e88f4a8dd963345e88c9d0af0621032493440eda9cda240553d4039b37e048ca1596e064fecd8d8234e59960edd18bd88e6c2b57a18ea65239e47c9a836af WHIRLPOOL dfdb6c10cb270a0d4099e922ce470d08117704685233a5ef8718016f319b3d97da70d72a765b863be4943f994cfc09c8473fc2132670f688c9a31d5d58058172
+EBUILD marble-4.11.1.ebuild 2165 SHA256 33bffe752d17fa23147648346463911cc4f0df13776acb8171825cd92dcf4c12 SHA512 b1c976264f76f5ccae7271fdc0963e56aeeb75307bf1d609655ba82785fd342d63e5b083933377b361bd27c30b949be2fd4c997a54c609598d0d498abe95dc1c WHIRLPOOL 193dce46f5dfc2586d852138acce9f27b3d0e2d7a4569dc7bb4f66917a4f8e6a596e6426ccad9e5f9f3da3b2ba0bf9ad53a6c67375470d12cdd6bf3ab7a15ec5
+MISC ChangeLog 26287 SHA256 ddd2af4b3abcfced37080fe3d30c522e770070df0274c383ec2c822bac3a91aa SHA512 57e4ab219073114c73bbab14b48d145469088b184f31f3f2bf3adc15914ed4f87d9e65f4e9ec60a2edb15ceb93533c18dec52497fb7fbb2e21764262a46eeeae WHIRLPOOL 4f28754e5e546fe5ed08d8b0d5e0de00ffa25ceec483034ec55bd08957c0bed7f32f55192c9df596a2fbc3545a48d2e774a7a8b46f404f6e545ca09b5bfaebf0
 MISC metadata.xml 373 SHA256 bbd543061276ef3309ab0f528947dc70857d33a441d3525e377704d2ea857e06 SHA512 72ddb5048237a73cb4f11f326c024569e8c70344453d26a9a5aadb95215e753d7223216783bc2664ee7b25042c051b725f175a0ae20f5f079d5a1a03035d4e8b WHIRLPOOL 02e69fd5f574715e7ad949487ce1bc38a7aacd0af450d578e31df88ef83190ffa23695dd5bde027b4bee4f6039cb488d6ecf8843163b54e7dc40cf7c518508ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSEh0FAAoJEMbwO6tnXQ0svu0IAJtS4vbu9JD0p+2KonbZ92XN
-A5LTwdvhSD/9x+c1D8Hw4jXFa1WISYo5cNBY5HsxnVxgz8OtBjGKJiL3jJMkCkiH
-J1ML6jyp8l0b7EjbkOWFg+a1r4WYsZfF8PiSHY0N2UYrEdHfWVuwycpY/a1CsXJz
-GdWZmvUtZM+rodNHSXbrj860exQ17BZ5dnsmm3xr4GP6qcg/wtR/n8LfVpmQ3gh+
-l7cKdDUtkprPJAOI5F8zJ85QcMUOk8YspWfBrKf0qtEFS8U0pGIqcdM8ejASx0pQ
-V/Uv2LzFtQ1vVdAmjeMwGX+/ko6wApjWYeXAm7PS8ZGdW7q+iVgs+gaXFN3e7As=
-=6LXe
+iKYEAREIAGYFAlImM25fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1STdQCePjW28BcPsh3J9w0O2Qzwbx+m
+rSMAoIWjkOcg5UTwfQJs/jyTWK96NWmY
+=a7Ue
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.11.1.ebuild b/kde-base/marble/marble-4.11.1.ebuild
new file mode 100644
index 000000000000..e050b2c610d4
--- /dev/null
+++ b/kde-base/marble/marble-4.11.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.11.1.ebuild,v 1.1 2013/09/03 19:04:29 creffett Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="http://marble.kde.org/"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
+
+# tests fail / segfault. Last checked for 4.9.0
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:4[dbus(+)]
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( $(add_kdebase_dep pykde4) )
+	)
+	shapefile? ( sci-libs/shapelib )
+	zip? ( dev-libs/quazip )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-qt/qttest:4 )
+"
+# the qt dependencies are needed because with USE=-kde nothing is pulled in
+# by default... bugs 414165 & 429346
+
+REQUIRED_USE="
+	plasma? ( kde )
+	python? ( kde )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+	python_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use !kde QTONLY)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with shapefile libshp)
+		$(cmake-utils_use_with zip quazip)
+		-DBUILD_MARBLE_TESTS=OFF
+		-DWITH_liblocation=0
+		-DWITH_QextSerialPort=OFF
+		$(use kde && cmake-utils_use_with python PyKDE4)
+	)
+
+	kde4-base_src_configure
+}
+
+src_test() {
+	if use kde; then
+		elog "Marble tests can only be run in the qt-only version"
+	else
+		local mycmakeargs=(
+			-DBUILD_MARBLE_TESTS=ON
+		)
+		kde4-base_src_test
+	fi
+}