Use Python 2 (bug #313967).

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

4 files changed, 25 insertions, 24 deletions

diff --git a/media-sound/positron/ChangeLog b/media-sound/positron/ChangeLog
index 663a4a6f9408..895255d41865 100644
--- a/media-sound/positron/ChangeLog
+++ b/media-sound/positron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/positron
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/ChangeLog,v 1.19 2008/12/20 02:48:29 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/ChangeLog,v 1.20 2011/03/11 19:33:13 arfrever Exp $
+
+  11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  positron-1.1.ebuild:
+  Use Python 2 (bug #313967).
 
   20 Dec 2008; Alexis Ballier <aballier@gentoo.org> positron-1.1.ebuild:
   install doc in /usr/share/doc/PF, bug #241290
diff --git a/media-sound/positron/Manifest b/media-sound/positron/Manifest
index cba0b2cc3130..8543453b51b7 100644
--- a/media-sound/positron/Manifest
+++ b/media-sound/positron/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST positron-1.1.tar.gz 88427 RMD160 36ce9580b1fdc434d2febf4a2fd08ee413898c54 SHA1 c636be4313a88c719e310014e693c2550b7706df SHA256 c4f6311c58c29725dfca1e2110e1ef3608d07912051e8f16832837299943f0b4
-EBUILD positron-1.1.ebuild 770 RMD160 532e9263ff28c69c6b7b283ff332c47b23a75c1a SHA1 2c14e9f2be03ec5f90d73547d3bef86f599cb6ae SHA256 3c54613bf5ff8fe1af75179074170d4994d8b32397c74ea959137506f0159e00
-MISC ChangeLog 2232 RMD160 0c46b43483fd4655054aadd25d0b4b8629d30ff0 SHA1 e6eee89e4d74cfec09d3ef364aca0b1bb2119ee3 SHA256 c8ed113b0cb4ce4311ac12ca12c708d7e4700070b065e00acd80d31a09f1d082
+EBUILD positron-1.1.ebuild 840 RMD160 50202d10e35f55c97cd9bfdd5ec44f619f5c7fb1 SHA1 da4326b21e8b76697aa6c337ca39b068a17e5c36 SHA256 4d34c2e90e3ae6ac35fe46ee783386b0191ee4a47fcbbedcc34149f504a80ce8
+MISC ChangeLog 2359 RMD160 f107c38136913026f9d667c66fb65a5d2ad3c126 SHA1 4bc0eec75ec5db2b022dd3abf9b9db7a051aa3e9 SHA256 154240793ae504642bbfe7b5aa7f72e62788786738c1b6fba627c74fe09f7292
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklMXQQACgkQvFcC4BYPU0rx9QCgzm6h/1BughI/ViBuD6bcpTqW
-1BYAnisnr4RCETnetRgIZHMY7vq+caeU
-=07nY
------END PGP SIGNATURE-----
diff --git a/media-sound/positron/positron-1.1.ebuild b/media-sound/positron/positron-1.1.ebuild
index ea8bbe04bd45..9a54144f9fa8 100644
--- a/media-sound/positron/positron-1.1.ebuild
+++ b/media-sound/positron/positron-1.1.ebuild
@@ -1,6 +1,9 @@
-# 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/media-sound/positron/positron-1.1.ebuild,v 1.13 2008/12/20 02:48:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/positron/positron-1.1.ebuild,v 1.14 2011/03/11 19:33:13 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils
 
@@ -13,12 +16,16 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 IUSE="vorbis"
 
-DEPEND=">=dev-lang/python-2.2"
-RDEPEND="${DEPEND}
-	 vorbis? ( dev-python/pyvorbis )"
+DEPEND="vorbis? ( dev-python/pyvorbis )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
-src_unpack() {
-	distutils_src_unpack
+src_prepare() {
+	distutils_src_prepare
 	# install docs in /usr/share/doc/${PF}, bug #241290
 	sed -i -e "s:share/doc/positron:share/doc/${PF}:" setup.py
 }
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
index af4da0fa8c93..1773efebb007 100644
--- a/media-sound/puddletag/Manifest
+++ b/media-sound/puddletag/Manifest
@@ -1,6 +1,6 @@
 DIST puddletag-0.10.0.tar.gz 347497 RMD160 e4c2bac7c876f88d6dc11012a9a229aba2eacc7e SHA1 f8d0c3b89cc0b0788545b7d37e9cce1ebc608852 SHA256 38d8e8d8f36ca8aae3de83fa3df1cc31436a42688b8dd1eebf53b8cf28277547
 DIST puddletag-0.9.12.tar.gz 350571 RMD160 849355c11c076bfd32d950df9afb8f016bc6fe65 SHA1 865f41a715d94e5ef83ca371706d6df34992c728 SHA256 f003f6920366b9c29b1f3529137a71d0b5e641f64bfe96570790686f5731f011
-EBUILD puddletag-0.10.0.ebuild 1116 RMD160 49c8e51d0deafbd9fca1236b7b149cfe84156840 SHA1 a53cae2d50c74f75e9e4cac4495a55ab881d32ac SHA256 fd7cb691de47d749ab161c98c6f2d7ffeb7a3c4ddbe33f20ad59589f9b445125
-EBUILD puddletag-0.9.12.ebuild 1108 RMD160 09636974f2343aabcd064a6820f5fa8612efdfe3 SHA1 a2960e70151f05a8357afcc34799a01d2797d0dd SHA256 390e4274521317410b5f3504000efb9f9d0530371834825214dea61f94666c54
-MISC ChangeLog 1442 RMD160 d4e8a2bdc58ceb6aba4ff7968f2b39aef6db7570 SHA1 bbd6005ed09191519be563c09a299165a93dcd1b SHA256 94e7eb4771b42aeeacbe1608cdb7417d6bf4fd07f5f51aa665d7091d5e33ec01
+EBUILD puddletag-0.10.0.ebuild 1124 RMD160 370610b0383ce4925b6918d1dc5eb267836042f1 SHA1 e11cad4754042d157246c6a9ad170b0e11e9a2ae SHA256 9c7023ec164b3838ea08a1ca4ca6c1f1feb406973bc7843cf6abe6e138d45555
+EBUILD puddletag-0.9.12.ebuild 1116 RMD160 7506032e92ca6bdc1f7ea74bebb1c380db170fce SHA1 4f1a37c8611d8f3e83b055e26dc6f5f0cf88c7a9 SHA256 e3fd0d425f379c08ff857926d0e4aae1528b78fbd5a00138f359c571cca98a36
+MISC ChangeLog 1599 RMD160 e75e6a026822794b150f3293605c0eb843dd42a3 SHA1 00068e78b1913069598007326c990aa87071a428 SHA256 173b108c4f1b32fece4e6a9c239bfa09f9a10c860ac017652a841bd33f26d4f6
 MISC metadata.xml 403 RMD160 a7f84da8b40a3dfbefe89c81f8c6cb831affcb83 SHA1 60b7f236db05965fa992d9e4019c7bf6d455803a SHA256 b836298ddbe741ae7026ec8f3fccc322026d1e3fd904d88e8b59df9ac2951549