3 files changed, 34 insertions, 42 deletions
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 37b4eb610a9..a0122681e66 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 AUX marble-4.6.2-magic.patch 828 RMD160 1522e8dbeda1a17d19e7e78b8093424b93ee7b0c SHA1 f0c8bcc01a3381e99191d958b728e660b63caf9d SHA256 25d4c077da9218ca6f8400a803553203df596cdace0eee1eaf5ec56e6604e174
 AUX marble-4.7-magic-r1.patch 1801 RMD160 27e157f23903d7ce070682abffd534159eb8e3f1 SHA1 04264060be347156ed0d1d4555de84612b54f702 SHA256 9d5a32d90f0a00492ef53ff523abfb25729f1d23d0ce213be6e6fa96edb31cbe
 AUX marble-4.7-magic.patch 997 RMD160 7b8229a0d6496c9452fce4185dde4050734c1152 SHA1 03fba22202648b73a013226eff70de5a158303eb SHA256 6e9b37be7cf5088eb812617f239e0948f0472a3d5bc47ddac7cc93a2f2ef6047
-EBUILD marble-4.7.49.9999.ebuild 1740 RMD160 950be5e28822bad9a63245c53bd9a66b4a62dd03 SHA1 b9789d419be626dfeb6fd76425b44c8e20dc3d15 SHA256 e9ca9ed0a288b6e3cca0606e7b96cbf18f7e8e8ca6feb40f4e62485d017f1a07
-EBUILD marble-9999.ebuild 1685 RMD160 61cbec9d4df00ab5f99856865bb57f3592d1f52e SHA1 6e8916e54e119b8bccd012df2ae7d0acc14ada32 SHA256 a2f55284952961137aca87dafa7fd0c7dbd328025e426d862a7104a39262ec6b
+EBUILD marble-4.7.49.9999.ebuild 1708 RMD160 5e3337b917366d5465c3657ba1f06c86521bca8f SHA1 bffbade03c18f318e22a65bb7e4364a221f644b6 SHA256 0cd02578246ec631d7f695bb9230317f59d2beea4000f0686587d5b192ebd89e
+EBUILD marble-9999.ebuild 1649 RMD160 d8b958323d56ea60da9e75cb74232f9a010a5efa SHA1 010b98ca799e87aefcbbcdebb8f7e8db1207169d SHA256 67f19ef674a9a60bab411ff493b06376b1ece04f432920bdba9e6218831fcf82
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOmzvzAAoJENwGBM22xffeOPUP/20BgTjBozPyp45euO9IrmJ5
-IeA1yvXYCTMKBMiNm7P8aaAVoRweum6gvcFD+Hy/lr49Eyjyd2I++/mYhvEEjQbj
-8fgVk4YfEei+3qLOrq6b2FfeCvgueH2EfcXFo2VlDlMOmc4D7dfHba7XQ8DaFjQV
-gPnBwsJnX+VLCQVCFLyze4XnMvGSGcAyh3ojkjZTZMx5cOhRLkHefOmiQHXKMnRm
-CFO0F3Dqi6HKgQluuGcxVT3H4ANsrowCClKAs9WDKFQth/UptM3y/boP1kNl/otX
-cE2dCniPVJJNeCqF0KcoxzA+MqKTsOJ/3O3MlEuHWrFsEXeI0PLsL2I4RmxVYMEe
-lOXk0zhlIkHX4DKJLTPr3y6hcHfCnWg3tMWon6NNHzp63KPvMP8D8t7rltC+E3Jz
-8ai08qygQr/mmdkjJY03AiEDjC4vcCUubDlghhc6mLDyQuamaLJOci50RhSrr38G
-n15tKFgbwvb8POWWAXGRlPHDDBU9MVWVaijgta5KgbewuLS6jr+bWRAIV4LLJ0+m
-kdfZwPxXx8fa+pGaDNjPNMOaQ3GgN+aTydYhwMS6LYxyRSk62p810swseFYXlKWU
-joxPa2zbOBPn5/SgvyYPrFEojybOtlqUvHejO60XpOpSU35urE4Ii69AQkt2d2vG
-+CgFL43ZCmKPb0XtAJ9r
-=6+Tb
+iQIcBAEBCgAGBQJOojJ3AAoJELHSF2kinlg4shMP/1srnZXntmccfoZvVXdE7ZW+
+R8zQoQQr2A+CHwTemKTUcLxW4sNbkueTfDKjYeWuHl+7fGRyqp9FOnmZn+qraRIX
+/ceqbQnukAh31Obt0fKKN2TKPc8FiX6+50n6X2Qzu0w4g51KVSwWRk2mhvWRrfwV
+QXRF14e31FeKzRIK5PzD+nKsTlm+6FasbE0UgCd1oRQ3wTFaxitVhyujAPhgW7qC
+hC66hAah4Z2V7wYdrrR9jD8NagwCz3WhIINYCBvfkW2iLPGvUF9lESnQDgeQ69nT
+qWgPSN68cs+etggb3wbYolbyXMNWg1eOPJZnIWCgTJwbiOlGZpsRXmtKlZ2cH2fM
+6KOrPvVXMG2SeMOm9WmuKT433pE9Wab2sIds2RvpdoYMy9XtDB4f4ulD2l4UNXE6
+bWIiY04x6LC0gcXUBNVfzI0ZojNXrk2NXuNKCPplQd/7zawx/8t0wtUH51Njj0GZ
+CpsV6BqW4S5a6UT2k8zZynyBu8cT0jEj1tA9eCR0fSHaj4mXCfbBhJ32TJlHnDE1
+2DqUWmKQd25mPvNb+w2I+6AQiIU4db2K7rGKIkHLGQeG64K5Mx5JQWIkQ26URRC3
+RAlNUEx3CzUK3EcLrAToDz1ilf2iWi/ERuPq7OEdoXBdn6xzAbx8si/t1z5UhOxt
+k6uMEgOK/vAADHtlzvmc
+=HYT2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 37acfd76071..07f0ae172b2 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
@@ -28,8 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 "
 
+REQUIRED_USE="plasma? ( kde )"
+
 PATCHES=(
-			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
 )
 
 pkg_setup() {
@@ -40,30 +42,24 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {
-	mycmakeargs=(
+	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)
-		-DWITH_liblocation=0
-	)
-	use kde || mycmakeargs=(
-		-DQTONLY=ON
-		${mycmakeargs[@]}
-	)
-	use kde && mycmakeargs=(
+		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with python PyKDE4)
-		${mycmakeargs[@]}
+		-DWITH_liblocation=0
+		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-
 	kde4-base_src_configure
 }
 
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 9d936ac07e6..e517c4c88d8 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
 
-EAPI=3
+EAPI=4
 
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
@@ -28,6 +28,8 @@ DEPEND="
 RDEPEND="${DEPEND}
 "
 
+REQUIRED_USE="plasma? ( kde )"
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
@@ -36,6 +38,8 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {
@@ -46,20 +50,12 @@ src_configure() {
 		$(cmake-utils_use_with python PythonLibrary)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
-		-DWITH_liblocation=0
-	)
-	use kde || mycmakeargs=(
-		-DQTONLY=ON
-		${mycmakeargs[@]}
-	)
-	use kde && mycmakeargs=(
+		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
-		$(cmake-utils_use_with python PyKDE4)
-		${mycmakeargs[@]}
+		-DWITH_liblocation=0
+		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
-
 	kde4-base_src_configure
 }