[gentoo-commits] proj/kde:master commit in: kde-base/marble/

[Andreas Hüttel]

commit:     b782d52008d0096712edc86497ce04693d774e12
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Thu Nov  3 17:10:17 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 17:10:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b782d520

[kde-base/marble] Dont try to install non-existing FindMarbleWidget.cmake

(Portage version: 2.1.10.32/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 kde-base/marble/marble-4.7.49.9999.ebuild |   10 +---------
 kde-base/marble/marble-9999.ebuild        |   10 ++++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index bf31559..e66e234 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
 
 EAPI=4
 
@@ -63,11 +63,3 @@ src_configure() {
 
 	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
-}

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index b4f1435..e66e234 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
 
 EAPI=4
 
@@ -30,6 +30,10 @@ RDEPEND="${DEPEND}
 
 REQUIRED_USE="plasma? ( kde )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+)
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
@@ -39,10 +43,12 @@ 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)