[kde-base/marble] Add support for qt-only build, bug 356457

(Portage version: 2.1.10.8/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

5 files changed, 151 insertions, 16 deletions

diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 5cfbcef2336..2999473dfea 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX marble-4.5.5-gpsd.patch 1644 RMD160 34379056c5c59ddc50d249bbfd7ef971343e744d SHA1 fd6b6b81945d951bb6ad0bb735df33c11bb2008e SHA256 d0361623c91e511d016c65ad21caa3402b38571372b1ba7463e37cc86da0f50b
 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 1575 RMD160 d723d27f8eb7d25051ede60b98b9bad890f3e671 SHA1 4f95bffebebaf9cde398537a30ef00fcab30b9b4 SHA256 b33353414b1dbc0024746a8bdfd026d6b6d0eeebe3f616e2533c199c289d6a43
-EBUILD marble-9999.ebuild 1575 RMD160 d723d27f8eb7d25051ede60b98b9bad890f3e671 SHA1 4f95bffebebaf9cde398537a30ef00fcab30b9b4 SHA256 b33353414b1dbc0024746a8bdfd026d6b6d0eeebe3f616e2533c199c289d6a43
+EBUILD marble-4.7.49.9999.ebuild 1805 RMD160 9420327f2c3e3c45a83ec4c6b43024080c02df39 SHA1 0dca79c57341be42259912c53553148d542a6397 SHA256 2c2cc925b1198e0e4b8a347f46dad2f691ac07cbb6bd3635dd2038e9b800dcea
+EBUILD marble-9999.ebuild 1805 RMD160 9420327f2c3e3c45a83ec4c6b43024080c02df39 SHA1 0dca79c57341be42259912c53553148d542a6397 SHA256 2c2cc925b1198e0e4b8a347f46dad2f691ac07cbb6bd3635dd2038e9b800dcea
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJONZ62AAoJENwGBM22xffeuTcP/iznkVPwFkIRT+H55YoXE0rd
+xG2BboEylr/W4sd1LktbBXzeVe7I7Py/0+Vm/slan0tWCASTYZ/xbFzf3K0DBJey
+0JXH8tPrkBbCXrr9mfam2VvtGmWEPj0REKgMw3VkVdJSLK6o4LnvdX3h/0u84J2f
+NJXvfxK/4kU+6rKvCcZ0x1MvC7q0oOgC9OIuoZGtgC8XoDipqGxMeyGpfuXM3Rae
+an+/OIv0LJA8rXoyqO5BRtkqRNnfW31YdGQfJYL/Nv1BJmWhAL5/zseEI6HRtmSr
+DhO82vnkLBAx/o0SfRtndpRT4ZEwHnuQm6f+6EOEuf+Cr0lakoplfa96y/Z2ivmY
+fkXKOfBvXBaBfNTiFX8l387WwTUlef+oc3YUNs+8mEnhCF0ocpmjsUfbtJlCObye
+VgBE6H3JrQPaLsKwDoyeyodemsUwcSfJ3mbw/YbSmPxQzG3tqnZRd/OmBZtwVOpz
+ghlDZlL8TeIWCepHpZdhnAqi9LThctf231X+Sa+lmIlmIT5in/VJF8Z6qZQU3sIT
+z350wA5O452H5r9XxfncpWn8zTqdZ4IV/ZO06xKgJvCQ36WcyJvaoZSnrbQS2Zl2
+tMtMGFZnOHLWo2PburTD38BpYCkiV3VZbQM5iEGdihVuU6v24sssa/CltJBn/L2K
+hB6Yam/t4eiaNkaSsTJO
+=TcDm
+-----END PGP SIGNATURE-----
diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
new file mode 100644
index 00000000000..ec515e99d88
--- /dev/null
+++ b/kde-base/marble/files/marble-4.5.5-gpsd.patch
@@ -0,0 +1,43 @@
+Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+===================================================================
+--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -18,6 +18,9 @@ using namespace Marble;
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd("localhost", DEFAULT_GPSD_PORT),
++#endif
+       m_timer( 0 )
+ {
+     connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -73,8 +80,16 @@ void GpsdConnection::initialize()
+ void GpsdConnection::update()
+ {
+ #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting(0) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }
diff --git a/kde-base/marble/files/marble-4.7-magic-r1.patch b/kde-base/marble/files/marble-4.7-magic-r1.patch
new file mode 100644
index 00000000000..2249884b5ca
--- /dev/null
+++ b/kde-base/marble/files/marble-4.7-magic-r1.patch
@@ -0,0 +1,50 @@
+diff -ruN marble-4.7.0.orig/CMakeLists.txt marble-4.7.0/CMakeLists.txt
+--- marble-4.7.0.orig/CMakeLists.txt	2011-06-22 16:53:54.000000000 +0200
++++ marble-4.7.0/CMakeLists.txt	2011-07-31 20:20:44.000000000 +0200
+@@ -38,7 +38,7 @@
+   "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake.")
+ endif()
+ 
+-if(EXPERIMENTAL_PYTHON_BINDINGS)
++if(NOT QTONLY AND EXPERIMENTAL_PYTHON_BINDINGS)
+     macro_optional_find_package(PythonLibrary)
+ 
+     macro_optional_find_package(SIP)
+diff -ruN marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt
+--- marble-4.7.0.orig/src/plugins/positionprovider/CMakeLists.txt	2011-07-07 16:05:38.000000000 +0200
++++ marble-4.7.0/src/plugins/positionprovider/CMakeLists.txt	2011-07-31 20:16:08.000000000 +0200
+@@ -1,3 +1,7 @@
++# we cannot use macro_optional_find_package here, because we want to be
++# able to build without kde support
++
++IF(WITH_libgps)
+ FIND_PACKAGE(libgps)
+ IF(LIBGPS_FOUND)
+      MESSAGE( STATUS "Building with gpsd position provider")
+@@ -5,12 +9,19 @@
+ ELSE(LIBGPS_FOUND)
+      MESSAGE( STATUS "Not building with gpsd position provider")
+ ENDIF(LIBGPS_FOUND)
++ELSE(WITH_libgps)
++     SET(LIBGPS_FOUND 0)
++ENDIF(WITH_libgps)
+ 
++IF(WITH_liblocation)
+ FIND_PACKAGE(liblocation)
+ IF(liblocation_FOUND)
+      MESSAGE( STATUS "Building with Maemo GPS support")
+      ADD_SUBDIRECTORY( maemo )
+ ENDIF(liblocation_FOUND)
++ELSE(WITH_liblocation)
++     SET(liblocation_FOUND 0)
++ENDIF(WITH_liblocation)
+ 
+ FIND_PACKAGE(QtLocation)
+ IF(QTLOCATION_FOUND)
+@@ -19,4 +30,4 @@
+ ENDIF(QTLOCATION_FOUND)
+ 
+ # experimental implementation
+-# ADD_SUBDIRECTORY( geoclue )
+\ Kein Zeilenumbruch am Dateiende.
++# ADD_SUBDIRECTORY( geoclue )
diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 159904d33f4..2646f51e741 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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
 
 KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
@@ -12,7 +13,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps plasma python"
+IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
 RESTRICT=test
@@ -21,15 +22,17 @@ DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
-		$(add_kdebase_dep pykde4)
+		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
 RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
-# note that this patch will not work if we ever make a qt-only build
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -44,15 +47,22 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyKDE4)
 		$(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_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		${mycmakeargs[@]}
+	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 159904d33f4..2646f51e741 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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
 
 KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 KDE_SCM="git"
@@ -12,7 +13,7 @@ inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
-IUSE="debug designer-plugin gps plasma python"
+IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
 RESTRICT=test
@@ -21,15 +22,17 @@ DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
-		$(add_kdebase_dep pykde4)
+		kde? ( $(add_kdebase_dep pykde4) )
 	)
 "
 RDEPEND="${DEPEND}
 	!sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
-# note that this patch will not work if we ever make a qt-only build
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -44,15 +47,22 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyKDE4)
 		$(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_with plasma)
+		$(cmake-utils_use_with python PyKDE4)
+		${mycmakeargs[@]}
+	)
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'