Use Python 2 (bug #313951).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/media-sound/jack/ChangeLog b/media-sound/jack/ChangeLog
index 2e3d064063de1491620b577ec4a7865cfd06725a..e67c647696d66e792a58f88abbf228c374485f03 100644 (file)
--- a/media-sound/jack/ChangeLog
+++ b/media-sound/jack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jack
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.18 2007/06/02 16:16:02 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.19 2010/05/28 21:08:01 arfrever Exp $
+
+  28 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  jack-3.0.0.ebuild, jack-3.1.1.ebuild:
+  Use Python 2 (bug #313951).
 
   02 Jun 2007; nixnut <nixnut@gentoo.org> jack-3.1.1.ebuild:
   Stable on ppc wrt bug 172952

diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 0fa15c0dacd522c7f0b94ab24f7dd84cbe640c0d..f8c9835305f453fb8b0e7b3c610c1294089116aa 100644 (file)
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -1,6 +1,6 @@
 DIST jack-3.0.0.tar.gz 311556 RMD160 fc9de2a431b94b9abd0bb06fdab52dda4f279ec7 SHA1 192c5389a2051ae0dbffdb13323c5aed1c0ec7c1 SHA256 ce324369cbc323cce23ff5a2dd95e20a7257ec08eb30e2508f6ef6d78f4aa88f
 DIST jack-3.1.1.tar.gz 318119 RMD160 16e9f5a8e0228b0fe6d1c742ffa1f8117a7268f5 SHA1 b529e2d53f8b626ea962e4d8c7b1ad9457e20401 SHA256 fef030c4ba68a747d11e04c8ec4ca545563dbef519a6b23a3ebd6bb9bcb038cc
-EBUILD jack-3.0.0.ebuild 1176 RMD160 069ab84be84498d665fc8f4605ab7870c3f3b922 SHA1 d9a74bdd0573ec51905574fc0af3bec53b4030d5 SHA256 6d78fdc58de328e10721c10400ff0e289e7de99cc07528780c2aef7eb87fe97f
-EBUILD jack-3.1.1.ebuild 1127 RMD160 a3cf613c10bee315e79315ce43fe6615b85b0023 SHA1 3bb6bc463a829760406e935e48b768e0a69a225f SHA256 a6e392899dcb7fc3e47a0f6129439a9826965940719e7cbfc0f513fab23bdd70
-MISC ChangeLog 1975 RMD160 f66378080f3a58bdf6b865aa0bfb662a1b39ec24 SHA1 500c0091d182087dc9bd9733faff5a7e32219eeb SHA256 9065a1c09c0ffcea94af3c4addb2a8b773364f32c4b31f3f321eee823e6320fa
+EBUILD jack-3.0.0.ebuild 1186 RMD160 009d360114138552eaa195b4c48f00a375a3abfd SHA1 83a498124ff779233907998fbcd102880d2471ff SHA256 857de2e58d146e572cef6b17ea8b75f73db96fb050404d6eff7ab5df917f9b6d
+EBUILD jack-3.1.1.ebuild 1031 RMD160 816c6af79afc78bb5ed0f3b2d3ac36f431b13a9e SHA1 a08c64c7f93e50ef42c6aff024de572d99281682 SHA256 e9783c9cdff51249817a916f89ca672cb968f616cb410c5a56e3ee7d78abbc48
+MISC ChangeLog 2121 RMD160 e892bb4ae341a90f8aa2d0eeb4fed0ba6f5ccdf6 SHA1 9f428b7eb953e480d9256b4c5117ff6840e1c505 SHA256 b8efc818ca06d63b094f9b22b0630ba7460589417a79c98b344306d8a8817c9c
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e

diff --git a/media-sound/jack/jack-3.0.0.ebuild b/media-sound/jack/jack-3.0.0.ebuild
index 341250c3951998892156f24c63bdb95f300002a5..7f128165f7cd980a623977af0eeb717d665d9b7c 100644 (file)
--- a/media-sound/jack/jack-3.0.0.ebuild
+++ b/media-sound/jack/jack-3.0.0.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.13 2009/08/03 13:04:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.14 2010/05/28 21:08:01 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
 inherit distutils
 
@@ -13,8 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-       sys-libs/ncurses"
+DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}
        dev-python/cddb-py
        dev-python/id3-py
@@ -24,6 +26,11 @@ RDEPEND="${DEPEND}
        media-sound/lame
        media-sound/cdparanoia"
 
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
 src_compile() {
        python setup-cursesmodule.py build || die "compilation failed"
 }
@@ -34,10 +41,9 @@ src_install() {
 
        dobin jack || die "dobin failed"
 
-       distutils_python_version
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages
-       insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-       doins jack_*py
+       insinto $(python_get_sitedir)
+       PYTHON_MODNAME="$(ls jack_*.py)"
+       doins ${PYTHON_MODNAME}
 
        newman jack.man jack.1
 

diff --git a/media-sound/jack/jack-3.1.1.ebuild b/media-sound/jack/jack-3.1.1.ebuild
index 1084d31c44d481dc9acfae5a64b065528738d98c..d86f2e9c5bddb756bc6edd4e080838a3bee8b4ab 100644 (file)
--- a/media-sound/jack/jack-3.1.1.ebuild
+++ b/media-sound/jack/jack-3.1.1.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.1.1.ebuild,v 1.7 2009/08/03 13:04:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.1.1.ebuild,v 1.8 2010/05/28 21:08:01 arfrever Exp $
 
-inherit distutils multilib
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
 
 DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
 HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
@@ -13,8 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="dev-lang/python
-       sys-libs/ncurses"
+DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}
        dev-python/cddb-py
        dev-python/id3-py
@@ -24,20 +26,19 @@ RDEPEND="${DEPEND}
        media-sound/lame
        media-sound/cdparanoia"
 
-src_compile() {
-       python setup.py build || die "compilation failed"
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
 }
 
 src_install() {
-       python setup.py install --root="${D}" \
-               || die "installation failed"
+       distutils_src_install
 
-       dobin jack
+       dobin jack || die "dobin failed"
 
-       distutils_python_version
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages
-       insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-       doins jack_*py
+       insinto $(python_get_sitedir)
+       PYTHON_MODNAME="$(ls jack_*.py)"
+       doins ${PYTHON_MODNAME}
 
        newman jack.man jack.1