version bump, added mikmod support via mikmod USE flac; support for flac 1.1.3

(Portage version: 2.1.1-r2)

3 files changed, 88 insertions, 2 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 55d80f95168c..cbd1cdb93555 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cmus
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.2 2006/12/11 07:28:02 opfer Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.3 2007/01/03 10:37:37 opfer Exp $
+
+*cmus-2.1.0 (03 Jan 2007)
+
+  03 Jan 2007; Christian Faulhammer <opfer@gentoo.org> +cmus-2.1.0.ebuild:
+  version bump, added mikmod support via mikmod USE flac; support for flac 1.1.3
 
   11 Dec 2006; Christian Faulhammer <opfer@gentoo.org> cmus-2.0.4.ebuild:
   corrected flac dependency
diff --git a/media-sound/cmus/cmus-2.1.0.ebuild b/media-sound/cmus/cmus-2.1.0.ebuild
new file mode 100644
index 000000000000..db068801f9e1
--- /dev/null
+++ b/media-sound/cmus/cmus-2.1.0.ebuild
@@ -0,0 +1,78 @@
+# 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.1.0.ebuild,v 1.1 2007/01/03 10:37:37 opfer Exp $
+
+inherit eutils
+
+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="~x86"
+IUSE="alsa ao arts debug flac mad mikmod modplug mp3 musepack oss vorbis"
+
+DEPEND="sys-libs/ncurses
+	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 )
+	musepack? ( >=media-libs/libmpcdec-1.2 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
+#	aac? ( >=media-libs/faad-2.5 ) # after licensing issues have been settled
+#	mp4? ( media-libs/libmp4v2
+#		>=media-libs/faad-2.5 )
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if ! built_with_use sys-libs/ncurses unicode
+	then
+		ewarn
+		ewarn "\t sys-libs/ncurses compiled without the unicode USE flag."
+		ewarn "\t Please recompile sys-libs/ncurses with USE=unicode and emerge"
+		ewarn "\t cmus again if you experience any problems with UTF-8 or"
+		ewarn "\t wide characters."
+		ewarn
+		epause
+	fi
+}
+
+my_config() {
+	local value
+	use ${1} && value=y || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_compile() {
+	local debuglevel myconf
+
+	use debug && debuglevel=2 || debuglevel=1
+
+	myconf="CONFIG_SUN=n CONFIG_AAC=n CONFIG_MP4=n"
+	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 modplug CONFIG_MODPLUG
+	my_config musepack CONFIG_MPC
+	my_config oss CONFIG_OSS
+	my_config vorbis CONFIG_VORBIS
+
+	# econf doesn't work, because configure wants "prefix" without dashes
+	./configure prefix=/usr ${myconf} DEBUG=$debuglevel || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README
+}
diff --git a/media-sound/cmus/files/digest-cmus-2.1.0 b/media-sound/cmus/files/digest-cmus-2.1.0
new file mode 100644
index 000000000000..98c2b516ef2b
--- /dev/null
+++ b/media-sound/cmus/files/digest-cmus-2.1.0
@@ -0,0 +1,3 @@
+MD5 11ca53a05442ee073b6e790e957b1433 cmus-2.1.0.tar.bz2 146956
+RMD160 f359c8929dd616855aedbe2c4d1d2e252a8946ca cmus-2.1.0.tar.bz2 146956
+SHA256 fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0 cmus-2.1.0.tar.bz2 146956