Version bump KDE SC 4.9.3

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

3 files changed, 98 insertions, 9 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 889d107e61c7..c89ddb484a67 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.159 2012/10/02 18:12:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.160 2012/11/08 23:27:02 creffett Exp $
+
+*marble-4.9.3 (08 Nov 2012)
+
+  08 Nov 2012; <creffett@gentoo.org> +marble-4.9.3.ebuild:
+  Version bump KDE SC 4.9.3
 
 *marble-4.9.2 (02 Oct 2012)
 
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index a7459705b084..f8ea6f1b50c6 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -5,19 +5,17 @@ AUX marble-4.9.1-shapelib.patch 420 SHA256 c8445dfec6508f5aa84a14e93518bacc0aebb
 DIST marble-4.8.5.tar.xz 19899400 SHA256 46d1eedc5da29ebb4b7cef4e7442b94513642e9013d770787b778d61674956ad SHA512 edf50567781fe60556c5dee081aabf0691139f85e88dfe9a08bfd6bbe78c798a07a2c095d9c638da86c690a25a86a339859955360f7effa31806b3be263f663f WHIRLPOOL e181a953f8323cf8953621e7bb859530a76d4a3f264705a02343312a605be5f9531c09462314e5be048bdeb93bdc702657d404888b9bf386cc350250cf6e99bc
 DIST marble-4.9.1.tar.xz 19822624 SHA256 a0633e59ecedfa092e72a9a72b6c2ed646311726b2e2ace141f935410f17f7e9 SHA512 915a9f7db08a8d0edb2695192f5076b12762568200a998e818b5e7c5ba1923ecc518df20a6ab45d03cf9efaed27297e8559695cc37546265dad3810bd56bbd7f WHIRLPOOL 2cfe891348650dd8e5e4f8d35fa5f746524c49f453e21a743f9fc1e575edddf5cd759b7736121c589852c0a833f271c9ea6d4f5fa18c66f5f4102a43a5655a1d
 DIST marble-4.9.2.tar.xz 19840120 SHA256 ea6ebc60fe9a9ce26f6838373df3e245a9daedbb4c816cd590dff1bd512bc6f0 SHA512 b98fa3ac129715f8c84fc6f35bfe618eb4dad7960f04d7568b7fd362eaa081fa46765e22c60c156769b407d65198d54a1426df950aa3cdd90181c4c9421fcae3 WHIRLPOOL 738646db6be7e10dc9aaf93ebd8fdab113473f4a84702bf8d2a05e9d895b035c7a9264d1d3101a1047e696020da08ead2743be4fa809ad9b6050d2edce99ed44
+DIST marble-4.9.3.tar.xz 19835184 SHA256 ce0e6eab3d903b0053b9fd0023ff522a2619ae15be6e9ccfe7eed3ecd83759b7 SHA512 9f938ff953bfd917cc5ad044dd05da1d01643d3a8216707f82e799cf3057db16be89574627691dc4c2398a1ef6c26ed2bd0193b50e8e1bbf591d5aadf05d1db2 WHIRLPOOL 59aa59697e4c4d1007e595f9d5c46c8ab003217753f066973a0f1add1948881642b9e09e33c9eff198234e2d18cf8f942ed6ac65acb4c3e0838dc822f0af1125
 EBUILD marble-4.8.5.ebuild 1975 SHA256 bd6f9bb3c70beb1d759e6078b5c9dc63e867c99c908acb1d6b90f16579be896e SHA512 7ac2410690e46c701429fb3b3818998bb29f2d69904144b7da2cb62e2b83f9503876354a3fa8364dd2bbaf09da75e833230f6805b3228642b1a91c1aee6e80fe WHIRLPOOL a28666ae78e3a764f5bb488b84bb62c9fafff72dde93a42889f3e7ede9229c6e9b5845b327f11e3b27284d42fa0c32193af72720acde42791a889c9ea2a7cdda
 EBUILD marble-4.9.1.ebuild 2081 SHA256 bfded1114f373d62f0b390e43ea674716ca135b20e422b9bd66300525b110cde SHA512 456e1731537346414e55b52f3a16cf578066e005445d76860394394115fa569229a969f8928efda4e22b485e14125e6ec576934144048aa3943aaf5e093d1222 WHIRLPOOL f87474a6a1712274e1eb2bd3357fee17ea79b65d72557286bde7f9dd5a829e5482d19ef13aa5a9394de5343be10d13a2bf026fa94caa4cc4158ded9af5186552
 EBUILD marble-4.9.2.ebuild 2034 SHA256 4f8930314fd05242eb7ec7f84920279a5fe82612e1b4c6b99ba7680f71df1fd5 SHA512 5fc7614af6295a24a386a0b41060ea345d21bb4fb733f0985884fc1a3535fa5a0e76416197b699a1241b7453e195dc785463383c8d5538903bb99e508bbe9ab3 WHIRLPOOL bce7c3cf3a41dfe9e920aa1ba2948e766cb00afd8eaf6002d11f91a376609a1acc66e165aa4bfcb6db79b636c1d339410a28df860fb82ad7fde9ef2877b9c0ef
-MISC ChangeLog 20126 SHA256 329301ef3ad2cb21a87c0072e76e2424772f5298d553bbc50939e6d2c16576fc SHA512 f00447ed6a7b9315007bbf2ef9a7e47d7c6ba121097e0cec7c5959e9dee20e78284e3a4c2e0b020c0390053f176f4a013cfd4393ebe0a310880206cb950a93ca WHIRLPOOL 8651335fe300ea6b3d94bf967a2b3753ed046ec77c7c37bb891608a82eb0b312ea738c7362041ef1632e70fb0acf2636fdfdda8ecea8c88963f2b88e4fe4eed5
+EBUILD marble-4.9.3.ebuild 2038 SHA256 35d2b54ef4748ecf2e873422d82419f9158f959496baac82a02ee53ce82d665c SHA512 8106c3c3ea899ce105361b1f18e9d8de172ca500f191a33ccb7779a34fde8e2fbbeafc30a3702b9b435a1f34f05ff28fda651c1b4a251afac739354461206e98 WHIRLPOOL c8d63063313f08c6f0056910abfd7b22b2da633668bf8dbd2ece81071dca6a452af58656ba1ca3899916b48c1f2e09834b38b97bd3d8e49bd26e76a6e0f566bc
+MISC ChangeLog 20247 SHA256 7d3be49c56323a3355566e198e1a886eefbc22752bce9c942f8fb4d4aedcfef7 SHA512 7d98dd39b5f16d5d45a69d8c4b2425af5b6100d99963f5e4c08c7681fd05d0304a5365125e1f4417d561d4e1c3f09d3fb2e1aa386e85e17edafc1906135fdec8 WHIRLPOOL 2be80e326032ddbecbb470c2b298c3fced9dbf8481387f47c9a6ac4f5ac303cf9deff039e06c3ae0df007d22a9d9e4415603e19ceb6196763cb07081d8bad72a
 MISC metadata.xml 295 SHA256 a4c1fd56209e5d3f3da4b0bf987cfa686964c796a4a5a33dda2a1381ddd98cb0 SHA512 58f62f125475c90cd625082cff28e8e56ad9bdd369f35db6deaa8e908648f86a09da3aa15af8c1c4cd0df70e3255478fb9cbf4f33d806b4a48bb2a13a118e03d WHIRLPOOL ddfca73476c1a6e286bc7742f8646adb2d692944e1e409222ee3c5e752f5863695ddbd43cfd5805a9a18768485fa0efe0cba18238d9837a169269bdcd14bed98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQay8JAAoJEO+t9ga+3I3aQeoH/ia9gG/Ac0j+dCzEluGp1srA
-1/QQuffPg4Bh5AKu3Ikbsb3p8LviA0vSCXEKm6ySfBV3Sa0XZlEHtvAYQZs8bhfV
-iJw8/ek+5rTK3TKWj8vcqfKgfmEQxne9mstdBkjwAH0A1I1aYbdVxjujg6/5Y0rZ
-KO35F7H3ULaPxIpxchqUVK9RgAPAXp19WScZJgpnLV+mZ3GZEbQap9vRHeP+iDna
-j7ksFPEWuv034WvZ1LBgKORGmN+1gseiN0JKqHR4iA4fT/pwOESH6wuO6jePpZO7
-FPwZR2na0X6FCuWWbrnODDTBx3V2gTsBGoxmJtCboCyp/xxQK+fA/IdsmGuxqe4=
-=gqKk
+iEYEAREIAAYFAlCcQFEACgkQ23laikJhg1TteACfXq1Sst272TB8dSKcpGjpdU6N
+en8AmwVbhS+kEputUHNLV1fYr/ENpmkO
+=/ixQ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.9.3.ebuild b/kde-base/marble/marble-4.9.3.ebuild
new file mode 100644
index 000000000000..ad167f679326
--- /dev/null
+++ b/kde-base/marble/marble-4.9.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.9.3.ebuild,v 1.1 2012/11/08 23:27:02 creffett Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test"
+
+# tests fail / segfault. Last checked for 4.9.0
+RESTRICT="test"
+
+RDEPEND="
+	x11-libs/qt-core:4
+	x11-libs/qt-declarative:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-webkit: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 )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( x11-libs/qt-test: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)
+		-DBUILD_MARBLE_TESTS=OFF
+		-DWITH_liblocation=0
+		$(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
+}