Version bump and removed beta2 as mpdconf1.patch changed

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc9 x86_64)

3 files changed, 45 insertions, 43 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 2e17a15ff55c..219ba570cdbb 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.139 2008/12/05 22:35:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.140 2008/12/20 15:13:00 angelos Exp $
+
+*mpd-0.14_beta3 (20 Dec 2008)
+
+  20 Dec 2008; Christoph Mende <angelos@gentoo.org> files/mpdconf1.patch,
+  -mpd-0.14_beta2.ebuild, +mpd-0.14_beta3.ebuild:
+  Version bump and removed beta2 as mpdconf1.patch changed
 
 *mpd-0.14_beta2 (05 Dec 2008)
 
diff --git a/media-sound/mpd/files/mpdconf1.patch b/media-sound/mpd/files/mpdconf1.patch
index 9ccbbff5d93f..f48208106a26 100644
--- a/media-sound/mpd/files/mpdconf1.patch
+++ b/media-sound/mpd/files/mpdconf1.patch
@@ -16,7 +16,7 @@
 +db_file                         "/var/lib/mpd/database"
 +log_file                        "/var/log/mpd/mpd.log"
 +error_file                      "/var/log/mpd/mpd.error.log"
- #follow_outside_symlinks         "no"
+ #follow_outside_symlinks         "yes"
  #follow_inside_symlinks          "yes"
  ################################################################
 @@ -17,13 +17,13 @@
diff --git a/media-sound/mpd/mpd-0.14_beta2.ebuild b/media-sound/mpd/mpd-0.14_beta3.ebuild
index 4814b832e2c8..181d6581aa99 100644
--- a/media-sound/mpd/mpd-0.14_beta2.ebuild
+++ b/media-sound/mpd/mpd-0.14_beta3.ebuild
@@ -1,8 +1,8 @@
 # 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_beta2.ebuild,v 1.1 2008/12/05 22:35:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_beta3.ebuild,v 1.1 2008/12/20 15:13:00 angelos Exp $
 
-EAPI=1
+EAPI=2
 
 inherit flag-o-matic eutils
 
@@ -13,9 +13,9 @@ 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 ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio sysvipc 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 sysvipc unicode vorbis wavpack zeroconf"
 
-DEPEND="!sys-cluster/mpich2
+RDEPEND="!sys-cluster/mpich2
 	>=dev-libs/glib-2.4:2
 	aac? ( >=media-libs/faad2-2.0_rc2 )
 	alsa? ( media-sound/alsa-utils )
@@ -23,8 +23,10 @@ DEPEND="!sys-cluster/mpich2
 	audiofile? ( media-libs/audiofile )
 	curl? ( net-misc/curl )
 	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	icecast? ( lame? ( media-libs/libshout ) )
+	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 ) )
@@ -34,20 +36,16 @@ DEPEND="!sys-cluster/mpich2
 	musepack? ( media-libs/libmpcdec )
 	ogg? ( media-libs/libogg )
 	pulseaudio? ( media-sound/pulseaudio )
-	zeroconf? ( net-dns/avahi )
-	vorbis? ( media-libs/libvorbis
-		icecast? ( media-libs/libshout ) )
-	wavpack? ( media-sound/wavpack )"
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-text/xmlto )"
 
 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"
-		eerror "media-libs/flac with +ogg, to build libOggFLAC."
-		die "Missing libOggFLAC library."
-	fi
-
 	if use icecast && ! use lame && ! use vorbis; then
 		ewarn "USE=icecast enabled but lame and vorbis disabled,"
 		ewarn "disabling icecast"
@@ -56,33 +54,30 @@ pkg_setup() {
 	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/mpdconf1.patch
 }
 
-src_compile() {
-	local myconf
-
-	myconf=""
+src_configure() {
+	local myconf=""
 
-	if use zeroconf; then
-		myconf+=" --with-zeroconf=avahi"
+	if use icecast; then
+		myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)
+			$(use_enable lame lametest)"
 	else
-		myconf+=" --with-zeroconf=no"
+		myconf+=" --disable-shout_ogg --disable-shout_mp3"
 	fi
 
 	if use ogg && use flac; then
-		myconf=" --enable-oggflac --enable-libOggFLACtest"
+		myconf+=" --enable-oggflac --enable-libOggFLACtest"
 	else
-		myconf=" --disable-oggflac --disable-libOggFLACtest"
+		myconf+=" --disable-oggflac --disable-libOggFLACtest"
 	fi
 
-	if use icecast; then
-		myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)"
+	if use zeroconf; then
+		myconf+=" --with-zeroconf=avahi"
 	else
-		myconf+=" --disable-shout_ogg --disable-shout_mp3"
+		myconf+=" --with-zeroconf=no"
 	fi
 
 	append-lfs-flags
@@ -93,6 +88,7 @@ src_compile() {
 		$(use_enable ao) \
 		$(use_enable audiofile) \
 		$(use_enable curl) \
+		$(use_enable debug) \
 		$(use_enable ffmpeg) \
 		$(use_enable flac) \
 		$(use_enable id3) \
@@ -108,8 +104,6 @@ src_compile() {
 		$(use_enable vorbis oggvorbis) \
 		$(use_enable wavpack) \
 		${myconf}
-
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -118,19 +112,21 @@ src_install() {
 	fperms 750 /var/run/mpd
 	keepdir /var/run/mpd
 
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/share/doc/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.example
+	use doc && dodoc 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
-	fi
+	use unicode && \
+		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			/etc/mpd.conf || die "dosed failed"
+
 	diropts -m0755 -o mpd -g audio
 	dodir /var/lib/mpd/music
 	keepdir /var/lib/mpd/music
@@ -140,11 +136,11 @@ src_install() {
 	keepdir /var/log/mpd
 
 	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
+		dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
 }
 
 pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd initscript, please make"
+	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