--- mpd-0.16.8.ebuild	2012-05-05 05:05:09.000000000 -0400
+++ mpd-0.16.8-r00.1.ebuild	2012-05-22 08:09:38.000000000 -0400
@@ -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
@@ -161,10 +161,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