Split id3 support from mad support (USE=id3 now)

Removed USE=iconv, added USE=sysvipc
Fixed lame/vorbis/icecast dependencies (bug 246236)
Fixed warning about icecast enabled without encoders (bug 246232)
Fixed USE=ffmpeg
Removed ChangeLog from dodoc (bug 246238)
Fix loglevel (bug 246207)
Thanks to Daniel Schömer <daniel.schoemer@gmx.net> and Avuton Olrich <avuton@gmail.com>
(Portage version: 2.2_rc13/cvs/Linux 2.6.28-rc4 x86_64)

4 files changed, 44 insertions, 21 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8e78da3480ae..47edb24c1f16 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.133 2008/11/09 08:42:57 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.134 2008/11/10 16:33:06 angelos Exp $
+
+  10 Nov 2008; Christoph Mende <angelos@gentoo.org>
+  +files/mpd-0.14_alpha1-loglevel.patch, mpd-0.14_alpha1.ebuild:
+  Split id3 support from mad support (USE=id3 now) Removed USE=iconv, added
+  USE=sysvipc Fixed lame/vorbis/icecast dependencies (bug 246236) Fixed
+  warning about icecast enabled without encoders (bug 246232) Fixed
+  USE=ffmpeg Removed ChangeLog from dodoc (bug 246238) Fix loglevel (bug
+  246207) Thanks to Daniel Schömer <daniel.schoemer@gmx.net> and Avuton
+  Olrich <avuton@gmail.com>
 
   09 Nov 2008; Christoph Mende <angelos@gentoo.org> mpd-0.14_alpha1.ebuild:
   Improve icecast logic and add missing glib dependency
diff --git a/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch b/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch
new file mode 100644
index 000000000000..7d0740eabd45
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.14_alpha1-loglevel.patch
@@ -0,0 +1,12 @@
+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/metadata.xml b/media-sound/mpd/metadata.xml
index d0fadb22eb23..ae184a7e6aa4 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <use>
     <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.14_alpha1.ebuild b/media-sound/mpd/mpd-0.14_alpha1.ebuild
index 1edbe02ebe2b..dd5ebb87c651 100644
--- a/media-sound/mpd/mpd-0.14_alpha1.ebuild
+++ b/media-sound/mpd/mpd-0.14_alpha1.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2008/11/09 08:42:57 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14_alpha1.ebuild,v 1.3 2008/11/10 16:33:06 angelos Exp $
 
 EAPI=1
 
-inherit eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="http://www.musicpd.org"
@@ -13,7 +13,7 @@ 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 curl ffmpeg flac icecast iconv ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio unicode vorbis wavpack zeroconf"
+IUSE="aac alsa ao audiofile curl ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio sysvipc unicode vorbis wavpack zeroconf"
 
 DEPEND="!sys-cluster/mpich2
 	>=dev-libs/glib-2.4:2
@@ -21,22 +21,22 @@ DEPEND="!sys-cluster/mpich2
 	alsa? ( media-sound/alsa-utils )
 	ao? ( >=media-libs/libao-0.8.4 )
 	audiofile? ( media-libs/audiofile )
-	zeroconf? ( net-dns/avahi )
 	curl? ( net-misc/curl )
 	ffmpeg? ( media-video/ffmpeg )
 	flac? ( media-libs/flac )
-	icecast? ( media-libs/libshout )
-	iconv? ( virtual/libiconv )
+	icecast? ( lame? ( media-libs/libshout ) )
+	id3? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
+	lame? ( icecast? ( media-sound/lame ) )
 	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad
-	       media-libs/libid3tag )
+	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
 	musepack? ( media-libs/libmpcdec )
 	ogg? ( media-libs/libogg )
 	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
+	zeroconf? ( net-dns/avahi )
+	vorbis? ( media-libs/libvorbis
+		icecast? ( media-libs/libshout ) )
 	wavpack? ( media-sound/wavpack )"
 
 S="${WORKDIR}/${PN}-${PV/_/~}"
@@ -48,9 +48,9 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
-	if use shoutcast && ! use lame && ! use vorbis; then
-		ewarn "USE=shoutcast enabled but lame and vorbis disabled,"
-		ewarn "disabling shoutcast"
+	if use icecast && ! use lame && ! use vorbis; then
+		ewarn "USE=icecast enabled but lame and vorbis disabled,"
+		ewarn "disabling icecast"
 	fi
 
 	enewuser mpd "" "" "/var/lib/mpd" audio
@@ -59,7 +59,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
+	epatch "${FILESDIR}"/mpdconf.patch \
+		"${FILESDIR}"/${P}-loglevel.patch
 }
 
 src_compile() {
@@ -85,27 +86,27 @@ src_compile() {
 		myconf+=" --disable-shout_ogg --disable-shout_mp3"
 	fi
 
+	append-lfs-flags
+
 	econf \
 		$(use_enable aac) \
 		$(use_enable alsa) \
 		$(use_enable ao) \
 		$(use_enable audiofile) \
 		$(use_enable curl)
+		$(use_enable ffmpeg) \
 		$(use_enable flac) \
-		$(use_enable flac libFLACtest) \
+		$(use_enable id3) \
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad mp3) \
-		$(use_enable mad 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 sysvipc un) \
 		$(use_enable vorbis oggvorbis) \
-		$(use_enable vorbis vorbistest) \
 		$(use_enable wavpack) \
 		${myconf}
 
@@ -120,7 +121,7 @@ src_install() {
 
 	emake install DESTDIR="${D}" || die
 	rm -rf "${D}"/usr/share/doc/mpd/
-	dodoc AUTHORS ChangeLog INSTALL README TODO UPGRADING
+	dodoc AUTHORS NEWS README TODO UPGRADING
 	dodoc doc/COMMANDS doc/mpdconf.example
 
 	insinto /etc