Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 113 insertions, 1 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index ef53915594fa..c9b2d70b2a1b 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.68 2014/07/14 15:19:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.69 2014/08/15 07:59:06 ssuominen Exp $
+
+*cmus-2.6.0 (15 Aug 2014)
+
+  15 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +cmus-2.6.0.ebuild,
+  metadata.xml:
+  Version bump.
 
   14 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> cmus-2.5.0-r1.ebuild:
   Simplify libcdio dependency string.
diff --git a/media-sound/cmus/cmus-2.6.0.ebuild b/media-sound/cmus/cmus-2.6.0.ebuild
new file mode 100644
index 000000000000..dd0cb62a0432
--- /dev/null
+++ b/media-sound/cmus/cmus-2.6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.6.0.ebuild,v 1.1 2014/08/15 07:59:06 ssuominen Exp $
+
+EAPI=5
+inherit multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://cmus.github.io/"
+SRC_URI="http://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac alsa ao cue cdio cddb discid debug examples flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor unicode vorbis wavpack wma zsh-completion"
+
+CDEPEND="sys-libs/ncurses[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? ( media-libs/libao )
+	cue? ( media-libs/libcue )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	discid? ( media-libs/libdiscid )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod:0 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp4? ( >=media-libs/libmp4v2-1.9:0 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	tremor? ( media-libs/tremor )
+	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	wavpack? ( media-sound/wavpack )
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	zsh-completion? ( app-shells/zsh )
+	pidgin? ( net-im/pidgin dev-python/dbus-python )"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="tremor? ( vorbis )"
+
+DOCS="AUTHORS README.md"
+
+# TODO: What is CONFIG_ROAR and why it's missing from Portage?
+# TODO: If CONFIG_ROAR is unhandled, has someone skipped other new dependencies as well?
+
+my_config() {
+	local value
+	use ${1} && value=a || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_configure() {
+	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
+
+	use debug && debuglevel=2
+
+	my_config cue CONFIG_CUE
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config wma CONFIG_FFMPEG
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	./configure prefix="${EPREFIX}"/usr ${myconf} exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_install() {
+	default
+
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/_cmus
+	fi
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index da94b58f660e..15b13f03a604 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -11,6 +11,8 @@
     <flag name="cue">enable CUE sheet parsing</flag>
     <flag name="discid">enable reading the ID of the inserted CD</flag>
     <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
+	<flag name="opus">enable support for <pkg>media-libs/opusfile</pkg></flag>
+	<flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
     <flag name="wma">add support for Windows Media Audio</flag>
   </use>
 </pkgmetadata>