Fix build with python 3 as active version by Michael (kensington) <gentoo@scribeofthenile.com>. Fixes bug #412563.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 34 insertions, 11 deletions

diff --git a/kde-base/kajongg/ChangeLog b/kde-base/kajongg/ChangeLog
index bb2e072e2721..e0ab18493b10 100644
--- a/kde-base/kajongg/ChangeLog
+++ b/kde-base/kajongg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kajongg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.48 2012/04/18 22:06:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/ChangeLog,v 1.49 2012/04/19 20:22:04 johu Exp $
+
+  19 Apr 2012; Johannes Huber <johu@gentoo.org> kajongg-4.8.1.ebuild,
+  kajongg-4.8.2.ebuild:
+  Fix build with python 3 as active version by Michael (kensington)
+  <gentoo@scribeofthenile.com>. Fixes bug #412563.
 
   18 Apr 2012; Markus Meier <maekke@gentoo.org> kajongg-4.8.1.ebuild:
   x86 stable, bug #409403
diff --git a/kde-base/kajongg/Manifest b/kde-base/kajongg/Manifest
index 3c7398ff52aa..e2feaec1b60a 100644
--- a/kde-base/kajongg/Manifest
+++ b/kde-base/kajongg/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST kdegames-4.7.4.tar.bz2 62948398 RMD160 ef3c730eb79704204ba7b6a50061bcc92617b2a4 SHA1 a1f97524f868ab9dae0439abcbf4b41f68715598 SHA256 dfa9f7d3b59bdf541090010c418b527e27b69a88c991f753fa70e02aa6e78230
 DIST kdegames-4.8.1.tar.xz 58053984 RMD160 4f4865e78f1b403bf2e68317731f477f46a07411 SHA1 bcf764fd1f2f8083c388c17f26b83eeac568b1d5 SHA256 7d6eedec9079398e3a8f36c23d794aec2460c2f80bcafed23fb05dad56ca7b49
 DIST kdegames-4.8.2.tar.xz 58839716 RMD160 4a5adc7dea2c8e2fcd649b5e2df2b9f1ebb12190 SHA1 9aeeccbc5f79f7f6b1e91bac41857ac3818cd989 SHA256 1cdd7ac24147c9850872bc37de26248216258a78638d4eef61af514364cb9bde
 EBUILD kajongg-4.7.4.ebuild 646 RMD160 896a993161a339c2d0bbae37080ebfca1dfaa88f SHA1 c32f8ae0c7936bb46423444dfe44c4eb31c644f0 SHA256 c10304598ff15cdec5691e1689bff3a885186ef237bcabf56d067eedb8904a55
-EBUILD kajongg-4.8.1.ebuild 635 RMD160 89d6f2dd69b5321325587885f989776df809bb30 SHA1 a3384db752d01f3109d08566f3a89326ae167054 SHA256 abfcae266723828fdc53d866ef30fa4099753b2afb50f3348722ebca24200880
-EBUILD kajongg-4.8.2.ebuild 635 RMD160 24b92e74e490df67ff558384360a98bdac8185f5 SHA1 39d9c14bb8457f8c8c87968fe995af7ea9640456 SHA256 ffd5e77fbd45fad4836a431eafd64e3592935258455ca87ab62f379f5e8932e2
-MISC ChangeLog 5925 RMD160 1056964c262407be08aac99017d88e2d686152c8 SHA1 a1d7049e7d164bec83ec4da8055ff11bd691bbeb SHA256 11433a059c5c75e10b76a839537ab5b572e6d99483504c9791776469e534e565
+EBUILD kajongg-4.8.1.ebuild 768 RMD160 77b21b6c314b97bd194d891d808d66d92181cb7f SHA1 559282136dafac0ea6864f98e24c4d1a093598ee SHA256 727a08df98128c1337eaa68e46704727a5a92487a7e967a5b0f6edd78452f17a
+EBUILD kajongg-4.8.2.ebuild 770 RMD160 2ac4bf0570a5070d62bf6e0941491befa352cd94 SHA1 e843bb93b647bea8b4c031a7a3b67f25db68ad2d SHA256 fbe79d6303ffed65d0ffe781df0b76bfdab3a49c8b217844ade5f692361b2505
+MISC ChangeLog 6137 RMD160 d2f9dbbb3419c89696bb1621f9fb4d88b8644185 SHA1 7fe57077bc6256500b726222a49ca5f0e34b598b SHA256 fa23a605146526a3f4dccd0c47b6ce6d0d29c08573eac152acff86b04727df06
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+PO5oACgkQkKaRLQcq0GKoTwCfToQV/0a4DD5rZicjNoEFZgM6
-ziYAn1JJQfZ4hsgjk0IRpbjl0nyluAs4
-=q34V
+iQEcBAEBCgAGBQJPkHQnAAoJEO+t9ga+3I3abHIH/0qJbhzksPnQohvlIJy/rmvy
++Cw/l+oz8jK0rTIiMJLV6/aTkYjTdZvc6FRi/R9sBDf8rYKGf5GBiJPmW29ne2al
+mvCa8PYQI7bDFDI6gWTIkXINfBaofT2DI+gqQGnuniwRqMNcoK9BSaea2E0hZaCc
+gV+Oj47hDRCj8KMw+J3sXxfYnHzimyTr3E8WOo4ULI7y3W9+1bNTSSm5JfBC8KBj
+BstmdcxVTY9U/YpFpGRvW/Nf5KbHsycDXdHIPMp1OD9aG8Jsj2QzeOEHYrNcBFFm
+sqHKuPaV79zOXUh3jIfVgCAqO1q9WWhhWxmHX1wxtimTKBHa4HinLBZ8UzOq1A4=
+=mtna
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kajongg/kajongg-4.8.1.ebuild b/kde-base/kajongg/kajongg-4.8.1.ebuild
index e580116500a0..4ea818e0fba0 100644
--- a/kde-base/kajongg/kajongg-4.8.1.ebuild
+++ b/kde-base/kajongg/kajongg-4.8.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.8.1.ebuild,v 1.3 2012/04/18 22:06:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.8.1.ebuild,v 1.4 2012/04/19 20:22:04 johu Exp $
 
 EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdegames"
+PYTHON_DEPEND="2:2.6"
 inherit kde4-meta python
 
 DESCRIPTION="The classical Mah Jongg for four players"
@@ -23,6 +24,12 @@ RDEPEND="${DEPEND}
 "
 
 pkg_setup() {
+	python_set_active_version 2
 	python_pkg_setup
 	kde4-meta_pkg_setup
 }
+
+src_prepare() {
+	python_convert_shebangs -r 2 kajongg/src
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kajongg/kajongg-4.8.2.ebuild b/kde-base/kajongg/kajongg-4.8.2.ebuild
index 43846562f0a0..8b3c6d2c1a83 100644
--- a/kde-base/kajongg/kajongg-4.8.2.ebuild
+++ b/kde-base/kajongg/kajongg-4.8.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.8.2.ebuild,v 1.1 2012/04/04 23:59:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kajongg/kajongg-4.8.2.ebuild,v 1.2 2012/04/19 20:22:04 johu Exp $
 
 EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdegames"
+PYTHON_DEPEND="2:2.6"
 inherit kde4-meta python
 
 DESCRIPTION="The classical Mah Jongg for four players"
@@ -23,6 +24,12 @@ RDEPEND="${DEPEND}
 "
 
 pkg_setup() {
+	python_set_active_version 2
 	python_pkg_setup
 	kde4-meta_pkg_setup
 }
+
+src_prepare() {
+	python_convert_shebangs -r 2 kajongg/src
+	kde4-meta_src_prepare
+}