Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x84F20B43

4 files changed, 465 insertions, 17 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 2bb810a88074..4057585f6c16 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.371 2015/02/27 22:24:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.372 2015/04/12 16:35:01 angelos Exp $
+
+*mpd-0.18.23 (12 Apr 2015)
+*mpd-0.19.9 (12 Apr 2015)
+
+  12 Apr 2015;  <christoph@gentoo.org> +mpd-0.18.23.ebuild, +mpd-0.19.9.ebuild:
+  Version bump
 
   27 Feb 2015; Michał Górny <mgorny@gentoo.org> mpd-0.18.16.ebuild,
   mpd-0.18.20.ebuild, mpd-0.19.6.ebuild:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 4106c1f0ad45..f1f0368dd1c7 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -11,29 +11,25 @@ AUX mpd2.init 828 SHA256 3591473024005cdb15f13809c7675fbb964dc1b13e7658a01e12e34
 DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79f6b935e4fc9f93cb60c332 SHA512 014629b913e7bd537f38303ffee295648b55fe18dc0ea669b463b82c3d60334792eeedb624f96849c834cf32e0bb5107f804e59d62be293ff78d3d940dbbb9e2 WHIRLPOOL dee52fe02174b3818ce4483385b7b91e0667fddfd4912023551032b29a67b80a9d3aba2f2d49781266eceb25d5af2c3fe1285f46ad1513cafcd0f5d3766d2705
 DIST mpd-0.18.16.tar.xz 587724 SHA256 7524c7a7695acfc6a5ce4117b30c74b172cef681a4bb9032db20c3671ad5765a SHA512 bddd0236066bae97ef690b24a0eac46d892fe10ce7c5455634cb8b84210bf2ceb1b5ee8c7754fcf581de7fbd165c9b805f179e243b88bc87e6254e72fa6c8f45 WHIRLPOOL cdf7488fee33b18880b24686bcc86b8d4696023e72011d1310d81f067a8ae99590441c61214e5e371b3cd4da6fb99575963343765c9defa4fb3b41582193c407
 DIST mpd-0.18.20.tar.xz 587320 SHA256 0de4f79fb4f0788ec7e7db7d5abc18bd54d32b7bdaf6fbd244c44e5d56b69f2b SHA512 743761c9ab9bf3c856e2355f417f90a9dfb8d8df5d75d3fc904d874516743ffee969f6ae225f88ed128588e508d82e558a7a279f3b18888c29f7f9d592ce9a29 WHIRLPOOL 21ab9870a42be68d8073d84422ea368ab58c1435e41f81daf9e151230b5b64022f8b91b2856d2c01c585a219e5082d97eb8bde0c16b99b7ddaef585c19da4f2b
+DIST mpd-0.18.23.tar.xz 584160 SHA256 647cf5a27ca68307ab4b28b0c58a3f7461d1f8dad1ab4d3e2ac9a2c380d92e70 SHA512 99641514b4c7dac8d814f891072e0131efa54bc03d9abd54165cbbea3398fb21b01236ab43374a763184c4aad06b3b27cc9455c6f78168e2bf49d7c8c945b975 WHIRLPOOL 9416e88e0071966fc06bd9cfb6ec4a536cf2eeb5c66f3646fb3425a9ffd7edd268858d0ef1b23fbff374306b2c4d4b61610862fd60aa06d5502de313754c1f1c
 DIST mpd-0.19.6.tar.xz 703328 SHA256 fac25376ee46b89249ee28a1ae13b2d5d1df7ff62464340c33c077015364d1e0 SHA512 b679c42169ad0815c69de817b7d59531e6afb9a88ed15ddbe4648f103815b513605081ffddb12a92c9e52e402fcb80c9df984c05c70491a4f3cc4f7efc5e3d86 WHIRLPOOL 7c02eaf842a89417e2a97ee0d6bae4ab22e3233c015496b8bb93bcff2eca40104ae5bdbe50a91d27a1130e531be515e2ff551424f0466cc5525953eb29ab044c
+DIST mpd-0.19.9.tar.xz 701480 SHA256 47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f SHA512 7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 WHIRLPOOL 04ee826f55512c5f4b28f0bfbf78e23710070970be2f7da07b421483da1d9dad20b0b3513a2529f88d83c92f8202cb57bad09fee894eb18387cbc156312e3a06
 EBUILD mpd-0.17.6.ebuild 6383 SHA256 b44c3f09e5e04bfd37369cafb3140a085fb4c8858ba675ff3860a853d4a4d04c SHA512 2dd07e16aa2aad1887dd6e1c28ba232aee8e43a8d93d7802d27cb9c5a5d86958729db58058e76e6ce64c6fd69588f44d1bf7ae4e17210cf9d9232dcc6cf8122d WHIRLPOOL 17013d47a134c4d32dd984b7171efec3898f942a5092da52d6a4a7119bc9b7be8b1cddbfc6f109df34296e9f5a5b365656e51dc3e7b43426b3c83cddbf10b7a3
 EBUILD mpd-0.18.16.ebuild 6392 SHA256 683a39d9aaef7a7c95b176e0348de6ca7dc02c9e924800a85373f1f6fc030487 SHA512 fc4c948be775547b66b9b44d5a4faea2e6251945217dd4cee1847ffad3fb53bb967982195bde1dc622562e134c5f0b1691fa67b4e4fef91167ddb35e9996a40a WHIRLPOOL 4f262312f3e8f4fdec66bbbac8887af4a2ba4d7dac8378d4d7eaea09eb0da72881e148a21c61132220d179e9f44be7b4bba3658bfaf384100b05348116ab902b
 EBUILD mpd-0.18.20.ebuild 6397 SHA256 2fbc1bb4a5af50e64fd72cc15a38d6b327c3181db6bd25e601562376c8b3335e SHA512 0fed3053458307bbbdc41ae75e8118c3a69901ff1fbd0cce6a0781c19d7cac1a58c88aaf663b6da2bfd306ca4a1fc405dc0f6b91489f74c5d2cd3db18532d3c1 WHIRLPOOL 6c3376caa2f169e8f8bdeab503af66f475cdb3f31019b3d73af59f4c83f22fddb5f88294e5d7a2f5bcc8ab0a4201c56674cdc088dc801d4ac18d86057ba2b57e
+EBUILD mpd-0.18.23.ebuild 6376 SHA256 892f76c767061655c1fa02f1096b38500d1b35e90e39ce00e9e0aa8554cf6932 SHA512 8b3eea661c36dc2f0d9d40b03b1d6b1405df101a6c4ce2382e5edd6b665c6670a1e27060f7b46b182dba368cd99d60710ae4857c0ccd9f881bc8ca5b0efb0bd8 WHIRLPOOL 4003fa488e8974de80e8d3fa10faf310ed06100f792a087c1b72da9443d5a728cd9e89cc0627ef6c800aa558e960eb4ac6d02b796c1c66bd6f1904a1d2e915a9
 EBUILD mpd-0.19.6.ebuild 7085 SHA256 32d70a458f26f74f36a5da29fb15ceb72eab8335eeaf799a8b16b09139748b26 SHA512 afc89cd134edfe7859a4e413ea0314e6dcc5d76b1c4ad152be3eba0ed8de2177a4a05321fb8204b9808b89da408ba1e5efb41d18f2a0d0e88dc4fe898156783a WHIRLPOOL 9a40cab20508aa8d688c49d859a3fe9a838fe1a9da56fed9d7269bdf646df4e0f56653e076ea0ac0cd15f66cda5dd8780d2502bd7114c91a71aa216683012acd
-MISC ChangeLog 52847 SHA256 edb7abb02fc24b02a0844d8ca060ad4233e95c5ca3f46129635931ade777f2f2 SHA512 5b5d63d3d40ac9bfc1a6db6c0d100706b063e6628bd4b6d823ec8a268d0c20dd3e992acf41613cdf28fae0bc19a8f00d1fa98a6fc48a7e70f2fe7e9bea188fb6 WHIRLPOOL 9438eceae81e419529d80a92453ab243da0cfe76c0856f23126bae72e0d521e753aabb965dcc85de91eb7104901440b2832457d8d658a0a7a30f1151212829b2
+EBUILD mpd-0.19.9.ebuild 7064 SHA256 575fbc8a76b15b8a5284ae3d4083af0adcf88bdb6a247f3632db13adaafd40d6 SHA512 f1a987e2c5830af317947089c23787e937f402efac9af101ebf165525383f7a2989858e51cf25df55942f1c7c53797f51197d24b91a3443e8326cac2ac468911 WHIRLPOOL c95c7854884ed83ab04d6fd89e1e1a23e38eeaad274b2583de88cfb6e59186cc0260a78763db99e05d6cad5c0d4e2146e265ee3c8293ee0474ffaa7387deaa22
+MISC ChangeLog 52998 SHA256 9dff3da1d9b78526b6e3019071c759e32ab373e1b5cae83b0e07c91ed9294e84 SHA512 882559edb4132540b33c9fec54ee1a97e68e09bed67f2c93e63c8cfb91afe49afcc3760e488cb7c833d0508312862c056dbd5a9259a9f4a83a50752bf94ff491 WHIRLPOOL 0dd2c9f42763342e244d26d5e3d57687f0644ba507c808f1ebe162c1f7c633b9639bfc7bcc107efe32c0ed367d97ae81fcee5cc9fad7bcea5e2eac76595d6a56
 MISC metadata.xml 2238 SHA256 51d3a2bd33c22a6a2ebf2430444d8e2b4c5ff255e9eb543a63dcd32f2b87748a SHA512 140766b0432097745032cbe4f64ad723a0d175c6d37c81c82591afb88f2fc056a19b0f1560ea23fe5c0936d2106f6ecbf5f0149891978ced7ad9607d25e436a1 WHIRLPOOL 9949d8769bf1976400f486184d269d6eeedd7c705702e6c452ded7c47c7043bb125a06412a833a54aa3d1b4a0f1e794b46875c5620f08cd6ff0e3e88ee7f6555
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU8O6mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZORlAP/jL8toq3OgDPvwLYi1JuD8PY
-v7vrVTYhosrQ1rzRYhQuax3lSgYI1P6Ve34SSqiup2H0Hbl+SsviPw+vN5fG60vq
-FLaMF7LBg4eMcKNMGqTKUjY/HG8JfwtLovaaak1VpmGGEjG5CmN1Skns2ujXuobC
-UJqjfBl/hOsKDW3ER5iCQssWsE3u0STFaTy7K/cTgx2Ecp3Pc6r+WPp3k4KONjTM
-zYLK/OtQJUlfHEpweYEpimiYVfhz8JiGsgm3m9OC1g4u/M9dIShAxwMk6aaj37TI
-tDWPXiyyynnKVp2ICrA1gPKMBmfYILU/f9X5qcVb8alowWZ3sv4EmRXs9Pg1xdmP
-9ktJWG4EjVn6z06NFLSQXBBkjAUJ8L0yzfYhpC+q9jCcgnh4BvIFZu08n2siuBB8
-ZBoGddSihQJ2ixzAU3u/Lf9PzF+0PjLHtjhLZAVmBEqLvgvYwBAPD9Pd0+kcbLoy
-phIGzeWdzYlODVqoB15I4l7Lsk5m1aV2POvD3ojBAtqC3D0NKw+agMURr+hk819v
-ENqIno2WnJ2noJ5UMCijJEq7tIa0JdM0HLZS7X1yWxFFtZL6YnfMyIO9O5SbQXrg
-gc30DHNj8KtV17cj4uqYl4bXkWR07nFaUTPZ5Pcgq8h9FMi4r97osQN4QzV6pOT8
-RcxT747EFPTaOUxrAyr0
-=Fetp
+iQEcBAEBCAAGBQJVKp62AAoJELWcuBZ1ofgwKecH/jznSX62Qc7NmQxc1P/494D5
+QrCVBsreg2pY8IyNW4EGvdKsYFG97g6nF05muphZ/44fFXCIfvVeiduw8E+XPvzL
+W4qQPVZ7HMI0ylXjyOlpNlQhmJNNJEc1+aBogQpsO5vqYmM0LJKI4dEzAwkheG0Q
+PRIefIgw088vng/PbpROIDAucRCCP9PGjteVgShYw5cwlSGDlTxkviBUyM8qkIL2
+x+fHZT+lTnt0f3q0gX39lBvGr3v3YbdZN0aL4VhpU9Ddj7/9x/ZZGR/iNJYjKOae
+alPF18N0vO0w+AiJ5A2qRMhfZcDmnt8N8oFm/V+IausZhETyssDS0Ye1KLJmKYc=
+=Nj2o
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.18.23.ebuild b/media-sound/mpd/mpd-0.18.23.ebuild
new file mode 100644
index 000000000000..0288c7bde8ca
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.23.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.23.ebuild,v 1.1 2015/04/12 16:35:01 angelos Exp $
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad 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} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	adplug? ( media-libs/adplug )
+	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-paranoia )
+	curl? ( net-misc/curl )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	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 ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	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 )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	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="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/CdioParanoiaInputPlugin.cxx || die
+	fi
+}
+
+src_configure() {
+	local mpdconf="--disable-documentation --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 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 faad aac) \
+		$(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 libmpdclient) \
+		$(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 opus) \
+		$(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 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}"/${PN}2.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.19.9.ebuild b/media-sound/mpd/mpd-0.19.9.ebuild
new file mode 100644
index 000000000000..6f99f97a9197
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.9.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.19.9.ebuild,v 1.1 2015/04/12 16:35:01 angelos Exp $
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug expat faad +fifo +ffmpeg
+	flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack lame mms
+	libav libmpdclient libsamplerate libsoxr +mad mikmod modplug mpg123 musepack
+	+network nfs ogg openal opus oss pipe pulseaudio recorder samba selinux sid
+	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
+	wildmidi zeroconf zip"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad 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} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	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-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	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 ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba[smbclient] )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--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 samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(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 samba smbclient) \
+		$(use_enable nfs)			\
+		$(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 soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(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 sqlite)		\
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(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}"/${PN}2.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}