Fix dependencies: gettext is not an RDEPEND.

(Portage version: 2.1_pre4-r1)

4 files changed, 21 insertions, 13 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 4c435f4d91a8..beaf548e4846 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.95 2005/12/26 12:10:47 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.96 2006/02/15 15:38:53 flameeyes Exp $
+
+  15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> avidemux-2.0.24.ebuild,
+  avidemux-2.0.42-r1.ebuild, avidemux-2.1_pre1.ebuild:
+  Fix dependencies: gettext is not an RDEPEND.
 
   26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> avidemux-2.0.24.ebuild:
   Cleanup
diff --git a/media-video/avidemux/avidemux-2.0.24.ebuild b/media-video/avidemux/avidemux-2.0.24.ebuild
index e58ea7ec3cf6..e718d4898833 100644
--- a/media-video/avidemux/avidemux-2.0.24.ebuild
+++ b/media-video/avidemux/avidemux-2.0.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.24.ebuild,v 1.11 2005/12/26 12:10:47 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.24.ebuild,v 1.12 2006/02/15 15:38:53 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,15 +23,17 @@ RDEPEND="virtual/x11
 	>=x11-libs/gtk+-2.4.0-r1
 	xvid? ( >=media-libs/xvid-0.9.1 )
 	x86? ( dev-lang/nasm )
-	nls? ( >=sys-devel/gettext-0.12.1 )
+	nls? ( virtual/libintl )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	arts? ( >=kde-base/arts-1.2.1 )
 	truetype? ( >=media-libs/freetype-2.1.4 )
 	alsa? ( >=media-libs/alsa-lib-0.9.8 )"
 # media-sound/toolame is supported as well
 
-DEPEND="$RDEPEND >=sys-devel/autoconf-2.58
-		>=sys-devel/automake-1.8.3"
+DEPEND="$RDEPEND
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8.3"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/media-video/avidemux/avidemux-2.0.42-r1.ebuild b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
index c0d24e5043bf..6a4573b5d156 100644
--- a/media-video/avidemux/avidemux-2.0.42-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.0.42-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.2 2005/12/19 14:45:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.42-r1.ebuild,v 1.3 2006/02/15 15:38:53 flameeyes Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -25,7 +25,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
 	       >=media-libs/faad2-2.0-r7 )
 	mad? ( media-libs/libmad )
 	xvid? ( >=media-libs/xvid-1.0.0 )
-	nls? ( >=sys-devel/gettext-0.12.1 )
+	nls? ( virtual/libintl )
 	vorbis? ( >=media-libs/libvorbis-1.0.1 )
 	arts? ( >=kde-base/arts-1.2.3 )
 	truetype? ( >=media-libs/freetype-2.1.5 )
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xextproto
 		) virtual/x11 )
 	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.12.1 )
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/automake-1.8.3"
 
diff --git a/media-video/avidemux/avidemux-2.1_pre1.ebuild b/media-video/avidemux/avidemux-2.1_pre1.ebuild
index 1a36d6f19ab4..1aa226a1d6f4 100644
--- a/media-video/avidemux/avidemux-2.1_pre1.ebuild
+++ b/media-video/avidemux/avidemux-2.1_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.3 2005/12/19 14:45:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.1_pre1.ebuild,v 1.4 2006/02/15 15:38:53 flameeyes Exp $
 
 inherit eutils flag-o-matic fixheadtails
 
@@ -27,7 +27,7 @@ RDEPEND="
 	       >=media-libs/faad2-2.0-r7 )
 	mad? ( media-libs/libmad )
 	xvid? ( >=media-libs/xvid-1.0.0 )
-	nls? ( >=sys-devel/gettext-0.12.1 )
+	nls? ( virtual/libintl )
 	vorbis? ( >=media-libs/libvorbis-1.0.1 )
 	arts? ( >=kde-base/arts-1.2.3 )
 	truetype? ( >=media-libs/freetype-2.1.5 )
@@ -48,6 +48,7 @@ DEPEND="$RDEPEND
 			x11-proto/xextproto
 		) virtual/x11 )
 	dev-util/pkgconfig
+	nls? ( >=sys-devel/gettext-0.12.1 )
 	>=sys-devel/autoconf-2.58
 	>=sys-devel/automake-1.8.3"