Fix bug 312657, require python 2

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

4 files changed, 34 insertions, 20 deletions

diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 28114c613dc2..f1526ce008cc 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.44 2010/05/04 05:48:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.45 2010/05/15 20:33:29 reavertm Exp $
+
+*lokalize-4.4.2-r1 (15 May 2010)
+
+  15 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -lokalize-4.4.2.ebuild, +lokalize-4.4.2-r1.ebuild, lokalize-4.4.3.ebuild:
+  Fix bug 312657, require python 2
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -lokalize-4.4.1.ebuild:
   Drop KDE SC 4.4.1
diff --git a/kde-base/lokalize/Manifest b/kde-base/lokalize/Manifest
index b56a74d6d99b..53c346da0785 100644
--- a/kde-base/lokalize/Manifest
+++ b/kde-base/lokalize/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdesdk-4.3.3.tar.bz2 5618409 RMD160 991c8cd55e3794347dc0dce5e0530afcc7e903da SHA1 3b582863935d924854989d541c148387c7f52eba SHA256 19e58ac2cd438f311939044e997b76a05ffd0ff4b303e38531fce83e5630904f
 DIST kdesdk-4.3.5.tar.bz2 5617746 RMD160 365c1f4c307acc4c17443969d4ac153c047d5fae SHA1 663acbdfc7263cd9c6c6098445d8afe043d36514 SHA256 b050c548038e20d515e1ce9375776e2e98c2efd96609ff9b4497631afa997fe9
 DIST kdesdk-4.4.2.tar.bz2 5648138 RMD160 0c0982d1d07c565cbbb676c155d0b8fcb659b04c SHA1 782904b00515cb5f4c8581473bca600c7b9053f1 SHA256 39a81e75726d479e7f453fee288c4cbe331a35a365d18a9e0d2e4accca984bb2
 DIST kdesdk-4.4.3.tar.bz2 5648508 RMD160 8e39554ff09ded898f91db7248135347051825c2 SHA1 63b66969a31e8eeb22fcbae043476859da90dead SHA256 47ff3edfa84ad91ed1f659ca987cdd5a1ea7b4579b8505c6204ba7687bf49807
 EBUILD lokalize-4.3.3.ebuild 375 RMD160 70547db984541b11f571d5986f265ff10cac4e87 SHA1 5769cd42f86be5fbbc55524f73e0dc3000980a0e SHA256 d91701ac9fe13715887007ccc071919c888f388d781ac43e50a4c08ae230e2d0
 EBUILD lokalize-4.3.5.ebuild 828 RMD160 bf5b9e3c38ff92807e690fe407780f94e40c16e0 SHA1 18a8aa328ae02ddbca03297d31b16d3c5a99608f SHA256 8322b2aba49e1759641348db65961e1d70600c259957265123310d9d2e000827
-EBUILD lokalize-4.4.2.ebuild 830 RMD160 2a103b408e523fc952ca83591f8eb2e849aa3d76 SHA1 703f04cd4f49043d1769e870f632fb3f434457a0 SHA256 726bb917e5f36fb1ed2a3a027a4838a42d6682bbfb82e98a55c4ece6a337197b
-EBUILD lokalize-4.4.3.ebuild 930 RMD160 c4ae9f4de2ea859ae0d91c109f7480199f4dff9e SHA1 de05b7d4edb37a55a495babf955b805f9faffd19 SHA256 af348a1ac701a583c75e2bd39c3ab4adf053068adc636f38cf63131fa1624142
-MISC ChangeLog 5361 RMD160 75c7613ba261fd7cb1d488ba5544377331872358 SHA1 66e36d9b74986088f54ee36e29cacf2ba92d6bd9 SHA256 245dc17f9195fe543ff514ed443a6b9774fc0f6029879d82bf70c8a2cd8a3254
+EBUILD lokalize-4.4.2-r1.ebuild 1081 RMD160 1e29ebea1687493c164dc22f766b712f76136cd5 SHA1 aef0899bac20c625047c9aa8950d133cd8bea430 SHA256 b7455efdb6c450015be9e6416f0a41a8719b37f2293d39a32c10972e855a6546
+EBUILD lokalize-4.4.3.ebuild 1078 RMD160 d25de39558c71d07466247fa94c6330dc07aa6fe SHA1 d345ab70c7ef3cf61a58be697180071a89729a6e SHA256 5e45e19d615193534df3bc53f65d89fcf9dae16202964705ffa1fd812b57be93
+MISC ChangeLog 5563 RMD160 984472f7a50ac91ee9dc359c60fa560d9b38c736 SHA1 340ece5f26d0e56a90271c8210921520f6dc344c SHA256 277f6b4d57ff7a487df90ff70012944873a34c2ffa575175084e429900a05e4b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvftcsACgkQ5BmOA85PVLh7WwCfcema2G7cgaHviME6TRi1xw3y
-uu0AmgJgyKG4tULCr/sw5wvZ89YWAQmF
-=IAC4
------END PGP SIGNATURE-----
diff --git a/kde-base/lokalize/lokalize-4.4.2.ebuild b/kde-base/lokalize/lokalize-4.4.2-r1.ebuild
index e1e52992e41d..f946fc09ec39 100644
--- a/kde-base/lokalize/lokalize-4.4.2.ebuild
+++ b/kde-base/lokalize/lokalize-4.4.2-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.2.ebuild,v 1.1 2010/03/30 21:56:56 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.2-r1.ebuild,v 1.1 2010/05/15 20:33:29 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdesdk"
-inherit kde4-meta
+PYTHON_DEPEND="2"
+inherit python kde4-meta
 
 DESCRIPTION="KDE4 translation tool"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -22,7 +23,18 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep pykde4)
 "
 
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+}
+
 pkg_postinst() {
+	kde4-meta_pkg_postinst
 	echo
 	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
 	elog "	emerge -vau subversion"
diff --git a/kde-base/lokalize/lokalize-4.4.3.ebuild b/kde-base/lokalize/lokalize-4.4.3.ebuild
index a783864ec6e2..cdb183e989f4 100644
--- a/kde-base/lokalize/lokalize-4.4.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.4.3.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/lokalize/lokalize-4.4.3.ebuild,v 1.1 2010/05/03 21:38:06 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.4.3.ebuild,v 1.2 2010/05/15 20:33:29 reavertm Exp $
 
 EAPI="3"
 
@@ -23,12 +23,18 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep pykde4)
 "
 
-src_prepare() {
-	python_convert_shebangs -r 2 .
-	kde4-meta_src_prepare
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
 }
 
 pkg_postinst() {
+	kde4-meta_pkg_postinst
 	echo
 	elog "To be able to autofetch KDE translations in new project wizard, install subversion client:"
 	elog "	emerge -vau subversion"