Add support for qt-only build, bug 356457

Package-Manager: portage-2.1.10.8/cvs/Linux x86_64

4 files changed, 158 insertions, 2 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index b9a3e7d2840b..67c394c56d49 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.102 2011/07/28 20:02:13 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.103 2011/07/31 18:24:35 dilfridge Exp $
+
+*marble-4.7.0-r1 (31 Jul 2011)
+
+  31 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/marble-4.7-magic-r1.patch, +marble-4.7.0-r1.ebuild:
+  Add support for qt-only build, bug 356457
 
   28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org>
   +files/marble-4.5.5-gpsd.patch, marble-4.7.0.ebuild:
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index fe80424bc5db..24445d015288 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,5 +1,9 @@
+-----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
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
 DIST kdeedu-4.6.4.tar.bz2 71678603 RMD160 425844f153fafbe18da26b852e76eb0ec936d096 SHA1 c58c2afbedccfa12d25e47202da995940cc9acb4 SHA256 8db25b2e21af8f105a33aed3d6a7924107f814fdaa57d571fac2b9893e5a978f
@@ -8,6 +12,24 @@ DIST marble-4.7.0.tar.bz2 21019383 RMD160 41628a5a1628c31da16a69474d55975c0da615
 EBUILD marble-4.6.3.ebuild 1848 RMD160 2f3aecd8ac4773f3627aa672f620e0bb6e23714c SHA1 33931df08ad78892ea81c6d67752c8293e45b407 SHA256 39417a0f53dd2b17d2dd11a219a6f90fd86d64bc4ef6314e741f5c1abfede32e
 EBUILD marble-4.6.4.ebuild 1847 RMD160 4176372d850ba9faa21cb8d8f5f2f8139522e89a SHA1 6905a91d2094cb45d691ca7e5bfe42601e125761 SHA256 e33b977bee95bff61d446e52db55248b5c9cf13e6d6e0c3abf1fc407463ff04d
 EBUILD marble-4.6.5.ebuild 1844 RMD160 30aa6ebba01ab979cb71053867d8f36b53d621f5 SHA1 ab42e1ce8ccfd3e6e4d417578ded64fca3861003 SHA256 e4186a3cd067ae283fbd022d3cb5d11723925a15c35dc167fa55c2190b0e113c
+EBUILD marble-4.7.0-r1.ebuild 1852 RMD160 3b3fb043978c74417bbd592acd5f6236c360b6e0 SHA1 1573ec5280b40e58144163b67382548d6c09a03b SHA256 b0e01ee4532f5bf198b7982a95d2488ad5963184d4ea4f5b4d709574fd365826
 EBUILD marble-4.7.0.ebuild 1767 RMD160 601b3a68cac5edbd5f5e3d7dce8aff0c51141710 SHA1 7a8cd67b252de0f40b7e5c5fdab4487f45d18f76 SHA256 27a9801649cea27023b3bc922f7bd07c0bad4c1b24b6109d0db87eb7df2785b5
-MISC ChangeLog 12990 RMD160 7461023c81228afdf3ecb0d3094d08ca49fbe81e SHA1 9e8aae67dbfbdc1f7b561777f12a5cc3cc0ba8a4 SHA256 9455b83308ae3775319e220ebd8185e7f3d9c3f85e6613115ad68c45a572cb05
+MISC ChangeLog 13188 RMD160 3996b80dddde912fbe5be46adca35a10df6c3dbc SHA1 afa4ae62dd4a83170a193bc2273d6766417e2418 SHA256 3a9e8c54f8fdd57c57c525f0691088e73c744b69a81d73f3b90312156e4fcb50
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJONZ3tAAoJENwGBM22xffeiW0QAKa+9T/GC4M6ss9i3mmX+Te1
+EcmIU9EpDl8kcigmcpl7SAMXwAVyyRZqJtMxUuvEQBLj9zxZO+8puW/jrRhztsfc
+isadeQaoGXO4RSiz2Woebpj8L/579cXwUrBGxADWS5DKRz5HIzKCOC3dcfitSmIO
+NG+zm2T7WSssz+3uuQ1CT1sdcxGTB118VIfeqIEKd3k5XLl6HsDlJddqN6DSQnW8
+SvHVYLO1tu/CSfQ/FM5qBGl9gl8cXTCUbYM1NxwYgSSmuartfm4HlgYFCrrcDhjA
+pylR2NH8BljBYeYU6nxBjGBo6NiyIMzBZHeoKsnxjUTPCscQozNu20CDC2ymuds7
+czR6E5oKkZ4aRckXABVFF7luPYVgkRAGKXLE+S7I810iTwc3lwtmlS5u5uFis6fG
+ToAN7SHtT2sCQ6/Yb7NUOxC7LMUgu5yJur73PT7AWNAp3zzLHNHQl3eCYEtYeQPZ
+iLT90GuIVmPmPz+BOLMiWxS1A7IywWkYpOD2tHWDjECy19GG15E8x3MBuwgJNor6
+VOXJW//5Z9fekrSMK+tYWNROHZCP7HmiMjF1OWEkzKuDFvjILUvZotMc5pfIWAe4
+edqGrs8XEky5g9GFtckyRa00M8uLqBld3B2vE3jLFqsRkZ5RchlyTJoirYfqMWSA
+zR5cdtTveDqL5AVZQwT5
+=sPpw
+-----END PGP SIGNATURE-----
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 000000000000..2249884b5ca7
--- /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.0-r1.ebuild b/kde-base/marble/marble-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..10b536284f19
--- /dev/null
+++ b/kde-base/marble/marble-4.7.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# 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
+
+KDE_HANDBOOK="optional"
+KDE_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+KDE_SCM="git"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps +kde plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		kde? ( $(add_kdebase_dep pykde4) )
+	)
+"
+RDEPEND="${DEPEND}
+	!sci-geosciences/marble
+"
+
+PATCHES=(
+			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_configure() {
+	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_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 </'
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	if use plasma; then
+		insinto /usr/share/apps/cmake/modules
+		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
+	fi
+	kde4-base_src_install
+}