Changed ogg USE flag to vorbis, bug #101877. Changed home directory of mpd user and all related config settings to /var/lib/mpd, bug #101662. Added 'use netmount' to initscript depend(). Removed old ebuilds.

(Portage version: 2.0.53_rc5)

15 files changed, 56 insertions, 605 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index 24910263d082..87ea7bc1db42 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/mpd-svn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.19 2005/10/10 14:01:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.20 2005/10/17 00:52:17 ticho Exp $
+
+*mpd-svn-20051009-r1 (17 Oct 2005)
+
+  17 Oct 2005; Andrej Kacian <ticho@gentoo.org> -files/mpd.pidfile.rc6,
+  files/mpd.rc6, -mpd-svn-20050408-r1.ebuild, -mpd-svn-20050601.ebuild,
+  -mpd-svn-20050731.ebuild, -mpd-svn-20050823.ebuild,
+  -mpd-svn-20050907.ebuild, +mpd-svn-20051009-r1.ebuild:
+  Changed ogg USE flag to vorbis, bug #101877. Changed home directory of mpd
+  user and all related config settings to /var/lib/mpd, bug #101662. Added
+  'use netmount' to initscript depend(). Removed old ebuilds.
 
 *mpd-svn-20051009 (10 Oct 2005)
 
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index 4baf3812451e..3a8535d42107 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,26 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1e7cf3dbea0c71acfd3656c55aa1870a mpd-svn-20050731.ebuild 3943
-MD5 51fc9629c4887379b64eb34ff41aeac4 mpd-svn-20050601.ebuild 3943
-MD5 39c2a66ba6d81e6b63a3aaa9ed58223c mpd-svn-20051009.ebuild 3965
-MD5 a832e52d5789026d84611787edddf804 mpd-svn-20050408-r1.ebuild 3945
-MD5 0632b570f63947b63e6dcfaf7bf15d0f mpd-svn-20050907.ebuild 3965
 MD5 901d95ed9d712191bfcaba5b87909860 ChangeLog 4325
-MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
-MD5 4e971b7fca427a0ee25dae15d1dd1697 mpd-svn-20050823.ebuild 3965
-MD5 c5dbcf547c18db7bc2f46dfcc877190b files/digest-mpd-svn-20050408-r1 69
-MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
-MD5 1e90c2bf70a37aa60def8f6570621667 files/digest-mpd-svn-20050601 69
-MD5 f401f6ffc23b28ea41f472eb3d2ef6c0 files/digest-mpd-svn-20050731 69
-MD5 e539ac321bff94e6f20dfe3c4ae41a71 files/digest-mpd-svn-20050823 69
-MD5 c7ffbfef29f971631b7390ec47b70769 files/digest-mpd-svn-20050907 69
 MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009 69
-MD5 02158d2f5c411a78b65c7f692fb81405 files/mpd.pidfile.rc6 717
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDSnRnQlM6RnzZP+IRAsQRAJ99rs/Y+ryGPSP6CtORsRV3ZvJHCACcDREl
-CuOFPOQL4aVwWXzkd5VhWoc=
-=xks0
------END PGP SIGNATURE-----
+MD5 5d7578fe5b1a752eac4f981a7c53c4bf files/digest-mpd-svn-20051009-r1 69
+MD5 e47c10119abd1ada0f809ac19d539b9f files/mpd.rc6 731
+MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
+MD5 9d0447a58543d5a0ab9adb7188de1dc6 mpd-svn-20051009-r1.ebuild 4410
+MD5 39c2a66ba6d81e6b63a3aaa9ed58223c mpd-svn-20051009.ebuild 3965
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050408-r1 b/media-sound/mpd-svn/files/digest-mpd-svn-20050408-r1
deleted file mode 100644
index 601908e9c6a4..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050408-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 04d7d73d16eec28b02ba81e3ec902693 mpd-svn-20050408.tar.bz2 864460
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050601 b/media-sound/mpd-svn/files/digest-mpd-svn-20050601
deleted file mode 100644
index de2f3c316ee5..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050601
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b115d6e2f149dbd71ca0a5de4aea761 mpd-svn-20050601.tar.bz2 877843
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050731 b/media-sound/mpd-svn/files/digest-mpd-svn-20050731
deleted file mode 100644
index 427b8c455a8a..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050731
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0003599797e0b010823cc373142e1b80 mpd-svn-20050731.tar.bz2 877245
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050823 b/media-sound/mpd-svn/files/digest-mpd-svn-20050823
deleted file mode 100644
index 7613bac7294e..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050823
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a62de62258db66085bbdc20cc63d9a3 mpd-svn-20050823.tar.bz2 879823
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050907 b/media-sound/mpd-svn/files/digest-mpd-svn-20050907
deleted file mode 100644
index 313f411f6439..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050907
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb1be6e82f61ee5f63e82d7e14b80c3d mpd-svn-20050907.tar.bz2 881718
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20051009-r1 b/media-sound/mpd-svn/files/digest-mpd-svn-20051009-r1
new file mode 100644
index 000000000000..09384ed966ce
--- /dev/null
+++ b/media-sound/mpd-svn/files/digest-mpd-svn-20051009-r1
@@ -0,0 +1 @@
+MD5 8d460c571673c31911370c26a8f2e498 mpd-svn-20051009.tar.bz2 883235
diff --git a/media-sound/mpd-svn/files/mpd.pidfile.rc6 b/media-sound/mpd-svn/files/mpd.pidfile.rc6
deleted file mode 100755
index 3e50c7e2280b..000000000000
--- a/media-sound/mpd-svn/files/mpd.pidfile.rc6
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.pidfile.rc6,v 1.2 2005/03/13 16:26:45 ticho Exp $
-
-pidfile="/var/run/mpd/mpd.pid"
-
-depend() {
-	need localmount
-} 
-
-checkconfig() {
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --pidfile ${pidfile}
-	eend $? 
-}
diff --git a/media-sound/mpd-svn/files/mpd.rc6 b/media-sound/mpd-svn/files/mpd.rc6
index d53d80b4b298..46fbb69b39ed 100755
--- a/media-sound/mpd-svn/files/mpd.rc6
+++ b/media-sound/mpd-svn/files/mpd.rc6
@@ -1,18 +1,16 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.rc6,v 1.2 2005/03/11 19:06:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/files/mpd.rc6,v 1.3 2005/10/17 00:52:17 ticho Exp $
+
+pidfile="/var/run/mpd/mpd.pid"
 
 depend() {
 	need localmount
+	use netmount
 } 
 
 checkconfig() {
-	if [ -f /etc/conf.d/mpd ]; then
-		eerror "Please remove the /etc/conf.d/mpd file as it is no longer used."
-		eerror "You may configure your mpd settings in /etc/mpd.conf"
-	fi
-
 	if ! [ -f /etc/mpd.conf ]; then
 		eerror "Configuration file /etc/mpd.conf does not exist."
 		return 1
@@ -25,12 +23,12 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
+	start-stop-daemon --start --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --signal 1 --exec /usr/bin/mpd 
+	start-stop-daemon --stop --pidfile ${pidfile}
 	eend $? 
 }
diff --git a/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild b/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild
deleted file mode 100644
index 22207c931f49..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild,v 1.4 2005/05/28 12:54:08 luckyduck Exp $
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
-
-DEPEND="dev-util/gperf
-	!media-sound/mpd
-	sys-libs/zlib
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	icecast? ( media-libs/libshout )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( >=media-libs/libmusepack-1.1 )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf \
-		$(use_enable aac) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable flac) \
-		$(use_enable icecast shout) \
-		$(use_enable ipv6) \
-		$(use_enable !mad mpd-mad) \
-		$(use_enable !mad id3tag) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable ogg) \
-		$(use_enable ogg oggtest) \
-		$(use_enable ogg vorbistest) \
-		|| die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.pidfile.rc6 mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
-	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost,"
-	einfo "rather than to all available IPs."
-	echo
-	if use ao; then
-		einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-		einfo "please refer to the FAQ"
-		einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are"
-		einfo "having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to"
-		ewarn "adjust audio_output sections in /etc/mpd.conf to use"
-		ewarn "ALSA or OSS. See"
-		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
-		draw_line
-		echo
-	fi
-	einfo "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-	echo
-	ewarn "Note that this is just a development version of Music Player Daemon,"
-	ewarn "so if you want to report any bug, please state this fact in your"
-	ewarn "report, as well as the fact that you used a ${P} Gentoo ebuild."
-	echo
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050601.ebuild b/media-sound/mpd-svn/mpd-svn-20050601.ebuild
deleted file mode 100644
index 5fdd0e93a41d..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050601.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050601.ebuild,v 1.2 2005/07/25 13:39:06 dholm Exp $
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
-
-DEPEND="dev-util/gperf
-	!media-sound/mpd
-	sys-libs/zlib
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	icecast? ( media-libs/libshout )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( >=media-libs/libmusepack-1.1 )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf \
-		$(use_enable aac) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable flac) \
-		$(use_enable icecast shout) \
-		$(use_enable ipv6) \
-		$(use_enable !mad mpd-mad) \
-		$(use_enable !mad id3tag) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable ogg) \
-		$(use_enable ogg oggtest) \
-		$(use_enable ogg vorbistest) \
-		|| die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.pidfile.rc6 mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
-	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost,"
-	einfo "rather than to all available IPs."
-	echo
-	if use ao; then
-		einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-		einfo "please refer to the FAQ"
-		einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are"
-		einfo "having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to"
-		ewarn "adjust audio_output sections in /etc/mpd.conf to use"
-		ewarn "ALSA or OSS. See"
-		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
-		draw_line
-		echo
-	fi
-	einfo "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-	echo
-	ewarn "Note that this is just a development version of Music Player Daemon,"
-	ewarn "so if you want to report any bug, please state this fact in your"
-	ewarn "report, as well as the fact that you used a ${P} Gentoo ebuild."
-	echo
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050731.ebuild b/media-sound/mpd-svn/mpd-svn-20050731.ebuild
deleted file mode 100644
index 3b5e5b40dab9..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050731.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050731.ebuild,v 1.1 2005/07/30 22:21:08 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
-
-DEPEND="dev-util/gperf
-	!media-sound/mpd
-	sys-libs/zlib
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	icecast? ( media-libs/libshout )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( >=media-libs/libmusepack-1.1 )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf \
-		$(use_enable aac) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable flac) \
-		$(use_enable icecast shout) \
-		$(use_enable ipv6) \
-		$(use_enable !mad mpd-mad) \
-		$(use_enable !mad id3tag) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable ogg) \
-		$(use_enable ogg oggtest) \
-		$(use_enable ogg vorbistest) \
-		|| die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.pidfile.rc6 mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
-	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost,"
-	einfo "rather than to all available IPs."
-	echo
-	if use ao; then
-		einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-		einfo "please refer to the FAQ"
-		einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are"
-		einfo "having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to"
-		ewarn "adjust audio_output sections in /etc/mpd.conf to use"
-		ewarn "ALSA or OSS. See"
-		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
-		draw_line
-		echo
-	fi
-	einfo "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-	echo
-	ewarn "Note that this is just a development version of Music Player Daemon,"
-	ewarn "so if you want to report any bug, please state this fact in your"
-	ewarn "report, as well as the fact that you used a ${P} Gentoo ebuild."
-	echo
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050823.ebuild b/media-sound/mpd-svn/mpd-svn-20050823.ebuild
deleted file mode 100644
index 4b426f6d3427..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050823.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050823.ebuild,v 1.1 2005/08/23 15:39:15 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
-
-DEPEND="dev-util/gperf
-	!media-sound/mpd
-	sys-libs/zlib
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	icecast? ( media-libs/libshout )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( >=media-libs/libmusepack-1.1 )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf \
-		$(use_enable aac) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable flac) \
-		$(use_enable icecast shout) \
-		$(use_enable ipv6) \
-		$(use_enable !mad mpd-mad) \
-		$(use_enable !mad id3tag) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable mikmod mod) \
-		$(use_enable musepack mpc) \
-		$(use_enable ogg) \
-		$(use_enable ogg oggtest) \
-		$(use_enable ogg vorbistest) \
-		|| die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.pidfile.rc6 mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
-	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
-	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
-	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
-	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
-	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
-	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
-	insinto /var/log
-	touch ${T}/blah
-	insopts -m0640 -o mpd -g audio
-	newins ${T}/blah mpd.log
-	newins ${T}/blah mpd.error.log
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost,"
-	einfo "rather than to all available IPs."
-	echo
-	if use ao; then
-		einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-		einfo "please refer to the FAQ"
-		einfo "http://www.musicpd.org/wiki/moin.cgi/MpdFAQ if you are"
-		einfo "having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to"
-		ewarn "adjust audio_output sections in /etc/mpd.conf to use"
-		ewarn "ALSA or OSS. See"
-		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
-		draw_line
-		echo
-	fi
-	einfo "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-	echo
-	ewarn "Note that this is just a development version of Music Player Daemon,"
-	ewarn "so if you want to report any bug to MPD developers, please state this fact in"
-	ewarn "your bug report, as well as the fact that you used a ${P} Gentoo ebuild."
-	echo
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050907.ebuild b/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild
index 1814d4965d54..42dba12c8278 100644
--- a/media-sound/mpd-svn/mpd-svn-20050907.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20050907.ebuild,v 1.1 2005/09/07 21:15:57 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/mpd-svn-20051009-r1.ebuild,v 1.1 2005/10/17 00:52:17 ticho Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod mp3 musepack ogg oss unicode"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod mp3 musepack vorbis oss unicode"
 
 DEPEND="dev-util/gperf
 	!media-sound/mpd
@@ -26,11 +26,26 @@ DEPEND="dev-util/gperf
 	       media-libs/libid3tag )
 	mikmod? ( media-libs/libmikmod )
 	musepack? ( media-libs/libmpcdec )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )"
+
+upgrade_warning() {
+	echo
+	ewarn "This package now correctly uses 'vorbis' USE flag, instead of 'ogg'."
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=101877 for details."
+	echo
+	ewarn "Home directory of user mpd, as well as default locations in mpd.conf have"
+	ewarn "been changed to /var/lib/mpd, please bear that in mind while updating"
+	ewarn "your mpd.conf file."
+	echo
+	epause 7
+}
 
 pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
+	upgrade_warning
+	enewuser mpd '' '' "/var/lib/mpd" audio || die "problem adding user mpd"
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
 }
 
 src_compile() {
@@ -53,9 +68,9 @@ src_compile() {
 		$(use_enable mikmod libmikmodtest) \
 		$(use_enable mikmod mod) \
 		$(use_enable musepack mpc) \
-		$(use_enable ogg) \
-		$(use_enable ogg oggtest) \
-		$(use_enable ogg vorbistest) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis oggtest) \
+		$(use_enable vorbis vorbistest) \
 		|| die "could not configure"
 
 	emake || die "emake failed"
@@ -76,7 +91,7 @@ src_install() {
 	newins doc/mpdconf.example mpd.conf
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/mpd.pidfile.rc6 mpd
+	newexe ${FILESDIR}/mpd.rc6 mpd
 
 	if use unicode; then
 		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
@@ -84,18 +99,18 @@ src_install() {
 	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
 	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
 	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
-	dosed 's:^music_directory.*$:music_directory "/usr/share/mpd/music":' /etc/mpd.conf
-	dosed 's:^playlist_directory.*$:playlist_directory "/usr/share/mpd/playlists":' /etc/mpd.conf
+	dosed 's:^music_directory.*$:music_directory "/var/lib/mpd/music":' /etc/mpd.conf
+	dosed 's:^playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' /etc/mpd.conf
 	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
 	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
 	dosed 's:^pid_file.*$:pid_file "/var/run/mpd/mpd.pid":' /etc/mpd.conf
-	dosed 's:^db_file.*:db_file "/usr/share/mpd/database":' /etc/mpd.conf
+	dosed 's:^db_file.*:db_file "/var/lib/mpd/database":' /etc/mpd.conf
+	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state:' /etc/mpd.conf
 	diropts -m0755 -o mpd -g audio
-	dodir /usr/share/mpd/music
-	keepdir /usr/share/mpd/music
-	dodir /usr/share/mpd/playlists
-	keepdir /usr/share/mpd/playlists
-	dodir /usr/share/mpd/
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
 	insinto /var/log
 	touch ${T}/blah
 	insopts -m0640 -o mpd -g audio
@@ -125,5 +140,5 @@ pkg_postinst() {
 	ewarn "so if you want to report any bug to MPD developers, please state this fact in"
 	ewarn "your bug report, as well as the fact that you used a ${P} Gentoo ebuild."
 	draw_line
-	echo
+	upgrade_warning
 }