+ 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
Package-Manager: portage-2.1.2.9

5 files changed, 134 insertions, 13 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/Manifest b/media-sound/cmus/Manifest
index 69a08abffd4b..fe138d6d8c38 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -6,25 +6,33 @@ MD5 a4eb9a6a20e5d0a9ece11fd802e14cb3 files/cmus-2.1.0-faad-2.0.patch 9319
 RMD160 04e836ec3ae74d7d233aa9bf96bd5313a67ad4fa files/cmus-2.1.0-faad-2.0.patch 9319
 SHA256 74e70a7c6430f3d210a27a4ed272f70d4ab7be12b665d6b9eb30d4f9ae4d71be files/cmus-2.1.0-faad-2.0.patch 9319
 DIST cmus-2.1.0.tar.bz2 146956 RMD160 f359c8929dd616855aedbe2c4d1d2e252a8946ca SHA1 961d4bd1446c9499aeaac5a280761e5d98ca514f SHA256 fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0
+DIST cmus-2.2.0.tar.bz2 155448 RMD160 1287666c16332ad34222461e29d8355ef607e7b5 SHA1 a6472633ac55660eb3aec5d2ae0296da86903bb2 SHA256 f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005
 EBUILD cmus-2.1.0-r1.ebuild 2652 RMD160 88000d9ff0c7118c99a92b8b8d9aea25f1f69e20 SHA1 fe2da553d2dd9cc591a352637badb4e8cd4dd36a SHA256 3967b3f4eb066b134beb61ed4be250c12c10860a14bce6ccb031d671f1bbf515
 MD5 ba554ff16ca89e916d0a358254b508d8 cmus-2.1.0-r1.ebuild 2652
 RMD160 88000d9ff0c7118c99a92b8b8d9aea25f1f69e20 cmus-2.1.0-r1.ebuild 2652
 SHA256 3967b3f4eb066b134beb61ed4be250c12c10860a14bce6ccb031d671f1bbf515 cmus-2.1.0-r1.ebuild 2652
-MISC ChangeLog 1936 RMD160 923f4eff8870c11015351632e33cbec3573a0c8c SHA1 7d6d70b0fb75bd35a0edb26652e3f572e4227021 SHA256 c0bb7bb143e5dcb19d2b21b0c585f3f8a20660d095a78e6f4a37604f0449dfd7
-MD5 6f4faa68d07103ad1471aa7de2f72902 ChangeLog 1936
-RMD160 923f4eff8870c11015351632e33cbec3573a0c8c ChangeLog 1936
-SHA256 c0bb7bb143e5dcb19d2b21b0c585f3f8a20660d095a78e6f4a37604f0449dfd7 ChangeLog 1936
-MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2
-MD5 f2e99271e391d686f969c3d65ac24562 metadata.xml 266
-RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 metadata.xml 266
-SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2 metadata.xml 266
+EBUILD cmus-2.2.0.ebuild 2868 RMD160 cb91e1ec8d139c4e3170d5c0b1fd3a4a4e6c66d1 SHA1 459019394d369ce2d1ec153d7c91d7015c129780 SHA256 eb2d22300934a86f310d4f806a88091adeba2c2f33b708a97a4546e200c0c82d
+MD5 b7e1738985fc23e045f291aea0779f24 cmus-2.2.0.ebuild 2868
+RMD160 cb91e1ec8d139c4e3170d5c0b1fd3a4a4e6c66d1 cmus-2.2.0.ebuild 2868
+SHA256 eb2d22300934a86f310d4f806a88091adeba2c2f33b708a97a4546e200c0c82d cmus-2.2.0.ebuild 2868
+MISC ChangeLog 2358 RMD160 ce42ce2f58887604ff79bfaa601a06ee191c9915 SHA1 1022b85a99a74ca9d34104d53d5b5a13b9348340 SHA256 c00d3254fb5113b9c75f6d78e862cf01744d24c95ea7613044863473c1dba5ad
+MD5 495fad6efa642b9809befc303f1ee895 ChangeLog 2358
+RMD160 ce42ce2f58887604ff79bfaa601a06ee191c9915 ChangeLog 2358
+SHA256 c00d3254fb5113b9c75f6d78e862cf01744d24c95ea7613044863473c1dba5ad ChangeLog 2358
+MISC metadata.xml 267 RMD160 20bfbfa228d9c5ca5763d1285b306583ff0e3f03 SHA1 0c2d8a6d417e0503516229d097e19f591ae92ffb SHA256 bed7dbe54b8db30cba32aa717fb01c066c35e22fc43531bd5464111646ee4a16
+MD5 6c31cb9dab2b50b0a6436e6d801483cf metadata.xml 267
+RMD160 20bfbfa228d9c5ca5763d1285b306583ff0e3f03 metadata.xml 267
+SHA256 bed7dbe54b8db30cba32aa717fb01c066c35e22fc43531bd5464111646ee4a16 metadata.xml 267
 MD5 09c6a71861ec01bf051528e96b76651b files/digest-cmus-2.1.0-r1 235
 RMD160 a55cde314c80603ebb98468fbd26542662ba5203 files/digest-cmus-2.1.0-r1 235
 SHA256 c40feb869833f7706be4e6c528e121c6b18fddeb0d275c0ad9695d8714f8a3a2 files/digest-cmus-2.1.0-r1 235
+MD5 78d1bc563742ffc68eb5fc3552b59915 files/digest-cmus-2.2.0 235
+RMD160 4b4e972c4dd5114b12d776956fbb85a1ddd87a5a files/digest-cmus-2.2.0 235
+SHA256 ed44dd10d3e403d7eef99d4b602498d36b8d7e104ca8f0499627cee43563b98b files/digest-cmus-2.2.0 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGX7hqNQqtfCuFneMRAp4DAJwLtSvq6MuYHfzh9HIiiKdrUxciJQCfZwL/
-EBPDQCaxlpdx4hNpXiQRvyE=
-=rNiC
+iD8DBQFGrnhGNQqtfCuFneMRAuwEAJ9leVpmXoF49ToZAWz3vJJFO5l0GACdFtdk
+RR9hL5SvS4R4gf7sTLiIWS8=
+=qJ9N
 -----END PGP SIGNATURE-----
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>