Change init script to use mpd's own forking mechanism (bug #507734)

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

5 files changed, 333 insertions, 5 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index b199f407124d..15c64a2b072f 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.341 2014/04/13 09:45:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.342 2014/04/15 16:35:25 angelos Exp $
+
+*mpd-0.18.10-r1 (15 Apr 2014)
+
+  15 Apr 2014; Christoph Mende <angelos@gentoo.org> +files/mpd-0.18.conf.patch,
+  +files/mpd2.init, +mpd-0.18.10-r1.ebuild:
+  Change init script to use mpd's own forking mechanism (bug #507734)
 
 *mpd-0.18.10 (13 Apr 2014)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 3a94f95ac4bc..a6bd2c73bba0 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,20 +3,23 @@ Hash: SHA256
 
 AUX mpd-0.16.conf.patch 2646 SHA256 5994735065e0e4a8b9b0fbb7ff8219088b7015c573a379dfeacecdfe55834653 SHA512 9a6cd76d0327d30063659084e72005c85c7a9541c93bacfec098bce93839040ec6da78da9bd4beb5dcb1625c7b0ac6d0cb3f42ca5e7313f0a05cd46286f0c9a1 WHIRLPOOL 06639909305319b818b8fa008bcaeb29b54b70403a4119d627b3d7eda56bdf3a9b246fb5f68bbabe1f52a65d78fb39058ce87f03aeb98f1fd34dec505f84e353
 AUX mpd-0.17.4-ffmpeg2.patch 572 SHA256 d525dd6abc07577c54355dd2eb0721cda2b66c8250dbf97494ed8fc07d30a048 SHA512 72c9cab4ecb8479a3b22b3b571ed0cd22317d331a2016b6e8f357f379b46595b6c01096bb8a51a28c9d62542cfb0ceb61a7363792e85a5cb01334b4f965ae3a8 WHIRLPOOL 79383eae9cf4e95d18c5e1278056b83e32373f549c2ecf3855696ef0e1c5e9c18d9ec79f02847f141100021ed52228e8ac2802e51f3f0a28dbe181b971ca6e41
+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 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
 EBUILD mpd-0.17.6.ebuild 6308 SHA256 d1f9f9e12f74c5fda255aebd3e994f43511c48b17e9289791a6c470f4c6cd721 SHA512 cbd8aaf31b04821151607e0827c159808b0b681f7e991d6d10322a7d8151b35346b53b9b942a8e24254e812f67bac0bd83c7c82c4c3251cb3b0defe5346e3864 WHIRLPOOL 977ab20709e003002d8a415a003a07b498e8329da89dccd0a1988a30f4019159f752681e0e13f2b84fe2e40d8f683576c3e05e9c0e2e87bcc7ce83d8d4f4a958
+EBUILD mpd-0.18.10-r1.ebuild 6297 SHA256 a7be2a8f648ea34c19b1b7c95791625ce6ee675ac9c02287725e73fc9ba9d24a SHA512 d4ba82de4c1d4ae27bf8d8cbfd9c5d230fed183d566202837020281db9f439a84520bb2098e62ce54c9bf247cb66006e891fed33632d5bd14f381d8fe9512879 WHIRLPOOL 66e67eebf8de6c423138fb1477d1b73697a0e01e3d948de9ee3cb51a687e9e2d540f93d04fcdaaedd1ac0ad7495b11199bafccc2eb8a3e000735fa3be914131c
 EBUILD mpd-0.18.10.ebuild 6289 SHA256 d033b083ceccc908f37b7bcf6c3bb7423a3acd9235bfa3d3fb4ccecd302fc6e0 SHA512 df7954f58852593d6ca11b39d37887a84be486bd78c17006270155824a5bd5216484816fba68869cb52a31d175d2e4ec0898132bfe17e7d4c5314a15e4b1dfcc WHIRLPOOL e1eb15477baa59887cded5abd5b119da8607fdc40826e03747096e3bdd5948e58a0421c83f6532e88e0634f74a60d18248eca562698e7d09de46eb47afbd9b08
 EBUILD mpd-0.18.9.ebuild 6290 SHA256 3981fa0b502bf632e60e0dfd6b4ac65e2bd314f67583432d66c400706a4b9ebb SHA512 2d42b3c465b3acc60fc98e3d9c76b7aa680c3ba938e550cc90437f0877437a92804d32fa8660ae4bbf3fd667946b03cecc492ea7a400e81d486d43624eb9d503 WHIRLPOOL 09d631885aa0aba9226701abe194b86739d597ecb8c6c7eba6c05dea1b6811dfd9da9759a9691c0394ef2b204b14a6d0a27ed4414b059f804f36fdbb4e5fd11c
-MISC ChangeLog 48540 SHA256 4b8b3e28e741688ba003f73a1c869b978d2a1b2083d87b53b36c0542de2ff493 SHA512 4c641dfeabd8f12798df53846bbc2f4a72a3901489e72939cd0827d11614147713e641feee80e7f03e5de1d73b433a28dd46aedf85103b6245e26667dd012083 WHIRLPOOL 0256ac4c8bf805e4ff5a663e9bbcb4ec94305e14fb795f843fe731f4c7437743fa1dd3239781b8bfdebdd060b90c3bc7dff8fbde0af2d2328f96daf937dc1ddf
+MISC ChangeLog 48766 SHA256 8cb5631f99b0671b7167990c84c33ac173d8d5b634f5d21f36e7905a25c81592 SHA512 940e3dde086c76ad88d3d2fdcc97230caae8a46abd545b9a336d61c3340aa12ac375bd03310d2872f6dce03c8f31d101c3acd8bacf54929654b654edc004f74c WHIRLPOOL 891a6d9dec44777643ddbe10144d6e97596bcabaa48d4a3af503a5c4cfbd4eb71be9754b3ba655ac0fb9aab1e1e195f7f3b5884c8f3185dcb44f2dfe4bb28589
 MISC metadata.xml 2057 SHA256 03ab12c4339334c9925649d19c61844c14600680d33b83736922b4537b94515c SHA512 71f55e89be531d5e1aa32182b8348899b87dfa3ef13782f52cc39748cce307273b714975016e2737d4e9941f2f4e71f31d6b38856eb5a9f1c1d33b2afc28fbb6 WHIRLPOOL 160272fbeffa01fbec0fc5bbb75f643cc4540def81f6e31bde450e18865bf43a6a329890db0bb8d3c6a22fdd740c1c1bf213cf87bc54fe103c7fadcba892a9d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNKeK4ACgkQmWq1bYTyC0MwrAEAorQTlHBpGReNK0+DZ0rFeLIE
-mJcopSXkSiaZBT6HouYA/3B11XI9OBtxqupCf0yeTwRZTYWv25TpaVmJSAW1rSwq
-=ycpi
+iF4EAREIAAYFAlNNX88ACgkQmWq1bYTyC0MnmwD6AqoqxuZotFwZ+MF8QdTPSMY3
++Yv7Ejs74s7FTolFtLMA/iX6NhZZ7D/OoUu42mWJVjkXqJPmo7ZXmwBHpwpiSoLQ
+=QTMN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/mpd-0.18.conf.patch b/media-sound/mpd/files/mpd-0.18.conf.patch
new file mode 100644
index 000000000000..d71056f7cd0d
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.18.conf.patch
@@ -0,0 +1,78 @@
+diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
+index 470a5c9..9f595a6 100644
+--- a/doc/mpdconf.dist
++++ b/doc/mpdconf.dist
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#music_directory		"~/music"
++music_directory			"/var/lib/mpd/music"
+ #
+ # This setting sets the MPD internal playlist directory. The purpose of this
+ # directory is storage for playlists created by MPD. The server will use 
+ # playlist files not created by the server but only if they are in the MPD
+ # format. This setting defaults to playlist saving being disabled.
+ #
+-#playlist_directory		"~/.mpd/playlists"
++playlist_directory		"/var/lib/mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the 
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file			"~/.mpd/database"
++db_file			"/var/lib/mpd/database"
+ # 
+ # These settings are the locations for the daemon log files for the daemon.
+ # These logs are great for troubleshooting, depending on your log_level
+@@ -34,20 +34,20 @@
+ # The special value "syslog" makes MPD use the local syslog daemon. This
+ # setting defaults to logging to syslog, otherwise logging is disabled.
+ #
+-#log_file			"~/.mpd/log"
++log_file			"/var/lib/mpd/log"
+ #
+ # This setting sets the location of the file which stores the process ID
+-# for use of mpd --kill and some init scripts. This setting is disabled by
+-# default and the pid file will not be stored.
++# for use of mpd --kill and some init scripts. This setting is required when
++# using the Gentoo init script.
+ #
+-#pid_file			"~/.mpd/pid"
++pid_file			"/var/lib/mpd/pid"
+ #
+ # This setting sets the location of the file which contains information about
+ # most variables to get MPD back into the same general shape it was in before
+ # it was brought down. This setting is disabled by default and the server 
+ # state will be reset on server start up.
+ #
+-#state_file			"~/.mpd/state"
++state_file			"/var/lib/mpd/state"
+ #
+ # The location of the sticker database.  This is a database which
+ # manages dynamic information attached to songs.
+@@ -64,7 +64,7 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user				"nobody"
++user				"mpd"
+ #
+ # This setting specifies the group that MPD will run as. If not specified
+ # primary group of user specified with "user" setting will be used (if set).
+@@ -78,10 +78,10 @@
+ # This setting can deny access to control of the daemon.
+ #
+ # For network
+-#bind_to_address		"any"
++bind_to_address		"localhost"
+ #
+ # And for Unix Socket
+-#bind_to_address		"~/.mpd/socket"
++bind_to_address		"/var/lib/mpd/socket"
+ #
+ # This setting is the TCP port that is desired for the daemon to get assigned
+ # to.
diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init
new file mode 100644
index 000000000000..53f5a02de846
--- /dev/null
+++ b/media-sound/mpd/files/mpd2.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd2.init,v 1.1 2014/04/15 16:35:25 angelos Exp $
+
+depend() {
+	need localmount
+	use net netmount nfsmount alsasound esound pulseaudio
+}
+
+checkconfig() {
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	if ! grep -q ^pid_file /etc/mpd.conf; then
+		eerror "Invalid configuration: pid_file needs to be set."
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon"
+	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	/usr/bin/mpd --kill
+	eend $?
+}
diff --git a/media-sound/mpd/mpd-0.18.10-r1.ebuild b/media-sound/mpd/mpd-0.18.10-r1.ebuild
new file mode 100644
index 000000000000..4b9f03d280f8
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.10-r1.ebuild
@@ -0,0 +1,204 @@
+# 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-r1.ebuild,v 1.1 2014/04/15 16:35:25 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 libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder 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 )
+	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 _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-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}"/${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
+}