Stable on amd64 and x86. Depend on new ffmpeg as it uses new api.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

4 files changed, 8 insertions, 106 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 5c55be052643..e3e8b0b893d1 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.55 2012/05/05 08:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.56 2012/05/16 08:30:50 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -cmus-2.4.2.ebuild,
+  -files/cmus-2.4.2-ffmpeg.patch, cmus-2.4.3.ebuild:
+  Stable on amd64 and x86. Depend on new ffmpeg as it uses new api.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> cmus-2.4.2.ebuild,
   cmus-2.4.3.ebuild:
diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild
deleted file mode 100644
index a52f56167d6a..000000000000
--- a/media-sound/cmus/cmus-2.4.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.5 2012/05/05 08:16:16 mgorny Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
-pidgin pulseaudio 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 )
-	flac? ( media-libs/flac )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	zsh-completion? ( app-shells/zsh )
-	pidgin? ( net-im/pidgin
-		dev-python/dbus-python )"
-
-S=${WORKDIR}/${MY_P}
-
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-}
-
-src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
-
-	use debug && debuglevel=2
-
-	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 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 ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
-		libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_install() {
-	default
-
-	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
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/cmus/cmus-2.4.3.ebuild b/media-sound/cmus/cmus-2.4.3.ebuild
index be333eeb34ca..8165a2499ad3 100644
--- a/media-sound/cmus/cmus-2.4.3.ebuild
+++ b/media-sound/cmus/cmus-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.3 2012/05/05 08:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.4 2012/05/16 08:30:50 scarabeus Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
 pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
 
@@ -30,7 +30,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
deleted file mode 100644
index eb6c97e6c1ec..000000000000
--- a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmus-v2.4.2/ffmpeg.c.orig
-+++ cmus-v2.4.2/ffmpeg.c
-@@ -32,6 +32,9 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#ifndef AVUTIL_MATHEMATICS_H
-+#include <libavutil/mathematics.h>
-+#endif
- #endif
- 
- #if (LIBAVFORMAT_VERSION_INT < ((52<<16)+(31<<8)+0))