Bump KDE SC 4.11.5

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

3 files changed, 101 insertions, 16 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index c3de9aef91d4..ed33e206dc86 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.227 2013/12/18 19:57:48 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.228 2014/01/10 04:21:29 creffett Exp $
+
+*marble-4.11.5 (10 Jan 2014)
+
+  10 Jan 2014; Chris Reffett <creffett@gentoo.org> +marble-4.11.5.ebuild:
+  Bump KDE SC 4.11.5
 
 *marble-4.12.0 (18 Dec 2013)
 
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 864e497c31ba..3ffbf0de1feb 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -3,26 +3,20 @@ Hash: SHA256
 
 DIST marble-4.11.2.tar.xz 19061160 SHA256 6aee196e0ea0ee0ea53058002575508a46f1fb7c46a41801e0a4f7b757b54764 SHA512 34f88fc0d001d4559c0666ee9a0d54dcf25bfc85c23a1e0ff26546bfffe547d9c7fac558362062902160439bc2c7aa18b6d2f632dcc3401ccf57f015d5dfe71d WHIRLPOOL eceef5d44cac7f7bcac70237e620ed3a2b1395a24d4f80c3b01d9b0759ef28afe73eaaf4ed92ce5ff5632bbbb3e0cc812d5fa38d026ff41049a730ef5c21e316
 DIST marble-4.11.4.tar.xz 19058240 SHA256 9d658c0685f0ac88d3adc860ba17c640151c9dd6b6cf486052cae462d683a61d SHA512 80125fe7711a37a5e907db5eb2ee5fa8a7d3b4e678c72b40ff1cb5110b35e74ea35f2c793a0faa5d4908d339fd14fe9b57ab0b059a6cf31e8af0974f69142211 WHIRLPOOL a69a73ba79ce710b0f3f589c9d1dabffe8966e70feaa3e26078291fbcae99c483c1ea37f8c96933df0a966f2bf1abbc5dac9e129f22f3d6fea7edd016b94e38d
+DIST marble-4.11.5.tar.xz 18950820 SHA256 abefd694fd3a52fd27c92791878ea95b1f380068c9b12f2c20e604e797c22d55 SHA512 dd4c2113c4d34eadd3a55005ed1340d35322e73c40cb45ed2e7cca8e2780420587a599067a5132d70073793785d80808080ba49cc4d912d0622cec516dcabaac WHIRLPOOL 987a4e429b38735d72e8d18b70354fff1a7ae7a7411758367fae3598a9f7f49bced8dddff28ce83cb8da0025463690ad73efd31ee0a98773b382d813a1722273
 DIST marble-4.12.0.tar.xz 18785904 SHA256 2f457d97ed389ad4460e7904ef87561802a5b59f86ed96b3e70020b387921d52 SHA512 b423943cf81856fbcc3928e8efd88c6db45d8564488b09182f2981fded8a9f8e9499984f26075b68dac31f855a75d6cfa8219c4effa284c8a6be307d8c7e99dd WHIRLPOOL 5927be8d286d89f51753d050799f1d1b06cfa432ce672dc10973d37d99f4076e06fb38ed38d247eb0744435163caff0a04d64d72f62459ec10f0cac963bd0a29
 EBUILD marble-4.11.2.ebuild 2163 SHA256 c64b09417c6ad0cd20b6888998e116cc6dedac33d0e091facfbc24637a337afe SHA512 5e5d9a4a84930adbf72795f0e23647b3802ad48b6d17c85014138f1708b1819782f8d5e9027771f390de4d97f8de5f4e621881050bcdc60fd06bca70f5dfa961 WHIRLPOOL bec8064849aa7fb78925f666a640945a3d8e7785f03d1d72e3f215449712da5bb346927966344ffc2820c49af5bffef8bb42292ae95f9955bb9f9031b4550c5a
 EBUILD marble-4.11.4.ebuild 2169 SHA256 e36b3f64b250087b13cdc0612fc16bb071e6784e0c976c72b0b298ee6aef1927 SHA512 7ca76b9ef35b398aa0fc84252678986c5f097170e99e8277325b36e6cd422fd8af8f2ce82c420f188052b07a9c1eb442b0077a29d7b9a72a7583b9604352faa5 WHIRLPOOL a2067a13f0e6f6c134b332055cdd3bc22022202005a6d0d6fa29c1fe26c2412a4c67e4384b15cf67a9aafdca14185b6f7717d7d6535465e7fe1328f379d9781d
+EBUILD marble-4.11.5.ebuild 2095 SHA256 30aa7000a93e2fa5927d4fb5688b2575024ba55bf349563ee1157f5af8d81628 SHA512 077c6869bb1618a8086975f19a4f1681541c81024d2008730b7bcc313426d29e6861f6eba38bf7a9abb96d593d8a1871657d6b08ee5fb7dde5e5a2dfa3e3bf6e WHIRLPOOL 18e72929540de2cc3e4ffa4c42fa1ca7ecc56d21fb23cd69cb168ef59f338995087379d350a646f597bc86dbc0192e6d2d78a42cf6252ca2cfb2541c1e7c96dd
 EBUILD marble-4.12.0.ebuild 2152 SHA256 19638b06460e4dda4c68a7b80f07fefa9da920af6c24c766c4c612c8b94e19e6 SHA512 8e7d4a375817cf4e802f4787c779aa9795a3404fd3fdcb29c40321c3387106b204a08c011a413f1d4aa5ede9540b1f0cc75ea3bec8605e73210b004159637c36 WHIRLPOOL 11ca4fdab2062ebdc5d524cdf03934884219d5fe8f9e55e885ce5d7fc50edfa96000f42231885c2e04d946a55f271eea83adaa1c8a1a34ec465dd035f1675c46
-MISC ChangeLog 27888 SHA256 1f1b1f28e726b946e97a5741e3321043f1b1d516fc2c80bbb84986ee0fad9836 SHA512 16f50abc80c9069541d93ccbe1693808876dc9c6d54bc2c1c8a838dece7921b9df7d2b6987857c84f7bc06d6af70b2b0937c233f06b820ac8ccc019f268d70d5 WHIRLPOOL b04677083cda99561a8470f0be92a13c412dadde6ea26f414039a3110b7cb462c891151126f361011c36e82f898bd9cf09ba54ba97b97a0637f709e099581136
+MISC ChangeLog 28018 SHA256 01bda185fc6de90a24e3f4147d32dfc1f813b4fd74aa071889a20253700173a7 SHA512 ee07e7a5e4cea8c17dadf21de44d44f3be1928a3d386cda867b060af502f27e05545f9bd10b563da670455dd0b2f4e29f4dcbffeeeeffc679a8351cf2e1a7e21 WHIRLPOOL 3b500c1a1030877d7f50806951514c0292c575f2cfbe98bd9b45a6d82c5062616fd33460673e13891730a0f420c1f088228c8ef006ea5b4c1de962ef97a3cce3
 MISC metadata.xml 373 SHA256 bbd543061276ef3309ab0f528947dc70857d33a441d3525e377704d2ea857e06 SHA512 72ddb5048237a73cb4f11f326c024569e8c70344453d26a9a5aadb95215e753d7223216783bc2664ee7b25042c051b725f175a0ae20f5f079d5a1a03035d4e8b WHIRLPOOL 02e69fd5f574715e7ad949487ce1bc38a7aacd0af450d578e31df88ef83190ffa23695dd5bde027b4bee4f6039cb488d6ecf8843163b54e7dc40cf7c518508ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsf6QAAoJEGVpnaTzz9K95icQAKGj2xSHsK0ziNZMyGBdj5rG
-f6YRpGsID8rIvIf4N525CWdCfExYZanh94bnOBzq11vizDpG/KrFV0FHUYfvzwcd
-XMgnAS9ATbn41uuzMzkGN5doflevD8Ja1WQIb8xZuL8V6DTwRH1K/5phw9VJlrG7
-m81R7OzncheKTc4GC/X+ZOUBe3pHqzZGgsVcBHHgWIMIRPukIEmsNwg0zlF/PvgY
-/qbCTu+GEdZgBX1C/sbYxsYomWh7zmD4WVo3FIOZjxDUCcFRc3LN0evtMgw/x0v1
-snGzoSj0eNBS55p1BbT6dJkvNQZZ3UBo5s1syHgPpXffRXu5qVyM7GwUY/pXsT78
-TTh9Lq8kxU/5MLXcCScnCj9x2MMb+xq8e3xr6qpRFAU4ibjgSgTXYhKkmd7Y44Hd
-ZF/onL/gOldUJDCBRpD91yraDiUt8VtfSDfgiXywCi5aUzf6LOPND8/4hwhGdKAL
-RFEvE9I6kVDR49hqR8nkmsDAqVflExmCVw6jb3WZgmjrYhDsfstqJRJsCHSW9ZCu
-Us2ttL8jccC6sihHGm1Tnu9yWpB8RrhVz7ZWdr7dmRL7yMx892yCk3vyPTRcYHiL
-j7iz1Vji9Q6b4gsXikyTGvKSa2zmntds6XtWKNJ5g4n8ccP+3/MQ87nMMQGQrTSB
-B4fMpdCmBb+S22HI+//P
-=OmHP
+iKYEAREIAGYFAlLPdlBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TNZwCfZ0srvKBTNuG0n4mPYZ+OMDqH
+7F4Anj1O05dAC3J4vQXiuuVlLfUkOgbJ
+=lXbb
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.11.5.ebuild b/kde-base/marble/marble-4.11.5.ebuild
new file mode 100644
index 000000000000..2e5e0fb17d9b
--- /dev/null
+++ b/kde-base/marble/marble-4.11.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.11.5.ebuild,v 1.1 2014/01/10 04:21:29 creffett Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit kde4-base python-r1
+
+DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="http://marble.kde.org/"
+KEYWORDS=" ~amd64 ~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/qtdbus:4
+	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
+		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
+	)
+	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() {
+	kde4-base_pkg_setup
+	python_setup
+}
+
+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
+}