Remove amrnb support wrt #252140.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 11 insertions, 10 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index c14e681a1206..3537f5fb36f7 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.155 2009/09/30 18:44:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.156 2009/10/20 16:23:35 ssuominen Exp $
+
+  20 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  avidemux-2.4.4-r2.ebuild:
+  Remove amrnb support wrt #252140.
 
 *avidemux-2.5.1_p5359 (30 Sep 2009)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 631b26fdd8fe..af84c6f5d954 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -9,8 +9,8 @@ DIST avidemux-2.5-r5359.tar.bz2 11182791 RMD160 5b187080f487d13e844d8837b8b06743
 DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d688e2771bebe SHA1 bdc6aab3f19c1ef71f3e04c23435f22452651fd9 SHA256 bcd472ea7c5f96c8bf8f48c2c93d53804912e94c77120dc8739e2c0ab122d69c
 DIST avidemux_2.4.4.tar.gz 6894690 RMD160 8bb2705b3e2d5379d833ec4fa06a01b897c06e04 SHA1 c50a00caf13a8ea1053e5994edeb59354192e18e SHA256 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956
 DIST avidemux_2.5.1.tar.gz 13020725 RMD160 fc12d01cf4b98ddcf635c20b32f8890cc70ab23a SHA1 50fe78548e0ebf0611d23aa4755f332056520392 SHA256 2f5546b8a95da23f5c43202d9c7b465dd7a0012d689d483ad7eb44bae8ca5c92
-EBUILD avidemux-2.4.4-r2.ebuild 3583 RMD160 033e90179de8fea9f239bb800e408bf0586f0688 SHA1 6b68ecd13a899a65caf7e0879f608da2fb9d271c SHA256 81badef9b02bbf740b0be67617547e13db8fad7dc7f72b82a877681921e75884
+EBUILD avidemux-2.4.4-r2.ebuild 3538 RMD160 e88f8a04653b628a1300b4d73473a320f2a79655 SHA1 55b9f7303d74ecfe14f1a5a2f654e2413f1214a9 SHA256 76527af36b493063cda3442d0ad2713847a02518e767969b6fdc94b381118849
 EBUILD avidemux-2.5.1-r2.ebuild 4955 RMD160 bf3971eec4b58d10c6d5241af9f8725d78c9f101 SHA1 66279aae61f9a66503f628c5358a1776e03e33e0 SHA256 4a1a5ddcef86f2e9e0d9141b8172ad31246a499415fb903ac07faf38c22ca374
 EBUILD avidemux-2.5.1_p5359.ebuild 4811 RMD160 8db5673c738e6ffaab55934d691f30d6fe66924b SHA1 9e6c4fed123626c6350554eeb97fc64d332611f6 SHA256 9a43b8ed6ef572deac7be60156a5a43a44d96a0e5c8687c1127414214c9d98b8
-MISC ChangeLog 27657 RMD160 5d43d55d1548bb3840673705c398a6a7e7a908c4 SHA1 0a692e3b6ec4658ecbf7a2eb3c32cd45ff53d000 SHA256 9fa93bae7ac957df1ecaa4456c11305d03fc81f3a792e416300cdba96ce1cda9
-MISC metadata.xml 590 RMD160 018bf8622286335430012a39ce6810cce1968d03 SHA1 82400c105393d875cd8e5ec93947eb1430c3142c SHA256 9b3978e836b23532658749ccd39bcf469463f5af540cf8211479307678c262b6
+MISC ChangeLog 27779 RMD160 3085c888a4acceea281493ba4c04513fe4d26618 SHA1 5281739b5c15cbfe1de0e48ecc165176a94cc622 SHA256 95ca23fd9be4a033356f953505b035c1403cffca04e7a2d23dc1168fdef4fea2
+MISC metadata.xml 465 RMD160 cbd50d211f2ad02fa9eb5da75509396f8464b6cc SHA1 e22f8fba25f6138d4a29c93079afbddf96832c33 SHA256 06d094aee75706e06b7f50e739616add134f188aef4a110d5912bdf2fd25e501
diff --git a/media-video/avidemux/avidemux-2.4.4-r2.ebuild b/media-video/avidemux/avidemux-2.4.4-r2.ebuild
index a65277e29fb7..26aa3823b6cc 100644
--- a/media-video/avidemux/avidemux-2.4.4-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.4.4-r2.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-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.6 2009/09/30 14:40:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.4-r2.ebuild,v 1.7 2009/10/20 16:23:35 ssuominen Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="amd64 ppc x86"
-IUSE="+aac +aften +alsa amrnb +dts esd jack libsamplerate +mp3 +truetype
+IUSE="+aac +aften +alsa +dts esd jack libsamplerate +mp3 +truetype
 	+vorbis +x264 +xv +xvid gtk +qt4"
 RESTRICT="test"
 
@@ -27,7 +27,6 @@ RDEPEND="dev-libs/libxml2
 		media-libs/faad2 )
 	aften? ( media-libs/aften )
 	alsa? ( media-libs/alsa-lib )
-	amrnb? ( media-libs/amrnb )
 	dts? ( media-libs/libdca )
 	mp3? ( media-sound/lame )
 	esd? ( media-sound/esound )
@@ -81,7 +80,7 @@ src_configure() {
 	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAC=1"
 	use mp3 || mycmakeargs="${mycmakeargs} -DNO_Lame=1"
 	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
-	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
+	mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
 	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
 	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
 	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 544e57189f34..085e23139f86 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -10,7 +10,5 @@
     <flag name='aften'>Enable A/52 (AC-3) audio encoder support</flag>
     <flag name='amr'>Enable Adaptive Multi-Rate format support through
       <pkg>media-libs/opencore-amr</pkg></flag>
-	<flag name='amrnb'>Enables Adaptive Multi-Rate Audio support (Narrow Band)
-      through <pkg>media-libs/amrnb</pkg></flag>
   </use>
 </pkgmetadata>