Depend on virtual/ffmpeg. Fixes bug #362071.

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

3 files changed, 7 insertions, 68 deletions

diff --git a/media-libs/FusionSound/ChangeLog b/media-libs/FusionSound/ChangeLog
index 5cfeb5176ddc..9a1fca80e4da 100644
--- a/media-libs/FusionSound/ChangeLog
+++ b/media-libs/FusionSound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/FusionSound
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.12 2011/06/29 14:54:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/ChangeLog,v 1.13 2011/10/18 09:41:36 scarabeus Exp $
+
+  18 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -FusionSound-1.1.1.ebuild, FusionSound-1.1.1-r1.ebuild:
+  Depend on virtual/ffmpeg. Fixes bug #362071.
 
   29 Jun 2011; Christoph Mende <angelos@gentoo.org>
   FusionSound-1.1.1-r1.ebuild:
diff --git a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
index 1cac2e7e2258..f7cbdad345e5 100644
--- a/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
+++ b/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.5 2011/06/29 14:54:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1-r1.ebuild,v 1.6 2011/10/18 09:41:36 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/DirectFB-${PV}
 	vorbis? ( media-libs/libvorbis )
 	mad? ( media-libs/libmad )
 	cddb? ( media-libs/libcddb )
-	ffmpeg? ( >=media-video/ffmpeg-0.6.90_rc0 )
+	ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 )
 	!net-zope/zodb"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/media-libs/FusionSound/FusionSound-1.1.1.ebuild b/media-libs/FusionSound/FusionSound-1.1.1.ebuild
deleted file mode 100644
index 7f60d1b2008e..000000000000
--- a/media-libs/FusionSound/FusionSound-1.1.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/FusionSound/FusionSound-1.1.1.ebuild,v 1.6 2009/12/23 11:13:31 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Audio sub system for multiple applications"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://www.directfb.org/downloads/Core/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa cddb ffmpeg mad oss timidity vorbis"
-
-RDEPEND=">=dev-libs/DirectFB-${PV}
-	alsa? ( media-libs/alsa-lib )
-	timidity? ( media-libs/libtimidity
-		media-sound/timidity++ )
-	vorbis? ( media-libs/libvorbis )
-	mad? ( media-libs/libmad )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? ( >=media-video/ffmpeg-0.5 )
-	!net-zope/zodb"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
-	sed -i -e 's:-O3 -ffast-math -pipe::' configure.in \
-		|| die "sed failed"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	local myaudio="wave"
-
-	use alsa && myaudio="${myaudio} alsa"
-	use oss && myaudio="${myaudio} oss"
-
-	# Lite is used only for tests or examples.
-	# Tremor isn't there with latest libvorbis.
-	econf \
-		--disable-dependency-tracking \
-		--without-lite \
-		--with-drivers="${myaudio}" \
-		--without-examples \
-		$(use_with timidity) \
-		--with-wave \
-		$(use_with vorbis) \
-		--without-tremor \
-		$(use_with mad) \
-		$(use_with cddb cdda) \
-		$(use_with ffmpeg) \
-		--with-playlist
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir=/usr/share/doc/${PF}/html \
-		install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}