+ version bump with new features:

  support for WMA (USE=wma) and wavpack (USE=wavpack)
  several bugs fixed (partly been patched already in 2.1.0-r1)
  install support script for net-im/pidgin (USE=pidgin)
  install command completion for Zshell (USE=zsh-completion)
  some rework on the ebuild itself
(Portage version: 2.1.2.9)

4 files changed, 115 insertions, 2 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index cd7d676e10af..bcccbecf798a 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.11 2007/06/01 06:10:35 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.12 2007/07/30 23:46:08 opfer Exp $
+
+*cmus-2.2.0 (30 Jul 2007)
+
+  30 Jul 2007; Christian Faulhammer <opfer@gentoo.org> metadata.xml,
+  +cmus-2.2.0.ebuild:
+  version bump with new features:
+  support for WMA (USE=wma) and wavpack (USE=wavpack)
+  several bugs fixed (partly been patched already in 2.1.0-r1)
+  install support script for net-im/pidgin (USE=pidgin)
+  install command completion for Zshell (USE=zsh-completion)
+  some rework on the ebuild itself
 
   01 Jun 2007; Christian Faulhammer <opfer@gentoo.org> -cmus-2.1.0.ebuild,
   cmus-2.1.0-r1.ebuild:
diff --git a/media-sound/cmus/cmus-2.2.0.ebuild b/media-sound/cmus/cmus-2.2.0.ebuild
new file mode 100644
index 000000000000..479743b62cc3
--- /dev/null
+++ b/media-sound/cmus/cmus-2.2.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.2.0.ebuild,v 1.1 2007/07/30 23:46:08 opfer Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://onion.dynserv.net/~timo/cmus.html"
+SRC_URI="http://onion.dynserv.net/~timo/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa ao arts debug examples flac mad mikmod modplug mp3 mp4 musepack \
+	oss pidgin vorbis wavpack wma zsh-completion"
+
+DEPEND="sys-libs/ncurses
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? (  media-libs/libao )
+	arts? ( kde-base/arts )
+	flac? ( media-libs/flac )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp3? ( >=media-libs/libmad-0.14 )
+	mp4? ( media-libs/libmp4v2
+		media-libs/faad2 )
+	musepack? ( >=media-libs/libmpcdec-1.2 )
+	pidgin? ( net-im/pidgin
+		dev-python/dbus-python )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	wavpack? ( media-sound/wavpack )
+	wma? ( media-video/ffmpeg )
+	zsh-completion? ( app-shells/zsh )"
+RDEPEND="${DEPEND}"
+
+my_config() {
+	local value
+	use ${1} && value=y || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+pkg_setup() {
+	if ! built_with_use sys-libs/ncurses unicode
+	then
+		ewarn
+		ewarn "sys-libs/ncurses compiled without the unicode USE flag."
+		ewarn "Please recompile sys-libs/ncurses with USE=unicode and emerge"
+		ewarn "cmus again if you experience any problems with UTF-8 or"
+		ewarn "wide characters."
+		ewarn
+		epause
+	fi
+}
+
+src_compile() {
+	local debuglevel=1 myconf="CONFIG_SUN=n"
+
+	use debug && debuglevel=2
+
+	my_config aac CONFIG_AAC
+	my_config ao CONFIG_AO
+	my_config alsa CONFIG_ALSA
+	my_config arts CONFIG_ARTS
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config mikmod CONFIG_MIKMOD
+	my_config mp3 CONFIG_MAD
+	my_config mp4 CONFIG_MP4
+	my_config modplug CONFIG_MODPLUG
+	my_config musepack CONFIG_MPC
+	my_config oss CONFIG_OSS
+	my_config vorbis CONFIG_VORBIS
+	my_config wavpack CONFIG_WAVPACK
+	my_config wma CONFIG_FFMPEG
+
+	# econf doesn't work, because configure wants "prefix" (and similar) without dashes
+	./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
+		libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
+	use examples || rm -rf "${D}/usr/share/doc/${PF}/examples/"
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/_cmus
+	fi
+
+	if use pidgin; then
+		sed -i -e "s:/usr/local/bin/python:/usr/bin/python:" contrib/cmus-updatepidgin.py
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/files/digest-cmus-2.2.0 b/media-sound/cmus/files/digest-cmus-2.2.0
new file mode 100644
index 000000000000..ea4897f91510
--- /dev/null
+++ b/media-sound/cmus/files/digest-cmus-2.2.0
@@ -0,0 +1,3 @@
+MD5 7a9895ecfc10cd16577c73051436962f cmus-2.2.0.tar.bz2 155448
+RMD160 1287666c16332ad34222461e29d8355ef607e7b5 cmus-2.2.0.tar.bz2 155448
+SHA256 f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005 cmus-2.2.0.tar.bz2 155448
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index ce2fe7f80844..e40c97e7b598 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -6,4 +6,4 @@
     <name>Christian Faulhammer</name>
   </maintainer>
   <herd>no-herd</herd>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>