Use Python 2 (bug #308325).

Package-Manager: portage-2.2.0_alpha29_p4/cvs/Linux x86_64

4 files changed, 58 insertions, 17 deletions

diff --git a/app-cdr/gtkcdlabel/ChangeLog b/app-cdr/gtkcdlabel/ChangeLog
index e3294cf1cbda..bb449728d8ec 100644
--- a/app-cdr/gtkcdlabel/ChangeLog
+++ b/app-cdr/gtkcdlabel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/gtkcdlabel
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.37 2009/04/30 18:06:18 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.38 2011/03/30 23:03:34 arfrever Exp $
+
+  30 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gtkcdlabel-1.12.ebuild, gtkcdlabel-1.14.ebuild:
+  Use Python 2 (bug #308325).
 
 *gtkcdlabel-1.14 (30 Apr 2009)
 
diff --git a/app-cdr/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
index 14dbb11ffe5d..d7063dbd5d46 100644
--- a/app-cdr/gtkcdlabel/Manifest
+++ b/app-cdr/gtkcdlabel/Manifest
@@ -1,6 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gtkcdlabel-1.12.tar.bz2 30054 RMD160 7b062f107e8edd9bda56cb29e960006cbf29c109 SHA1 d5ecc95109fd8c883c6f78ac100fea0c9483cb4c SHA256 a2db925b4b7afc748465257872ffa5e5a7ba0a1545244431247ce506d0999a6b
 DIST gtkcdlabel-1.14.tar.bz2 36397 RMD160 323735798ae488d7549b3bce15a3c097c995ffc6 SHA1 6b44533c6e10fd2dfb2e42d1928e70baf6d9d585 SHA256 df3307744822cde89632da8a83bae7e8e7c3754ed4738cf559c4be14cc66c303
-EBUILD gtkcdlabel-1.12.ebuild 771 RMD160 2a6aaf2c63d45212c46eb890fa26ea434be73304 SHA1 15753fce8d514def3ba915623e295a176b8d15db SHA256 631d3220b18f6670a8dd35db8aa70f60aba4ad6ee86c6a39e66b71e8957180fb
-EBUILD gtkcdlabel-1.14.ebuild 785 RMD160 344fff28391acae048b629903d04e7ab399694c3 SHA1 b343444bd5a7a2241684e36c0b934de91a812acd SHA256 02e391778f8b32936c71544ed4b4d38a2fbbcef3cea07697b3018d772faa217c
-MISC ChangeLog 4825 RMD160 75596454a2a66ceae0980aa2efbb6dfbfcabb4d4 SHA1 d4651d3441fa049ab869fb6d299169c46494db3b SHA256 ea02a100bef673315d1bfef0faa20ad1f6c44ffb96938723b25c1ce0cd8e2f36
+EBUILD gtkcdlabel-1.12.ebuild 872 RMD160 18375ca934cf66f4c50abec606e3f8e0449ec869 SHA1 19d246ec553c2020f83092acca684de19df491f1 SHA256 86939f277a9ec7306dad452c754c1d8ad8d3d038e08bc67f70df7c2691895587
+EBUILD gtkcdlabel-1.14.ebuild 876 RMD160 b55e3282efc52fd260a1950ee3ad2c9f3fcc437a SHA1 096128caa7de74cb565c31bf157668f50382644f SHA256 ada2c3ed3408e8fc08dce6db4bfa5fe88fb6a99e5dc8aeb987b01ab4e7a611be
+MISC ChangeLog 4978 RMD160 caa76ec61f00bab7dcf91aeaecdf18adf87b6f25 SHA1 2eae1f9076fadab9e7fd658ede6cbca7f6b57503 SHA256 4dfa0db60506d252c21da5fcf8866e6ae1a6b501f89e232f95c00d160618609c
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNk7bvAAoJENgZr6v6gHY0w4cP/RuuqdbV/bq/Y3+j4FLssPWf
+xmfFgNtXwCEKGjSgluYlZcmnRxSvgUYQPMQDfZuHYJT12VXlG9U814JcXYIsMXCg
+f/EiAtGeNh00cglx0t0Tsmu6F6CwrIKsOvQhqZJSIZdYMVHHjFd61jxaQ/9HrUSk
+CVNaX+Dn8EF2pNl5/zIGWp88QpKscSJjjPEispa4BOAjMzDxGYsgCH2y5l+wLOp7
+uGcBRmPxDK2Pmws70DcXZkoEXmwIxsigWKAWVkjmWJD32CCYaFCPDPNVhtJoALXM
+nL5B/ntWBmWBEVVYxzREaUYwgn4p1hRQyJ3qKozJzRS8fuRMajfhef0MKK9fH4vq
+qx2WeonM5ePNywCWQBrFXlMGlj8alPbKSGogeS+vILd9+j3hlBhJSzLm9c94jg5v
++owU5jX1fJsA2AzOK25eUYK0O5peebDxYuA1op5z2Zyfbi5f1oGSfXil9XqaxG/j
+xIY7Zk35jfcB4DXUYlwu6sMaZoqfkIn/JeOEcgh75GuA53NjWqOZ9nSe7FGGkqzX
+ZdPS2h4FBXXCoBRANH7HFzOuHWnxNAaHOEQMtKq2MiE5MZ7ROZrzJkIB0xFtVx1s
+ccjjhD+6ICRKiPDqz6Wq0IGOOVek7uTYBraVkFPMSQRImWvFABlHbjqGBxIPr6PF
+S873W1/k6IueC1dlS3m5
+=0Fhv
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
index 355f8c6a252f..6cfa33205b25 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild,v 1.5 2008/07/27 16:13:12 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild,v 1.6 2011/03/30 23:03:35 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit python
 
 DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers."
 HOMEPAGE="http://gtkcdlabel.sourceforge.net"
@@ -11,13 +16,17 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.5
-	>=app-cdr/cdlabelgen-3
+DEPEND=">=app-cdr/cdlabelgen-3
 	dev-python/pygtk"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
 
 src_install() {
-	dobin usr/bin/${PN}.py || die "dobin failed."
+	newbin usr/bin/${PN}.py ${PN} || die "dobin failed"
 	insinto /usr/share
-	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed."
+	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
 	dodoc usr/share/doc/${PN}/{AUTHORS,README}
 }
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
index 4eb3dc730aab..b1c7772f2066 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild,v 1.1 2009/04/30 18:06:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild,v 1.2 2011/03/30 23:03:34 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit python
 
 DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers."
 HOMEPAGE="http://gtkcdlabel.sourceforge.net"
@@ -11,13 +16,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.5
-	>=app-cdr/cdlabelgen-4
+DEPEND=">=app-cdr/cdlabelgen-4
 	dev-python/pygtk"
-DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
 
 src_install() {
-	dobin usr/bin/${PN}.py || die "dobin failed"
+	newbin usr/bin/${PN}.py ${PN} || die "dobin failed"
 	insinto /usr/share
 	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
 	dodoc usr/share/doc/${PN}/{AUTHORS,README}