Enabled more USE flags by default to get expected behavior on default USE flags, added more verbose descriptions for USE=curl and USE=lame and removed 0.14.1

(Portage version: 2.2_rc26/cvs/Linux x86_64)

4 files changed, 12 insertions, 164 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 821492c78f53..a12b947d3151 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.158 2009/03/22 17:20:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.159 2009/03/27 18:47:58 angelos Exp $
+
+  27 Mar 2009; Christoph Mende <angelos@gentoo.org> metadata.xml,
+  -mpd-0.14.1.ebuild, mpd-0.14.2.ebuild:
+  Enabled more USE flags by default to get expected behavior on default USE
+  flags, added more verbose descriptions for USE=curl and USE=lame and
+  removed 0.14.1
 
   22 Mar 2009; Markus Meier <maekke@gentoo.org> mpd-0.14.2.ebuild:
   x86 stable, bug #262680
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index f3677811731f..60368bca8aca 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -7,7 +7,9 @@
 	<name>Christoph Mende</name>
   </maintainer>
   <use>
+	<flag name="curl">Support for web streams</flag>
 	<flag name="icecast">Enable support for Icecast2</flag>
 	<flag name="id3">Support for ID3 tags</flag>
+	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.14.1.ebuild b/media-sound/mpd/mpd-0.14.1.ebuild
deleted file mode 100644
index 232ac27cd561..000000000000
--- a/media-sound/mpd/mpd-0.14.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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.14.1.ebuild,v 1.1 2009/01/18 23:59:47 angelos Exp $
-
-EAPI=2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-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 curl debug doc ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
-
-RDEPEND="!sys-cluster/mpich2
-	>=dev-libs/glib-2.4:2
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac
-		ogg? ( media-libs/flac[ogg] ) )
-	icecast? ( lame? ( media-libs/libshout )
-		vorbis? ( media-libs/libshout ) )
-	id3? ( media-libs/libid3tag )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( icecast? ( media-sound/lame ) )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( media-libs/libmpcdec )
-	ogg? ( media-libs/libogg )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-text/xmlto )"
-
-pkg_setup() {
-	if use icecast && ! use lame && ! use vorbis; then
-		ewarn "USE=icecast enabled but lame and vorbis disabled,"
-		ewarn "disabling icecast"
-	fi
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_prepare() {
-	cp doc/mpdconf.example doc/mpdconf.dist
-	epatch "${FILESDIR}"/mpdconf1.patch
-}
-
-src_configure() {
-	local myconf=""
-
-	if ! use alsa && ! use ao && ! use icecast && ! use jack && ! use oss && \
-		! use pulseaudio; then
-		eerror "You did not enable any output backend."
-		einfo "Please enable one of the following USE flags:"
-		einfo "USE=alsa - output via ALSA"
-		einfo "USE=ao - output via media-libs/libao"
-		einfo "USE=icecast - output via net-misc/icecast"
-		einfo "USE=jack - output via media-sound/jack-audio-connection-kit"
-		einfo "USE=oss - output via OSS"
-		einfo "USE=pulseaudio - output via media-sound/pulseaudio"
-		die "No audio output enabled"
-	fi
-
-	if use icecast; then
-		myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)
-			$(use_enable lame lametest) $(use_enable lame)"
-	else
-		myconf+=" --disable-shout_ogg --disable-shout_mp3 --disable-lametest
-			--disable-lame"
-	fi
-
-	if use ogg && use flac; then
-		myconf+=" --enable-oggflac --enable-libOggFLACtest"
-	else
-		myconf+=" --disable-oggflac --disable-libOggFLACtest"
-	fi
-
-	append-lfs-flags
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable ffmpeg) \
-		$(use_enable flac) \
-		$(use_enable id3) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mad mp3) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		--enable-un \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable wavpack) \
-		$(use_with zeroconf zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/doc/mpd/
-
-	dodoc AUTHORS NEWS README TODO UPGRADING
-	dodoc doc/mpdconf.dist
-	use doc && dohtml doc/protocol.html
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.rc mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			/etc/mpd.conf || die "dosed failed"
-	fi
-
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-	dodir /var/log/mpd
-	keepdir /var/log/mpd
-
-	if use alsa; then
-		dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
-	elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.14.2.ebuild b/media-sound/mpd/mpd-0.14.2.ebuild
index 5d91667a541f..0f76fcbdf4ea 100644
--- a/media-sound/mpd/mpd-0.14.2.ebuild
+++ b/media-sound/mpd/mpd-0.14.2.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.14.2.ebuild,v 1.6 2009/03/22 17:20:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.2.ebuild,v 1.7 2009/03/27 18:47:58 angelos Exp $
 
 EAPI=2
 
@@ -13,7 +13,8 @@ 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 curl debug doc +ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
+IUSE="aac +alsa ao audiofile +curl debug doc +ffmpeg flac icecast +id3 ipv6 jack
+lame libsamplerate +mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
 
 RDEPEND="!sys-cluster/mpich2
 	>=dev-libs/glib-2.4:2