Fix bug 312659 (python support), actually enable python bindings, thanks to Locke Shinseiko

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 26 insertions, 5 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 0731eabd4b11..e09b6e1dce2a 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.66 2010/05/04 05:49:18 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.67 2010/05/15 21:14:10 reavertm Exp $
+
+*marble-4.4.3-r1 (15 May 2010)
+*marble-4.4.2-r1 (15 May 2010)
+
+  15 May 2010; Maciej Mrozowski <reavertm@gentoo.org> -marble-4.4.2.ebuild,
+  +marble-4.4.2-r1.ebuild, -marble-4.4.3.ebuild, +marble-4.4.3-r1.ebuild:
+  Fix bug 312659 (python support), actually enable python bindings, thanks
+  to Locke Shinseiko
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -marble-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/marble/marble-4.4.3.ebuild b/kde-base/marble/marble-4.4.2-r1.ebuild
index a8ee06e4214b..99658515e720 100644
--- a/kde-base/marble/marble-4.4.3.ebuild
+++ b/kde-base/marble/marble-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2010/05/03 21:38:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.2-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm Exp $
 
 EAPI="3"
 
@@ -33,14 +33,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	python_convert_shebangs -r 2 .
 	kde4-meta_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)
diff --git a/kde-base/marble/marble-4.4.2.ebuild b/kde-base/marble/marble-4.4.3-r1.ebuild
index b81d8f6bd6fc..b16861fd8dba 100644
--- a/kde-base/marble/marble-4.4.2.ebuild
+++ b/kde-base/marble/marble-4.4.3-r1.ebuild
@@ -1,12 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.4.3-r1.ebuild,v 1.1 2010/05/15 21:14:10 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdeedu"
 CPPUNIT_REQUIRED="optional"
-inherit kde4-meta
+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"
@@ -26,10 +27,21 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_prepare() {
+	kde4-meta_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)