Add conditional bindist restriction and remove bindist USE flag, bug 541594.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

7 files changed, 23 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index d1a59ae3d54e..0dd881783867 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.935 2015/03/02 09:21:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.936 2015/03/15 17:45:19 ulm Exp $
+
+  15 Mar 2015; Ulrich Müller <ulm@gentoo.org> mplayer-1.1.1-r1.ebuild,
+  mplayer-1.2_pre20130729.ebuild, mplayer-1.2_pre20141011.ebuild,
+  mplayer-1.2_pre20150214.ebuild, mplayer-9999.ebuild, metadata.xml:
+  Add conditional bindist restriction and remove bindist USE flag, bug 541594.
 
   02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> mplayer-1.2_pre20130729.ebuild:
   Stable for ppc, wrt bug #517692
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 472986b34967..0e3701050a08 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -6,12 +6,11 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
     <flag name="bl">Blinkenlights video output</flag>
     <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
     <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
     <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
-    <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+    <flag name="cpudetection">Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs)</flag>
     <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
     <flag name="enca">Enables support for charset discovery and conversion</flag>
     <flag name="faac">Use external faac library for AAC encoding</flag>
diff --git a/media-video/mplayer/mplayer-1.1.1-r1.ebuild b/media-video/mplayer/mplayer-1.1.1-r1.ebuild
index bac881d5293d..5860f2f749e9 100644
--- a/media-video/mplayer/mplayer-1.1.1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.1.1-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/mplayer/mplayer-1.1.1-r1.ebuild,v 1.15 2015/01/30 17:15:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v 1.16 2015/03/15 17:45:19 ulm Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav +enca +encode faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -169,7 +169,7 @@ fi
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !faac )
+REQUIRED_USE="
 	dvdnav? ( dvd )
 	libass? ( truetype )
 	truetype? ( iconv )
@@ -183,6 +183,7 @@ REQUIRED_USE="bindist? ( !faac )
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch"
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index 14aec3611742..afeec13fc72a 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.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/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.18 2015/03/02 09:21:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.19 2015/03/15 17:45:19 ulm Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -172,7 +172,6 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="
-	bindist? ( !faac )
 	dga? ( X )
 	dvdnav? ( dvd )
 	enca? ( iconv )
@@ -187,6 +186,7 @@ REQUIRED_USE="
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
 
 PATCHES=( "${FILESDIR}/${P}-compat.patch" )
 
diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
index 96fbff9463ef..50ccdbfbd350 100644
--- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20141011.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/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.5 2015/01/30 17:15:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v 1.6 2015/03/15 17:45:19 ulm Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -172,7 +172,6 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="
-	bindist? ( !faac )
 	dga? ( X )
 	dvdnav? ( dvd )
 	enca? ( iconv )
@@ -187,6 +186,7 @@ REQUIRED_USE="
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
index f2e56992c17f..a6c2494fdf4d 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214.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/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.2 2015/02/14 20:44:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v 1.3 2015/03/15 17:45:19 ulm Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -172,7 +172,6 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="
-	bindist? ( !faac )
 	dga? ( X )
 	dvdnav? ( dvd )
 	enca? ( iconv )
@@ -187,6 +186,7 @@ REQUIRED_USE="
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 53ab7a7937df..2428b9f6c791 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.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/mplayer/mplayer-9999.ebuild,v 1.167 2015/02/14 20:44:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.168 2015/03/15 17:45:19 ulm Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
 
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
 bs2b cddb +cdio cdparanoia cpudetection debug dga
 directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -172,7 +172,6 @@ fi
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
 REQUIRED_USE="
-	bindist? ( !faac )
 	dga? ( X )
 	dvdnav? ( dvd )
 	enca? ( iconv )
@@ -187,6 +186,7 @@ REQUIRED_USE="
 	xscreensaver? ( X )
 	xv? ( X )
 	xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then