*** 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-07 08:13:03.000000000 -0400
***************
*** 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 $
  
  EAPI=4
  inherit eutils flag-o-matic linux-info multilib
--- 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.9 2012/04/25 07:04:22 angelos Exp $
  
  EAPI=4
  inherit eutils flag-o-matic linux-info multilib
***************
*** 11,21 ****
  
  LICENSE="GPL-2"
  SLOT="0"
! KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc 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
! sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
  
  REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
  	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
--- 11,22 ----
  
  LICENSE="GPL-2"
  SLOT="0"
! KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc ~x64-macos x86 ~x86-fbsd"
! IUSE="aac +alsa ao audiofile bzip2 cdio +createuser 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 sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi
! zeroconf zip"
  
  REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
  	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
***************
*** 62,74 ****
  	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"
--- 63,75 ----
  	zeroconf? ( net-dns/avahi[dbus] )
  	zip? ( dev-libs/zziplib )"
  DEPEND="${RDEPEND}
! 	dev-util/pkgconfig"
  
  pkg_setup() {
  	use network || ewarn "Icecast and Shoutcast streaming needs networking."
  	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
  
! 	use createuser && enewuser mpd "" "" "/var/lib/mpd" audio
  
  	if use inotify; then
  		CONFIG_CHECK="~INOTIFY_USER"
***************
*** 160,169 ****
  
  	if use unicode; then
  		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
! 			"${D}"/etc/mpd.conf || die "sed failed"
  	fi
  
! 	diropts -m0755 -o mpd -g audio
  	dodir /var/lib/mpd
  	keepdir /var/lib/mpd
  	dodir /var/lib/mpd/music
--- 161,170 ----
  
  	if use unicode; then
  		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
! 			"${ED}"/etc/mpd.conf || die "sed failed"
  	fi
  
! 	use createuser && diropts -m0755 -o mpd -g audio
  	dodir /var/lib/mpd
  	keepdir /var/lib/mpd
  	dodir /var/lib/mpd/music
***************
*** 177,181 ****
  	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
  }
--- 178,182 ----
  	elog "sure that MPD's pid_file is unset."
  
  	# also change the homedir if the user has existed before
! 	use createuser && usermod -d "/var/lib/mpd" mpd
  }