[kde-base] Version bump KDE SC 4.7.0

(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

3 files changed, 100 insertions, 1 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index e825fc88c0d7..33b7c8d80127 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.100 2011/07/09 15:14:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.101 2011/07/27 14:04:48 alexxy Exp $
+
+*marble-4.7.0 (27 Jul 2011)
+
+  27 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +marble-4.7.0.ebuild,
+  +files/marble-4.7-magic.patch:
+  Version bump KDE SC 4.7.0
 
 *marble-4.6.5 (09 Jul 2011)
 
diff --git a/kde-base/marble/files/marble-4.7-magic.patch b/kde-base/marble/files/marble-4.7-magic.patch
new file mode 100644
index 000000000000..f9db1544e85e
--- /dev/null
+++ b/kde-base/marble/files/marble-4.7-magic.patch
@@ -0,0 +1,25 @@
+diff -urN marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt
+--- marble-4.7.49.9999.orig/src/plugins/positionprovider/CMakeLists.txt	2011-07-04 12:42:13.869879320 +0200
++++ marble-4.7.49.9999/src/plugins/positionprovider/CMakeLists.txt	2011-07-04 12:43:28.567021582 +0200
+@@ -1,4 +1,4 @@
+-FIND_PACKAGE(libgps)
++macro_optional_find_package(libgps)
+ IF(LIBGPS_FOUND)
+      MESSAGE( STATUS "Building with gpsd position provider")
+      ADD_SUBDIRECTORY( gpsd )
+@@ -6,7 +6,7 @@
+      MESSAGE( STATUS "Not building with gpsd position provider")
+ ENDIF(LIBGPS_FOUND)
+ 
+-FIND_PACKAGE(liblocation)
++macro_optional_find_package(liblocation)
+ IF(liblocation_FOUND)
+      MESSAGE( STATUS "Building with Maemo GPS support")
+      ADD_SUBDIRECTORY( maemo )
+@@ -19,4 +19,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.ebuild b/kde-base/marble/marble-4.7.0.ebuild
new file mode 100644
index 000000000000..fd43545e6a11
--- /dev/null
+++ b/kde-base/marble/marble-4.7.0.ebuild
@@ -0,0 +1,68 @@
+# 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.ebuild,v 1.1 2011/07/27 14:04:48 alexxy Exp $
+
+EAPI=3
+
+KDE_HANDBOOK="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 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
+		$(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
+
+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_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
+	)
+
+	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
+}