[kde-base/marble-4.4.2] Sync with tree: fixed bug #312659, revbump for convert shebangs. merge fix to live.

4 files changed, 88 insertions, 4 deletions

diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index e7f079733e7..d7b8b58e13d 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,3 +1,5 @@
-EBUILD marble-4.4.9999.ebuild 1181 RMD160 72b7388d0127ed0fc7775b3eaf7470ddf8c14945 SHA1 11bdb43b563c944b4c0043eabe66ce0dc14c507d SHA256 dc9410475493a73fc096056b597509ae550e558cb88b998940fa1c26d16c3e28
-EBUILD marble-9999.ebuild 1181 RMD160 72b7388d0127ed0fc7775b3eaf7470ddf8c14945 SHA1 11bdb43b563c944b4c0043eabe66ce0dc14c507d SHA256 dc9410475493a73fc096056b597509ae550e558cb88b998940fa1c26d16c3e28
+DIST kdeedu-4.4.2.tar.bz2 59801015 RMD160 fc75aca4c96399243f78bdab0e3e79f690a85eee SHA1 5e80f6eaecb87545554804d7a82187b8da5bb4d6 SHA256 475f92442ec84248b6fa9d0f8c96dd78ed09645f78e568cdf5a0ee707fd4f839
+EBUILD marble-4.4.2-r1.ebuild 1524 RMD160 5f2dbc828c9729b52e5970bf82b4ad615382c263 SHA1 56a6dfcc911e13357cea703aa0f981dfd96f9bbc SHA256 9d6e61757ff3f796b8969a42b5a562cacf0e4084ae2c2a5e62f39846f5c7350b
+EBUILD marble-4.4.9999.ebuild 1355 RMD160 2aad6ebcea2c1077453a4f3dd8ed8c289b871935 SHA1 f383696402ab41769dbde9a84c43037f83e4bf00 SHA256 54024c0ad0c0babcfe6ed6f8cccd8b83110f56c545cc490410421b92ee77a073
+EBUILD marble-9999.ebuild 1355 RMD160 2aad6ebcea2c1077453a4f3dd8ed8c289b871935 SHA1 f383696402ab41769dbde9a84c43037f83e4bf00 SHA256 54024c0ad0c0babcfe6ed6f8cccd8b83110f56c545cc490410421b92ee77a073
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
diff --git a/kde-base/marble/marble-4.4.2-r1.ebuild b/kde-base/marble/marble-4.4.2-r1.ebuild
new file mode 100644
index 00000000000..8c5db4ea0d6
--- /dev/null
+++ b/kde-base/marble/marble-4.4.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.2.ebuild,v 1.1 2010/03/30 21:57:40 spatz Exp $
+
+EAPI="3"
+
+KMNAME="kdeedu"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +handbook plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	gps? ( sci-geosciences/gpsd )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		$(add_kdebase_dep pykde4)
+	)
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !sci-geosciences/marble )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+	)
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
+
+	if use gps; then
+		mycmakeargs+=(-DHAVE_LIBGPS=1)
+	else
+		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
+			marble/Findlibgps.cmake || die "sed to disable gpsd failed."
+	fi
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/marble/marble-4.4.9999.ebuild b/kde-base/marble/marble-4.4.9999.ebuild
index c086475bf30..0b29a7dbebd 100644
--- a/kde-base/marble/marble-4.4.9999.ebuild
+++ b/kde-base/marble/marble-4.4.9999.ebuild
@@ -6,7 +6,8 @@ EAPI="3"
 
 KMNAME="kdeedu"
 CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
@@ -26,6 +27,16 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	kde4-meta_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index c086475bf30..0b29a7dbebd 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -6,7 +6,8 @@ EAPI="3"
 
 KMNAME="kdeedu"
 CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
@@ -26,6 +27,16 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	kde4-meta_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)