--- usr/portage/media-sound/mpd/mpd-0.16.5.ebuild	2012-05-05 05:05:09.000000000 -0400
+++ var/portage/media-sound/mpd/mpd-0.16.5.ebuild	2012-05-21 13:38:42.000000000 -0400
@@ -1,6 +1,6 @@
 # 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.16.5.ebuild,v 1.10 2012/05/05 08:39:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.9 2012/04/25 07:04:22 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc ~x64-macos x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
 fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
 +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
@@ -62,13 +62,13 @@
 	zeroconf? ( net-dns/avahi[dbus] )
 	zip? ( dev-libs/zziplib )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-util/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
+	use prefix || enewuser mpd "" "" "/var/lib/mpd" audio
 
 	if use inotify; then
 		CONFIG_CHECK="~INOTIFY_USER"
@@ -160,10 +160,10 @@
 
 	if use unicode; then
 		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${D}"/etc/mpd.conf || die "sed failed"
+			"${ED}"/etc/mpd.conf || die "sed failed"
 	fi
 
-	diropts -m0755 -o mpd -g audio
+	use prefix || diropts -m0755 -o mpd -g audio
 	dodir /var/lib/mpd
 	keepdir /var/lib/mpd
 	dodir /var/lib/mpd/music
@@ -177,5 +177,5 @@
 	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
+	use prefix || usermod -d "/var/lib/mpd" mpd
 }