Version bump

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

5 files changed, 212 insertions, 8 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 36ecbf28774a..b11d96373733 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.160 2009/04/03 16:09:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.161 2009/04/14 13:14:09 angelos Exp $
+
+*mpd-0.15_alpha1 (14 Apr 2009)
+
+  14 Apr 2009; Christoph Mende <angelos@gentoo.org> metadata.xml,
+  mpd-0.14.2.ebuild, +mpd-0.15_alpha1.ebuild:
+  Version bump
 
   03 Apr 2009; Joseph Jezak <josejx@gentoo.org> mpd-0.14.2.ebuild:
   Marked ppc64 stable for bug #262680.
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f1ac1dfc2bae..590958684f35 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664
 AUX mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
 AUX mpdconf1.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SHA1 70a087a8de4b6abd185cb223d738db1f5544b9d8 SHA256 b31d7f3d426b9183b354cedeb1757f05c0ad7724a97c8c1bc7cc75cbfcac80cc
 DIST mpd-0.13.2.tar.bz2 413347 RMD160 39825142d8f19ca04d7a2e025b59043a8adb53fa SHA1 3b826bc75c314e6db6715a978c9b405775d3478c SHA256 d98db80ec0bba7d4a82a8aecff965f6887f7b055ad064d8d5ccb55cc614cdfb5
 DIST mpd-0.14.2.tar.bz2 287115 RMD160 4580907acdf361713bf3fe881a47871e84dfa864 SHA1 1ac9f6eff72c9e061af670e195da824310f3d922 SHA256 0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
+DIST mpd-0.15_alpha1.tar.bz2 352935 RMD160 ef3a3a94f2e886c72d96c29d0d3ae556ef401e3b SHA1 7265733fc67f48b6bbb6ab2b035189721a90966d SHA256 5c415e5160f04471c95d160c7f65ecd51ac17c12ff26322687a3eba859e55138
 EBUILD mpd-0.13.2.ebuild 3553 RMD160 5c47c39953147d7e19decc156a126a63e68abc26 SHA1 6a11d9ce1b52107fe5dc29600137a702e168ce78 SHA256 8da5aa4a463f6a32a88fa4fde6798333906a77d674f0e7e2acb97b96e2b03d6d
-EBUILD mpd-0.14.2.ebuild 4514 RMD160 c6372816684dbe88d1ea68e9a283d0a5a6b69d47 SHA1 da903251a615f9aab8f5609122942552c058bfa7 SHA256 35e7b65607dcd59c61e9604a3819fb953b54859a7675b42b090578e570ba833d
-MISC ChangeLog 24209 RMD160 e84d6470b81f33d27f6a107d8d9738b2835c5c30 SHA1 ed8120e05c531118017086a9ac32997f0e8e4cbd SHA256 f7c3d987a357ab27f6195cfc9faa0dfb5e11d95ef4fd4e2dc5c97b7590363a9a
-MISC metadata.xml 491 RMD160 f620e771db01e1d14ee96c2e109a1fa81280773e SHA1 519af3abcfc78ae9a172f1d70adde256015a710c SHA256 1299dc884cf251322a82343bf58770aa063e7b82f3c0dd1478e21cdfc6afada3
+EBUILD mpd-0.14.2.ebuild 4515 RMD160 a33f04389f8619c94f9f0f2c1cf7df1359af8351 SHA1 ac17c062b4977d1d5c5fac2fd4a9cc0dffe74919 SHA256 a4d3b90b611169e68cab7af34f28ce419bb834d6e39b7bb7bb9a8758453038a0
+EBUILD mpd-0.15_alpha1.ebuild 4917 RMD160 ffb8321dbe629ed451f0b0f413c58e14b8305051 SHA1 04cc94f18b5a5aa43c8b08e874f6e27d9aa1b9f8 SHA256 27e122dd652c09546dbb58d2ab572c7bcaf75311f8b9e3ef4af43432f65c5238
+MISC ChangeLog 24370 RMD160 3310320a11376c4343d21546ccd45b8fb977972e SHA1 90d6c7a9fdd105a729804667489ecc682998a72d SHA256 50da1f800563eb15e17f75bd0625f6212b9a18420c25cd9a877100078aac05b7
+MISC metadata.xml 1160 RMD160 cc2892e87f913ab202bc3194e647e6bddde64a76 SHA1 5d8631a40c4ba426370df094eef1a71d8eb486d0 SHA256 151307b7e3164cee6edd336adc42992ed8ac75d1046830aaa84304d50c0f67e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknkjCoACgkQKhnDs22gwa9x1ACgnvGmnYSi/LFqCzRKSzfNhsXJ
+oFoAoMOR1WZU2/dHdZGg7bU6WygDrp8n
+=iz7w
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 60368bca8aca..35f0117b1607 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -7,9 +7,19 @@
 	<name>Christoph Mende</name>
   </maintainer>
   <use>
-	<flag name="curl">Support for web streams</flag>
-	<flag name="icecast">Enable support for Icecast2</flag>
+	<flag name="cdio">Use libcdio for CD support</flag>
+	<flag name="curl">Support for web stream listening</flag>
+	<flag name="fifo">Support writing audio to a FIFO</flag>
+	<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis</flag>
+	<flag name="gprof">Build with profiling support</flag>
+	<flag name="http-stream">Support streaming via built-in HTTP server</flag>
+	<flag name="icecast">Support for Icecast2 streaming</flag>
 	<flag name="id3">Support for ID3 tags</flag>
 	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
+	<flag name="lastfmradio">Support listening to last.fm radio stations</flag>
+	<flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
+	<flag name="pipe">Support writing audio to a pipe</flag>
+	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+	<flag name="zip">Support for ZIP files</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.14.2.ebuild b/media-sound/mpd/mpd-0.14.2.ebuild
index a4a240963402..b2536c8a5d40 100644
--- a/media-sound/mpd/mpd-0.14.2.ebuild
+++ b/media-sound/mpd/mpd-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.2.ebuild,v 1.8 2009/04/03 16:09:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.2.ebuild,v 1.9 2009/04/14 13:14:09 angelos Exp $
 
 EAPI=2
 
@@ -108,10 +108,10 @@ src_configure() {
 		$(use_enable musepack mpc) \
 		$(use_enable oss) \
 		$(use_enable pulseaudio pulse) \
-		--enable-un \
 		$(use_enable vorbis oggvorbis) \
 		$(use_enable wavpack) \
 		$(use_with zeroconf zeroconf avahi) \
+		--enable-un \
 		${myconf}
 }
 
diff --git a/media-sound/mpd/mpd-0.15_alpha1.ebuild b/media-sound/mpd/mpd-0.15_alpha1.ebuild
new file mode 100644
index 000000000000..abc2a4e15413
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15_alpha1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_alpha1.ebuild,v 1.1 2009/04/14 13:14:09 angelos Exp $
+
+EAPI=2
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug doc +fifo +ffmpeg flac fluidsynth gprof http-stream icecast +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad mikmod modplug musepack ogg oss pipe pulseaudio sid sqlite unicode vorbis wavpack zeroconf zip"
+
+RDEPEND="!sys-cluster/mpich2
+	>=dev-libs/glib-2.4:2
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( >=media-libs/libao-0.8.4 )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac
+		ogg? ( media-libs/flac[ogg] ) )
+	fluidsynth? ( media-sound/fluidsynth )
+	icecast? ( lame? ( media-libs/libshout )
+		vorbis? ( media-libs/libshout ) )
+	id3? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( icecast? ( media-sound/lame ) )
+	libmms? ( media-libs/libmms )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-libs/libmpcdec )
+	ogg? ( media-libs/libogg )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sqlite? ( dev-db/sqlite:3 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	zeroconf? ( net-dns/avahi )
+	zip? ( dev-libs/zziplib )"
+	#midi? ( media-libs/wildmidi )
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen
+		app-text/xmlto )"
+
+pkg_setup() {
+	if use icecast || use http; then
+		if ! use lame && ! use vorbis; then
+			eerror "Icecast or http output streaming is enabled,"
+			eerror "but there is no encoding enabled (lame and"
+			eerror "vorbis are both disabled)."
+		fi
+	fi
+
+	if use lastfmradio && ! use curl; then
+		eerror "Cannot enable lastfmradio without curl."
+	fi
+
+	if use fluidsynth; then
+		ewarn "Use of fluidsynth USE is highly discouraged by upstream."
+		#ewarn "Use wildmidi unless you know better."
+	fi
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+}
+
+src_prepare() {
+	cp doc/mpdconf.example doc/mpdconf.dist
+	epatch "${FILESDIR}"/mpdconf1.patch
+}
+
+src_configure() {
+	if use icecast || use http; then
+		myconf="$(use_enable lame lame-encoder) $(use_enable vorbis vorbis-encoder)"
+	else
+		myconf="--disable-lame-encoder --disable-vorbis-encoder"
+	fi
+
+	append-lfs-flags
+
+	econf \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable curl) \
+		$(use_enable cdio iso9660) \
+		$(use_enable debug) \
+		$(use_enable doc documentation) \
+		$(use_enable fluidsynth) \
+		$(use_enable fifo) \
+		$(use_enable ffmpeg) \
+		$(use_enable flac) \
+		$(use_enable gprof) \
+		$(use_enable http httpd-output) \
+		$(use_enable id3) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable modplug) \
+		$(use_enable libmms mms) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable musepack mpc) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sid sidplay) \
+		$(use_enable sqlite sqlite) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable zip) \
+		$(use_with zeroconf zeroconf avahi) \
+		--enable-tcp \
+		--enable-un \
+		${myconf}
+		#$(use_enable midi wildmidi) \
+}
+
+src_install() {
+	dodir /var/run/mpd
+	fowners mpd:audio /var/run/mpd
+	fperms 750 /var/run/mpd
+	keepdir /var/run/mpd
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -rf "${D}"/usr/share/doc/mpd/
+
+	dodoc AUTHORS NEWS README TODO UPGRADING
+	dodoc doc/mpdconf.dist
+	use doc && dohtml doc/protocol.html
+
+	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 || die "dosed failed"
+	fi
+
+	diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	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
+
+	if use alsa; then
+		dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
+	elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}