diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2013-01-20 10:05:03 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2013-01-20 10:05:03 +0000 |
| commit | 6a963bc02f5ffe068c9d6d3c653790027347ebf1 (patch) | |
| tree | 47543cd842dd79007dd8fd5dac751933375f7635 /media-sound | |
| parent | Add fixes patch from bug #446906 (diff) | |
| download | gentoo-2-6a963bc02f5ffe068c9d6d3c653790027347ebf1.tar.gz gentoo-2-6a963bc02f5ffe068c9d6d3c653790027347ebf1.tar.bz2 gentoo-2-6a963bc02f5ffe068c9d6d3c653790027347ebf1.zip | |
Restrict libcdio version to <0.90 for stable aqualung and remove 0.90 support from arch version until a proper patch is available.
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 215AD14D)
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/aqualung/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild | 10 | ||||
| -rw-r--r-- | media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild | 13 |
3 files changed, 11 insertions, 19 deletions
diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog index 23a2b4e1d711..3d2b9be96832 100644 --- a/media-sound/aqualung/ChangeLog +++ b/media-sound/aqualung/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/aqualung # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.27 2013/01/17 21:19:34 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.28 2013/01/20 10:05:03 billie Exp $ + + 20 Jan 2013; Daniel Pielmeier <billie@gentoo.org> + aqualung-0.9_beta11-r1.ebuild, aqualung-0.9_beta11-r2.ebuild: + Restrict libcdio version to <0.90 for stable aqualung and remove 0.90 support + from arch version until a proper patch is available. *aqualung-0.9_beta11-r2 (17 Jan 2013) diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild index ad991b0012f3..8b994bf42a07 100644 --- a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild +++ b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.12 2013/01/17 21:16:54 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.13 2013/01/20 10:05:03 billie Exp $ EAPI=4 @@ -20,7 +20,7 @@ IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua KEYWORDS="amd64 x86" RDEPEND="alsa? ( media-libs/alsa-lib ) - cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) + cdda? ( <dev-libs/libcdio-0.90[-minimal] ) cddb? ( media-libs/libcddb ) flac? ( media-libs/flac ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) @@ -57,12 +57,6 @@ src_prepare() { -e '/BUILD_CFLAGS/s:-O2::' \ -e '/BUILD_CFLAGS/s: -ggdb -g -O0::' \ configure.ac || die - if has_version dev-libs/libcdio-paranoia; then - sed -i \ - -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ - -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ - src/*.{c,h} src/decoder/dec_cdda.h || die - fi eautoreconf } diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild index 660465914ee0..a4fe99b2d944 100644 --- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild +++ b/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.1 2013/01/17 21:16:54 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.2 2013/01/20 10:05:03 billie Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua +IUSE="alsa cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack" RDEPEND="sys-libs/zlib @@ -38,7 +38,6 @@ RDEPEND="sys-libs/zlib wavpack? ( media-sound/wavpack ) ladspa? ( media-libs/liblrdf ) libsamplerate? ( media-libs/libsamplerate ) - cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) ifp? ( media-libs/libifp ) cddb? ( media-libs/libcddb ) lua? ( dev-lang/lua )" @@ -60,12 +59,6 @@ src_prepare() { -e '/BUILD_CFLAGS/s:-O2::' \ -e '/BUILD_CFLAGS/s: -ggdb -g -O0::' \ configure.ac || die - if has_version dev-libs/libcdio-paranoia; then - sed -i \ - -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \ - -e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \ - src/*.{c,h} src/decoder/dec_cdda.h || die - fi eautoreconf } @@ -93,7 +86,7 @@ src_configure() { $(use_with wavpack) \ $(use_with ladspa) \ $(use_with libsamplerate src) \ - $(use_with cdda) \ + --without-cdda \ $(use_with ifp) \ $(use_with cddb) \ $(use_with lua) \ |