From aebd728773cd40edcbe5d0bce55748300e66c869 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Mon, 24 May 2004 22:04:03 +0000 Subject: Updated init script, closing out bug #51748 --- media-sound/mpd/ChangeLog | 8 +++- media-sound/mpd/Manifest | 12 +++--- media-sound/mpd/files/digest-mpd-0.10.3 | 1 - media-sound/mpd/files/digest-mpd-0.10.3-r1 | 1 + media-sound/mpd/files/digest-mpd-0.9.4 | 1 - media-sound/mpd/files/digest-mpd-0.9.4-r1 | 1 + media-sound/mpd/files/mpd.rc6 | 7 ++-- media-sound/mpd/mpd-0.10.3-r1.ebuild | 61 ++++++++++++++++++++++++++++++ media-sound/mpd/mpd-0.10.3.ebuild | 61 ------------------------------ media-sound/mpd/mpd-0.9.4-r1.ebuild | 58 ++++++++++++++++++++++++++++ media-sound/mpd/mpd-0.9.4.ebuild | 58 ---------------------------- 11 files changed, 137 insertions(+), 132 deletions(-) delete mode 100644 media-sound/mpd/files/digest-mpd-0.10.3 create mode 100644 media-sound/mpd/files/digest-mpd-0.10.3-r1 delete mode 100644 media-sound/mpd/files/digest-mpd-0.9.4 create mode 100644 media-sound/mpd/files/digest-mpd-0.9.4-r1 create mode 100644 media-sound/mpd/mpd-0.10.3-r1.ebuild delete mode 100644 media-sound/mpd/mpd-0.10.3.ebuild create mode 100644 media-sound/mpd/mpd-0.9.4-r1.ebuild delete mode 100644 media-sound/mpd/mpd-0.9.4.ebuild (limited to 'media-sound/mpd') diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 420c4dc653bd..5d09d50a4ee3 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/mpd # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.26 2004/05/04 02:06:59 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.27 2004/05/24 22:04:03 ferringb Exp $ + +*mpd-0.9.4-r1 (24 May 2004) + + 24 May 2004; Brian Harring mpd-0.10.3-r1.ebuild, + mpd-0.10.3.ebuild, mpd-0.9.4-r1.ebuild, mpd-0.9.4.ebuild, files/mpd.rc6: + Rev-bumped 0.9.4 and 10.3 to -r1, fixed init script. bug #51748 03 May 2004; Jeremy Huddleston mpd-0.10.3.ebuild, mpd-0.9.4.ebuild: diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest index 5a829f08a303..7bded25df412 100644 --- a/media-sound/mpd/Manifest +++ b/media-sound/mpd/Manifest @@ -1,7 +1,7 @@ -MD5 ae27ee00f3c63e09b3e7468725032a14 mpd-0.10.3.ebuild 1931 -MD5 5fbcd24d1bb5070ffab2df9b8d51517a mpd-0.9.4.ebuild 1675 -MD5 3374d49a0ad8529c0b8005e6cac04f6a ChangeLog 3900 +MD5 f8a680515b3714554c80af443be1f7f1 ChangeLog 4143 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 b26df5fab168ac4c9bca171911b4dc8c files/digest-mpd-0.9.4 62 -MD5 727c4148fc9939fdbb4ba6770d2b1249 files/digest-mpd-0.10.3 62 -MD5 5cd3bab7eb503a4ee550056af2e6ff30 files/mpd.rc6 916 +MD5 b23693f9344820d5f0eefa12bdbb2bb4 mpd-0.10.3-r1.ebuild 1932 +MD5 3a82f703941ebed688a50b4194558dd4 mpd-0.9.4-r1.ebuild 1676 +MD5 b26df5fab168ac4c9bca171911b4dc8c files/digest-mpd-0.9.4-r1 62 +MD5 727c4148fc9939fdbb4ba6770d2b1249 files/digest-mpd-0.10.3-r1 62 +MD5 cc593845fa97f61c502284600c858b07 files/mpd.rc6 861 diff --git a/media-sound/mpd/files/digest-mpd-0.10.3 b/media-sound/mpd/files/digest-mpd-0.10.3 deleted file mode 100644 index a63b72317181..000000000000 --- a/media-sound/mpd/files/digest-mpd-0.10.3 +++ /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.3-r1 b/media-sound/mpd/files/digest-mpd-0.10.3-r1 new file mode 100644 index 000000000000..a63b72317181 --- /dev/null +++ b/media-sound/mpd/files/digest-mpd-0.10.3-r1 @@ -0,0 +1 @@ +MD5 cd16e7cba47ca743106ab10bbcf1f41d mpd-0.10.3.tar.gz 815429 diff --git a/media-sound/mpd/files/digest-mpd-0.9.4 b/media-sound/mpd/files/digest-mpd-0.9.4 deleted file mode 100644 index 565283b79cd9..000000000000 --- a/media-sound/mpd/files/digest-mpd-0.9.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 64e1e011b9d0f69db25cc6a104c59c90 mpd-0.9.4.tar.gz 1021683 diff --git a/media-sound/mpd/files/digest-mpd-0.9.4-r1 b/media-sound/mpd/files/digest-mpd-0.9.4-r1 new file mode 100644 index 000000000000..565283b79cd9 --- /dev/null +++ b/media-sound/mpd/files/digest-mpd-0.9.4-r1 @@ -0,0 +1 @@ +MD5 64e1e011b9d0f69db25cc6a104c59c90 mpd-0.9.4.tar.gz 1021683 diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6 index 067a421a58c6..1c6d28a651da 100644 --- a/media-sound/mpd/files/mpd.rc6 +++ b/media-sound/mpd/files/mpd.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc6,v 1.5 2004/04/20 07:50:57 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc6,v 1.6 2004/05/24 22:04:03 ferringb Exp $ depend() { need localmount @@ -25,13 +25,12 @@ start() { checkconfig || return 1 ebegin "Starting Music Player Daemon" - start-stop-daemon --start --quiet --exec /usr/bin/mpd \ - --pidfile /var/run/mpd --make-pidfile -- --no-create-db + start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db eend $? } stop() { ebegin "Stopping Music Player Daemon" - start-stop-daemon --stop --quiet --pidfile /var/run/mpd + start-stop-daemon --stop --exec /usr/bin/mpd eend $? } diff --git a/media-sound/mpd/mpd-0.10.3-r1.ebuild b/media-sound/mpd/mpd-0.10.3-r1.ebuild new file mode 100644 index 000000000000..4cbd91f28c81 --- /dev/null +++ b/media-sound/mpd/mpd-0.10.3-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# 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.1 2004/05/24 22:04:03 ferringb 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.3.ebuild b/media-sound/mpd/mpd-0.10.3.ebuild deleted file mode 100644 index b53b12dad5b4..000000000000 --- a/media-sound/mpd/mpd-0.10.3.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.3.ebuild,v 1.7 2004/05/04 02:06:59 eradicator 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.9.4-r1.ebuild b/media-sound/mpd/mpd-0.9.4-r1.ebuild new file mode 100644 index 000000000000..b233a74b287a --- /dev/null +++ b/media-sound/mpd/mpd-0.9.4-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# 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.1 2004/05/24 22:04:03 ferringb 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" +} diff --git a/media-sound/mpd/mpd-0.9.4.ebuild b/media-sound/mpd/mpd-0.9.4.ebuild deleted file mode 100644 index cded7c6d48b4..000000000000 --- a/media-sound/mpd/mpd-0.9.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4.ebuild,v 1.5 2004/05/04 02:06:59 eradicator 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" -} -- cgit v1.2.3-65-gdbad