Version bump wrt #275585 by René Kjellerup.

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

3 files changed, 161 insertions, 2 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 17e1c30ad93c..89938939a94d 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.170 2009/05/22 11:49:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.171 2009/07/08 13:03:20 ssuominen Exp $
+
+*mpd-0.15 (08 Jul 2009)
+
+  08 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +mpd-0.15.ebuild:
+  Version bump wrt #275585 by René Kjellerup.
 
   22 May 2009; Samuli Suominen <ssuominen@gentoo.org> mpd-0.15_beta2.ebuild:
   Doxygen doesn't do much of anything in this beta release wrt #270812,
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 7e22feae4dce..8c41df9a894f 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,8 +2,10 @@ AUX 0.14.2-mpdconf.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SH
 AUX 0.15_beta2-mpdconf.patch 3125 RMD160 4e48dfaee8d7fbb9b0615efb19b223c74f0b0b34 SHA1 45df89770e81e74eae18a8ae6f9ab66671320c95 SHA256 706ff3f0f46ab3d71fd29f1c16b781dfd44dee5cde8091b52ccd2f2fd9af0058
 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664
 DIST mpd-0.14.2.tar.bz2 287115 RMD160 4580907acdf361713bf3fe881a47871e84dfa864 SHA1 1ac9f6eff72c9e061af670e195da824310f3d922 SHA256 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
+DIST mpd-0.15.tar.bz2 385833 RMD160 abb0fb12aa0d8c0f7e6f13f3ec9cba24e1f6e09e SHA1 05707b007a2fd51885aa301922c0ac15dcbf9c86 SHA256 38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
 DIST mpd-0.15_beta2.tar.bz2 370471 RMD160 91b67fa908d83f02b9e9b3580048f3df90b0e7e3 SHA1 6bc357ce73bf48f56fc1d529fc030c03117f9ff1 SHA256 d7d7ea4a961173856db28b96601fbebad727ee09fadb78a1c2af1e88c6f17ea1
 EBUILD mpd-0.14.2.ebuild 5250 RMD160 4f6bc7f0de68629ab19d86ac1b92060edf9e5b66 SHA1 8d27e89be1ae75b94bcf6d2ad8d8fd328efce283 SHA256 b27167ecefc77154b41c31f3302dcf9fa5ebe8f11d6cad75746baf94e5fb9a9a
+EBUILD mpd-0.15.ebuild 4665 RMD160 5deac365dcf3dc51e35a6656b0b7fb8d1316e8e5 SHA1 8633889d0f3ba8ac9e21c46835113210bf7c9ad3 SHA256 f674d33bd850575771a8854c7fef4a6bba4000cb891c444003579216dd9b3cac
 EBUILD mpd-0.15_beta2.ebuild 4803 RMD160 f9b8ce4d1549e3c8d7e82209da239f9d02d1b21a SHA1 84f923471317ab03dc8cc7e2132feb0a4865dbf6 SHA256 0adaa0f321264ffa83d382b0a3ffabd0e66cd0e34a38c8153ccdba5b17844834
-MISC ChangeLog 26006 RMD160 e3c952c4650a890a528fc1b94262198d1d8f2322 SHA1 e684e5bfac17c9f5bd0f2c85e785ee256e4587f1 SHA256 6ac8ac843bc1a2377841b40618401e43f2d60b9be6f5d4d40bc7cdac3a0d62a8
+MISC ChangeLog 26151 RMD160 19939941d281d7622188d50c4679de8c035e5b3f SHA1 10823499b9b5e29f16bbbf4bbfe73797d24e2f13 SHA256 12e25ffcd5f60af2d6b39e7ff558fe68343c037c9ee3ffe8c1ae9c69d9d27098
 MISC metadata.xml 1149 RMD160 7ad3a8c78eaee60551970dd731ae5feb592db985 SHA1 0f1ca4f4071da612c6b2d33bafb9ab5de8d6481a SHA256 0d8fc7200b53283e94d0167677d0a812770a2c20a0b4f232e90cb8727bee67b0
diff --git a/media-sound/mpd/mpd-0.15.ebuild b/media-sound/mpd/mpd-0.15.ebuild
new file mode 100644
index 000000000000..d7ae4588ef1e
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.ebuild
@@ -0,0 +1,152 @@
+# 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.ebuild,v 1.1 2009/07/08 13:03:20 ssuominen 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 )
+	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-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}"/${PV}_beta2-mpdconf.patch
+}
+
+src_configure() {
+	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)"
+	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
+}