Dont make use of the deprecated oggvorbis useflag any longer, see #94254.

Package-Manager: portage-2.0.51.22-r1

15 files changed, 54 insertions, 731 deletions

diff --git a/media-sound/mpd-svn/ChangeLog b/media-sound/mpd-svn/ChangeLog
index ec714cb28737..8ede359cb689 100644
--- a/media-sound/mpd-svn/ChangeLog
+++ b/media-sound/mpd-svn/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2005/05/12 10:48:24 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd-svn/ChangeLog,v 1.13 2005/05/28 12:54:08 luckyduck Exp $
+
+  28 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -mpd-svn-20041207.ebuild, -mpd-svn-20050131.ebuild,
+  -mpd-svn-20050308.ebuild, -mpd-svn-20050312.ebuild,
+  -mpd-svn-20050328.ebuild, -mpd-svn-20050408.ebuild,
+  mpd-svn-20050408-r1.ebuild:
+  Dont make use of the deprecated oggvorbis useflag any longer, see #94254.
 
   12 May 2005; Andrej Kacian <ticho@gentoo.org> mpd-svn-20050408-r1.ebuild:
   Changed 'mpc' USE flag to 'musepack'. Suggested by Andreas Claesson
diff --git a/media-sound/mpd-svn/Manifest b/media-sound/mpd-svn/Manifest
index ff26dfb18e56..58fb0c487259 100644
--- a/media-sound/mpd-svn/Manifest
+++ b/media-sound/mpd-svn/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e7f3e335924e2b9efad414e4f269076d mpd-svn-20041207.ebuild 3111
-MD5 b5fd110181c78bdbb57a8da7873491fd mpd-svn-20050408-r1.ebuild 3920
-MD5 a949f2738fb9b8c36a256ac9531fda4d mpd-svn-20050312.ebuild 3738
-MD5 fd2c2dd25dc00071a4f48bc07eb8fca4 mpd-svn-20050308.ebuild 3497
-MD5 02fed60e83a2a4fa97ffb270283f346b mpd-svn-20050131.ebuild 3196
-MD5 d11cec98d13ab49a23ef8a4c99f41558 mpd-svn-20050328.ebuild 3738
-MD5 ae8a4ba48ef1f24a3257efe8c47ea820 mpd-svn-20050408.ebuild 3827
-MD5 e708bfc610da5d545de4a986746b7df7 ChangeLog 2883
+MD5 a832e52d5789026d84611787edddf804 mpd-svn-20050408-r1.ebuild 3945
+MD5 eb61e53262e0de6d71ff1d7db8102244 ChangeLog 3208
 MD5 28ed49040b6ddc36def2c2a536394b37 metadata.xml 251
 MD5 c5dbcf547c18db7bc2f46dfcc877190b files/digest-mpd-svn-20050408-r1 69
 MD5 4e6ca0e3263baccca8dbe560cb7304da files/mpd.rc6 881
-MD5 a7cc5b5be644089b25d206fe9b71ebd1 files/digest-mpd-svn-20041207 69
-MD5 22e3fa9684ff58f754a41fb785c8b32a files/digest-mpd-svn-20050131 69
-MD5 51916f6bb6ff487021c4c26f76a1d8e7 files/digest-mpd-svn-20050308 69
-MD5 9d06583bf2f3ca00fa9a5ae6c01cab9b files/digest-mpd-svn-20050312 69
-MD5 e236710f9d5c01c3f97b53f1c2013a19 files/digest-mpd-svn-20050328 69
-MD5 c5dbcf547c18db7bc2f46dfcc877190b files/digest-mpd-svn-20050408 69
 MD5 02158d2f5c411a78b65c7f692fb81405 files/mpd.pidfile.rc6 717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCgzTMQlM6RnzZP+IRAmPSAJ408yeIzfJfgezKRFefJw4pYbc9UwCdHlv+
-DqOyDtbyA8GrikPTd7XZISU=
-=AS1P
+iD8DBQFCmGoI06ebR+OMO78RAm/+AKCLg62rXMGpDucxs/F9A/oZXFg7nwCdHAxQ
+P/8dBZ7TIYr7sfEMGBHiQJ0=
+=Epbw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20041207 b/media-sound/mpd-svn/files/digest-mpd-svn-20041207
deleted file mode 100644
index 86c400ac8e89..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20041207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3325a44affae7acac190e54a60265c42 mpd-svn-20041207.tar.bz2 838873
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050131 b/media-sound/mpd-svn/files/digest-mpd-svn-20050131
deleted file mode 100644
index aa757a123fad..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050131
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4cb4817e5b7d4870437ea6acbb294cb mpd-svn-20050131.tar.bz2 835354
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050308 b/media-sound/mpd-svn/files/digest-mpd-svn-20050308
deleted file mode 100644
index a668b387247a..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050308
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e622467911b35278ef2d5629aab6008 mpd-svn-20050308.tar.bz2 852649
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050312 b/media-sound/mpd-svn/files/digest-mpd-svn-20050312
deleted file mode 100644
index 571949cfd7f8..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050312
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fba4bd46c2e2cfb71fe468a8c50dbab2 mpd-svn-20050312.tar.bz2 854281
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050328 b/media-sound/mpd-svn/files/digest-mpd-svn-20050328
deleted file mode 100644
index 1c293b77cd0b..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050328
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6801a62929f2182134158a61ab1c96bc mpd-svn-20050328.tar.bz2 864651
diff --git a/media-sound/mpd-svn/files/digest-mpd-svn-20050408 b/media-sound/mpd-svn/files/digest-mpd-svn-20050408
deleted file mode 100644
index 601908e9c6a4..000000000000
--- a/media-sound/mpd-svn/files/digest-mpd-svn-20050408
+++ /dev/null
@@ -1 +0,0 @@
-MD5 04d7d73d16eec28b02ba81e3ec902693 mpd-svn-20050408.tar.bz2 864460
diff --git a/media-sound/mpd-svn/mpd-svn-20041207.ebuild b/media-sound/mpd-svn/mpd-svn-20041207.ebuild
deleted file mode 100644
index fd2917c7b54c..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20041207.ebuild
+++ /dev/null
@@ -1,97 +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-20041207.ebuild,v 1.3 2005/03/11 19:06:09 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	dev-util/gperf"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING 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.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
-	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
-}
-
-pkg_postinst() {
-	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 having problems."
-	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather then all available IPs."
-	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."
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050131.ebuild b/media-sound/mpd-svn/mpd-svn-20050131.ebuild
deleted file mode 100644
index af5b42eb69a4..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050131.ebuild
+++ /dev/null
@@ -1,100 +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-20050131.ebuild,v 1.2 2005/03/11 19:06:09 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib
-	dev-util/gperf
-	icecast? ( media-libs/libshout )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable icecast shout` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING 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.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
-	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
-}
-
-pkg_postinst() {
-	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 having problems."
-	einfo
-	einfo "The default config now binds the daemon strictly to localhost, rather than"
-	einfo "to all available IPs."
-	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."
-}
diff --git a/media-sound/mpd-svn/mpd-svn-20050308.ebuild b/media-sound/mpd-svn/mpd-svn-20050308.ebuild
deleted file mode 100644
index ad752f797ab0..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050308.ebuild
+++ /dev/null
@@ -1,112 +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-20050308.ebuild,v 1.1 2005/03/11 19:06:10 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	sys-libs/zlib
-	dev-util/gperf
-	icecast? ( media-libs/libshout )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable ao` \
-		`use_enable icecast shout` || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING 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.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
-	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
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost, rather than"
-	einfo "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 having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to adjust audio_output"
-		ewarn "sections in /etc/mpd.conf to use ALSA or OSS. See"
-		ewarn "/usr/share/doc/${PF}/mpdconf.example.gz."
-		draw_line
-		echo
-	fi
-	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-20050312.ebuild b/media-sound/mpd-svn/mpd-svn-20050312.ebuild
deleted file mode 100644
index 7f4d7df833c9..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050312.ebuild
+++ /dev/null
@@ -1,119 +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-20050312.ebuild,v 1.2 2005/03/14 00:05:19 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	sys-libs/zlib
-	dev-util/gperf
-	icecast? ( media-libs/libshout )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable ao` \
-		`use_enable icecast shout` || 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
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING 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
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost, rather than"
-	einfo "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 having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to adjust audio_output"
-		ewarn "sections in /etc/mpd.conf to use 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-20050328.ebuild b/media-sound/mpd-svn/mpd-svn-20050328.ebuild
deleted file mode 100644
index e76c74ef5cc7..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050328.ebuild
+++ /dev/null
@@ -1,119 +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-20050328.ebuild,v 1.1 2005/03/28 15:24:24 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	sys-libs/zlib
-	dev-util/gperf
-	icecast? ( media-libs/libshout )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable ao` \
-		`use_enable icecast shout` || 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
-
-	emake install DESTDIR=${D} || die
-	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING 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
-}
-
-pkg_postinst() {
-	echo
-	einfo "The default config now binds the daemon strictly to localhost, rather than"
-	einfo "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 having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to adjust audio_output"
-		ewarn "sections in /etc/mpd.conf to use 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-20050408-r1.ebuild b/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild
index 5e365e5c4d9c..22207c931f49 100644
--- a/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild
+++ b/media-sound/mpd-svn/mpd-svn-20050408-r1.ebuild
@@ -1,8 +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-20050408-r1.ebuild,v 1.3 2005/05/12 10:48:24 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao musepack"
+# $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
 
@@ -10,46 +8,50 @@ DESCRIPTION="A development version of Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mad mikmod musepack ogg unicode"
 
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
+DEPEND="dev-util/gperf
+	!media-sound/mpd
+	sys-libs/zlib
 	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
 	alsa? ( media-libs/alsa-lib )
 	ao? ( >=media-libs/libao-0.8.4 )
-	sys-libs/zlib
-	dev-util/gperf
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
 	icecast? ( media-libs/libshout )
-	musepack? ( >=media-libs/libmusepack-1.1 )"
+	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 oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable ao` \
-		`use_enable icecast shout` \
-		`use_enable musepack mpc` || die "could not configure"
+	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"
 }
@@ -62,7 +64,7 @@ src_install() {
 
 	emake install DESTDIR=${D} || die
 	rm -rf ${D}/usr/share/doc/mpd/
-	dodoc COPYING ChangeLog INSTALL README TODO UPGRADING
+	dodoc ChangeLog INSTALL README TODO UPGRADING
 	dodoc doc/COMMANDS doc/mpdconf.example
 
 	insinto /etc
@@ -100,18 +102,20 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	einfo "The default config now binds the daemon strictly to localhost, rather than"
-	einfo "to all available IPs."
+	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 having problems."
+		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 adjust audio_output"
-		ewarn "sections in /etc/mpd.conf to use ALSA or OSS. See"
+		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
diff --git a/media-sound/mpd-svn/mpd-svn-20050408.ebuild b/media-sound/mpd-svn/mpd-svn-20050408.ebuild
deleted file mode 100644
index 20f5486ae2c5..000000000000
--- a/media-sound/mpd-svn/mpd-svn-20050408.ebuild
+++ /dev/null
@@ -1,123 +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.ebuild,v 1.2 2005/05/08 01:28:55 ticho Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac mikmod alsa unicode icecast ao"
-
-inherit eutils
-
-DESCRIPTION="A development version of Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND="!media-sound/mpd
-	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	mikmod? ( media-libs/libmikmod )
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.4 )
-	sys-libs/zlib
-	dev-util/gperf
-	icecast? ( media-libs/libshout )"
-
-pkg_setup() {
-	enewuser mpd '' '' '' audio || die "problem adding user mpd"
-}
-
-src_compile() {
-	econf `use_enable aac` \
-		`use_enable oggvorbis ogg` \
-		`use_enable oggvorbis oggtest` \
-		`use_enable oggvorbis vorbistest` \
-		`use_enable audiofile` \
-		`use_enable audiofile audiofiletest` \
-		`use_enable ipv6` \
-		`use_enable flac libFLACtest` \
-		`use_enable flac` \
-		`use_enable !mad mpd-mad` \
-		`use_enable !mad id3tag` \
-		`use_enable mikmod libmikmodtest` \
-		`use_enable mikmod mod` \
-		`use_enable ao` \
-		`use_enable icecast shout` || 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 COPYING 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, rather than"
-	einfo "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 having problems."
-		echo
-	else
-		draw_line
-		ewarn "As you're not using libao for audio output, you need to adjust audio_output"
-		ewarn "sections in /etc/mpd.conf to use 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
-}