New release candidate. Use /var/log/mpd dir for logs, so we do not have to create them with correct perms in /var/log.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 156 insertions, 8 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index e594fb63ba5c..522fbb956c8a 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.74 2006/08/19 18:43:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.75 2006/08/24 23:27:29 ticho Exp $
+
+*mpd-0.12.0_rc3 (24 Aug 2006)
+
+  24 Aug 2006; <ticho@gentoo.org> +mpd-0.12.0_rc3.ebuild:
+  New release candidate. Use /var/log/mpd dir for logs, so we do not have to
+  create them with correct perms in /var/log.
 
 *mpd-0.12.0_rc2 (19 Aug 2006)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index be7e1153ca48..98c60d11bff8 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -12,6 +12,7 @@ SHA256 aaf555b4156c37dc8d6d8b18abb48b1fa577ab9a2fd46bf712fee03b0d3cbc06 files/mp
 DIST mpd-0.11.5.tar.gz 1127523 RMD160 4a7dd3473110aa1f860fbd7a760da7fdfe2a9ebf SHA1 5661008b3eb799f8d76949a37bc439917dbbb68a SHA256 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 DIST mpd-0.12.0rc1.tar.bz2 396642 RMD160 7bbd7d35d3c0c7c35e12c304a9ae5ec78ddb8fb3 SHA1 1a0e1695004e8a90c07731be4a7163745b5073bc SHA256 7ba411c305283feba94ced39e89819690836337493c7336eaea63df3e27a5e4c
 DIST mpd-0.12.0rc2.tar.bz2 396746 RMD160 3b81ecf6f3954ac41e61432ba25cd8142e8edbaf SHA1 77846c5fefe508891487ec78d4a4c10ad0493859 SHA256 edbcdfa8dd3cdfd63fd6b5208962abb637cd4a1b7500b708ace4cab943260f0a
+DIST mpd-0.12.0rc3.tar.bz2 396856 RMD160 ccc75718fa1a1e861bc87341b51f5079638653f1 SHA1 ca781bbf6fca01fc1908df8f911c8fb2257465d5 SHA256 50d40854f6d94fa4d1ac38d09951146876a03e71ec28cce1ed2dca489aa2d760
 EBUILD mpd-0.11.5-r2.ebuild 3304 RMD160 b1a7ea91c4445161d3bdc777e3a269ccc659a5f3 SHA1 e7d6aa473b17a2966339b7820c37e3cca9180f31 SHA256 d04571dec819d91b8303f6de7eac9715ab9edcf46462158318c754b89a47efc8
 MD5 08052f4e9ffe594d6b35c9d8c113ef6e mpd-0.11.5-r2.ebuild 3304
 RMD160 b1a7ea91c4445161d3bdc777e3a269ccc659a5f3 mpd-0.11.5-r2.ebuild 3304
@@ -24,10 +25,14 @@ EBUILD mpd-0.12.0_rc2.ebuild 4113 RMD160 4401480409bdfc237624a5a69a0b3377b79168b
 MD5 9f119c8abe4a299b9a0c31ea122c99ee mpd-0.12.0_rc2.ebuild 4113
 RMD160 4401480409bdfc237624a5a69a0b3377b79168b2 mpd-0.12.0_rc2.ebuild 4113
 SHA256 9ad256bc6b72c10f381f9e2a7a772e546b6367731c816fbb67f92ec20a45c46c mpd-0.12.0_rc2.ebuild 4113
-MISC ChangeLog 11442 RMD160 a93e496622673d91ebb86926aa8626679f7d3b35 SHA1 5b753a55078ac5dd53e323e442039fe847d1a082 SHA256 c40962d3c58c1f0ad16efa5555d78bb570d5dbbda0a22c097dfb259d5316fe68
-MD5 8b31eaf06b08ec58e4ae8b2646c61617 ChangeLog 11442
-RMD160 a93e496622673d91ebb86926aa8626679f7d3b35 ChangeLog 11442
-SHA256 c40962d3c58c1f0ad16efa5555d78bb570d5dbbda0a22c097dfb259d5316fe68 ChangeLog 11442
+EBUILD mpd-0.12.0_rc3.ebuild 4042 RMD160 ec999fdb6c83888240f4fa89222cfeb54f55c0c4 SHA1 d5142c728defe3f44fe0ed68b69aacf6e56d9eb4 SHA256 d333901fd64eff998803bceab17f67ef8c867f1ca541d3ae88cefca20e3a8b55
+MD5 29c8db746e1f3d3255051f02354bd297 mpd-0.12.0_rc3.ebuild 4042
+RMD160 ec999fdb6c83888240f4fa89222cfeb54f55c0c4 mpd-0.12.0_rc3.ebuild 4042
+SHA256 d333901fd64eff998803bceab17f67ef8c867f1ca541d3ae88cefca20e3a8b55 mpd-0.12.0_rc3.ebuild 4042
+MISC ChangeLog 11655 RMD160 50ef677dd9b2a1560f422d27829810968c0ab484 SHA1 bfe49e74f57e0d1bba3ceb528dc2b54d5bc431de SHA256 bbc91bbc13c8ba31adb8488024098c8080f502f8d9fcffc9c300b1c493ad0b46
+MD5 0d447db4cad5066faae910491b0e3f40 ChangeLog 11655
+RMD160 50ef677dd9b2a1560f422d27829810968c0ab484 ChangeLog 11655
+SHA256 bbc91bbc13c8ba31adb8488024098c8080f502f8d9fcffc9c300b1c493ad0b46 ChangeLog 11655
 MISC metadata.xml 252 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d SHA1 3c81d53044fd315d5f10d2c46e3aa078c45d3384 SHA256 86a9454895a5e4e636f9da9f557de3525ed6e606f95ffe92ca1e79c005d3b4b9
 MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d metadata.xml 252
@@ -41,10 +46,13 @@ SHA256 a283d15ee00bbcd2e65faee3147e3a926be8b24207fa5136220d09470785a938 files/di
 MD5 cf0c656c79e900da3932bd1b9e45db19 files/digest-mpd-0.12.0_rc2 244
 RMD160 87f8e82a05dce9b9de61484f30912b4a6ea43f69 files/digest-mpd-0.12.0_rc2 244
 SHA256 50f00981ab19a43544fee01439cb844a566f9d89e44995b3cd660e26441f1b1f files/digest-mpd-0.12.0_rc2 244
+MD5 79ee1159e1a09bf0a2ae3aa27d5bad2a files/digest-mpd-0.12.0_rc3 244
+RMD160 0c8f9d967c66cd6f8d773a1dce72a215341a204a files/digest-mpd-0.12.0_rc3 244
+SHA256 3bf0fb5cd58403cd9b3071a65b7390f31c35fbef0d0bef598bf2c83b36194ff8 files/digest-mpd-0.12.0_rc3 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE51vx10xuJSrg3/sRAtMOAJ4g2IDF9buJaN7R8XievR+BKLA2iwCff9uB
-h6ETxUVxzV2hXOuWkfvc4Co=
-=+TIE
+iD8DBQFE7jYA10xuJSrg3/sRAqdtAJ46vX6Ee4g1K3yaC005VHJndpiGjQCfX8gq
+IRuxbtWA7W3hd8DTblycntU=
+=4uBZ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/digest-mpd-0.12.0_rc3 b/media-sound/mpd/files/digest-mpd-0.12.0_rc3
new file mode 100644
index 000000000000..89b33b6e9fdd
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.12.0_rc3
@@ -0,0 +1,3 @@
+MD5 b9d417538904408f6793b8507a6677c5 mpd-0.12.0rc3.tar.bz2 396856
+RMD160 ccc75718fa1a1e861bc87341b51f5079638653f1 mpd-0.12.0rc3.tar.bz2 396856
+SHA256 50d40854f6d94fa4d1ac38d09951146876a03e71ec28cce1ed2dca489aa2d760 mpd-0.12.0rc3.tar.bz2 396856
diff --git a/media-sound/mpd/mpd-0.12.0_rc3.ebuild b/media-sound/mpd/mpd-0.12.0_rc3.ebuild
new file mode 100644
index 000000000000..9b100d54f7ff
--- /dev/null
+++ b/media-sound/mpd/mpd-0.12.0_rc3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc3.ebuild,v 1.1 2006/08/24 23:27:29 ticho Exp $
+
+inherit eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A development version of Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://musicpd.org/uploads/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="aac alsa ao audiofile flac icecast ipv6 mp3 mikmod mp3 musepack oss
+pulseaudio unicode vorbis"
+
+DEPEND="dev-util/gperf
+	!media-sound/mpd-svn
+	sys-libs/zlib
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( >=media-libs/libao-0.8.4 )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	icecast? ( media-libs/libshout )
+	mp3? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	musepack? ( media-libs/libmpcdec )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )"
+
+S="${WORKDIR}/${MY_P}"
+
+upgrade_warning() {
+	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 5
+}
+
+pkg_setup() {
+	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() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable alsa alsatest) \
+		$(use_enable oss) \
+		$(use_enable mp3) \
+		$(use_enable aac) \
+		$(use_enable ao) \
+		$(use_enable ao aotest) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable flac oggflac) \
+		$(use_enable icecast shout) \
+		$(use_enable ipv6) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable musepack mpc) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable vorbis 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-0.12.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 "/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/mpd.log":' /etc/mpd.conf
+	dosed 's:^error_file.*$:error_file "/var/log/mpd/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 "/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 /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+	dodir /var/log/mpd
+	keepdir /var/log/mpd
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
+}
+
+pkg_postinst() {
+	upgrade_warning
+	elog "If you are upgrading from 0.11.x, check the configuration file carefully,"
+	elog "the format has changed. See the example config file installed as"
+	elog "/usr/share/doc/mpd-0.12.0_rc1/mpdconf.example.gz, and mpd.conf manual page."
+	elog ""
+	elog "Please make sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+}