Remove USE ffmpeg from old versions.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27.7 i686
RepoMan-Options: --force

4 files changed, 15 insertions, 15 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 68345edec9ba..f23368d93d6e 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.88 2008/12/21 15:02:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.89 2008/12/21 15:20:27 ssuominen Exp $
+
+  21 Dec 2008; <ssuominen@gentoo.org> alsa-plugins-1.0.15.ebuild,
+  alsa-plugins-1.0.16.ebuild:
+  Remove USE ffmpeg from old versions.
 
   21 Dec 2008; nixnut <nixnut@gentoo.org> alsa-plugins-1.0.17-r1.ebuild:
   Stable on ppc wrt bug 245517
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 6201eae61960..3b485a306211 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -10,9 +10,9 @@ DIST alsa-plugins-1.0.15.tar.bz2 306676 RMD160 8064f45f5ffeb24a0e70b0465ba1c1583
 DIST alsa-plugins-1.0.16.tar.bz2 306914 RMD160 8ff2960cc139b1e9988c2c10cc45b9950193cb39 SHA1 692bbe5871547db33ffd8cf78e5f894cb2080a2d SHA256 ff6da9a1208363be135c27ee31d26e45dc2ff2124654f03f9fd1c20ac99f78da
 DIST alsa-plugins-1.0.17.tar.bz2 308119 RMD160 488661a743460d0f09d6679252798f65e4817cb3 SHA1 aac646dd368b8c42e12548356a5b66dcedd4d754 SHA256 35a7e1411ab7b34353136ecfbd2267201d37b671f48b946bf238a6d1f7fdf560
 DIST alsa-plugins-1.0.18.tar.bz2 312656 RMD160 83b570d5346c7c79f5fe628e381ba1cf8e5a69db SHA1 33b5eca861de35a6eeb47862f24a8663af56cd0a SHA256 deb7652a3c1360febbbffb5d0150e5ad8547063d37969ad24d13359f75a424ba
-EBUILD alsa-plugins-1.0.15.ebuild 2185 RMD160 3389c1ebbad1bd2e2a5e9b25bd895c0ca885fc6b SHA1 814347e456cf4f923a7c4d717a4659aa5fcd672c SHA256 bbea051f98ae1f8078e51d728cce0fc0ee4a3d2e211c7a6cd97fd1edb573242a
-EBUILD alsa-plugins-1.0.16.ebuild 2199 RMD160 8be103cba6c1213b0b846ab124f5f28e4c852dde SHA1 0217716ff51d5ea931da448e219f2c1a49338519 SHA256 48469aa1bc70722677330a5a6a9939394e8a6f5a196ad125548ef370cec3992b
+EBUILD alsa-plugins-1.0.15.ebuild 2096 RMD160 947f4d3bbee3e549ec9ab25fb1a6f1049dc9a81b SHA1 dd74eb0ba017fe5afc36248cdded912443c754d9 SHA256 f6e269f8013ac9f84860e20ceaf7a5d5d92780d6e3b57c9bd31dc44ea57db079
+EBUILD alsa-plugins-1.0.16.ebuild 2089 RMD160 14cada886e7133fe4a2685b934489ccc9be51cdd SHA1 f92fe7661e6b841a4179b6e4a8958f32adce3311 SHA256 d2b89a2ff450bfd206d4e88b94a00727b2b6a90db6ea2d8dcf70b6bd48353da8
 EBUILD alsa-plugins-1.0.17-r1.ebuild 1991 RMD160 e17f355e86bbb9a3ab463031dbc8ceb7267af8cb SHA1 b7fbf833ec02b8542ef4556305adf7af411192c7 SHA256 ee65e66fb4e8ca0b0ba4dd7944517a6a3a96696d4d385ada54974284e74702a3
 EBUILD alsa-plugins-1.0.18.ebuild 1992 RMD160 bd6680f030cdccac1da874a9e9e99c8e52d38c1c SHA1 4b77d9b73890e0d5210065aeb288c468b677392b SHA256 07ec281c1e13c9b84c8fb497efa0039ee962e0bf554a0b81b2a3b6684dc5d664
-MISC ChangeLog 13650 RMD160 d5f96e80f444a20dbff9712cca3a516a54e0fe38 SHA1 d61fdc9a239d5dc4d2c6e9bab87a3b64a69befd8 SHA256 83cb177c5b0a88429555f96b02ada6c9089e15d485366355cf160b53a0f79506
+MISC ChangeLog 13789 RMD160 d73d164de9d87ec6a5819134942bc1f1bca498cb SHA1 1ccd693877b2880178e5c8bd37a4a8ca2be62815 SHA256 e18adaa876044073ac735a1855658e2af90dc2e5eda24ca47f98cd3a2e56d9d8
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild
index cef7801b6854..edb328ad50a1 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild,v 1.2 2007/10/20 15:39:25 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.15.ebuild,v 1.3 2008/12/21 15:20:27 ssuominen Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -16,10 +16,9 @@ SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+IUSE="debug jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
-	ffmpeg? ( media-video/ffmpeg )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
 	libsamplerate? ( media-libs/libsamplerate )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -56,7 +55,7 @@ src_compile() {
 	# someone ask for it explicitely, to be on the safe
 	# side.
 	econf \
-		$(use_enable ffmpeg avcodec) \
+		--disable-avcodec \
 		$(use_enable jack) \
 		$(use_enable libsamplerate samplerate) \
 		$(use_enable pulseaudio) \
@@ -75,5 +74,4 @@ src_install() {
 	use jack && dodoc README-jack
 	use libsamplerate && dodoc samplerate.txt
 	use pulseaudio && dodoc README-pulse
-	use ffmpeg && dodoc lavcrate.txt a52.txt
 }
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild
index 803af23ce37e..ed5673376999 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild,v 1.10 2008/08/03 08:02:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.16.ebuild,v 1.11 2008/12/21 15:20:27 ssuominen Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -16,10 +16,9 @@ SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86"
-IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+IUSE="debug jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}
-	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080000 )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
 	libsamplerate? ( media-libs/libsamplerate )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -56,7 +55,7 @@ src_compile() {
 	# someone ask for it explicitely, to be on the safe
 	# side.
 	econf \
-		$(use_enable ffmpeg avcodec) \
+		--disable-avcodec \
 		$(use_enable jack) \
 		$(use_enable libsamplerate samplerate) \
 		$(use_enable pulseaudio) \
@@ -75,5 +74,4 @@ src_install() {
 	use jack && dodoc README-jack
 	use libsamplerate && dodoc samplerate.txt
 	use pulseaudio && dodoc README-pulse
-	use ffmpeg && dodoc lavcrate.txt a52.txt
 }