Version bump

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 194 insertions, 6 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 04b8bdfe8525..e7f9f51b2f20 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.254 2011/05/15 21:13:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.255 2011/06/05 20:13:42 angelos Exp $
+
+*mpd-0.16.3 (05 Jun 2011)
+
+  05 Jun 2011; Christoph Mende <angelos@gentoo.org> +mpd-0.16.3.ebuild:
+  Version bump
 
   15 May 2011; Markus Meier <maekke@gentoo.org> mpd-0.16.2.ebuild:
   arm stable, bug #364469
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 317f76d712b1..092296f04d65 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.conf.patch 2646 RMD160 746a65c8eeba996e6fffd561912b82ad81edb9cc SHA1 204d30b2439f49360810ba3790a03381e533ba6d SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653
@@ -10,16 +10,18 @@ DIST mpd-0.15.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245
 DIST mpd-0.15.16.tar.bz2 392986 RMD160 8b5e627e9a52702003e0cd57806d78a195d711af SHA1 af5695af1ca2b12b5ac92d840bff28f111558209 SHA256 6f5b6c722e21a90dc0deace4897342410c58b3b81f15019aacc69d9cfabbaa8b
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.16.2.tar.bz2 478096 RMD160 74e63fe4514eb8309bf2b2e4e4012566e14b6262 SHA1 ce0b8cd473f8acb45c06d73f41c18fc4dabbe440 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
+DIST mpd-0.16.3.tar.bz2 477517 RMD160 860a308ec443896da43c7421db8895c5aff9bd91 SHA1 7990bad609064752175127527fcf2ecf8066e36f SHA256 58df79cfa89b365413ee720f3f605ff01a9aa32be1e176d523243954648731d2
 EBUILD mpd-0.15.15.ebuild 4820 RMD160 03fb6932903e85f5d582adb59ff9e8fceb3fc3bc SHA1 6567ce80cdd65f638b39986fa7390a279403d6c8 SHA256 a10377575361923434da39f1de1be106153d9c0de3c687089001f2fc074fd07d
 EBUILD mpd-0.15.16.ebuild 4826 RMD160 0ebf65bf6c137fae87da0d8ca6bebffec81084a6 SHA1 b5b1e46ad481eb37fd188eef413f2fb5633f9145 SHA256 e00eea9c1bb24aefe95c0fd45979e183e84b4986a974cc376bb00b7db1a5ca68
 EBUILD mpd-0.15.8.ebuild 4868 RMD160 23a32cc381b6404292b211d42e9088dfa5e2d29b SHA1 5c3f4898c665c464a4bd643571998a3552436798 SHA256 e9dba19eac0a9795a5e74a5fd8105a6d28ef5c307a72f76c92316919228c1dc9
 EBUILD mpd-0.16.2.ebuild 5429 RMD160 508c1e352fca953546b5943e1eede44eca44d8c9 SHA1 3d593cd63dc0abd6d596cbc10ed7560de226ba39 SHA256 47f655a0650b5d60bb8f5c7b871334d39a71f5a626cc844a19404dcc8a3f4fa7
-MISC ChangeLog 36861 RMD160 2ac9d4251ccf7fa11e4dd6595cb2eba4faba39c5 SHA1 e8b392632b854d46f6abc0f6d7553a41f1b5c00e SHA256 184da4f57ac8f35312051180bd9eff4814b1dfb83dbd39d788c5c42d59722e57
+EBUILD mpd-0.16.3.ebuild 5433 RMD160 285b9a81d0fa4fa728097d831461b3942b9f4de8 SHA1 8cf65bea9ad82b46ec6c22f5c60588c4aceca5bd SHA256 b866457b7b97470545601d32de8a1804ed32f7cf107f26db2c9095fcdd201fde
+MISC ChangeLog 36977 RMD160 f21555bccfd9ce3c82fc0c6b6d5594aeb53c6bc6 SHA1 e3b1765c20c3024242fc7a7ac5f0f5eacd8991e3 SHA256 e9fa0c6776e0c78260a7d48475f60c0542093601427e47ee3f1a6ca76f6e2c72
 MISC metadata.xml 1519 RMD160 4231c2d53cf47048c4638a9d49b48f7f72212550 SHA1 423766ff1530f40ef17a2c84c92add1ffe4a7d62 SHA256 f8c901bf6b4e25af758178c8b91d043771418ba112d435973b7ead5bd5151bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3QQmIACgkQkKaRLQcq0GKM4QCcD8OW3Fa7hIJHu5m9eIwbA+k5
-fCkAnjhu81aghbQqzcxN3mjjVGoiTeYc
-=IBKU
+iF4EAREIAAYFAk3r43sACgkQmWq1bYTyC0PgzAEAss2t9z1wt671y8X9T6pqGWkV
+JL8wNtadJsN+KPRULxsBAMaOms9KuhjFrtQG7K091AE74ddvOzW1od7377BZQ3l1
+=Dg92
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.16.3.ebuild b/media-sound/mpd/mpd-0.16.3.ebuild
new file mode 100644
index 000000000000..0edd4fd14ba9
--- /dev/null
+++ b/media-sound/mpd/mpd-0.16.3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3.ebuild,v 1.1 2011/06/05 20:13:42 angelos Exp $
+
+EAPI=4
+inherit eutils flag-o-matic linux-info 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 bzip2 cdio cue +curl debug +fifo +ffmpeg flac
+fluidsynth profile +id3 inotify ipv6 jack lame lastfmradio libmms libsamplerate
++mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
+sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
+	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
+			ogg flac sid vorbis wavpack wildmidi )
+	network? ( || ( audiofile flac lame twolame vorbis ) )
+	lastfmradio? ( curl )"
+
+RDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	aac? ( media-libs/faad2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/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 )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	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
+
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-tcp --enable-un	--disable-documentation
+		--disable-ffado --disable-gme --enable-largefile
+		--disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-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"
+
+	econf \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio iso9660) \
+		$(use_enable cue) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable ffmpeg) \
+		$(use_enable fifo) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable id3) \
+		$(use_enable inotify) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable libmms mms) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable profile gprof) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sid sidplay) \
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init mpd
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${D}"/etc/mpd.conf || die "sed 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
+}
+
+pkg_postinst() {
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
+	elog "sure that MPD's pid_file is unset."
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}