From 95c0b89484222e616066b7a7515187059cf4a0e2 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 19 Apr 2010 16:16:39 +0000 Subject: Use Python 2 (bug #313521). (Portage version: HEAD/cvs/Linux x86_64) --- media-libs/alsa-lib/ChangeLog | 6 +++++- media-libs/alsa-lib/alsa-lib-1.0.23.ebuild | 18 +++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'media-libs') diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog index f4efeebeeeb0..c0905af158f2 100644 --- 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 + 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/alsa-lib-1.0.23.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.23.ebuild index b56f278f28ff..1b3bee053efd 100644 --- 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" -- cgit v1.2.3-65-gdbad