Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 174 insertions, 6 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8d6d7b401d18..60db5afc267d 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.239 2011/02/28 17:26:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.240 2011/03/14 22:19:39 hwoarang Exp $
+
+*mpd-0.15.16 (14 Mar 2011)
+
+  14 Mar 2011; Markos Chandras <hwoarang@gentoo.org> +mpd-0.15.16.ebuild:
+  Version bump
 
   28 Feb 2011; <angelos@gentoo.org> mpd-0.16.1-r2.ebuild:
   wave-encoder is only used with USE=network
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index d04d02ec452b..4cc90ff70168 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.conf.patch 2655 RMD160 ad8a9eb214c1c446505becedfe2587bd1997cbaa SHA1 d695f1a8d885e5f44f394e39a76a0d700b955ab6 SHA256 c6b9573c035fb3aace9a0d5277503d7ca6184d92798fbb3f17dd85596e0926fd
@@ -7,18 +7,30 @@ AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c
 AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
 DIST mpd-0.15.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245 SHA1 2ec37cc32469255ea603d15617f100d1f12e766c SHA256 db6dc242722e3178bcbff6b67ced8caccbb8dcddf867b8ab6bab42d6e55982ab
+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.1.tar.bz2 480244 RMD160 f96ecb6a337043ea4982a2fa609d026b0d571647 SHA1 328d6d1e118e7d0029535559b2ae87ac10b79d6e SHA256 b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
 EBUILD mpd-0.15.15.ebuild 4811 RMD160 5d07d81ddbdcea0338df757eecd9955ff34d8a8c SHA1 41c0f95e3c7a5562e75e9b03fdd10019e38caff1 SHA256 646f6b819c080188a15539c9abd2ab3b24d124e3c451cdfb5c3ad87f00062ea3
+EBUILD mpd-0.15.16.ebuild 4822 RMD160 36024de0158db3f2766519ab49031058c4351686 SHA1 ada86d45f6392e4cd555225a1c618cb6a01182a7 SHA256 17926b55b0b928b150b5354533dbe2a99ca8f03da1429d9dcee089c315331de3
 EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
 EBUILD mpd-0.16.1-r1.ebuild 5212 RMD160 195e74c78a11b19437b34d0980d0f5b95d79a1b6 SHA1 67471c4a459e5efb5023167565c3f2cc559cc677 SHA256 d9c20bbfd3b990f3429e772f627eb43d217e777d2dbb05408ef049a562bca704
 EBUILD mpd-0.16.1-r2.ebuild 5540 RMD160 2effae36f38f07a549c865bcfc784359f395b449 SHA1 f2d0e6fa8d61c127f6125e529eb2e75b94020ab9 SHA256 7932652d7e8da805787e60657ce5d3fb43ddf19460e4ab728b6c32e9f6b7b3fa
-MISC ChangeLog 35020 RMD160 94dd948f6e7ba6af5a8b9cab1d8b4b2f7b6a85af SHA1 370d8757498a9c1d6f3025b28d2ed55ac7391e58 SHA256 d1310f9ef464b5080dcbfebeac9a95adeb5d44833bc093d393669e35a7fd61d7
+MISC ChangeLog 35139 RMD160 8314d1de722f959884b9cce45ff107982896d7b2 SHA1 daa779ff57af62fbe1f75ee33b54400cd6701ac6 SHA256 13c686a543ca3829818d705a2134e23a989a62889c3ff2d4c762f275f0f11c81
 MISC metadata.xml 1519 RMD160 4231c2d53cf47048c4638a9d49b48f7f72212550 SHA1 423766ff1530f40ef17a2c84c92add1ffe4a7d62 SHA256 f8c901bf6b4e25af758178c8b91d043771418ba112d435973b7ead5bd5151bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1r2uAACgkQmWq1bYTyC0N5egEAp7rxiAGYdkmxtkvw7f8foK/X
-GMJjiS0In7Hof30LtCMA/1H6QnAtKCq+dgSOctDorv03dICgpYb88pcx6oPjxcqU
-=SK0g
+iQIcBAEBCgAGBQJNfpQ2AAoJEPqDWhW0r/LCNYcQAJ4+bKuDDngUGRbvBfAIZi47
+/wVs8iFdj6P4XGTBKA6TzgQ0bT01J2STDm89p+ctRq2yQ+/WssL3zBBReHvISzr3
+vN6gda8UkHyQdCivi+jYMDGPELRA+31SboYtK6umBkXxJyBghkswgcfXvDoli0/4
+jw5FIbq/sbyajc6qvw9X8NETBVIcfP34ovJ5/1y4UnkrwMuK3D1PkNQsWPLdPwpM
+EflgYC2Ce+5nZb+jO/+beeGhqMA5xapzExAZU8cO4aq+5Mlbr8hrj4vOi4c2ACSG
+hycQwz0dLPwpwVTi9cnWUPkPLHjC+VP4KLRPUe3PMsWbB4dUmwq1AWzT5KjdLKC0
+rJSLeJPW6uTs8Ay3h6NH9OaIb8dJbtoCI4l2xqvhOVl4de+xNb1Ze48eDD5otciF
+x80a/lBZD/L0vObOybr2TJWpOsVqKSq+HFVxDOangpOZIVh9BQ9G5ABDuapHhecE
+G2GZUSTh4J5HvAe+G20tHEw5OMccxIdeovFtNY/51jdvDkPr6/r2LqPKoWrGKlV0
+8ezV+wPGgdphJYbNLsLbiv435biTgTyrS5QDQ9ddOu09Ok8sdKNQsrmNSm6yZZ2B
+Kkf//iNxamb3TWtxdeIy/W0ynEdM+zIW+V1T/D6+UftubkMNK2G+8nRw8Pk9b+z3
+zeYQmr0IT4L/3VIEeGVB
+=teUc
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.15.16.ebuild b/media-sound/mpd/mpd-0.15.16.ebuild
new file mode 100644
index 000000000000..c1f44fd10821
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.16.ebuild
@@ -0,0 +1,151 @@
+# 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.15.16.ebuild,v 1.1 2011/03/14 22:19:39 hwoarang 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 wildmidi zip"
+
+RDEPEND="!sys-cluster/mpich2
+	>=dev-libs/glib-2.6: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 )
+	wildmidi? ( media-sound/wildmidi )
+	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."
+	use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm"
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/mpd.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un
+		--disable-wildmidi --disable-libOggFLACtest --disable-documentation
+		--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)"
+		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
+
+	if use lastfmradio && use curl; then
+		mpdconf+=" --enable-lastfm"
+	else
+		mpdconf+=" --disable-lastfm"
+	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 libmms mms) $(use_enable wildmidi) \
+		$(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() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init 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
+}
+
+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
+}