cleaned out old versions, added 0.11.2-r1 (removing 0.11.2) w/ the depends/droproot fixes.

10 files changed, 46 insertions, 207 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 9e2f12873dbe..e216cc5b19e2 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.35 2004/07/22 21:15:33 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.36 2004/07/22 21:30:43 ferringb Exp $
+
+*mpd-0.11.2-r1 (22 Jul 2004)
+
+  22 Jul 2004; Brian Harring <ferringb@gentoo.org> mpd-0.10.3-r1.ebuild,
+  mpd-0.10.4.ebuild, mpd-0.11.2.ebuild, mpd-0.9.4-r1.ebuild, mpd-0.11.2-r1.ebuild:
+  Cleaning up of older versions, fixed depends in 0.11.2 and added
+  USE="droproot" in a revbump.
 
 *mpd-0.11.1-r1 (22 Jul 2004)
 
@@ -11,7 +18,7 @@
   handling, added USE="droproot" option to control whether mpd runs as root, or
   user mpd, and adjusted the default configuration so that it binds strictly to
   localhost. These changes are intended to secure the default install- versions
-  beyond 0.11.1 will install mpd as non-root by default.  Corrected init.d script
+  beyond 0.11.2 will install mpd as non-root by default.  Corrected init.d script
   so that /etc/mpd.conf is used (was fixed once upon a time, but crept back in)
   which closes bug #56132 .
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c907bec869cc..2641de20535e 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,14 +1,9 @@
 MD5 823b621df5d3717be87258d6616c1933 ChangeLog 5587
 MD5 ab49b3978e51630cd199bddd4321bd49 metadata.xml 221
-MD5 7f836ed517e151b1e1ba1d2f2181f616 mpd-0.10.3-r1.ebuild 1923
-MD5 10713136a84d9d1419d1a69d58706c9a mpd-0.10.4.ebuild 1915
-MD5 7eeee75a4f1b489521647df96913d3b5 mpd-0.9.4-r1.ebuild 1667
+MD5 c9b6887908758d78b7e0ee7665fad062 mpd-0.11.2-r1.ebuild 2809
 MD5 1c2e6013d4b9a78599df00ac4e92c11a mpd-0.11.0-r1.ebuild 2797
-MD5 76845e94c803c11e2d1724466e36fcbe mpd-0.11.2.ebuild 1914
 MD5 675656dda664cecc74b65082b872c1e9 mpd-0.11.1-r1.ebuild 2814
-MD5 727c4148fc9939fdbb4ba6770d2b1249 files/digest-mpd-0.10.3-r1 62
-MD5 c211dd1fcfbc2b64395fd728cc572621 files/digest-mpd-0.10.4 62
-MD5 b26df5fab168ac4c9bca171911b4dc8c files/digest-mpd-0.9.4-r1 62
+MD5 721443952b6dfa20f262595b919c626b files/digest-mpd-0.11.2-r1 63
 MD5 aac769d5eea24e74c5669be8f9f94aef files/mpd.rc6 874
 MD5 721443952b6dfa20f262595b919c626b files/digest-mpd-0.11.2 63
 MD5 12b5b0ad7c2d89bfa754775e3a984aad files/digest-mpd-0.11.0-r1 63
diff --git a/media-sound/mpd/files/digest-mpd-0.10.3-r1 b/media-sound/mpd/files/digest-mpd-0.10.3-r1
deleted file mode 100644
index a63b72317181..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.10.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd16e7cba47ca743106ab10bbcf1f41d mpd-0.10.3.tar.gz 815429
diff --git a/media-sound/mpd/files/digest-mpd-0.10.4 b/media-sound/mpd/files/digest-mpd-0.10.4
deleted file mode 100644
index f0e8afb0129f..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.10.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f9bbcffb2e79d851b91478a1f28ad67 mpd-0.10.4.tar.gz 815439
diff --git a/media-sound/mpd/files/digest-mpd-0.11.2 b/media-sound/mpd/files/digest-mpd-0.11.2-r1
index fc2c0e6f3322..fc2c0e6f3322 100644
--- a/media-sound/mpd/files/digest-mpd-0.11.2
+++ b/media-sound/mpd/files/digest-mpd-0.11.2-r1
diff --git a/media-sound/mpd/files/digest-mpd-0.9.4-r1 b/media-sound/mpd/files/digest-mpd-0.9.4-r1
deleted file mode 100644
index 565283b79cd9..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.9.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64e1e011b9d0f69db25cc6a104c59c90 mpd-0.9.4.tar.gz 1021683
diff --git a/media-sound/mpd/mpd-0.10.3-r1.ebuild b/media-sound/mpd/mpd-0.10.3-r1.ebuild
deleted file mode 100644
index 92163c3463fd..000000000000
--- a/media-sound/mpd/mpd-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.3-r1.ebuild,v 1.2 2004/06/25 00:13:30 agriffis Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac"
-
-DESCRIPTION="Music Player Daemon (mpd)"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.musicpd.org"
-
-KEYWORDS="x86 ~amd64 ~sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	media-libs/libid3tag
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib"
-
-src_compile() {
-	local myconf
-	myconf="`use_enable aac` `use_enable audiofile` `use_enable ipv6` `use_enable flac`"
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
-			--disable-vorbistest"
-	use mad || myconf="${myconf} --enable-mpd-mad --enable-mpd-id3tag"
-
-	econf ${myconf} || 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
-
-	dosed 's:^port.*$:port "2100":' /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
-}
-
-pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers, please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
-}
diff --git a/media-sound/mpd/mpd-0.10.4.ebuild b/media-sound/mpd/mpd-0.10.4.ebuild
deleted file mode 100644
index 0e3ad9720ad1..000000000000
--- a/media-sound/mpd/mpd-0.10.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.4.ebuild,v 1.2 2004/06/25 00:13:30 agriffis Exp $
-
-IUSE="oggvorbis mad aac audiofile ipv6 flac"
-
-DESCRIPTION="Music Player Daemon (mpd)"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-HOMEPAGE="http://www.musicpd.org"
-
-KEYWORDS="~x86 ~amd64 ~sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	audiofile? ( media-libs/audiofile )
-	flac? ( >=media-libs/flac-1.1.0 )
-	media-libs/libid3tag
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib"
-
-src_compile() {
-	local myconf
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
-			--disable-vorbistest"
-	use mad || myconf="${myconf} --enable-mpd-mad --enable-mpd-id3tag"
-
-	econf `use_enable aac` \
-		`use_enable audiofile` \
-		`use_enable ipv6` \
-		`use_enable flac` \
-		${myconf} || 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
-
-	dosed 's:^port.*$:port "2100":' /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
-}
-
-pkg_postinst() {
-	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
-	einfo "please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
-}
diff --git a/media-sound/mpd/mpd-0.11.2.ebuild b/media-sound/mpd/mpd-0.11.2-r1.ebuild
index 63a5716c4576..23ee4b228bb2 100644
--- a/media-sound/mpd/mpd-0.11.2.ebuild
+++ b/media-sound/mpd/mpd-0.11.2-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.2.ebuild,v 1.1 2004/07/21 19:17:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.2-r1.ebuild,v 1.1 2004/07/22 21:30:43 ferringb Exp $
 
-IUSE="oggvorbis mad aac audiofile ipv6 flac"
+inherit eutils
+
+IUSE="oggvorbis mad aac audiofile ipv6 flac droproot mikmod"
 
 DESCRIPTION="Music Player Daemon (mpd)"
 SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
@@ -13,27 +15,31 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )
+	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 )
-	media-libs/libid3tag
+	mikmod? ( >=media-libs/libmikmod )
+	alsa? ( media-libs/alsa-lib )
 	>=media-libs/libao-0.8.4
 	sys-libs/zlib"
 
 src_compile() {
-	local myconf
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
-			--disable-vorbistest"
-	use mad || myconf="${myconf} --enable-mpd-mad --enable-mpd-id3tag"
-
+	#flip on/off the support, and test.
 	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` \
-		${myconf} || die "could not configure"
+		`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"
 }
@@ -50,6 +56,10 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/mpd.rc6 mpd
 
+	if use droproot; then
+		dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
+	fi
+	dosed 's:^#bind.*$:bind "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
@@ -57,8 +67,21 @@ src_install() {
 	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
 }
 
+pkg_preinst() {
+	if use droproot; then
+		echo "adding user"
+		enewuser mpd '' '' '' audio || die "problem adding user mpd"
+	fi
+}
+
 pkg_postinst() {
 	einfo "libao prior to 0.8.4 has issues with the ALSA drivers"
 	einfo "please refer to the FAQ"
 	einfo "http://musicpd.sourceforge.net/faq.php if you are having problems."
+	einfo
+	einfo "There have been a few changes to the default config as of late for security reason."
+	einfo "If the use flag droproot is enabled, mpd runs as user mpd rather then root; this will be a default"
+	einfo "in later versions, rather then enabled via use flag."
+	einfo
+	einfo "Also, the default config now binds the daemon strictly to localhost, rather then all available IPs."
 }
diff --git a/media-sound/mpd/mpd-0.9.4-r1.ebuild b/media-sound/mpd/mpd-0.9.4-r1.ebuild
deleted file mode 100644
index 472563ba6834..000000000000
--- a/media-sound/mpd/mpd-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4-r1.ebuild,v 1.2 2004/06/25 00:13:30 agriffis Exp $
-
-IUSE="oggvorbis mad"
-
-DESCRIPTION="Music Player Daemon (mpd)"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.musicpd.org"
-
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay )
-	>=media-libs/flac-1.1.0
-	>=media-libs/libao-0.8.4
-	sys-libs/zlib"
-
-src_compile() {
-	local myconf
-	myconf=""
-
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg  --disable-oggtest \
-			--disable-vorbistest"
-	use mad || myconf="${myconf} --enable-mpd-mad --enable-mpd-id3tag"
-
-	econf ${myconf} || 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
-
-	dosed 's:^port.*$:port "2100":' /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
-}
-
-pkg_postinst() {
-	einfo "libao has issues with the ALSA drivers, please refer to the FAQ"
-	einfo "http://musicpd.sourceforge.net/faq.php"
-}