Version bump

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

3 files changed, 209 insertions, 2 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index cc96a5d2e808..8205807ed22f 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.297 2012/08/08 19:26:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.298 2012/08/08 20:03:35 angelos Exp $
+
+*mpd-0.17.1 (08 Aug 2012)
+
+  08 Aug 2012; Christoph Mende <angelos@gentoo.org> +mpd-0.17.1.ebuild:
+  Version bump
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> mpd-0.16.8.ebuild:
   Marking mpd-0.16.8 ppc for bug 426834
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 281d4e66f0f7..f99c2686c9a4 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.15.1-mpdconf.patch 2912 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523 SHA512 cf7dd6ab37cd4492e41b78cec0feeb807f29951da1eda51600a42b2183797bbf440ef835c06bf3a1916f7aa2088ba5564ee8997b09bf7dc1cd5da507012b49ee WHIRLPOOL 98aa720ed334da8ce63f2743c0338909760aa272abe0c5b6492178fe04451cc9f191fae57cd27b6a3bdbeac4181b857eff5b3b6119b2e924dc73ebb232350a49
 AUX mpd-0.16.3-ffmpeg.patch 800 SHA256 b3958db44146f11bc1f99410284c30a2739915591e92704ed83ea389c222a121 SHA512 6b8b15c2a1effe698e701f7aa40c1d87ad720109666e04e49d231c8ea4abdf544cd99c51b4ae2fe714ed50658f4cb79377620cde15060079dd259b96174fe4bf WHIRLPOOL 632bde9d7485e759f6f46abe814312999b9a8cce8f22cd2b6098037efb71ff9170c4549c331b92750724fcf58b3d9b8a71468640b5f10e095750689a89a252fa
 AUX mpd-0.16.4-include-stdio.patch 269 SHA256 25816a9a87e06063e086bc93968aea2e312bb6e6618f1b789add960aaefffe63 SHA512 8edbfcdf02eb0b16b7b28d01989b9a5d2b720285f21398093094c00bafc6a4f00464b6e59e86567920bcb3676163348afd800e49a234933000871d86b6798696 WHIRLPOOL b441023f1717853c38582169291ba4240d9ecf33b6927cd350303efc3e5728b52c60708cd314178931e681968a4ac6cd477ddb93292e4f5d6b3ce8548a2ea3b3
@@ -11,6 +14,7 @@ DIST mpd-0.16.5.tar.bz2 498034 SHA256 1a03ba9fd38230d79be5ee7d2b75ffeae01d738613
 DIST mpd-0.16.6.tar.bz2 486442 SHA256 6ec5ad3fdeeb97608e40e041b6a458c61afd023a0fd1eeb464e208fcd36659df SHA512 a3b3727f1a09298bd78a27fb1b50110d609c4cc1b9f8674564918e03d28f71ba614e06e5df9dbb164c6cef3405eb7b35562799e047eef71e2499e1a1157c9fc2 WHIRLPOOL cfb720c84cadbbdc94075acc1efae3c4ca61bf2f91937a907b2718e007d4dd8a047fd2639190378b9cf6d519558221526ccfca30fd8af5986412834d8533544b
 DIST mpd-0.16.7.tar.bz2 487394 SHA256 47c10553389752c7fa072cf87c2bd30c552de75819fcf8286f3e7cc14ff0e32e SHA512 2d2d272426ca0e4f5ec95accac21e4dc0018ad4b22170f70674d96d72bbd969510f49e431064b42123db06eb1406273685b96be583c3ea0492b9e732d596f6f4 WHIRLPOOL c71ab947a1589368b1fbef245e5ec53a871aaed9d00d8c400c08d8ed77bae75b8dffc15f7a1c3fc454a13f1d3db99c498f740872d2aa6b38b211b4d57dfbd98a
 DIST mpd-0.16.8.tar.bz2 491170 SHA256 35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17 SHA512 ce6f0a004dec0e7269c1029c04c8d8f249ee5aeae362f60af6f617dc789e718a12b55d9efb928d7e332d6e9c8e960961b98174c57f5ff5a2f9f5b4999906a2c8 WHIRLPOOL 22713a7a684262c73ffde0ab063383dc84df6080de426b27712c8ac353f2f5d18ac69df918fb6bebd62dbd8da37361102573fdbd2fdfcf19ac4b22a4123a7e92
+DIST mpd-0.17.1.tar.bz2 546540 SHA256 b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8 SHA512 f3fb6395b16c503d21f87eeadac7abe319d66cf4953c738c43c6f80b5b1c2db9c7bc9ef52051db814aada00d336255cf5fa67d11075edb38ba5fbe7122db4eb7 WHIRLPOOL 9ae3f129d5da734336d46a0f72179b60dcbcc53b3ab1cf4959d8a7dd1cac683bbf2959cd93fc1366b7eaf0c9888c018de730c0500cd16dd99eff4e6994dcecf3
 DIST mpd-0.17.tar.bz2 556624 SHA256 3151ad270530ec3408d65d884bcc776cd08f92040ee4aecb96e90b6145ad5867 SHA512 3a1aae5903070339037e6139b3be661d4a011151864b29511cfa4ec4856edd1d06f63c3857edd2942d7795362889df0e5776a91e4be8076812cc3f3a94dac6b5 WHIRLPOOL 5b9c5d84af40e7a8c75cf77d5d0e657940e7b554194a5b9ea168012f1609e0105ac486bf3800afaa2f39e63d3c021dbe5ba6d0e5b59df0272678b1d4a121b004
 EBUILD mpd-0.16.2.ebuild 5442 SHA256 849ad636d848c45f9fbaac3e48156f5f90e26cee5d26e469c2680c3825976d04 SHA512 8d03bdafc61f3416d875e9760bd88f0f82446ad009508a0a1532767707ab08ac69fd1a962770829f0c1c03959ba8288dccb1d7d8827b5330e045412985a8a131 WHIRLPOOL d9ceb92ca67c6b35daa5a98fd1597fa509efd9b4619d7e5f8bac4dfbb287e9843c3546ce1a6019c53d90e1667f54c9ac2aa584be586d60d36e6ec134cf70112c
 EBUILD mpd-0.16.5.ebuild 5442 SHA256 012955a9ff6456eea812ed2efc0e5d932b1d2b1fa6d85e7a3f3d8078ee419ab2 SHA512 1d757e4f51802ee4c1df2c31a6c44428c66c9b4c86ec31542209e580be58c3a34ecbd77389fd88eee34d0079dd77cb1798c17f5678111735ba7aad01e97e8f41 WHIRLPOOL 0e5b40c0dd263a61637dc495dd68b8512adc6a3c1e1f7891eaf0fe6ff2bd2fe6866ea9bac5698710657f41f02e12a721377da3511ab051ba5c7bfee027fa72d7
@@ -18,6 +22,14 @@ EBUILD mpd-0.16.6.ebuild 5449 SHA256 26c2f7c8f15e2f2502b6e450ff5971dcef884ea8e10
 EBUILD mpd-0.16.7.ebuild 5487 SHA256 80bf24c785cc7048fe2e39fb27e9027dd8f4125581dbf3a1f95a32fa5a013661 SHA512 858e7dd37a8de3648e4cc2c0aa3c7aedf86c87d1c46db00dae6c90e3ce63ec3d5d0a92a129b9c71451d72e85b45da4d8a63001ed76fd7c0da621a5a35da1a8f8 WHIRLPOOL 3c46422f73d62e72bfdc999980ebe74094f7f6f3a2c2d55570190f91a4a21b9f9b032208c066964a6700aafa4bada334979c312db3d8b9d1371aad02c86bbb46
 EBUILD mpd-0.16.8.ebuild 5530 SHA256 0d7949197a8f74e90ad9ddcee15119a810fad8389749016a1ef785a4809af36e SHA512 ddb58aca4d90ea54dfae641de53653f3a9ef51e7964390e685ae0ad2a49607b27def3816e4c353bdc303f54b5aebe5594882b331ca6c4cca925864928bc8e9d0 WHIRLPOOL a3eba0c6de2847bf25f8434819a67b9eff95b8334de96a85b8073be4bd8ae7e9557fda66f79928650a2ef18a5dd1c5a6fb53f81d45118ddb9e8d0914f7d494a1
 EBUILD mpd-0.17-r1.ebuild 5930 SHA256 cae62fa0a53f9fd823acd574a101a7b7b7c1773e152ff9bb31263c55658fdf3f SHA512 356fc8dbabf328f51043241cf6193357976d79cf6fe35275dadefc507fbd220d94ddd58cc618180390e9df195fd9ebf8cee69a6cc25b7da13e6c6a1c3ee0ebaf WHIRLPOOL 049aa8c410ecf9f8b5154390da75508047d796054d1f88c6edbc6d9282699d423e44f2f4de65fd4e36a50b737cec1ac0b703a92784db3cb76da363caf9840af2
+EBUILD mpd-0.17.1.ebuild 5898 SHA256 99b2eb683cd176f7cacd6fc8079d9ffe4272946a28dac4c839e46a90f621a059 SHA512 777778465aca403a5c1c52ce587434145dbe7b55cf01e974703eaecfbf7e9c6517a107838b9bedf493c58c45ea82161d5e67ecba1eff722c495d4ef5c1e9b9ee WHIRLPOOL b73373c6049ec609ce7d378121e20f83e67256d3ac67cd1bfe02d0be112ec0cd45e6b84b503e7aaa6a95ec19edb345764e190145733fbea197efda68c9fbb4af
 EBUILD mpd-0.17.ebuild 5828 SHA256 db103aea3fa1c0ef3bf04b6bd4a3589b672385d2e1e0688ddd712f054bb5370f SHA512 0ef809510820ba3c0974fb55032d469b7c8139894d036b4f940c50eab7f2f10e6eda5db78542276cd8111b95a0214a12a64d6fb6c5719ff99b99b7d6438f3eb9 WHIRLPOOL fbc75bb83df825ba1d28cb0b20b050c49e460853a90fba846bdbf9637e286a891dc4cae0fd1f56a2eb784a4a4604b900d7b7a1893e7d480e808f07f175c367e1
-MISC ChangeLog 42699 SHA256 715fdca7bda8a4241cbda2dcf51dd4aecd0f4a2fd399545e26e6daafeaf60750 SHA512 202bc626eefc946dad830bdbff35cb9ab0ae377f39cc484f194d42199a9e2279926743390e8603ce4b8198d02e6ed78d46d4deed758b486d841096bdbda3ad9a WHIRLPOOL 5819cb06aeb92768909410f6d2c68ab8c3c8726a8149c34c5dbeaa28cbe5bbdbf995f588d1d25bbd2781b87f857d50df60e9a8e7cf6c199d232dfb988c97a9e2
+MISC ChangeLog 42815 SHA256 525f116c3466b4f59d7e6656b46f3adc8ba4d2860dca6709908e2525df1cb3b9 SHA512 c2cccaed73897c65925ef60f11ddd8689e5356c182f37174ee9583fffb779ae06acbbac3720e6bf872ee069650daf0f32d256945beffe69705a6d31c508fdab2 WHIRLPOOL 7aab858f5a25fb017e9776bdde6261c13c09b620fb53a9b6d4b8872d52788f90b56c982905248626b337d624fa42d36815152f08e302475e3b7d25e90abebe00
 MISC metadata.xml 1859 SHA256 ac0f784f218125bb433527a9646a10e2b54064707b81caaeac7bea9e17904bc3 SHA512 f69d851132ac7db4459b216b6dc7eee4e498833f9902e0995159a1253c2ef00159bb7d1bdd55bc4c18a0383887ecedbe3e0684d7d4a5a673bed927f58ba27c14 WHIRLPOOL 54ab0532189033132bd7d50ab77acd9be0b2fb731502dcb46130f90573d6466dff534dba48bb385cef1a8459006da59a8fdbb25c16a5be54014c06721bd55a0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAixh0ACgkQmWq1bYTyC0OvwwEAkBfNCf01B4NQLa1DpALToC4D
+ZzM0RUFNjw8yjqD1/WoA/jt+tMzTZQtfZe1RMSJuyVtNGkPqOQoxOAzO4a8NtzjE
+=77GR
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.17.1.ebuild b/media-sound/mpd/mpd-0.17.1.ebuild
new file mode 100644
index 000000000000..f935b0c07cd6
--- /dev/null
+++ b/media-sound/mpd/mpd-0.17.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.1.ebuild,v 1.1 2012/08/08 20:03:35 angelos Exp $
+
+EAPI=4
+inherit eutils flag-o-matic linux-info multilib systemd user
+
+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 ~x64-macos"
+IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac
+fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
+mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
+sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
+wildmidi zeroconf zip"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123
+	musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${INPUT_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	lastfmradio? ( curl )"
+
+RDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	aac? ( media-libs/faad2 )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio[-minimal] )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	soup? ( net-libs/libsoup:2.4 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	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}
+	virtual/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="--disable-despotify --disable-documentation --disable-ffado
+		--disable-mvp --disable-roar --enable-largefile
+		--enable-tcp --enable-un --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
+
+	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 cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable ffmpeg) \
+		$(use_enable fifo) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable gme) \
+		$(use_enable id3tag id3) \
+		$(use_enable inotify) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay) \
+		$(use_enable sndfile sndfile) \
+		$(use_enable soundcloud) \
+		$(use_enable soup) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${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":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	use prefix || 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
+}