append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" to be sure the correct libraries are found for libsidplay.

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

3 files changed, 21 insertions, 21 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index c3b68572a3ed..b48a34553c65 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.166 2009/05/17 14:40:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.167 2009/05/20 15:15:14 ssuominen Exp $
+
+  20 May 2009; Samuli Suominen <ssuominen@gentoo.org> mpd-0.15_beta2.ebuild:
+  append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" to be sure the
+  correct libraries are found for libsidplay.
 
   17 May 2009; Raúl Porcel <armin76@gentoo.org> mpd-0.14.2.ebuild:
   arm/sh/sparc stable wrt #262680
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c0e043a9c5a0..da80edae3846 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -7,6 +7,6 @@ DIST mpd-0.14.2.tar.bz2 287115 RMD160 4580907acdf361713bf3fe881a47871e84dfa864 S
 DIST mpd-0.15_beta2.tar.bz2 370471 RMD160 91b67fa908d83f02b9e9b3580048f3df90b0e7e3 SHA1 6bc357ce73bf48f56fc1d529fc030c03117f9ff1 SHA256 d7d7ea4a961173856db28b96601fbebad727ee09fadb78a1c2af1e88c6f17ea1
 EBUILD mpd-0.13.2.ebuild 3448 RMD160 6dfb85913c3d17ce8c7f244a5dda3d8ceb81ce76 SHA1 2177a554a61599e41882416aac907c42576b3236 SHA256 d7c6438aa15cdfff2db4646b0eef31041198e0f8c14923d75bc56537fc3ced90
 EBUILD mpd-0.14.2.ebuild 4518 RMD160 456c86380a816b1a1d97ad279bf56dcdc49989d4 SHA1 e57940dcaafe8cc3d6666342a90425396c56f787 SHA256 ee05ee06e5476b3f43ad5ac2f797425e0f0232e1238fa73593b1e41f674d4eb6
-EBUILD mpd-0.15_beta2.ebuild 4835 RMD160 22bc16d087b4f15cd5366708b7c5e00853df32bb SHA1 3925dab7478fe565e649bbe57457fec80a724ab0 SHA256 a1eb9524c7c870975f0e5e54c38b9ca7a7edf41f41cde38a3619816c8eda75dc
-MISC ChangeLog 25359 RMD160 b4de3f44994501a14ce05577f3fecd84635addcd SHA1 a8de0c574e58b53b6e679f774aff1cb1ba7e8dc8 SHA256 81d0414349b0c8920af2ca73e81434a54fbe3fa4992b629ef9c5dc17f506a1f7
+EBUILD mpd-0.15_beta2.ebuild 4893 RMD160 e7c41980d4676643e6352807a7f6294bb4d545f0 SHA1 4e8b5cb16ae22cf99b0ead489b17d0394f64fcc5 SHA256 ec2d3c13693bad13ceff7817accb255835a509af073b056f0b3449163d0bc275
+MISC ChangeLog 25557 RMD160 4b523d072a1ea2c40ab5d67041a67ed194df9f81 SHA1 6c07cd55ea73241333b20edcf379fdc2aada088a SHA256 a604d66bf6fc67f1ff5b5de596e5aa9c1b6ccaee10b0dd77bd16f5f35bb61dda
 MISC metadata.xml 1149 RMD160 7ad3a8c78eaee60551970dd731ae5feb592db985 SHA1 0f1ca4f4071da612c6b2d33bafb9ab5de8d6481a SHA256 0d8fc7200b53283e94d0167677d0a812770a2c20a0b4f232e90cb8727bee67b0
diff --git a/media-sound/mpd/mpd-0.15_beta2.ebuild b/media-sound/mpd/mpd-0.15_beta2.ebuild
index 671feede1b00..0002a56f9247 100644
--- a/media-sound/mpd/mpd-0.15_beta2.ebuild
+++ b/media-sound/mpd/mpd-0.15_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_beta2.ebuild,v 1.2 2009/05/17 07:37:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_beta2.ebuild,v 1.3 2009/05/20 15:15:14 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic
@@ -12,16 +12,16 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug doc +fifo +ffmpeg flac
-fluidsynth profile icecast +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
-mikmod modplug musepack network ogg oss pipe pulseaudio sid sqlite unicode
-vorbis wavpack zeroconf zip"
+IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug doc +fifo +ffmpeg flac
+fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
+mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
+vorbis wavpack zip"
 
 RDEPEND="!sys-cluster/mpich2
 	>=dev-libs/glib-2.4:2
 	aac? ( >=media-libs/faad2-2 )
 	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
+	ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
@@ -33,7 +33,7 @@ RDEPEND="!sys-cluster/mpich2
 	network? ( >=media-libs/libshout-2 )
 	id3? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( icecast? ( media-sound/lame ) )
+	lame? ( network? ( media-sound/lame ) )
 	libmms? ( >=media-libs/libmms-0.4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
@@ -46,7 +46,7 @@ RDEPEND="!sys-cluster/mpich2
 	sqlite? ( dev-db/sqlite:3 )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
-	zeroconf? ( net-dns/avahi )
+	avahi? ( net-dns/avahi )
 	zip? ( dev-libs/zziplib )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -56,14 +56,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P/_/\~}
 
 pkg_setup() {
-	if ! use network; then
-		ewarn "Icecast and Shoutcast HTTP streaming needs network."
-	fi
-
-	if use lastfmradio && ! use curl; then
-		eerror "Cannot enable lastfmradio without curl."
-	fi
-
+	use profile && ewarn "Profiling is only for developers, please don't
+	enable at random. Performance is poor with it."
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
 	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
 
 	enewuser mpd "" "" "/var/lib/mpd" audio
@@ -93,12 +88,13 @@ src_configure() {
 	fi
 
 	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
 
 	cd "${S}"
 
 	econf \
 		$(use_enable ipv6) $(use_enable cue) \
-		$(use_enable sqlite sqlite) $(use_enable curl) \
+		$(use_enable sqlite) $(use_enable curl) \
 		$(use_enable lastfmradio lastfm) $(use_enable libmms mms) \
 		$(use_enable bzip2) $(use_enable zip) \
 		$(use_enable cdio iso9660) $(use_enable id3) \
@@ -113,7 +109,7 @@ src_configure() {
 		$(use_enable jack) $(use_enable oss) \
 		$(use_enable pulseaudio pulse) $(use_enable aac) \
 		$(use_enable doc documentation) $(use_enable debug) \
-		$(use_enable profile gprof) $(use_with zeroconf zeroconf avahi) \
+		$(use_enable profile gprof) $(use_with avahi zeroconf avahi) \
 		${mpdconf}
 }