Version bump and removed old

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc7 x86_64)

7 files changed, 65 insertions, 290 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 609854f24064..2e17a15ff55c 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.138 2008/12/02 22:40:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.139 2008/12/05 22:35:37 angelos Exp $
+
+*mpd-0.14_beta2 (05 Dec 2008)
+
+  05 Dec 2008; Christoph Mende <angelos@gentoo.org> +files/mpdconf1.patch,
+  -files/mpd-0.14_alpha1-loglevel.patch, metadata.xml, -mpd-0.13.0.ebuild,
+  -mpd-0.13.1.ebuild, -mpd-0.14_alpha1.ebuild, +mpd-0.14_beta2.ebuild:
+  Version bump and removed old
 
   02 Dec 2008; Brent Baude <ranger@gentoo.org> mpd-0.13.2.ebuild:
   stable ppc64, bug 242128
diff --git a/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch b/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch
deleted file mode 100644
index 7d0740eabd45..000000000000
--- a/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -pru mpd-0.14~alpha1.orig/src/log.c mpd-0.14~alpha1/src/log.c
---- mpd-0.14~alpha1.orig/src/log.c	2008-11-09 20:01:02.000000000 +0100
-+++ mpd-0.14~alpha1/src/log.c	2008-11-09 20:01:16.000000000 +0100
-@@ -159,7 +159,7 @@ void setup_log_output(bool use_stdout)
- #define log_func(func,level) \
- mpd_printf void func(const char *fmt, ...) \
- { \
--	if ((int)log_threshold <= level) {		\
-+	if ((int)log_threshold >= level) {		\
- 		va_list args; \
- 		va_start(args, fmt); \
- 		g_logv(NULL, level, fmt, args);	\
diff --git a/media-sound/mpd/files/mpdconf1.patch b/media-sound/mpd/files/mpdconf1.patch
new file mode 100644
index 000000000000..9ccbbff5d93f
--- /dev/null
+++ b/media-sound/mpd/files/mpdconf1.patch
@@ -0,0 +1,51 @@
+--- doc/mpdconf.example	2008-12-03 05:01:07.000000000 +0100
++++ doc/mpdconf.example.gentoo	2008-12-05 23:25:32.000000000 +0100
+@@ -1,12 +1,12 @@
+-# An example configuration file for MPD
++# A default Gentoo configuration file for MPD
+ # See the mpd.conf man page for a more detailed description of each parameter.
+ 
+ ######################## REQUIRED PATHS ########################
+-music_directory                 "~/music"
+-playlist_directory              "~/.mpd/playlists"
+-db_file                         "~/.mpd/mpd.db"
+-log_file                        "~/.mpd/mpd.log"
+-error_file                      "~/.mpd/mpd.error"
++music_directory                 "/var/lib/mpd/music"
++playlist_directory              "/var/lib/mpd/playlists"
++db_file                         "/var/lib/mpd/database"
++log_file                        "/var/log/mpd/mpd.log"
++error_file                      "/var/log/mpd/mpd.error.log"
+ #follow_outside_symlinks         "no"
+ #follow_inside_symlinks          "yes"
+ ################################################################
+@@ -17,13 +17,13 @@
+ # If you wish to use mpd --kill to stop MPD, then you must
+ # specify a file here in which to store MPD's process ID.
+ #
+-#pid_file                        "~/.mpd/mpd.pid"
++pid_file                        "/var/run/mpd/mpd.pid"
+ #
+ # If specified, MPD will save its current state (playlist,
+ # current song, playing/paused, etc.) at exit.  This will be
+ # used to restore the session the next time it is run.
+ #
+-#state_file                      "~/.mpd/mpdstate"
++state_file                      "/var/lib/mpd/state"
+ #
+ ################################################################
+ 
+@@ -35,11 +35,11 @@
+ # started by.  If left unspecified, MPD will not drop root
+ # privileges at all (not recommended).
+ #
+-#user                            "nobody"
++user                            "mpd"
+ #
+ # The address and port to listen on.
+ #
+-#bind_to_address                 "any"
++bind_to_address                 "localhost"
+ #port                            "6600"
+ #
+ # Controls the amount of information that is logged.  Can be
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index ae184a7e6aa4..f3677811731f 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <herd>sound</herd>
   <maintainer>
-    <email>angelos@gentoo.org</email>
-    <name>Christoph Mende</name>
+	<email>angelos@gentoo.org</email>
+	<name>Christoph Mende</name>
   </maintainer>
   <use>
-    <flag name="icecast">Enable support for Icecast2</flag>
+	<flag name="icecast">Enable support for Icecast2</flag>
 	<flag name="id3">Support for ID3 tags</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.13.0.ebuild b/media-sound/mpd/mpd-0.13.0.ebuild
deleted file mode 100644
index b0e21c7c1844..000000000000
--- a/media-sound/mpd/mpd-0.13.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2008 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.11 2008/10/15 00:01:01 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="The 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
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-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."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.13.1.ebuild b/media-sound/mpd/mpd-0.13.1.ebuild
deleted file mode 100644
index 752bbd2cb4da..000000000000
--- a/media-sound/mpd/mpd-0.13.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.1.ebuild,v 1.8 2008/10/15 00:01:01 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="The 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
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-}
-
-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."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.14_alpha1.ebuild b/media-sound/mpd/mpd-0.14_beta2.ebuild
index 7b1f8a9716f2..4814b832e2c8 100644
--- a/media-sound/mpd/mpd-0.14_alpha1.ebuild
+++ b/media-sound/mpd/mpd-0.14_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_alpha1.ebuild,v 1.4 2008/11/14 11:53:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_beta2.ebuild,v 1.1 2008/12/05 22:35:37 angelos Exp $
 
 EAPI=1
 
@@ -59,8 +59,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/mpdconf.patch \
-		"${FILESDIR}"/${P}-loglevel.patch
+	epatch "${FILESDIR}"/mpdconf1.patch
 }
 
 src_compile() {
@@ -122,7 +121,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	rm -rf "${D}"/usr/share/doc/mpd/
 	dodoc AUTHORS NEWS README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
+	dodoc doc/mpdconf.example
 
 	insinto /etc
 	newins doc/mpdconf.example mpd.conf