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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 18 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/Manifest b/kde-base/marble/Manifest
index a7d7921e3c93..6f8cf4015f69 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 4.3.3-world_clock.patch 3156 RMD160 562427f96a14be8aeb7c92f07c0f0c2a6d0b861c SHA1 61c631f07e0b301be3564a3cc390c138fa050a66 SHA256 b0938e92976c3302eafda065b30758d9f7b1d9f15952be036c65b24d2fde9888
 DIST kdeedu-4.3.3.tar.bz2 57944052 RMD160 97ebfc7d2eb4fd5cf21df32eae95efa26f835b86 SHA1 fde1b8a7e548077f6327c940ec530db8565b5968 SHA256 3527fdb100f8d9e821ae1c811780ab6c255fb29f2c8d4acfe18d72f067312998
 DIST kdeedu-4.3.5.tar.bz2 57964399 RMD160 94bc3befae0a5a6c6395aa76751a1aec0cfc5e52 SHA1 fc3485dedb501f0befb3fa77d206a3416d094539 SHA256 4495d2bb56d498c6e1f4a3394a5dd2f9c156d1b48a0ad04051aad03f95e6801c
@@ -8,14 +5,7 @@ DIST kdeedu-4.4.2.tar.bz2 59801015 RMD160 fc75aca4c96399243f78bdab0e3e79f690a85e
 DIST kdeedu-4.4.3.tar.bz2 59800678 RMD160 541caaa59506a4981fbd6629b733c5929d686309 SHA1 12d06cdb65471a35d5ef8a255859dde06ad02f2e SHA256 9d7881bf4e2aa8816a7e82838f286c18910f9e5d8a19a16c7d8c15df8e0c0b9e
 EBUILD marble-4.3.3-r1.ebuild 1400 RMD160 5c6131b062bf9fc68f0639f9860f28367f4273d2 SHA1 a74e13d33aeac7017ef40325349a67073ff927b3 SHA256 3a90ad99de149f02f8ec6d80aa2b03838c06096605afc71c410a9e65b9a324cc
 EBUILD marble-4.3.5.ebuild 1348 RMD160 049ffa858f642b9f53cfc71b953242b124700fdf SHA1 2c1e333c168ce8444203eef98d39ef10b07b1fcf SHA256 87a6c2ff6800cdeca554750a82b2a9decd3a99864f633a7ca748d943ebd13720
-EBUILD marble-4.4.2.ebuild 1350 RMD160 c97e3b3e8d78d3dfa9c3b3680bbd82227fbe3f31 SHA1 34ba186f1eebedb17642fc6ae73a25a9b4d1dc09 SHA256 bf879e4db45705a381e28dd6852e3a49a213e83ef1858128e235f794c024be5e
-EBUILD marble-4.4.3.ebuild 1525 RMD160 e2f449ba89d64becfa786e3860f02f8ccddf3c0e SHA1 b0135dec4b5ad73dabbfea3fdb5e9ad2c87583f4 SHA256 fbb4567ea7d6189bef33a204902ca3b99a2518d7efb191288711f844b6f4722d
-MISC ChangeLog 8201 RMD160 f7bb8e62c53aeb97a9c0f1aac95748daeb85aaa7 SHA1 262e5314388165f5e1353138e66028b3b73e900e SHA256 0b5e844fb52cb50d2f0b75c42e407447ab5a9d2c6f6443f3c243e5cf4e60ebd2
+EBUILD marble-4.4.2-r1.ebuild 1607 RMD160 37b7616520da37a9a2a7a6fa367fda025a720005 SHA1 2a768a16d95aab775136209f38884a391f1305e0 SHA256 6ced1ffa8d3f3afbf6664e1ac599ebd3df125d294b0d3f199af62b2bbc39ebc4
+EBUILD marble-4.4.3-r1.ebuild 1607 RMD160 313e5aa415f46bd0b3dd63d6054324c93760036b SHA1 a080b18aae4b674b42578e46199bd755979aa948 SHA256 127b6ef2e4ad774aa8f3c2aa17e1935b3925b5c2749f12e2c89c63d96ac25726
+MISC ChangeLog 8513 RMD160 53b3ea61ba05c2a9f856bbf06798ab84be6ab0bf SHA1 64002f69da8a2147517e83f0467b6517c744b0d2 SHA256 fc8baab6d7e261ace6fb3bf32d528a2265b3022b27a7d6b91eed6a309cb9bc1e
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvftekACgkQ5BmOA85PVLgZCACfQ+ZgqU+vjQ4Xzsro/YW6UfXP
-KBwAoIBUtwvT4ZYaQjux0w52pcCeRYLA
-=xC79
------END PGP SIGNATURE-----
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)