Version bump. Fixes bug 281738.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

3 files changed, 169 insertions, 2 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 79549316172a..701e65844164 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.181 2009/08/16 14:28:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.182 2009/08/19 22:49:15 yngwin Exp $
+
+*mpd-0.15.2 (19 Aug 2009)
+
+  19 Aug 2009; Ben de Groot <yngwin@gentoo.org> +mpd-0.15.2.ebuild:
+  Version bump. Fixes bug 281738.
 
   16 Aug 2009; Raúl Porcel <armin76@gentoo.org> mpd-0.15.ebuild:
   arm/sh/sparc stable wrt #278677
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 2c2bde8983ae..454200818781 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,9 +4,11 @@ AUX 0.15_beta2-mpdconf.patch 3125 RMD160 4e48dfaee8d7fbb9b0615efb19b223c74f0b0b3
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
 DIST mpd-0.14.2.tar.bz2 287115 RMD160 4580907acdf361713bf3fe881a47871e84dfa864 SHA1 1ac9f6eff72c9e061af670e195da824310f3d922 SHA256 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
 DIST mpd-0.15.1.tar.bz2 385800 RMD160 595370f38b8f6fe80b14551214956088562f3d9c SHA1 eca8821e2c34b37232621b7219e39f0a6d67d190 SHA256 4a7a00ebefee0f95e6d4a9e34c41ca1f775046d2ae1e356e1382ccbaaba58fbf
+DIST mpd-0.15.2.tar.bz2 386742 RMD160 7e9f867cafc55155b77a5a325ff7f45c2f1662a9 SHA1 184ece57bb880dda9542fdb207fd43298b369373 SHA256 ddd08d17e4d553b0d7d3883069464d6efd3c1a39189772f0bc503ca3e024d51e
 DIST mpd-0.15.tar.bz2 385833 RMD160 abb0fb12aa0d8c0f7e6f13f3ec9cba24e1f6e09e SHA1 05707b007a2fd51885aa301922c0ac15dcbf9c86 SHA256 38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
 EBUILD mpd-0.14.2.ebuild 5250 RMD160 4f6bc7f0de68629ab19d86ac1b92060edf9e5b66 SHA1 8d27e89be1ae75b94bcf6d2ad8d8fd328efce283 SHA256 b27167ecefc77154b41c31f3302dcf9fa5ebe8f11d6cad75746baf94e5fb9a9a
 EBUILD mpd-0.15.1.ebuild 4953 RMD160 1bd083aff38413037ed4c12e58dabd841facdb81 SHA1 dd6c9f20779d29296ff8377dcc788ea53e42f13b SHA256 635886173e0332c4c54139019062dcadf7f9e18212d84634bb196f8a6acc1580
+EBUILD mpd-0.15.2.ebuild 4951 RMD160 309516cc178e2529f29364ab77a3a0566d47305f SHA1 a99575948b753eb4fcd482ad2687a2374244cf47 SHA256 4dc630d00f2ca18774276050656a2b7654ce36474d6e2afd0c0cad696c6ce2f9
 EBUILD mpd-0.15.ebuild 4906 RMD160 299434fa5d21f8d291f2dfeecd1dd8e30ae63772 SHA1 30a18ebb4a9328b29f57f6095e38640d7aad88dd SHA256 a9e53025a907ebfbd584cbbbd758f4abd053623a3bd7a1ee7d1461754f5ace11
-MISC ChangeLog 27380 RMD160 62645ca8f4a548d406dcb2f3220e5d925aa607d6 SHA1 4068ede966300a1217e1a23de3fcf1da621777d1 SHA256 fdf5ac3b642e171c4bf973ca0a49909759f7c8e32fc3cb08ccef3fb75fb138e7
+MISC ChangeLog 27509 RMD160 7070aef977f6a33882148dca0e55a0fcc38a5f22 SHA1 5b79ec80f4c9732d1916499b9b99ee2792fd284c SHA256 443ebe0e885a2d81bb4e4c4e6b26692d69209a1f8db850ee004c6c0e39f8a443
 MISC metadata.xml 1149 RMD160 7ad3a8c78eaee60551970dd731ae5feb592db985 SHA1 0f1ca4f4071da612c6b2d33bafb9ab5de8d6481a SHA256 0d8fc7200b53283e94d0167677d0a812770a2c20a0b4f232e90cb8727bee67b0
diff --git a/media-sound/mpd/mpd-0.15.2.ebuild b/media-sound/mpd/mpd-0.15.2.ebuild
new file mode 100644
index 000000000000..668ddc24f759
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.2.ebuild
@@ -0,0 +1,160 @@
+# 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.2.ebuild,v 1.1 2009/08/19 22:49:15 yngwin Exp $
+
+EAPI=2
+inherit eutils flag-o-matic multilib
+
+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 avahi bzip2 cdio cue +curl debug +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[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	cue? ( >=media-libs/libcue-0.13 )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	id3? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmms? ( >=media-libs/libmms-0.4 )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( || ( >=media-sound/musepack-tools-444
+		media-libs/libmpcdec ) )
+	ogg? ( media-libs/libogg )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( >=media-libs/libsidplay-2.1.1-r2:2 )
+	sqlite? ( dev-db/sqlite:3 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	avahi? ( net-dns/avahi )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/0.15.1-mpdconf.patch
+}
+
+src_configure() {
+	use profile && filter-flags -fomit-frame-pointer
+
+	local mpdconf="--enable-tcp --enable-un --disable-wildmidi
+		--disable-libOggFLACtest --disable-documentation"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)"
+		if ! use lame && ! use vorbis; then
+			ewarn "At least one encoder is required, enabling vorbis for you."
+			mpdconf+=" --enable-vorbis-encoder"
+		fi
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder"
+	fi
+
+	if use flac && use ogg; then
+		mpdconf+=" --enable-oggflac"
+	else
+		mpdconf+=" --disable-oggflac"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	cd "${S}"
+
+	econf \
+		$(use_enable ipv6) $(use_enable cue) \
+		$(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) \
+		$(use_enable audiofile) $(use_enable ffmpeg) \
+		$(use_enable flac) $(use_enable mad) \
+		$(use_enable mikmod) $(use_enable modplug) \
+		$(use_enable musepack mpc) $(use_enable vorbis) \
+		$(use_enable sid sidplay) $(use_enable fluidsynth) \
+		$(use_enable wavpack) $(use_enable libsamplerate lsr) \
+		$(use_enable alsa) $(use_enable ao) \
+		$(use_enable fifo) $(use_enable pipe pipe-output) \
+		$(use_enable jack) $(use_enable oss) \
+		$(use_enable pulseaudio pulse) $(use_enable aac) \
+		$(use_enable debug) $(use_enable profile gprof) \
+		$(use_with avahi zeroconf avahi) \
+		${mpdconf}
+}
+
+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 UPGRADING doc/mpdconf.dist
+
+	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
+}