Version bump and removed beta2 as mpdconf1.patch changed

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc9 x86_64

4 files changed, 59 insertions, 47 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/Manifest b/media-sound/mpd/Manifest
index a2c07230aa46..55da9f1f402b 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664
 AUX mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
-AUX mpdconf1.patch 2109 RMD160 66cd1274210f7085d38153ba51c21ddaed85032e SHA1 8fbcf704554a31a28d48ae29a77ef8379b370df5 SHA256 bb37d334524bf12ebe9e17c6347156ba757ffdec3e0d477dca9a22ef31cfd8ca
+AUX mpdconf1.patch 2110 RMD160 db0a16d43f2bd6e4d8425118c623d87c5a3d676d SHA1 737c4f91c1f1413b752d997765acf3cff3f8a99b SHA256 2741dafa3eb13ff2e3a056a143fc75bda9f7f315ee38b3e5df30c8ad6ad61b7b
 DIST mpd-0.13.2.tar.bz2 413347 RMD160 39825142d8f19ca04d7a2e025b59043a8adb53fa SHA1 3b826bc75c314e6db6715a978c9b405775d3478c SHA256 d98db80ec0bba7d4a82a8aecff965f6887f7b055ad064d8d5ccb55cc614cdfb5
-DIST mpd-0.14_beta2.tar.bz2 283107 RMD160 4c128e9e558a48114e4da171c3e0e8a17f14dac6 SHA1 444e8436a13c04a885bd1a902969e3121c3b4b2d SHA256 61ffe58221c0d6281367cd430f4efc9ae1b32f85ecf18c4961517b26b0142ad9
+DIST mpd-0.14_beta3.tar.bz2 283371 RMD160 95f86979e5d325962920605971c67f0086edd478 SHA1 88f8ba6f42a34a94f50bea19ac4fe9318cf4efb1 SHA256 b7621c4f4902ff2e9f9117b17f135ea9da97f86702b37deaa4801b6c8ed7e94e
 EBUILD mpd-0.13.2.ebuild 3699 RMD160 e324b79e1681272d5c311d0aae01b687582f1297 SHA1 149374a589fe726a1860985485208350b63db639 SHA256 2184961f6b4fba774a6c7b361db534c90d566b3074ae093cbd99d7b9c9e3f603
-EBUILD mpd-0.14_beta2.ebuild 3971 RMD160 fccf8f665b444b142eff371eabbfce449a58f464 SHA1 f7e902696466c15396161941595d958fd7ae9340 SHA256 eae94c10c2cad9ba5a87d382078dd002cbc9ffa71d6fe3543ea64f75361bfad2
-MISC ChangeLog 21499 RMD160 c6ce16f6f58ef7ff45097d600d33cc6ee8c2a914 SHA1 c0a6cf2313c71a39cc533a0d528f8a962c9eb1e2 SHA256 c268b6562f0cc10106ffa56944079f84f5dbb5f796cdfbaf3de194bd664a3fde
+EBUILD mpd-0.14_beta3.ebuild 3908 RMD160 ae171874dbfc470d3840c6b655a41a202d9d8bef SHA1 14d4d54577b45ae6218dacf555c7224d2019f9cd SHA256 05b29ff7cff2f0d882335bc0d8d08dc7e04b0046367e91b4ef69c6d45e19fe82
+MISC ChangeLog 21714 RMD160 ed7c809f80f81ad73ec83bc7057296824ecc3bc0 SHA1 5161023a7bebbcb2ef486a73db3dcf3471e22e13 SHA256 28e4684d5f7db6bc5c69f444b8e29e3108492b6de63ea41ec7ecfa0a0ebea91a
 MISC metadata.xml 376 RMD160 912f0c343887855312c7fd9867cba6b23291cec0 SHA1 3f59b493d6350cb20817bdb95d2283d96f8a9f50 SHA256 4db97047d3e3398f6ff4a8d7c581de110ebdd21c0f8dd64492a7e4cbbbbba853
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklNC4YACgkQKhnDs22gwa+jOgCfb0NHZY32Rll6dnnKvDtfbGAJ
+KXgAnRvRXuvhQjl8OPurx6Izx9yrhMRX
+=UBcO
+-----END PGP SIGNATURE-----
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