Depend on media-libs/alsa-lib instead of old style virtual/alsa bug #359007. Add a new revision to fix doc installation.

(Portage version: 2.1.9.42/cvs/Linux i686)

3 files changed, 102 insertions, 5 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index e9f512fe998b..f8b650c3063d 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/aqualung
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.13 2010/07/12 20:42:40 billie Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.14 2011/03/15 22:03:05 billie Exp $
+
+*aqualung-0.9_beta11-r1 (15 Mar 2011)
+
+  15 Mar 2011; Daniel Pielmeier <billie@gentoo.org> aqualung-0.9_beta11.ebuild,
+  +aqualung-0.9_beta11-r1.ebuild:
+  Depend on media-libs/alsa-lib instead of old style virtual/alsa bug #359007.
+  Add a new revision to fix doc installation.
 
   12 Jul 2010; Daniel Pielmeier <billie@gentoo.org>
   -files/aqualung-0.9_beta10-libmpcdecsv7.patch:
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
new file mode 100644
index 000000000000..3007ba6e3e6a
--- /dev/null
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 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.1 2011/03/15 22:03:05 billie Exp $
+
+EAPI=2
+
+inherit autotools eutils versionator
+
+MY_PV=$(delete_version_separator 2)
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="A music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.factorial.hu/"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua
+	mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio )
+	cddb? ( media-libs/libcddb )
+	flac? ( media-libs/flac )
+	ffmpeg? ( media-video/ffmpeg )
+	ifp? ( media-libs/libifp )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( dev-lang/lua )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	ladspa? ( media-libs/liblrdf )
+	dev-libs/libxml2
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	sed -i -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' doc/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_enable debug) \
+		$(use_with flac) \
+		$(use_with ffmpeg lavc) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with podcast) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with systray) \
+		$(use_with vorbis ogg) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack) \
+		--with-loop \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS README ChangeLog || die
+	newicon src/img/icon_64.png aqualung.png || die
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/aqualung-0.9_beta11.ebuild b/media-sound/aqualung/aqualung-0.9_beta11.ebuild
index 33e8f1f1f6e0..53c0fbc006e7 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 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/aqualung/aqualung-0.9_beta11.ebuild,v 1.4 2010/05/23 18:28:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11.ebuild,v 1.5 2011/03/15 22:03:05 billie Exp $
 
 EAPI=2
 
@@ -19,7 +19,7 @@ IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua
 	mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack"
 KEYWORDS="amd64 x86"
 
-RDEPEND="alsa? ( virtual/alsa )
+RDEPEND="alsa? ( media-libs/alsa-lib )
 	cdda? ( dev-libs/libcdio )
 	cddb? ( media-libs/libcddb )
 	flac? ( media-libs/flac )