Remove amrnb and amrwb support wrt #252140.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

5 files changed, 17 insertions, 21 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index 153bd8b87039..c59708df40cb 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.109 2009/07/09 16:23:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.110 2009/10/20 16:18:02 ssuominen Exp $
+
+  20 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> sox-14.2.0.ebuild,
+  sox-14.2.0-r1.ebuild, sox-14.3.0.ebuild:
+  Remove amrnb and amrwb support wrt #252140.
 
   09 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> sox-14.3.0.ebuild:
   Change FFmpeg dep to >= 0.5 wrt #275683.
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 9348479d7ada..57e1def1ea17 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
   <herd>sound</herd>
   <use>
-    <flag name="amrnb">Enables Adaptive Multi-Rate Audio support (Narrow Band)</flag>
-    <flag name="amrwb">Enables Adaptive Multi-Rate Audio support (Wide Band)</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/sox/sox-14.2.0-r1.ebuild b/media-sound/sox/sox-14.2.0-r1.ebuild
index f08ebc339f80..ec3401a8c8a6 100644
--- a/media-sound/sox/sox-14.2.0-r1.ebuild
+++ b/media-sound/sox/sox-14.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0-r1.ebuild,v 1.2 2009/06/22 08:54:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0-r1.ebuild,v 1.3 2009/10/20 16:18:02 ssuominen Exp $
 
 inherit flag-o-matic autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa amrnb amrwb ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
+IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	encode? ( media-sound/lame )
@@ -25,8 +25,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	ladspa? ( media-libs/ladspa-sdk )
 	>=media-sound/gsm-1.0.12-r1
 	id3tag? ( media-libs/libid3tag )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
 	png? ( media-libs/libpng )
 	wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}
@@ -58,8 +56,8 @@ src_compile () {
 		$(use_with ffmpeg) \
 		$(use_with ladspa) \
 		$(use_with id3tag) \
-		$(use_with amrwb amr-wb) \
-		$(use_with amrnb amr-nb) \
+		--without-amr-wb \
+		--without-amr-nb \
 		$(use_with png) \
 		$(use_with wavpack) \
 		--with-distro="Gentoo" \
diff --git a/media-sound/sox/sox-14.2.0.ebuild b/media-sound/sox/sox-14.2.0.ebuild
index 50ff1eeb2c25..f0bf4fc46b8e 100644
--- a/media-sound/sox/sox-14.2.0.ebuild
+++ b/media-sound/sox/sox-14.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0.ebuild,v 1.8 2009/06/22 08:54:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0.ebuild,v 1.9 2009/10/20 16:18:02 ssuominen Exp $
 
 inherit flag-o-matic autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa amrnb amrwb ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
+IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	encode? ( media-sound/lame )
@@ -25,8 +25,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	ladspa? ( media-libs/ladspa-sdk )
 	>=media-sound/gsm-1.0.12-r1
 	id3tag? ( media-libs/libid3tag )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
 	png? ( media-libs/libpng )
 	wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}
@@ -56,8 +54,8 @@ src_compile () {
 		$(use_with ffmpeg) \
 		$(use_with ladspa) \
 		$(use_with id3tag) \
-		$(use_with amrwb amr-wb) \
-		$(use_with amrnb amr-nb) \
+		--without-amr-wb \
+		--without-amr-nb \
 		$(use_with png) \
 		$(use_with wavpack) \
 		--with-distro="Gentoo" \
diff --git a/media-sound/sox/sox-14.3.0.ebuild b/media-sound/sox/sox-14.3.0.ebuild
index 2fdbfda68932..70170a92838d 100644
--- a/media-sound/sox/sox-14.3.0.ebuild
+++ b/media-sound/sox/sox-14.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.0.ebuild,v 1.2 2009/07/09 16:23:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.0.ebuild,v 1.3 2009/10/20 16:18:02 ssuominen Exp $
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa amrnb amrwb ao debug encode ffmpeg flac id3tag ladspa mad ogg oss png pulseaudio sndfile wavpack"
+IUSE="alsa ao debug encode ffmpeg flac id3tag ladspa mad ogg oss png pulseaudio sndfile wavpack"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	encode? ( media-sound/lame )
@@ -24,8 +24,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	ladspa? ( media-libs/ladspa-sdk )
 	>=media-sound/gsm-1.0.12-r1
 	id3tag? ( media-libs/libid3tag )
-	amrnb? ( media-libs/amrnb )
-	amrwb? ( media-libs/amrwb )
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
 	wavpack? ( media-sound/wavpack )"
@@ -48,8 +46,8 @@ src_compile () {
 		$(use_with ffmpeg) \
 		$(use_with ladspa) \
 		$(use_with id3tag) \
-		$(use_with amrwb) \
-		$(use_with amrnb) \
+		--without-amrwb \
+		--without-amrnb \
 		$(use_with png) \
 		$(use_with pulseaudio) \
 		$(use_with wavpack) \