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

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 105 insertions, 7 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/Manifest b/media-sound/aqualung/Manifest
index 4f9be7514cda..cb843de1c2a5 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,4 +1,5 @@
 DIST aqualung-0.9beta11.tar.gz 1584700 RMD160 3ff28f7611db89290baa1b0b8528c0ba5e79a762 SHA1 7a52a82ced0554acad56bd18f5ec707bf9fa85a0 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd
-EBUILD aqualung-0.9_beta11.ebuild 2348 RMD160 7ad7e1e6c9e53c827d07cafd64d287ccddd8c5db SHA1 327d317d210a3fc761f8b62e411d58f6d72898f0 SHA256 ba6b3d2f5e0e542214c31b4462e6a42199fa42a86f8018caf33ca04235771a94
-MISC ChangeLog 2618 RMD160 43649fb7637b7d5ff0488a080f33a7eb34c5d641 SHA1 aaf0d1c0bb4a4e64305205a043552eab392da723 SHA256 72fd2cc7f6fafdc300d421f0ec01961cbcef045613e65f89492a35211935156a
+EBUILD aqualung-0.9_beta11-r1.ebuild 2508 RMD160 453cdfeb5b0d365a7cd9986f6597d85df1270bb2 SHA1 d5c52abde3b49c73a9296c32d50e2febe9a94144 SHA256 8b45f031c6427647a21bcd79108d987bded24dfbcde870eb2ee2ace91d775b9d
+EBUILD aqualung-0.9_beta11.ebuild 2356 RMD160 2b3d30d6150dee63f7d69ad753ba336d2ebe9486 SHA1 9f40e7b131bd0445bf8729f38e090ba057f6a595 SHA256 505f3a45002231d579fce54da06b31f878b5bdc0c82ef15de441ead78994f8a5
+MISC ChangeLog 2897 RMD160 0f8bec1dfc368e6318c165ec908ca333a4491a34 SHA1 6a1089186477d9b2f10d0efa24282005112282cc SHA256 7956c790e3110599649d92a87b97077f2a19e00eafee27918b2a7567c5568e47
 MISC metadata.xml 663 RMD160 f62e66e7b9c130ea967c3f82bc59c24b43194cf9 SHA1 1841f9a0738b59214aa523f8240af8ed98737f34 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575
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 )