Modify installed initscript to need alsasound if alsa USE flag is set. Closes bug #99969 by Mike Kelly <pioto01 at gmail.com>. Change ogg USE flag to vorbis, bug #101877. Removed conditional dependency on libogg, as libvorbis itself depends on it. 'use netmount' in initscript depend(), closes bug #103458, by Nikolay Pashenkov <wildfire at ufanet.ru>.

(Portage version: 2.0.53_rc5)

6 files changed, 127 insertions, 30 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index a823e783381b..0eecbd2b9b1a 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.59 2005/10/16 20:28:41 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.60 2005/10/16 21:11:44 ticho Exp $
 
-  16 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6, metadata.xml:
-  Use 'after alsasound' instead of 'use alsasound' in the initscript. Closes
-  bug #99969, reported by Mike Kelly <pioto01 at gmail.com>.
+*mpd-0.11.5-r1 (16 Oct 2005)
+
+  16 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6,
+  mpd-0.11.5.ebuild, +mpd-0.11.5-r1.ebuild:
+  Modify installed initscript to need alsasound if alsa USE flag is set.
+  Closes bug #99969 by Mike Kelly <pioto01 at gmail.com>. Change ogg USE flag
+  to vorbis, bug #101877. Removed conditional dependency on libogg, as
+  libvorbis itself depends on it. 'use netmount' in initscript depend(),
+  closes bug #103458, by Nikolay Pashenkov <wildfire at ufanet.ru>.
 
   28 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -mpd-0.11.4.ebuild,
   -mpd-0.11.4-r1.ebuild, -mpd-0.11.4-r2.ebuild, mpd-0.11.5.ebuild:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 208774b23881..ba722cff25ac 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2fd19497a79fd29a04330b10dce4696d ChangeLog 9269
+MD5 30f5c297b4bdff517c13aa734e5749bf ChangeLog 9053
 MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5 63
-MD5 8c5298155f4be6bad9e3f8f97015e4a4 files/mpd.rc6 892
+MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5-r1 63
+MD5 88dce40f95c2edb497c44c8eefab3001 files/mpd.rc6 875
 MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
+MD5 84092bd6ef963475d0133c44e015d07e mpd-0.11.5-r1.ebuild 2888
 MD5 21e38811ed50249f5b77c39602cf86f9 mpd-0.11.5.ebuild 2914
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDUrgYQlM6RnzZP+IRAqGYAJ9MdhzuhEVT2rox50codYfXSl6J1ACgsVtz
-6nueVHyO71N96eMRe2ZpWXk=
-=TY0b
------END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/digest-mpd-0.11.5-r1 b/media-sound/mpd/files/digest-mpd-0.11.5-r1
new file mode 100644
index 000000000000..51d37f4d0442
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.11.5-r1
@@ -0,0 +1 @@
+MD5 1a9a1a9d31f00a43838b3752024f7ebe mpd-0.11.5.tar.gz 1127523
diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6
index 934f866dccbd..1412da896b0f 100644
--- a/media-sound/mpd/files/mpd.rc6
+++ b/media-sound/mpd/files/mpd.rc6
@@ -1,11 +1,11 @@
 #!/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/files/mpd.rc6,v 1.14 2005/10/16 20:27:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc6,v 1.15 2005/10/16 21:11:44 ticho Exp $
 
 depend() {
 	need localmount
-	after alsasound
+	use netmount
 } 
 
 checkconfig() {
diff --git a/media-sound/mpd/mpd-0.11.5-r1.ebuild b/media-sound/mpd/mpd-0.11.5-r1.ebuild
new file mode 100644
index 000000000000..c23b9304ae21
--- /dev/null
+++ b/media-sound/mpd/mpd-0.11.5-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r1.ebuild,v 1.1 2005/10/16 21:11:44 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis"
+
+DEPEND=">=media-libs/libao-0.8.4
+	!media-sound/mpd-svn
+	sys-libs/zlib
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	vorbis? ( media-libs/libvorbis )"
+
+pkg_setup() {
+	enewuser mpd '' '' '' audio || die "problem adding user mpd"
+}
+
+src_compile() {
+	econf \
+		$(use_enable aac) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis oggtest) \
+		$(use_enable vorbis vorbistest) \
+		|| die "could not configure"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "make install failed"
+
+	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.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
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
+}
+
+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"
+	einfo "problems."
+	einfo
+	einfo "The default config now binds the daemon strictly to localhost,"
+	einfo "rather then all available IPs."
+}
diff --git a/media-sound/mpd/mpd-0.11.5.ebuild b/media-sound/mpd/mpd-0.11.5.ebuild
index 73d161e96ce2..041da8286f12 100644
--- a/media-sound/mpd/mpd-0.11.5.ebuild
+++ b/media-sound/mpd/mpd-0.11.5.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/mpd-0.11.5.ebuild,v 1.7 2005/05/28 12:36:00 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5.ebuild,v 1.8 2005/10/16 21:11:44 ticho Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="aac alsa audiofile flac ipv6 mad mikmod ogg unicode"
+IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis"
 
 DEPEND=">=media-libs/libao-0.8.4
 	!media-sound/mpd-svn
@@ -23,8 +23,7 @@ DEPEND=">=media-libs/libao-0.8.4
 	mad? ( media-libs/libmad
 	       media-libs/libid3tag )
 	mikmod? ( media-libs/libmikmod )
-	ogg? ( media-libs/libogg
-		media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )"
 
 pkg_setup() {
 	enewuser mpd '' '' '' audio || die "problem adding user mpd"
@@ -42,9 +41,9 @@ src_compile() {
 		$(use_enable !mad id3tag) \
 		$(use_enable mikmod libmikmodtest) \
 		$(use_enable mikmod mod) \
-		$(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"
@@ -84,14 +83,14 @@ src_install() {
 	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() {
-	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"
-	einfo "problems."
-	einfo
+	echo
 	einfo "The default config now binds the daemon strictly to localhost,"
 	einfo "rather then all available IPs."
+	echo
 }