Further corrected libintl dependencies, suggested by Nikoli.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

7 files changed, 32 insertions, 19 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index 30e35f7bb69a..21ae7e166855 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.17 2014/01/30 16:40:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.18 2014/01/30 18:13:38 tomwij Exp $
+
+  30 Jan 2014; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.2-r1.ebuild,
+  avidemux-core-2.6.3.ebuild, avidemux-core-2.6.4.ebuild,
+  avidemux-core-2.6.5.ebuild, avidemux-core-2.6.7.ebuild,
+  avidemux-core-9999.ebuild:
+  Further corrected libintl dependencies, suggested by Nikoli.
 
   30 Jan 2014; Tom Wijsman <TomWij@gentoo.org> avidemux-core-9999.ebuild:
   Corrected libintl dependencies, suggested by Nikoli.
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
index 95b885c8a9cb..f10bd58dd8ed 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.6 2013/08/11 21:42:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild,v 1.7 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -47,10 +47,13 @@ RDEPEND="
 DEPEND="
 	$RDEPEND
 	oss? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
+	nls? ( sys-devel/gettext:0 )
 	virtual/pkgconfig
 "
-
+RDEPEND="
+	nls? ( virtual/libintl:0 )
+	$RDEPEND
+"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
index c3158916f77e..f6a0c1811d7d 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.5 2013/08/11 21:42:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.6 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -23,18 +23,19 @@ IUSE="debug nls sdl system-ffmpeg vdpau xv"
 DEPEND="
 	!<media-video/avidemux-${PV}:${SLOT}
 	dev-db/sqlite
-	nls? ( sys-devel/gettext )
 	sdl? ( media-libs/libsdl )
 	system-ffmpeg? ( >=media-video/ffmpeg-1.0:0[aac,cpudetection,mp3,theora] )
 	xv? ( x11-libs/libXv )
 	vdpau? ( x11-libs/libvdpau )
 "
 RDEPEND="
+	nls? ( virtual/libintl:0 )
 	$DEPEND
 "
 DEPEND="
 	$DEPEND
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext:0 )
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
index cece7467f8a7..ffb217b07abf 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.4 2013/08/11 21:42:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.4.ebuild,v 1.5 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -23,18 +23,19 @@ IUSE="debug nls sdl system-ffmpeg vdpau xv"
 DEPEND="
 	!<media-video/avidemux-${PV}:${SLOT}
 	dev-db/sqlite
-	nls? ( sys-devel/gettext )
 	sdl? ( media-libs/libsdl )
 	system-ffmpeg? ( >=media-video/ffmpeg-1.0:0[aac,cpudetection,mp3,theora] )
 	xv? ( x11-libs/libXv )
 	vdpau? ( x11-libs/libvdpau )
 "
 RDEPEND="
+	nls? ( virtual/libintl:0 )
 	$DEPEND
 "
 DEPEND="
 	$DEPEND
 	virtual/pkgconfig
+	nls? ( sys-devel/gettext:0 )
 	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
index d0cd31fbb39c..04236288fa4f 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild,v 1.1 2013/09/01 11:53:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.5.ebuild,v 1.2 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -31,7 +31,6 @@ fi
 DEPEND="
 	!<media-video/avidemux-${PV}:${SLOT}
 	dev-db/sqlite:3
-	nls? ( sys-devel/gettext:0 )
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
 	xv? ( x11-libs/libXv:0 )
@@ -40,11 +39,13 @@ DEPEND="
 	video_cards_fglrx? ( x11-libs/xvba-video:0 )
 "
 RDEPEND="
+	nls? ( virtual/libintl:0 )
 	$DEPEND
 "
 DEPEND="
 	$DEPEND
 	virtual/pkgconfig:0
+	nls? ( sys-devel/gettext:0 )
 	!system-ffmpeg? ( dev-lang/yasm:0[nls=] )
 "
 
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
index bd6be6861857..67d59e1caaf3 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild,v 1.1 2013/12/17 23:26:40 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.7.ebuild,v 1.2 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -31,7 +31,6 @@ fi
 DEPEND="
 	!<media-video/avidemux-${PV}:${SLOT}
 	dev-db/sqlite:3
-	nls? ( sys-devel/gettext:0 )
 	sdl? ( media-libs/libsdl:0 )
 	system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
 	xv? ( x11-libs/libXv:0 )
@@ -40,11 +39,13 @@ DEPEND="
 	video_cards_fglrx? ( x11-libs/xvba-video:0 )
 "
 RDEPEND="
+	nls? ( virtual/libintl:0 )
 	$DEPEND
 "
 DEPEND="
 	$DEPEND
 	virtual/pkgconfig:0
+	nls? ( sys-devel/gettext:0 )
 	!system-ffmpeg? ( dev-lang/yasm:0[nls=] )
 "
 
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild
index 76208bbdc551..3f1d0daa1011 100644
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.5 2014/01/30 16:40:45 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-9999.ebuild,v 1.6 2014/01/30 18:13:38 tomwij Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ DEPEND="
 "
 RDEPEND="
 	$DEPEND
-	virtual/libintl:0
+	nls? ( virtual/libintl:0 )
 "
 DEPEND="
 	$DEPEND