Version bump to alpha1 and remove snapshots so people actually get this update

(Portage version: 2.2_rc13/cvs/Linux 2.6.28-rc3 x86_64)

3 files changed, 38 insertions, 156 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index c9fd1c657784..e4b5f2b6a4d4 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.131 2008/11/07 10:29:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.132 2008/11/07 13:28:51 angelos Exp $
+
+*mpd-0.14_alpha1 (07 Nov 2008)
+
+  07 Nov 2008; Christoph Mende <angelos@gentoo.org> +mpd-0.14_alpha1.ebuild,
+  -mpd-0.14.0_pre20081015.ebuild, -mpd-0.14.0_pre20081103.ebuild:
+  Version bump to alpha1 and remove snapshots so people actually get this
+  update
 
   07 Nov 2008; Raúl Porcel <armin76@gentoo.org> mpd-0.13.2.ebuild:
   sparc stable wrt #242128
diff --git a/media-sound/mpd/mpd-0.14.0_pre20081103.ebuild b/media-sound/mpd/mpd-0.14.0_pre20081103.ebuild
deleted file mode 100644
index 298e31cc6d74..000000000000
--- a/media-sound/mpd/mpd-0.14.0_pre20081103.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.0_pre20081103.ebuild,v 1.1 2008/11/03 15:14:39 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac alsa ao audiofile avahi flac icecast iconv ipv6 jack libsamplerate mp3 mikmod musepack ogg oss pulseaudio unicode vorbis wavpack"
-
-DEPEND="!sys-cluster/mpich2
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	avahi? ( net-dns/avahi )
-	flac? ( media-libs/flac )
-	icecast? ( media-libs/libshout )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( media-libs/libmpcdec )
-	ogg? ( media-libs/libogg )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )"
-
-pkg_setup() {
-	if use ogg && use flac && ! built_with_use media-libs/flac ogg; then
-		eerror "To be able to play OggFlac files you need to build"
-		eerror "media-libs/flac with +ogg, to build libOggFLAC."
-		die "Missing libOggFLAC library."
-	fi
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
-}
-
-src_compile() {
-	local myconf
-
-	myconf=""
-
-	if use avahi; then
-		myconf="${myconf} --with-zeroconf=avahi"
-	else
-		myconf="${myconf} --with-zeroconf=no"
-	fi
-
-	if use ogg && use flac; then
-		myconf="${myconf} --enable-oggflac --enable-libOggFLACtest"
-	else
-		myconf="${myconf} --disable-oggflac --disable-libOggFLACtest"
-	fi
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa alsatest) \
-		$(use_enable ao) \
-		$(use_enable ao aotest) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable icecast shout) \
-		$(use_enable iconv) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mp3) \
-		$(use_enable mp3 id3) \
-		$(use_enable mikmod mod) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable musepack mpc) \
-		$(use_enable oss) \
-		$(use_enable ogg oggtest) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable vorbis vorbistest) \
-		$(use_enable wavpack) \
-		${myconf} || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/share/doc/mpd/
-	dodoc AUTHORS ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	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
-	fi
-	diropts -m0755 -o mpd -g audio
-	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
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd initscript, 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.0_pre20081015.ebuild b/media-sound/mpd/mpd-0.14_alpha1.ebuild
index 2945405aa522..46c96733351e 100644
--- a/media-sound/mpd/mpd-0.14.0_pre20081015.ebuild
+++ b/media-sound/mpd/mpd-0.14_alpha1.ebuild
@@ -1,30 +1,33 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.0_pre20081015.ebuild,v 1.1 2008/10/15 00:01:01 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_alpha1.ebuild,v 1.1 2008/11/07 13:28:51 angelos Exp $
 
 inherit eutils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+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 avahi flac icecast iconv ipv6 jack libsamplerate mp3 mikmod musepack ogg oss pulseaudio unicode vorbis wavpack"
+IUSE="aac alsa ao audiofile curl ffmpeg flac icecast iconv ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
 
 DEPEND="!sys-cluster/mpich2
 	aac? ( >=media-libs/faad2-2.0_rc2 )
 	alsa? ( media-sound/alsa-utils )
 	ao? ( >=media-libs/libao-0.8.4 )
 	audiofile? ( media-libs/audiofile )
-	avahi? ( net-dns/avahi )
+	zeroconf? ( net-dns/avahi )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
 	flac? ( media-libs/flac )
 	icecast? ( media-libs/libshout )
 	iconv? ( virtual/libiconv )
 	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( media-sound/lame )
 	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-libs/libmad
+	mad? ( media-libs/libmad
 	       media-libs/libid3tag )
 	mikmod? ( media-libs/libmikmod )
 	musepack? ( media-libs/libmpcdec )
@@ -33,6 +36,8 @@ DEPEND="!sys-cluster/mpich2
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )"
 
+S="${WORKDIR}/${PN}-${PV/_/~}"
+
 pkg_setup() {
 	if use ogg && use flac && ! built_with_use media-libs/flac ogg; then
 		eerror "To be able to play OggFlac files you need to build"
@@ -40,6 +45,11 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
+	if use shoutcast && ! use mad && ! use ogg; then
+		ewarn "USE=shoutcast enabled but mad and ogg disabled,"
+		ewarn "disabling shoutcast"
+	fi
+
 	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
@@ -54,35 +64,37 @@ src_compile() {
 
 	myconf=""
 
-	if use avahi; then
-		myconf="${myconf} --with-zeroconf=avahi"
+	if use zeroconf; then
+		myconf+=" --with-zeroconf=avahi"
 	else
-		myconf="${myconf} --with-zeroconf=no"
+		myconf+=" --with-zeroconf=no"
 	fi
 
 	if use ogg && use flac; then
-		myconf="${myconf} --enable-oggflac --enable-libOggFLACtest"
+		myconf=" --enable-oggflac --enable-libOggFLACtest"
+	else
+		myconf=" --disable-oggflac --disable-libOggFLACtest"
+	fi
+
+	if use icecast; then
+		myconf+=" $(use_enable ogg shout_ogg) $(use_enable mad shout_mp3)"
 	else
-		myconf="${myconf} --disable-oggflac --disable-libOggFLACtest"
+		myconf+=" --disable-shout_ogg --disable-shout_mp3"
 	fi
 
 	econf \
 		$(use_enable aac) \
 		$(use_enable alsa) \
-		$(use_enable alsa alsatest) \
 		$(use_enable ao) \
-		$(use_enable ao aotest) \
 		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
+		$(use_enable curl)
 		$(use_enable flac) \
 		$(use_enable flac libFLACtest) \
-		$(use_enable icecast shout) \
-		$(use_enable iconv) \
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable libsamplerate lsr) \
-		$(use_enable mp3) \
-		$(use_enable mp3 id3) \
+		$(use_enable mad mp3) \
+		$(use_enable mad id3) \
 		$(use_enable mikmod mod) \
 		$(use_enable mikmod libmikmodtest) \
 		$(use_enable musepack mpc) \
@@ -92,7 +104,7 @@ src_compile() {
 		$(use_enable vorbis oggvorbis) \
 		$(use_enable vorbis vorbistest) \
 		$(use_enable wavpack) \
-		${myconf} || die "could not configure"
+		${myconf}
 
 	emake || die "emake failed"
 }