Version bump (bug 310945) and 0.15.8 stable on amd64 (bug 309389), thanks to Roeland Douma

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

4 files changed, 171 insertions, 5 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 686f4510f10c..1a97959ef4bb 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.201 2010/04/09 02:02:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.202 2010/05/01 11:20:43 angelos Exp $
+
+*mpd-0.15.9 (01 May 2010)
+
+  01 May 2010; Christoph Mende <angelos@gentoo.org> mpd-0.15.8.ebuild,
+  +mpd-0.15.9.ebuild:
+  Version bump (bug 310945) and 0.15.8 stable on amd64 (bug 309389), thanks
+  to Roeland Douma
 
   09 Apr 2010; Jeroen Roovers <jer@gentoo.org> mpd-0.15.8.ebuild:
   Stable for HPPA (bug #309389).
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 1b1b64800f92..d037b772918c 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,11 +6,13 @@ DIST mpd-0.15.3.tar.bz2 386521 RMD160 9d33e2ad3cd524428e1e786276f70a50a6c08456 S
 DIST mpd-0.15.5.tar.bz2 388223 RMD160 fcf0007952a09a1c4f711af87eaffc86d7d9ef31 SHA1 11dd020363d0c1ba1aa883d074a6c0e1d9df09fd SHA256 c1ccbc7976d923b46ebf2c1d4a8eaca2694fac04fc343228184a168d65978dbf
 DIST mpd-0.15.6.tar.bz2 389017 RMD160 613623e9c886e4205cd06fd76cb46d35352a8b26 SHA1 388d75165c8702f2905774067ee10b5db9e206e9 SHA256 b0b6a6e91c56ff991acceacb6369335935b751f5b44c0007eb5762d40d57327f
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
+DIST mpd-0.15.9.tar.bz2 390141 RMD160 566440dbc16ac46f20d8d11bfe09ffe43423eb34 SHA1 9dbef302ef44372f2232c1df1af2f3a958ff601d SHA256 4a57a1a0dc71606d0db926b67d5b2c1ed2bfaf94baca7889d4b994a37bf367bb
 DIST mpd-0.15.tar.bz2 385833 RMD160 abb0fb12aa0d8c0f7e6f13f3ec9cba24e1f6e09e SHA1 05707b007a2fd51885aa301922c0ac15dcbf9c86 SHA256 38d4c4073e81585c0f0b1a3b4909f7fecd0305de90f373a9a1c087090e6ddc20
 EBUILD mpd-0.15.3.ebuild 4870 RMD160 4ce3e1c581880ec2b3814a9c1adca398be20dc28 SHA1 268329a879770afb5d9bff69c87671df8ba31d38 SHA256 229b83bc8d1d88ac2b25af0489af6f2ada0ee328b93ba468ed31ee020d2e53ae
 EBUILD mpd-0.15.5.ebuild 4863 RMD160 3b031037eb6b3baffa48ebb098d6380fa52c8114 SHA1 ece007c7876bdefb01e17cdd0535ca546b05264a SHA256 cfefa77fc4957e6882de67be2aa6a67a9bfe7d38ed18741056534459b8d2901b
 EBUILD mpd-0.15.6.ebuild 4913 RMD160 d36bd15267342b10f8106aa9e642361a56658593 SHA1 ceb601c2984ab81cda56462ff1fa0da217a20eee SHA256 09a3f7968465cc3060f89a612709c3e7a286199e8f0a70276797828aa87dfe42
-EBUILD mpd-0.15.8.ebuild 4860 RMD160 f230fb42b189a3148e756a0aa21232c2e2c5e05f SHA1 39de0117cc020c8204979d3b506019380a9e58b4 SHA256 c4da701d073d2f74f0b91f0f3d0e53e65d09e6b38998aa347ed3a84739a5e5a0
+EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
+EBUILD mpd-0.15.9.ebuild 4871 RMD160 11fe0a19a6be9c25f74c4b5908ebb0be406d1268 SHA1 2dc66e80b1aa965a0f8c1ce3fd6db410219733d4 SHA256 03ebc06a529142f558bbac933d4e9d27be36219c7ccce98cf68bbb6e05a038e8
 EBUILD mpd-0.15.ebuild 4866 RMD160 ae0220a6b3ea3ea6746e369ddf6a637a74d8a2b9 SHA1 c6c79d9f3d6375b0e875c51284ccfa86d4664c15 SHA256 8e21756596cb6a4fbc488f85ef1900dfe49b1fb33b80c9b3c344a06c9f974833
-MISC ChangeLog 29741 RMD160 6310ddbb4c36647be8568d7610b258a955e44b12 SHA1 cb290ee8022e9cad172c7951680091761917f76e SHA256 57b542af64127e0a83d08c12806f56e2c7895431b436a0a4e5bf9c9fe2588a77
+MISC ChangeLog 29961 RMD160 8fb7cd1dc4fc47d00f7ee02921a205a2da3aea17 SHA1 6f898964923f03d9dcfa64dec2426407f32e64de SHA256 c759d7a49fbd8010d102cbedc7e0e46ed7093ef22d2b95af48b38b701ba83b32
 MISC metadata.xml 1102 RMD160 88cdb7b7217f759eb993ff82589c74115213add4 SHA1 3ddf0689c3e5d2afc7371cad27c7f873aab5cb9f SHA256 4fe3d580f53a860190580caad66ed95ca02f05ea21228983d83ca26418410206
diff --git a/media-sound/mpd/mpd-0.15.8.ebuild b/media-sound/mpd/mpd-0.15.8.ebuild
index a28a0be9f550..63ccd4137e59 100644
--- a/media-sound/mpd/mpd-0.15.8.ebuild
+++ b/media-sound/mpd/mpd-0.15.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.6 2010/04/09 02:02:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.7 2010/05/01 11:20:43 angelos Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
+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
diff --git a/media-sound/mpd/mpd-0.15.9.ebuild b/media-sound/mpd/mpd-0.15.9.ebuild
new file mode 100644
index 000000000000..eb495241ae53
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.9.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.9.ebuild,v 1.1 2010/05/01 11:20:43 angelos 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 )
+	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() {
+	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
+}