convert to RESTRICT=bindist, bug #541588

Signed-off-by: aballier@gentoo.org
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

8 files changed, 35 insertions, 25 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1b29a4d70f67..584d3ce11c10 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.839 2015/03/05 13:52:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.840 2015/03/05 13:57:08 aballier Exp $
+
+  05 Mar 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.10.15.ebuild,
+  ffmpeg-1.0.10.ebuild, ffmpeg-1.2.12.ebuild, ffmpeg-1.2.6-r1.ebuild,
+  ffmpeg-2.2.13.ebuild, ffmpeg-2.5.4.ebuild, metadata.xml:
+  convert to RESTRICT=bindist, bug #541588
 
   05 Mar 2015; Alexis Ballier <aballier@gentoo.org> -ffmpeg-1.2.11.ebuild,
   -ffmpeg-2.2.12.ebuild, -ffmpeg-2.5.3.ebuild:
diff --git a/media-video/ffmpeg/ffmpeg-0.10.15.ebuild b/media-video/ffmpeg/ffmpeg-0.10.15.ebuild
index 3396e17061c1..da714a2198f9 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.15.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v 1.2 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.15.ebuild,v 1.3 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="5"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
+	aac aacplus alsa amr +bzip2 cdio celt cpudetection debug
 	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
 	jpeg2k libass libv4l modplug mp3 +network openal openssl oss pic pulseaudio
 	rtmp schroedinger sdl speex static-libs test theora threads
@@ -107,9 +107,10 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 "
 # faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	test? ( encode zlib )"
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild b/media-video/ffmpeg/ffmpeg-1.0.10.ebuild
index d35c5fd52c81..3df45279941b 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.10.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.3 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.10.ebuild,v 1.4 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
 	libv4l modplug mp3 +network openal openssl opus oss pic pulseaudio rtmp
@@ -116,11 +116,12 @@ DEPEND="${RDEPEND}
 	truetype? ( virtual/pkgconfig )
 	v4l? ( sys-kernel/linux-headers )
 "
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
index 8c1ad174bac1..51edfd43a632 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.1 2015/02/14 20:50:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.12.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
 	libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
@@ -145,11 +145,12 @@ RDEPEND="${RDEPEND}
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
index 11040e764f67..c86ad60210bd 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.15 2015/01/30 16:40:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6-r1.ebuild,v 1.16 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
 	libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
@@ -145,11 +145,12 @@ RDEPEND="${RDEPEND}
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/ffmpeg-2.2.13.ebuild b/media-video/ffmpeg/ffmpeg-2.2.13.ebuild
index 6f208c69838d..bab77faa341b 100644
--- a/media-video/ffmpeg/ffmpeg-2.2.13.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.1 2015/02/20 11:17:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.13.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
+	aac aacplus alsa amr amrenc bluray +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
 	ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
@@ -177,11 +177,12 @@ RDEPEND="${RDEPEND}
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/ffmpeg-2.5.4.ebuild b/media-video/ffmpeg/ffmpeg-2.5.4.ebuild
index d82c191fe4d7..a6ab991a317e 100644
--- a/media-video/ffmpeg/ffmpeg-2.5.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v 1.1 2015/02/14 20:58:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.5.4.ebuild,v 1.2 2015/03/05 13:57:08 aballier Exp $
 
 EAPI="5"
 
@@ -40,7 +40,7 @@ if [ "${PV#9999}" = "${PV}" ] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 IUSE="
-	aac aacplus alsa amr amrenc bindist bluray bs2b +bzip2 cdio celt
+	aac aacplus alsa amr amrenc bluray bs2b +bzip2 cdio celt
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	fribidi gme	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack
 	jpeg2k ladspa libass libcaca libsoxr libv4l lzma modplug mp3 +network
@@ -177,11 +177,12 @@ RDEPEND="${RDEPEND}
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
 		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+REQUIRED_USE="
 	libv4l? ( v4l )
 	fftools_cws2fws? ( zlib )
 	test? ( encode )"
+# faac is license-incompatible with ffmpeg
+RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
 
 S=${WORKDIR}/${P/_/-}
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 23e69c8617f5..e432f7bebad0 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -13,7 +13,6 @@
 	<flag name="armv6">Enables optimizations for armv6 processors.</flag>
 	<flag name="armv6t2">Enables optimizations for armv6t2 processors.</flag>
 	<flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
-	<flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
 	<flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>