Use Python 2 (bug #313521).

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

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index f4efeebeeeb03042e03bffba99e15c73d677f02e..c0905af158f2bffca1d30768dbd8d9b9ca0e5486 100644 (file)
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.307 2010/04/16 22:12:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.308 2010/04/19 16:16:39 arfrever Exp $
+
+  19 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  alsa-lib-1.0.23.ebuild:
+  Use Python 2 (bug #313521).
 
 *alsa-lib-1.0.23 (16 Apr 2010)
 

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index a3ebf1b3e318069c4d91702ea24c30a1a85a3e88..6c0ad6c7106e3f909de17593ce2bd2ab95d2191c 100644 (file)
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX alsa-lib-1.0.22-fd-leak.patch 1638 RMD160 c7605bc45d93b538f7ad4759fdccd6727878a76f SHA1 23d4ac7767d76dc71fb56d6ca007ab9d77847bda SHA256 79f73bc28f33c618b396aadbd775380cd0d8040cc0406f008fb5b595e9186ab2
 DIST alsa-lib-1.0.20.tar.bz2 794728 RMD160 8e0b48367abdd9d5746d2dc537014b1449e65e05 SHA1 0e6acce4301a4b3924e268a78e8c979a55cc8f88 SHA256 15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
 DIST alsa-lib-1.0.21a.tar.bz2 808475 RMD160 38e615c25a93f4529f06e079584d379439ed9600 SHA1 49032964d22404455f3173629f271324bd8af211 SHA256 a6ce09afadc5428b09667cef32f7eba4ce0ea45aca27819edbe188e076d70074
@@ -10,13 +7,6 @@ EBUILD alsa-lib-1.0.20-r1.ebuild 2745 RMD160 664b347652328094a722a01ab68cc1f5852
 EBUILD alsa-lib-1.0.21a.ebuild 2459 RMD160 6f858edbf7a3a668d5ff5725676d48e3d64e7c98 SHA1 4167226ed789c9953ac5ffa572c81d60b3cf479a SHA256 0ce5796e3dd35a56c39af284027e4c7f666d35dfb6a61d11135d21501ca3c3d5
 EBUILD alsa-lib-1.0.22-r1.ebuild 2524 RMD160 c4bdfabab1041fe52856ef7aaa0c8d49a53635c3 SHA1 8a7f22851aa0d1ba162e2f30d50aea7b61f26c85 SHA256 780a8c2f2ed6af969c98f2a22474b002b42b659f42316db0afcfda9418a8e69a
 EBUILD alsa-lib-1.0.22.ebuild 2476 RMD160 0188dd49b3186bce311aa6a12f7ec194c67ff6e9 SHA1 e55cbb159bd7c9c37de9d65cefc1b0fe8cbc3323 SHA256 afaa8fbc342eec31ad5584da5859763a89a5d1bf0d64bd61fd651a707caad5a8
-EBUILD alsa-lib-1.0.23.ebuild 2480 RMD160 b4dadeef494044a633320901f954cf5390094aac SHA1 b505fa355b85db51b6b40f0e3cfa81aa5d93c171 SHA256 2976fbc31adf5547517ee154c10b257a2ad36e909c810a30d7151b314564e087
-MISC ChangeLog 45253 RMD160 940397207472d259acdfcb0fd7261060f8f283e4 SHA1 177b95f1996621df0deab45f867d5518fbea3720 SHA256 39010486a7d76876f67e106c18b9bcb0858143fd97049699424c915389662365
+EBUILD alsa-lib-1.0.23.ebuild 2501 RMD160 ad89e9a6ca3e9eabbc88c8f19048fac99d1c03d5 SHA1 61a541a1cbc5644df9bd62d36a2c06ece4c3b322 SHA256 0076e77d3b4cb99c1b4cf4ecad9b940b9d0fbe80f73d24c5814411a065483d7d
+MISC ChangeLog 45383 RMD160 87db4408cfd9423e11903ccd51ed22b842790d99 SHA1 3e16dbd120f51b72f538251e9d1d34e87ccf304a SHA256 afa68dcd34c163adff6df91cdf4ce503aba05acaf45663c1dbf4a73cb32092c3
 MISC metadata.xml 349 RMD160 d53ee4e7e914ec155222ead9a6118ee8907b775a SHA1 20344a00a6f51ddc0dc4b8e0b09c8a21ba91cc4a SHA256 68b0f168985d3b03a0997eb9f9338662d1584dc7fe7ea35ae8f7564e5e20c2e3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvI4NoACgkQp5vW4rUFj5qe8gCffjZcgVW+GL/Htoe73/GpjZWn
-F+MAoLixkRS3O6Njwv1k1Gsayk86MK45
-=KMEV
------END PGP SIGNATURE-----

diff --git a/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild
index b56f278f28ff9ec481151574a85b117e9e3412b3..1b3bee053efd364c33f287dd3fd7836b081f7396 100644 (file)
--- a/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild,v 1.1 2010/04/16 22:12:08 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild,v 1.2 2010/04/19 16:16:39 arfrever Exp $
 
-inherit eutils libtool
+PYTHON_DEPEND="python? 2"
+
+inherit eutils libtool python
 
 MY_P="${P/_rc/rc}"
 S="${WORKDIR}/${MY_P}"
@@ -16,10 +18,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc debug alisp python"
 
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-       >=media-sound/alsa-headers-${PV}
+DEPEND=">=media-sound/alsa-headers-${PV}
        doc? ( >=app-doc/doxygen-1.2.6 )"
+RDEPEND=""
 
 IUSE_PCM_PLUGIN="copy linear route mulaw alaw adpcm rate plug multi shm file
 null empty share meter mmap_emul hooks lfloat ladspa dmix dshare dsnoop asym iec958
@@ -36,6 +37,10 @@ pkg_setup() {
                ewarn "are going to *misbehave* !"
                epause 5
        fi
+
+       if use python; then
+               python_set_active_version 2
+       fi
 }
 
 src_unpack() {
@@ -62,8 +67,7 @@ src_compile() {
                $(use_enable python) \
                --with-pcm-plugins="${ALSA_PCM_PLUGINS}" \
                --disable-dependency-tracking \
-               ${myconf} \
-               || die "configure failed"
+               ${myconf}
 
        emake || die "make failed"