Version bump. Ebuild updates by J. Alexander Treuman <jat at spatialrift.net>. Changed names of initscript and config file patch in FILESDIR to be version-agnostic, as they are used by both 0.12 and 0.13.

Package-Manager: portage-2.1.2.7

8 files changed, 188 insertions, 32 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 73e096ab6c40..f46fb0c346d8 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.97 2007/04/28 15:15:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.98 2007/05/28 21:59:00 ticho Exp $
+
+*mpd-0.13.0 (28 May 2007)
+
+  28 May 2007; Andrej Kacian <ticho@gentoo.org> -files/mpd-0.12.rc6,
+  -files/mpd-0.12-conf.patch, +files/mpd.rc, +files/mpdconf.patch,
+  mpd-0.12.1.ebuild, mpd-0.12.2.ebuild, +mpd-0.13.0.ebuild:
+  Version bump. Ebuild updates by J. Alexander Treuman <jat at
+  spatialrift.net>. Changed names of initscript and config file patch in
+  FILESDIR to be version-agnostic, as they are used by both 0.12 and 0.13.
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> mpd-0.12.1.ebuild,
   mpd-0.12.2.ebuild:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 71ed6bdfd817..622cb8d8bcbe 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mpd-0.12-conf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
-MD5 14008de3b007a1fd65dd073ca2ab1aa8 files/mpd-0.12-conf.patch 2034
-RMD160 6cd9198056b813e8c6015275db800fc99da63f6f files/mpd-0.12-conf.patch 2034
-SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e files/mpd-0.12-conf.patch 2034
-AUX mpd-0.12.rc6 657 RMD160 354e9f6362b5b623cc323b1a0c1f3d0d0bb77d9a SHA1 b6d3a63763281c0efb17411ba48a1b55791aa5e9 SHA256 c4195a34c077ef3076d3c9b94319d597d3331f125f7a64f459b46df4c325e01c
-MD5 5886a8440b690411cb55460ea4f36f66 files/mpd-0.12.rc6 657
-RMD160 354e9f6362b5b623cc323b1a0c1f3d0d0bb77d9a files/mpd-0.12.rc6 657
-SHA256 c4195a34c077ef3076d3c9b94319d597d3331f125f7a64f459b46df4c325e01c files/mpd-0.12.rc6 657
+AUX mpd.rc 651 RMD160 581960c60558d0454a35f66339500b3f3cfbd844 SHA1 1b1e7d62ff529225d83a7e3c01eb9a26f96ad561 SHA256 e0a4b11fee17941fed21627da9599e723444d9263fff847b07e2381f7ad9835c
+MD5 aa5be6559f88175ec6879ba6921ffdbe files/mpd.rc 651
+RMD160 581960c60558d0454a35f66339500b3f3cfbd844 files/mpd.rc 651
+SHA256 e0a4b11fee17941fed21627da9599e723444d9263fff847b07e2381f7ad9835c files/mpd.rc 651
+AUX mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
+MD5 14008de3b007a1fd65dd073ca2ab1aa8 files/mpdconf.patch 2034
+RMD160 6cd9198056b813e8c6015275db800fc99da63f6f files/mpdconf.patch 2034
+SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e files/mpdconf.patch 2034
 DIST mpd-0.12.1.tar.bz2 397761 RMD160 3352e60ead352bac0b4776f4b784c9f9505bc9bc SHA1 8b124bfcf4b1b2c23abd40661bd0ad0b33fadbfe SHA256 eefac7e55f86716f1f5fbc1f33688cfc8f1c8cde12b1d76b18f17144ea5285ba
 DIST mpd-0.12.2.tar.bz2 396894 RMD160 f8d56e052a0ca799165f2184cdc4c6f80f4db54a SHA1 789cfda24c682695155e34907edf31c2b52c8eaa SHA256 45b62783595ccd6c24f49be9c366eac4273b1378fb6add89dd978518362090a5
-EBUILD mpd-0.12.1.ebuild 3441 RMD160 83180dbd95e7422669bdda69746e4fb3df515e3e SHA1 7d990f68a0ac586d138427005b58331fa199e210 SHA256 8d644d57f8c53b36d77c39a8ed9d54e488be2bb6121cc4c4aafdbf406d7fc6b8
-MD5 5315ffd2b5b5e73fa408cc405731071b mpd-0.12.1.ebuild 3441
-RMD160 83180dbd95e7422669bdda69746e4fb3df515e3e mpd-0.12.1.ebuild 3441
-SHA256 8d644d57f8c53b36d77c39a8ed9d54e488be2bb6121cc4c4aafdbf406d7fc6b8 mpd-0.12.1.ebuild 3441
-EBUILD mpd-0.12.2.ebuild 3456 RMD160 a8e952a9e0f1f7d46a3f20898102a159abe3d21f SHA1 31a2f591ca7afe11aaa55a015226c8fd1cb1ed14 SHA256 557ac259a48162b288bf6f9cd9d39369ec21794c8af4cdaac276f078753c935e
-MD5 a7f8e462f6dc77824f5fd14545d757b6 mpd-0.12.2.ebuild 3456
-RMD160 a8e952a9e0f1f7d46a3f20898102a159abe3d21f mpd-0.12.2.ebuild 3456
-SHA256 557ac259a48162b288bf6f9cd9d39369ec21794c8af4cdaac276f078753c935e mpd-0.12.2.ebuild 3456
-MISC ChangeLog 15062 RMD160 1f80c8997067bed4ca5106351f160069a5229b48 SHA1 5c4bc2b7d402c6f0dbda8ed6684a9bf3b30ba4de SHA256 412d88d0f5cbb533c46c75841c558f8c52e1aaab843cfaffa9119f0f771b5977
-MD5 d359186e1c40f30a28b4de5439c0267c ChangeLog 15062
-RMD160 1f80c8997067bed4ca5106351f160069a5229b48 ChangeLog 15062
-SHA256 412d88d0f5cbb533c46c75841c558f8c52e1aaab843cfaffa9119f0f771b5977 ChangeLog 15062
+DIST mpd-0.13.0.tar.bz2 410927 RMD160 cce5507070c3ccc58f2d8ad6330cd6adff91a747 SHA1 5d69d5ec6da8e4a26797017f682e54789691395c SHA256 84ed71327eb733d7e7521eceee89b235b909456bae923eba100d84b51df14a89
+EBUILD mpd-0.12.1.ebuild 3426 RMD160 1fd0a284661a6315b150d1ccecde611051aaeb2f SHA1 1d8d6569194f4a3d8b4477fdc308ec999726e07f SHA256 80c282ac3585de8cacc350fa81ef37bc04c5894ddf0a74c67580f1b3e3c67f39
+MD5 e815d315cf9c16cf8c50c51a46dc2e53 mpd-0.12.1.ebuild 3426
+RMD160 1fd0a284661a6315b150d1ccecde611051aaeb2f mpd-0.12.1.ebuild 3426
+SHA256 80c282ac3585de8cacc350fa81ef37bc04c5894ddf0a74c67580f1b3e3c67f39 mpd-0.12.1.ebuild 3426
+EBUILD mpd-0.12.2.ebuild 3441 RMD160 6af346e1b69157ef138343a34846413c77b70847 SHA1 2fee6cf8dfe274c5f2ff58a2d068d27dbdba910f SHA256 22fb3b7cc9b6048cc2070e2831aaa01ce3340dab8dad9be295cb88289ccf0ebc
+MD5 b1e4c910558b63d39474529ae16dd0fd mpd-0.12.2.ebuild 3441
+RMD160 6af346e1b69157ef138343a34846413c77b70847 mpd-0.12.2.ebuild 3441
+SHA256 22fb3b7cc9b6048cc2070e2831aaa01ce3340dab8dad9be295cb88289ccf0ebc mpd-0.12.2.ebuild 3441
+EBUILD mpd-0.13.0.ebuild 3761 RMD160 1234e7828c635b2defc825084aba93bf1ad5fc5c SHA1 cca35d4feb2e7fe4f61038fdbef0cbae89efc85f SHA256 b753ff18d4248931537fdf3ebf583f37786b06571612a2e8cd4e5998f015671d
+MD5 8956de165072c36e60b7bffcbec083e5 mpd-0.13.0.ebuild 3761
+RMD160 1234e7828c635b2defc825084aba93bf1ad5fc5c mpd-0.13.0.ebuild 3761
+SHA256 b753ff18d4248931537fdf3ebf583f37786b06571612a2e8cd4e5998f015671d mpd-0.13.0.ebuild 3761
+MISC ChangeLog 15498 RMD160 0bb3eff445c55bf6f1cb63f394f70e86289614ff SHA1 a73cdbb91fa5ec2b2b489b35bca71806e1ec7fd2 SHA256 563ee2d7a2051f51c46a4a581b67da84a4724fa4cb5dec27b83d40882ba7d8e0
+MD5 926f31547d6c0d26d888c689162f5939 ChangeLog 15498
+RMD160 0bb3eff445c55bf6f1cb63f394f70e86289614ff ChangeLog 15498
+SHA256 563ee2d7a2051f51c46a4a581b67da84a4724fa4cb5dec27b83d40882ba7d8e0 ChangeLog 15498
 MISC metadata.xml 252 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d SHA1 3c81d53044fd315d5f10d2c46e3aa078c45d3384 SHA256 86a9454895a5e4e636f9da9f557de3525ed6e606f95ffe92ca1e79c005d3b4b9
 MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
 RMD160 32292cee0438108fffaacf9d07b2b4b4f65d5b5d metadata.xml 252
@@ -33,10 +38,13 @@ SHA256 4c8759285775ccbac09920b738beac80d7ec87da489e4e3276c7f0dca6ff52e8 files/di
 MD5 1bea757e747b0d7f3b59dddf53429f80 files/digest-mpd-0.12.2 235
 RMD160 6139d2c1b9dd68facc0b8fa4018abe15b38c7993 files/digest-mpd-0.12.2 235
 SHA256 8d159e7a7ddead47f9bbeab89b9a8d15bb998adeb82c9b6f01eac06906fdc005 files/digest-mpd-0.12.2 235
+MD5 a382078b0b6085ebc73221a79d273480 files/digest-mpd-0.13.0 235
+RMD160 89eef889acd031324353588efa8181eb1c951cf2 files/digest-mpd-0.13.0 235
+SHA256 52180b8ad636155a3ab0f0231a11a28d2294f0844992b1953a5b4a94f5951c18 files/digest-mpd-0.13.0 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGM2UEV3J2n04EauwRAqobAJ9IWMtewPnAz8D961UVV/cqIJh/CACgqgJz
-UQjholl3vP93FkcSDSZe5ro=
-=gCLL
+iD8DBQFGW1CrQlM6RnzZP+IRAn1KAKCrnFKRwo+GHLIDekT0bekg9ixkywCfWbcz
+92Cj3oC24OININW5Ux115jk=
+=tapF
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/digest-mpd-0.13.0 b/media-sound/mpd/files/digest-mpd-0.13.0
new file mode 100644
index 000000000000..03c84f24765b
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.13.0
@@ -0,0 +1,3 @@
+MD5 7d77b017a249b67d94de43e6c56f9c58 mpd-0.13.0.tar.bz2 410927
+RMD160 cce5507070c3ccc58f2d8ad6330cd6adff91a747 mpd-0.13.0.tar.bz2 410927
+SHA256 84ed71327eb733d7e7521eceee89b235b909456bae923eba100d84b51df14a89 mpd-0.13.0.tar.bz2 410927
diff --git a/media-sound/mpd/files/mpd-0.12.rc6 b/media-sound/mpd/files/mpd.rc
index b0219404c5c1..38b2776d0755 100755
--- a/media-sound/mpd/files/mpd-0.12.rc6
+++ b/media-sound/mpd/files/mpd.rc
@@ -1,7 +1,7 @@
 #!/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-0.12.rc6,v 1.5 2007/03/25 17:07:53 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc,v 1.1 2007/05/28 21:59:00 ticho Exp $
 
 depend() {
 	need localmount
diff --git a/media-sound/mpd/files/mpd-0.12-conf.patch b/media-sound/mpd/files/mpdconf.patch
index d37f629d5cac..d37f629d5cac 100644
--- a/media-sound/mpd/files/mpd-0.12-conf.patch
+++ b/media-sound/mpd/files/mpdconf.patch
diff --git a/media-sound/mpd/mpd-0.12.1.ebuild b/media-sound/mpd/mpd-0.12.1.ebuild
index e645d7e159ee..1a7619569267 100644
--- a/media-sound/mpd/mpd-0.12.1.ebuild
+++ b/media-sound/mpd/mpd-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.1.ebuild,v 1.10 2007/04/28 15:15:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.1.ebuild,v 1.11 2007/05/28 21:59:00 ticho Exp $
 
 inherit eutils
 
@@ -50,7 +50,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/mpd-${PV%.*}-conf.patch || die "epatch for config file
+	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file
 	failed"
 }
 
@@ -97,7 +97,7 @@ src_install() {
 	insinto /etc
 	newins doc/mpdconf.example mpd.conf
 
-	newinitd "${FILESDIR}"/mpd-0.12.rc6 mpd
+	newinitd "${FILESDIR}"/mpd.rc mpd
 
 	if use unicode; then
 		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
diff --git a/media-sound/mpd/mpd-0.12.2.ebuild b/media-sound/mpd/mpd-0.12.2.ebuild
index c047c47bd6a0..006c27c0b4de 100644
--- a/media-sound/mpd/mpd-0.12.2.ebuild
+++ b/media-sound/mpd/mpd-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.2.ebuild,v 1.2 2007/04/28 15:15:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.2.ebuild,v 1.3 2007/05/28 21:59:00 ticho Exp $
 
 inherit eutils
 
@@ -50,7 +50,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/mpd-${PV%.*}-conf.patch || die "epatch for config file
+	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file
 	failed"
 }
 
@@ -97,7 +97,7 @@ src_install() {
 	insinto /etc
 	newins doc/mpdconf.example mpd.conf
 
-	newinitd "${FILESDIR}"/mpd-0.12.rc6 mpd
+	newinitd "${FILESDIR}"/mpd.rc mpd
 
 	if use unicode; then
 		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
diff --git a/media-sound/mpd/mpd-0.13.0.ebuild b/media-sound/mpd/mpd-0.13.0.ebuild
new file mode 100644
index 000000000000..de540d335be3
--- /dev/null
+++ b/media-sound/mpd/mpd-0.13.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.0.ebuild,v 1.1 2007/05/28 21:59:00 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="A development version of Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/uploads/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="aac alsa ao audiofile avahi flac icecast iconv ipv6 jack libsamplerate mp3 mikmod musepack ogg oss pulseaudio unicode vorbis"
+
+DEPEND="!sys-cluster/mpich2
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( >=media-libs/libao-0.8.4 )
+	audiofile? ( media-libs/audiofile )
+	avahi? ( net-dns/avahi )
+	flac? ( media-libs/flac )
+	icecast? ( media-libs/libshout )
+	iconv? ( virtual/libiconv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	musepack? ( media-libs/libmpcdec )
+	ogg? ( media-libs/libogg )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )"
+
+pkg_setup() {
+	if use ogg && use flac && ! built_with_use media-libs/flac ogg; then
+		eerror "To be able to play OggFlac files you need to build"
+		eerror "media-libs/flac with +ogg, to build libOggFLAC."
+		die "Missing libOggFLAC library."
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
+}
+
+src_compile() {
+	local myconf
+
+	myconf=""
+
+	if use avahi; then
+		myconf="${myconf} --with-zeroconf=avahi"
+	else
+		myconf="${myconf} --with-zeroconf=no"
+	fi
+
+	if use ogg && use flac; then
+		myconf="${myconf} --enable-oggflac --enable-libOggFLACtest"
+	else
+		myconf="${myconf} --disable-oggflac --disable-libOggFLACtest"
+	fi
+
+	econf \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable alsa alsatest) \
+		$(use_enable ao) \
+		$(use_enable ao aotest) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable icecast shout) \
+		$(use_enable iconv) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3) \
+		$(use_enable mikmod mod) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable musepack mpc) \
+		$(use_enable oss) \
+		$(use_enable ogg oggtest) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable vorbis vorbistest) \
+		${myconf} || 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 AUTHORS ChangeLog INSTALL README TODO UPGRADING
+	dodoc doc/COMMANDS doc/mpdconf.example
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.rc mpd
+
+	if use unicode; then
+		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
+	fi
+	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() {
+	elog "If you will be starting mpd via /etc/init.d/mpd initscript, please make"
+	elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+
+	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
+}