Version bump, remove old, fix pid file path in logrotate script

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

5 files changed, 22 insertions, 232 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8fa9640a21da..eef2e8137309 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.348 2014/05/30 19:40:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.349 2014/06/08 11:51:47 angelos Exp $
+
+*mpd-0.18.11 (08 Jun 2014)
+
+  08 Jun 2014; Christoph Mende <angelos@gentoo.org> +mpd-0.18.11.ebuild,
+  -mpd-0.18.10.ebuild, -mpd-0.18.9.ebuild, files/mpd.logrotate:
+  Version bump, remove old, fix pid file path in logrotate script
 
   30 May 2014; Markos Chandras <hwoarang@gentoo.org> mpd-0.18.10-r1.ebuild:
   opus actually needs ogg support as well. Bug #511586 by Nikoli
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index d0ee222b0994..b0025fbfd188 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,33 +6,20 @@ AUX mpd-0.17.4-ffmpeg2.patch 572 SHA256 d525dd6abc07577c54355dd2eb0721cda2b66c82
 AUX mpd-0.17.6-opus-linking.patch 549 SHA256 6e2caa3a445e4001b8918d2bb7d8c05c73ce9aa2b39842aa72e711879e1b04eb SHA512 bbb6699dc4de8de8908464cb4086b610e597bb7cd1006b8d17770e3665872861644ddb795c450fe3784bf1f5cae3c724ac845f27565a9a57f632e9a9d79792ad WHIRLPOOL 480f62ed28dffe1a227a5cfe41ec30701a14014313bca97d6d68cf2f15d410c60bdfab2a3d7e69e263131c15741bea5d310ee864912cf9ae99e5838b112b8463
 AUX mpd-0.18.conf.patch 2969 SHA256 a8eb3e339513d6284f6be0a63f9676e44d768fc77d40ebe9f3073dd3171f0fae SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5 WHIRLPOOL 58f4a56426f66cd3337aafbfd6612bfc850fa022d13a150ff7f923e48f5d225c376ff751dab0ac5c6753320c060f04fc53a88e64b5ae3238499d3ce563df7654
 AUX mpd.init 836 SHA256 aa4156c9941aba452a9a53e17a8731063bb6c7f6ce4d67fe289502847e70d8b0 SHA512 de8dcede929d9785d6da904d38a985feb3091d2962d0ca0c294aa5e3a2a1e693f58d0ae1bc7cd339b8dadd751e6fbaf1f044b5677a82614457c13290ef94c5fe WHIRLPOOL bc382e87d4f85a565107e2f4bb0bcc32d2dd4b6368a9ea622bd2672ac2f0721dfb37ff555768d7e1466e1d9056c398afa6c6911e8a70994f81bddc2bb13316e3
-AUX mpd.logrotate 131 SHA256 18b3e7cb82984a846737494393edbebacfc7d06b79fddda5cd17d1710134f686 SHA512 39b7f58a2b7b50afdbb6d0a3a5e4f323b97ed1c59b37d238cdf7664ed0471f88b5592bccf49a6446d0d1ff4ffe7af3fdb6210e0024557e72fb9f79c3f4021561 WHIRLPOOL 9b2f6e46c787e617a12053914321b51dd5e6d382193fec610245e23a20654e6802a6d727202d038e36d1b9054c3be6487398b159fc5a741e3071b812df4333d5
+AUX mpd.logrotate 207 SHA256 37deafdf5e58e6541173557d947b1d5ae66421655cd4046f9f326255cd0fc490 SHA512 358dd4525ff62523c18dd1e86f5b854336492ff3b277be267a82dc502d3ef38f340feadc56e03d41df344e47c1fe18bbfd34282f468bfc1a1aac67963b494bdc WHIRLPOOL 5bae7e2caabad6aeed0cbe2a24c45e7a62de89189a193301c7aa6db204d1aa25ccbb9e281479bc0fc5cf1fe62a7d02cabb6f5fc3c64635a467ac85cba4cc329a
 AUX mpd2.init 828 SHA256 3591473024005cdb15f13809c7675fbb964dc1b13e7658a01e12e34c7e751897 SHA512 55f07586a678bb588b64de0f6ba64c6f95747d127b6c1e4fc8ab541d3261155957f38167abaff349bf29c66ba86f15ded60738b6ca8cb3cf32860e0ee9494c87 WHIRLPOOL d2222fbf290de86f3ff2c853bcd3ea4028151b25d99697e6adf6737d3ec573b8a5ff62caf26503001e0061b8169fd052c27d6b689e31c8c34bd76ed93c8e2c97
 DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79f6b935e4fc9f93cb60c332 SHA512 014629b913e7bd537f38303ffee295648b55fe18dc0ea669b463b82c3d60334792eeedb624f96849c834cf32e0bb5107f804e59d62be293ff78d3d940dbbb9e2 WHIRLPOOL dee52fe02174b3818ce4483385b7b91e0667fddfd4912023551032b29a67b80a9d3aba2f2d49781266eceb25d5af2c3fe1285f46ad1513cafcd0f5d3766d2705
 DIST mpd-0.18.10.tar.xz 584312 SHA256 dd506ca1d81b61ec10be6a3e7181869bd5adf0ffbb0a2e948f730826933f1c81 SHA512 120ebbcae7de24f2d660ab7d50cdd7e80ab39da2c9479cda0ad117f8f0729c0a87fa4363f06866cf6e154d6f44e09ce8f3e4f3fff240de12eb600eaec351c140 WHIRLPOOL b5e0e38903d1bf6e6bd12694944ac909c09de4e66b4d63b54e2865886206aa94577070622e8e45f09ade2674afc420778e5885729cbe49d412ca597e005de29e
-DIST mpd-0.18.9.tar.xz 584328 SHA256 0d4d3e6977cb607419abbb14c63d1e2b982acb84cd2be5346f19de5f699a68de SHA512 12e45e14108cce0a3a993b6d17dfc05ed7d14ea99cce85f202904b9bf1624bfecadbd4d465e3c9057822691a1a245e67524229b160fceb2f72d27d6a8bd56479 WHIRLPOOL 2c94529b592b953f653a3f0b76fc27a4e9bc61297e097274708dbe425b5d3559394e1e9524df874803ce3eb5ea004ea47c7066632459e574070f8e10218a6d5b
+DIST mpd-0.18.11.tar.xz 584500 SHA256 f0466a92008ba1a030aebef7ee3cf23f3a56a5764aa36f3a4058d2f336df2ad7 SHA512 9ffe2f7800170334021310e9b0121f4ec6ced557e0c6ba1a7dfc47585dd5d46392721e0757fba054266b1fe933bc9156fe7018b93756fe6192f08d110fa17c02 WHIRLPOOL 538a13b360686f9271fecea4213d34faf72fd7d1f61e3e9a8bcfa33e9313009f0c3a0df25e517ed27aef9ade8a6b1ced0fbf8758a886560a60314c5e218ea203
 EBUILD mpd-0.17.6.ebuild 6427 SHA256 2635cc0a08020c60891939d9e3edf9a9074ab34bb80236e37ad4cd8820124119 SHA512 90fc172bd841920fceb6ce7f0797f2ad2b197ad79b7234faabdbebf172bf6e519e2a5bd431a497a2925eba750daa77646f09d91fbcea6f2b6ea1eaf1b2f5393d WHIRLPOOL b6f7d1f60858722dc0592a4ebcd9a1f83b9db4dd344d9bfbd2d642ad0ff7d60afa8ac4066569962613fbce3d6f85313f45e354bd59357b7360fdba0118f119ee
 EBUILD mpd-0.18.10-r1.ebuild 6355 SHA256 f1621b57bc13e5dca2bd7897a6a89238632096a82d5b62d60ee89bc46abd8a97 SHA512 2edfefb1b78ad308ec49d1e3f5a5ad016bc1e7e0b71e54aadf8f9d89ce0ec0fc448e2f3a96d703deb90f06dabb69143d49092b39cc20b10b624a4ff4fc2cd91f WHIRLPOOL c8fa029f3493951ea27fde6fc59b2f043281bb2ad561ef0f83aeba5eeaf9d15085bf51bbee584267c9bcf114776755eae4bdfe71a63be6b4ea1cd16a7ab52b0f
-EBUILD mpd-0.18.10.ebuild 6332 SHA256 9a2846f986ea8098368d4868ba8744b2331753d940bdbaa81ef8254ade8476d8 SHA512 bee93b601b65cb79df58c43448dbf15f61bea69324c07aded0ec78d62941cd5edff00124bc9e18db3deb0e97957ca748c62542962df5f1018055ebc9d3454db4 WHIRLPOOL 2aa8be7f30ec7ade628fb0a2e9cd7e6fccb40faf7224378971920cc02f43a793dd5972aa37fe979f20355fc14dd9f8b9d5570cdbca01b6f2e9db9c43387f1b39
-EBUILD mpd-0.18.9.ebuild 6331 SHA256 bde4bf68edfd2f77ceb6f0d6104ba46b8077b99df39d941042a5a23b06c29441 SHA512 ef99d13ade3f33cab96183f7eb9dd6bfb9bed54f2259cd89d18358810ad6bc43a721b90e81a26793961de4194d771947f0de33bb21c62d0d2c657d33efe64dd3 WHIRLPOOL fb8b3402f7018a126485a70ae4752528708d4b05b73a55adfda30ccd257222925edda9c77714cf9c50f5d7cfebe7acca331610793b8143ef24d36506b7f2e6ac
-MISC ChangeLog 49563 SHA256 7d81b54399a6fca0557a855e556a76229094cb7518b8165c33376f03fda42b1d SHA512 88b9921f254cac0377f40962af5e875935ca3bc42442e291e9d04497aa1eb93745866f84ae0f9f088792a92d03ad004ffd5e1b6d3ab784b93f6c76b56c0538a9 WHIRLPOOL 7252a69b63236c6146a6c834afe9cefdc210b18b9ab08a2f2535e6b95fee959a33b58f7064b68fe090be9e3d6c3e621539331d4c1fb9a3f35a8535f701a83509
+EBUILD mpd-0.18.11.ebuild 6354 SHA256 fbcfd751f0da940e956137d89b99992accb5c0c7bcc03058ee1198ceae7c902d SHA512 ea9ca776cbbfef71f7ae6b4944e43033485ea106bd1a45509c68d33e02818e24640fe322d4263bf662241ef2262d143d2c7749b87c50dc25139713416e6c3185 WHIRLPOOL 6237e973b2163a9715a130fae7e066c87815058a4731110faca90db4a0d683fe94af5007dc6cb2121f8caaed88d895ca8035b269ed4371e3d82509159a790f21
+MISC ChangeLog 49794 SHA256 ecb04f34f5a800e481e25a33472e993c4893d5d8e27e13b0af121c85868dc621 SHA512 000da9fa3666ce7ab8baa81ecc1117c9ff7013a102a7759cb073bdf37bb982ae00dea58be1beb01df4e05898322612f4c9b44de4a5948a22c8ebabd79f3d4d58 WHIRLPOOL ffdf05d95b5ae536408e5afa69e08960675ab77cba233f44ceb8326f3e9819e729063ca2f1397bd4f3002aa441768081cd326837fa8f2e2531a0fc5e6f179555
 MISC metadata.xml 2057 SHA256 03ab12c4339334c9925649d19c61844c14600680d33b83736922b4537b94515c SHA512 71f55e89be531d5e1aa32182b8348899b87dfa3ef13782f52cc39748cce307273b714975016e2737d4e9941f2f4e71f31d6b38856eb5a9f1c1d33b2afc28fbb6 WHIRLPOOL 160272fbeffa01fbec0fc5bbb75f643cc4540def81f6e31bde450e18865bf43a6a329890db0bb8d3c6a22fdd740c1c1bf213cf87bc54fe103c7fadcba892a9d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTiN7GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun882T4QALokCHWnkCfQntqEWl2q6yGg
-8GGZpchLU3EQfUmMPw5tFls5akgXJJskEuPXAry4L8WnlLQrjkHOZpT6vVBEKrwF
-YdUY39RuKmcJTmrOKhZCojRHTRqCyi48gsSxzZZtG71QnjojwF7Hm5s15mpsozl8
-9e7otbZyfcuj4XT5eddy2ve+7njAgtOc9dHzBZhhWVVzVHhwoMvIa3p81x+OLI1G
-tw02Y5fyYZ09NbxFjh/z/JMNro+BR4JzUxPTMfj8+WxjtWGWiUthBER3gPhm0Wk6
-D1oNmMfNYhpgGDuFYOGz4FXJU7Jncw9DKpwk5p3M3q+Z+hVsI+fJhIZ/QH6M4rAo
-UmOlxfcvySZnsiyZm0LrMbZ/oYLFn3oB4oq0zAMZvQTUKimyOyzjOLVdamnsR7Um
-ZTLqOcAghRwko5DJJsdYWUDNRh9a0uZPwBZP1gwGJobRDFcmECF3vRq7YnoYNnBN
-L/yckqhKcMTva2gQtiqJOBdfBMjQkDYlUNfGukqR4Oc8/cr+8HOiHokSBX/sjiHs
-/XCmQmwx14/kQtqCizFVY0QIZM/kzi4lY/xNxxOq6CXj937xGJPKFVZkqEPO0RIE
-DQN0CNqwUDDwuYaiS3FDf/qCSkA2LoGbc2TYmwcMqCNXnlVR7GM/sEyILHs5+XDs
-UWvcosw0mRuGYGJpE+Dd
-=apT0
+iF4EAREIAAYFAlOUTlUACgkQmWq1bYTyC0M3CAD/aSXjrKZ1WyGdKImLeQja4RFc
+iiZOhtxI5CIaqGUJAtcA/itA7pPkIUKhGmuanCoGtI84FLmUMiYuBn+hqqvx8DwG
+=B4kD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd.logrotate b/media-sound/mpd/files/mpd.logrotate
index a19363174304..aae139d81afb 100644
--- a/media-sound/mpd/files/mpd.logrotate
+++ b/media-sound/mpd/files/mpd.logrotate
@@ -2,5 +2,6 @@
 	missingok
 	postrotate
 	[ -f /var/run/mpd.pid ] && cat /var/run/mpd.pid | xargs /bin/kill -HUP
+	[ -f /var/lib/mpd/pid ] && cat /var/lib/mpd/pid | xargs /bin/kill -HUP
 	endscript
 }
diff --git a/media-sound/mpd/mpd-0.18.10.ebuild b/media-sound/mpd/mpd-0.18.11.ebuild
index a3176b9fac2c..6bc6527b1e75 100644
--- a/media-sound/mpd/mpd-0.18.10.ebuild
+++ b/media-sound/mpd/mpd-0.18.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.10.ebuild,v 1.2 2014/05/17 14:47:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.11.ebuild,v 1.1 2014/06/08 11:51:47 angelos Exp $
 
 EAPI=5
 inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
@@ -26,7 +26,8 @@ ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
 	|| ( ${DECODER_PLUGINS} )
 	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )"
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )"
 
 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	dev-libs/glib:2
@@ -91,10 +92,10 @@ pkg_setup() {
 
 src_prepare() {
 	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is unset."
+		sure that MPD's pid_file is _set_."
 
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
 
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \
@@ -176,7 +177,7 @@ src_install() {
 	insinto /etc
 	newins doc/mpdconf.dist mpd.conf
 
-	newinitd "${FILESDIR}"/mpd.init mpd
+	newinitd "${FILESDIR}"/${PN}2.init ${PN}
 
 	if use unicode; then
 		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
diff --git a/media-sound/mpd/mpd-0.18.9.ebuild b/media-sound/mpd/mpd-0.18.9.ebuild
deleted file mode 100644
index 8c40e87c5a1c..000000000000
--- a/media-sound/mpd/mpd-0.18.9.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.9.ebuild,v 1.2 2014/05/17 14:47:02 swift 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 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} ) )"
-
-RDEPEND="!<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 <dev-libs/libcdio-0.90[-minimal] ) )
-	curl? ( net-misc/curl )
-	faad? ( media-libs/faad2 )
-	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 ) )
-	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 )
-	selinux? ( sec-policy/selinux-mpd )
-	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="${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() {
-	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is unset."
-
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.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-despotify --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}"/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
-
-	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
-}