Version bump wrt #268881.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

6 files changed, 90 insertions, 96 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 768e7e1fe94c..ca3aeb9c0552 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.163 2009/05/13 19:55:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.164 2009/05/15 03:47:30 ssuominen Exp $
+
+*mpd-0.15_beta1 (15 May 2009)
+
+  15 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/0.15_alpha1-mpdconf.patch, -mpd-0.15_alpha1.ebuild,
+  +files/0.15_beta1-mpdconf.patch, +mpd-0.15_beta1.ebuild,
+  metadata.xml:
+  Version bump wrt #268881.
 
   13 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   mpd-0.15_alpha1.ebuild:
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dc46d4918567..3734e2bb48db 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,12 @@
 AUX 0.13.2-mpdconf.patch 2034 RMD160 6cd9198056b813e8c6015275db800fc99da63f6f SHA1 e7321b8125088cc77bffa2553fbd9783da4d242f SHA256 b7ed811c9e72d5ff18a0fe27845dc8a52259ffcfcde14306a00b390dbfaebc7e
 AUX 0.14.2-mpdconf.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SHA1 70a087a8de4b6abd185cb223d738db1f5544b9d8 SHA256 b31d7f3d426b9183b354cedeb1757f05c0ad7724a97c8c1bc7cc75cbfcac80cc
-AUX 0.15_alpha1-mpdconf.patch 3023 RMD160 e00f9d2cd3d4e2d6c3032367300698a71e69d922 SHA1 a407db238b56e804b24f89268450aa75fdfcc649 SHA256 c6a46c0535331e60a57d94dd347ac60d33303a5f88a5e0b89219cfdb6312be5a
+AUX 0.15_beta1-mpdconf.patch 3106 RMD160 1b68d9c25ade6ff1b62db1cf4805d01e79138adc SHA1 3e5de48b9dd13b333e4b919eac3fd890e9be43fd SHA256 f916b1ce96fb8b2fffcb59a6fb482932a7f4445e7e431381b039999c9c17e6cc
 AUX mpd.rc 659 RMD160 56b7161cb0310a25c0164cd2abeeba13a9c60625 SHA1 bafa73ef83107a606f27e1a0c11761cb56eb72bd SHA256 c5895f9124474dfbec572d69dd31bc54c0c46d3bcf2ddd0c0e67c182af025664
 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 3559 RMD160 c542b8f6d55a4b88488311bc75ddfb2cfb801a0e SHA1 6af71885a074559f9b157bf2f167778005106836 SHA256 2ab611e49d6352339cfe9d9312a1e7c6254944a4d2ded991ebd2d65dee3d972e
+DIST mpd-0.15_beta1.tar.bz2 370014 RMD160 d5e10234ff0574a32284823af31ee47ef7d31e30 SHA1 99d4c5060aa27ab79d80b3142b1a0d3965d27c80 SHA256 fb137fe606aae5ae6ed57b1690ec348e44b927bc433bdf9e5497cbbd4635a1b8
+EBUILD mpd-0.13.2.ebuild 3448 RMD160 6dfb85913c3d17ce8c7f244a5dda3d8ceb81ce76 SHA1 2177a554a61599e41882416aac907c42576b3236 SHA256 d7c6438aa15cdfff2db4646b0eef31041198e0f8c14923d75bc56537fc3ced90
 EBUILD mpd-0.14.2.ebuild 4521 RMD160 12491bc2194369754500e15038bc7c54cce757ce SHA1 7347a5b12fa1a349e56c1b7b86c2e186c02ccc13 SHA256 1ea68888f92f673b022bb233c9f2d75830f10d8e1e9a06b5b074b0905ecf9647
-EBUILD mpd-0.15_alpha1.ebuild 5139 RMD160 4bd1163b7ea57c52a1c65b704dd81390ae37eff2 SHA1 727ff584e9fe88743d1e173afdd9fa2b8f62f395 SHA256 2e31f15f8dee435977023c9559f9ed547fd0e46d6b7943b25c9e54dd7e00b63a
-MISC ChangeLog 24788 RMD160 1292cfa77c74f7b314e11b21e8ed15be29c461c9 SHA1 2362a60af4a4d5df827295090c4e5706d7b516c2 SHA256 457f03ad52a1de84239c536810b1cbeb5bb40366d0159828a0581d676de251d1
-MISC metadata.xml 1160 RMD160 cc2892e87f913ab202bc3194e647e6bddde64a76 SHA1 5d8631a40c4ba426370df094eef1a71d8eb486d0 SHA256 151307b7e3164cee6edd336adc42992ed8ac75d1046830aaa84304d50c0f67e1
+EBUILD mpd-0.15_beta1.ebuild 4960 RMD160 899312b72c72ca5b9cf31a4167ec5b508b866e59 SHA1 565e4131b665f168cdccc93ae518cd8b56e09b02 SHA256 98656e2271bdf8ddcc170b522a087036e6f81d40a29d14d0dd67368d0359c2eb
+MISC ChangeLog 25038 RMD160 b2996ea61ad2bda5c6eeeefb363a26da8131021c SHA1 ab74b3cbca9939364730044a20e12fc0caaf246e SHA256 82bcbcad286b08e70519e2857cd3ed2e107ec91c5ce886c60c9e565e2afe10bf
+MISC metadata.xml 1149 RMD160 7ad3a8c78eaee60551970dd731ae5feb592db985 SHA1 0f1ca4f4071da612c6b2d33bafb9ab5de8d6481a SHA256 0d8fc7200b53283e94d0167677d0a812770a2c20a0b4f232e90cb8727bee67b0
diff --git a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch b/media-sound/mpd/files/0.15_beta1-mpdconf.patch
index 8407f79135bd..b0fface1ba16 100644
--- a/media-sound/mpd/files/0.15_alpha1-mpdconf.patch
+++ b/media-sound/mpd/files/0.15_beta1-mpdconf.patch
@@ -1,7 +1,6 @@
-diff --git a/doc/mpdconf.example b/doc/mpdconf.example
-index e231296..77f6d11 100644
---- a/doc/mpdconf.example
-+++ b/doc/mpdconf.example
+diff -ur mpd-0.15~beta1.orig/doc/mpdconf.example mpd-0.15~beta1/doc/mpdconf.example
+--- mpd-0.15~beta1.orig/doc/mpdconf.example	2009-04-30 17:35:31.000000000 +0300
++++ mpd-0.15~beta1/doc/mpdconf.example	2009-05-15 05:39:38.000000000 +0300
 @@ -1,4 +1,4 @@
 -# An example configuration file for MPD
 +# A default Gentoo configuration file for MPD
@@ -13,7 +12,7 @@ index e231296..77f6d11 100644
  # file:// protocol) or streaming files over an accepted protocol.
  #
 -#music_directory		"~/music"
-+music_directory			"/var/lib/mpd/music"
++music_directory "/var/lib/mpd/music"
  #
  # This setting sets the MPD internal playlist directory. The purpose of this
  # directory is storage for playlists created by MPD. The server will use 
@@ -21,7 +20,7 @@ index e231296..77f6d11 100644
  # format. This setting defaults to playlist saving being disabled.
  #
 -#playlist_directory		"~/.mpd/playlists"
-+playlist_directory		"/var/lib/mpd/playlists"
++playlist_directory "/var/lib/mpd/playlists"
  #
  # This setting sets the location of the MPD database. This file is used to
  # load the database at server start up and store the database while the 
@@ -30,7 +29,7 @@ index e231296..77f6d11 100644
  # files over an accepted protocol.
  #
 -#db_file			"~/.mpd/database"
-+db_file				"/var/lib/mpd/database"
++db_file "/var/lib/mpd/database"
  # 
  # These settings are the locations for the daemon log files for the daemon.
  # These logs are great for troubleshooting, depending on your log_level
@@ -39,14 +38,14 @@ index e231296..77f6d11 100644
  # setting defaults to logging to syslog, otherwise logging is disabled.
  #
 -#log_file			"~/.mpd/log"
-+log_file			"/var/log/mpd/mpd.log"
++log_file "/var/log/mpd/mpd.log"
  #
  # This setting sets the location of the file which stores the process ID
  # for use of mpd --kill and some init scripts. This setting is disabled by
  # default and the pid file will not be stored.
  #
 -#pid_file			"~/.mpd/pid"
-+pid_file			"/var/run/mpd/mpd.pid"
++pid_file "/var/run/mpd/mpd.pid"
  #
  # This setting sets the location of the file which contains information about
  # most variables to get MPD back into the same general shape it was in before
@@ -54,7 +53,7 @@ index e231296..77f6d11 100644
  # state will be reset on server start up.
  #
 -#state_file			"~/.mpd/state"
-+state_file			"/var/lib/mpd/state"
++state_file "/var/lib/mpd/state"
  #
  ###############################################################################
  
@@ -63,7 +62,7 @@ index e231296..77f6d11 100644
  # current user.
  #
 -#user				"nobody"
-+user				"mpd"
++user "mpd"
  #
  # This setting sets the address for the daemon to listen on. Careful attention
  # should be paid if this is assigned to anything other then the default, any.
@@ -71,11 +70,11 @@ index e231296..77f6d11 100644
  #
  # For network
 -#bind_to_address		"any"
-+bind_to_address			"localhost"
++bind_to_address	"localhost"
  #
  # And for Unix Socket
 -#bind_to_address		"~/.mpd/socket"
-+bind_to_address			"/var/lib/mpd/socket"
++bind_to_address	"/var/lib/mpd/socket"
  #
  # This setting is the TCP port that is desired for the daemon to get assigned
  # to.
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 35f0117b1607..5d61f3d304cf 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -8,16 +8,16 @@
   </maintainer>
   <use>
 	<flag name="cdio">Use libcdio for CD support</flag>
+	<flag name="cue">Support CUE Sheet Parser Library</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="network">Enables network streaming support</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>
diff --git a/media-sound/mpd/mpd-0.13.2.ebuild b/media-sound/mpd/mpd-0.13.2.ebuild
index 0b0679f57267..04c3ad91b670 100644
--- a/media-sound/mpd/mpd-0.13.2.ebuild
+++ b/media-sound/mpd/mpd-0.13.2.ebuild
@@ -1,9 +1,8 @@
 # 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.13.2.ebuild,v 1.11 2009/04/14 18:06:00 angelos Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.12 2009/05/15 03:47:30 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
@@ -15,7 +14,7 @@ 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
+RDEPEND="!sys-cluster/mpich2
 	aac? ( >=media-libs/faad2-2.0_rc2 )
 	alsa? ( media-sound/alsa-utils )
 	ao? ( >=media-libs/libao-0.8.4 )
@@ -34,22 +33,19 @@ DEPEND="!sys-cluster/mpich2
 	ogg? ( media-libs/libogg )
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-mpdconf.patch || die "epatch for config file failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-mpdconf.patch
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
-	myconf=""
-
 	if use avahi; then
 		myconf="${myconf} --with-zeroconf=avahi"
 	else
@@ -87,9 +83,7 @@ src_compile() {
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vorbis oggvorbis) \
 		$(use_enable vorbis vorbistest) \
-		${myconf} || die "could not configure"
-
-	emake || die "emake failed"
+		${myconf}
 }
 
 src_install() {
diff --git a/media-sound/mpd/mpd-0.15_alpha1.ebuild b/media-sound/mpd/mpd-0.15_beta1.ebuild
index df8542ae945a..cae1a0e8cb35 100644
--- a/media-sound/mpd/mpd-0.15_alpha1.ebuild
+++ b/media-sound/mpd/mpd-0.15_beta1.ebuild
@@ -1,9 +1,8 @@
 # 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.3 2009/05/13 19:55:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15_beta1.ebuild,v 1.1 2009/05/15 03:47:30 ssuominen Exp $
 
 EAPI=2
-
 inherit flag-o-matic eutils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
@@ -13,27 +12,27 @@ 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"
+IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug doc +fifo +ffmpeg flac
+fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad mikmod modplug musepack network 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 )
+	aac? ( >=media-libs/faad2-2 )
 	alsa? ( media-sound/alsa-utils )
 	ao? ( >=media-libs/libao-0.8.4 )
 	audiofile? ( media-libs/audiofile )
 	bzip2? ( app-arch/bzip2 )
 	cdio? ( dev-libs/libcdio )
+	cue? ( >=media-libs/libcue-0.13 )
 	curl? ( net-misc/curl )
 	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac
-		ogg? ( media-libs/flac[ogg] ) )
+	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
-	icecast? ( lame? ( media-libs/libshout )
-		vorbis? ( media-libs/libshout ) )
+	network? ( >=media-libs/libshout-2 )
 	id3? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( icecast? ( media-sound/lame ) )
-	libmms? ( media-libs/libmms )
+	libmms? ( >=media-libs/libmms-0.4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -47,94 +46,88 @@ RDEPEND="!sys-cluster/mpich2
 	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 )"
 
-S="${WORKDIR}/${P/_/~}"
+S=${WORKDIR}/${P/_/~}
 
 pkg_setup() {
-	if use icecast || use http-stream; then
-		if ! use lame && ! use vorbis; then
-			eerror "Icecast or http-stream output streaming is enabled,"
-			eerror "but there is no encoding enabled (lame and"
-			eerror "vorbis are both disabled)."
-		fi
+	if ! use network; then
+		ewarn "Icecast and Shoutcast HTTP streaming needs network."
 	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
-
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
 	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
 src_prepare() {
-	cp doc/mpdconf.example doc/mpdconf.dist
+	cp -f doc/mpdconf.example doc/mpdconf.dist
 	epatch "${FILESDIR}"/${PV}-mpdconf.patch
 }
 
 src_configure() {
-	if use icecast || use http-stream; then
-		myconf="$(use_enable lame lame-encoder) $(use_enable vorbis vorbis-encoder)"
+	append-lfs-flags
+	# OggFLACtest is for <=flac-1.2.2
+	local mpdconf="--disable-dependency-tracking --enable-tcp
+		--enable-un --disable-wildmidi --disable-mvp
+		--disable-libOggFLACtest --disable-werror"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)"
 	else
-		myconf="--disable-lame-encoder --disable-vorbis-encoder"
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder"
 	fi
 
-	if use ogg && use flac; then
-		myconf+=" --enable-oggflac --enable-libOggFLACtest"
+	if use flac && use ogg; then
+		myconf+=" --enable-oggflac"
 	else
-		myconf+=" --disable-oggflac --disable-libOggFLACtest"
+		myconf+=" --disable-oggflag"
 	fi
 
-	append-lfs-flags
-
 	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable ao) \
-		$(use_enable audiofile) \
-		$(use_enable bzip2) \
+		$(use_enable ipv6) \
+		$(use_enable cue) \
+		$(use_enable sqlite) \
 		$(use_enable curl) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable libmms mms) \
+		$(use_enable bzip2) \
+		$(use_enable zip) \
 		$(use_enable cdio iso9660) \
-		$(use_enable debug) \
-		$(use_enable doc documentation) \
-		$(use_enable fluidsynth) \
-		$(use_enable fifo) \
+		$(use_enable id3) \
+		$(use_enable audiofile) \
 		$(use_enable ffmpeg) \
 		$(use_enable flac) \
-		$(use_enable gprof) \
-		$(use_enable http-stream 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 modplug) \
 		$(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 sid sidplay) \
+		$(use_enable fluidsynth) \
 		$(use_enable wavpack) \
-		$(use_enable zip) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable fifo) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable jack) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable aac) \
+		$(use_enable doc documentation) \
+		$(use_enable debug) \
+		$(use_enable profile gprof) \
 		$(use_with zeroconf zeroconf avahi) \
-		--enable-tcp \
-		--enable-un \
-		${myconf}
-		#$(use_enable midi wildmidi) \
+		${mpdconf}
 }
 
 src_install() {
@@ -144,7 +137,7 @@ src_install() {
 	keepdir /var/run/mpd
 
 	emake DESTDIR="${D}" install || die "emake install failed"
-	rm -rf "${D}"/usr/share/doc/mpd/
+	rm -rf "${D}"/usr/share/doc/mpd
 
 	dodoc AUTHORS NEWS README TODO UPGRADING
 	dodoc doc/mpdconf.dist