ulm 15/03/15 17:45:20
Modified: mplayer-1.2_pre20141011.ebuild
mplayer-1.2_pre20130729.ebuild
mplayer-1.2_pre20150214.ebuild ChangeLog
mplayer-9999.ebuild mplayer-1.1.1-r1.ebuild
metadata.xml
Log:
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!)
Revision Changes Path
1.6 media-video/mplayer/mplayer-1.2_pre20141011.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild?r1=1.5&r2=1.6
Index: mplayer-1.2_pre20141011.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20141011.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer-1.2_pre20141011.ebuild 30 Jan 2015 17:15:57 -0000 1.5
+++ mplayer-1.2_pre20141011.ebuild 15 Mar 2015 17:45:19 -0000 1.6
@@ -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 @@
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 @@
# radio requires oss or alsa backend
# xvmc requires xvideo support
REQUIRED_USE="
- bindist? ( !faac )
dga? ( X )
dvdnav? ( dvd )
enca? ( iconv )
@@ -187,6 +186,7 @@
xscreensaver? ( X )
xv? ( X )
xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
1.19 media-video/mplayer/mplayer-1.2_pre20130729.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild?r1=1.18&r2=1.19
Index: mplayer-1.2_pre20130729.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mplayer-1.2_pre20130729.ebuild 2 Mar 2015 09:21:49 -0000 1.18
+++ mplayer-1.2_pre20130729.ebuild 15 Mar 2015 17:45:19 -0000 1.19
@@ -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 @@
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 @@
# radio requires oss or alsa backend
# xvmc requires xvideo support
REQUIRED_USE="
- bindist? ( !faac )
dga? ( X )
dvdnav? ( dvd )
enca? ( iconv )
@@ -187,6 +186,7 @@
xscreensaver? ( X )
xv? ( X )
xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
PATCHES=( "${FILESDIR}/${P}-compat.patch" )
1.3 media-video/mplayer/mplayer-1.2_pre20150214.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild?r1=1.2&r2=1.3
Index: mplayer-1.2_pre20150214.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20150214.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-1.2_pre20150214.ebuild 14 Feb 2015 20:44:56 -0000 1.2
+++ mplayer-1.2_pre20150214.ebuild 15 Mar 2015 17:45:19 -0000 1.3
@@ -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 @@
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 @@
# radio requires oss or alsa backend
# xvmc requires xvideo support
REQUIRED_USE="
- bindist? ( !faac )
dga? ( X )
dvdnav? ( dvd )
enca? ( iconv )
@@ -187,6 +186,7 @@
xscreensaver? ( X )
xv? ( X )
xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
1.936 media-video/mplayer/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.936&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.936&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.935&r2=1.936
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- ChangeLog 2 Mar 2015 09:21:49 -0000 1.935
+++ ChangeLog 15 Mar 2015 17:45:19 -0000 1.936
@@ -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 <[email protected]> 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 <[email protected]>
mplayer-1.2_pre20130729.ebuild:
Stable for ppc, wrt bug #517692
1.168 media-video/mplayer/mplayer-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.168&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.168&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.167&r2=1.168
Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- mplayer-9999.ebuild 14 Feb 2015 20:44:56 -0000 1.167
+++ mplayer-9999.ebuild 15 Mar 2015 17:45:19 -0000 1.168
@@ -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 @@
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 @@
# radio requires oss or alsa backend
# xvmc requires xvideo support
REQUIRED_USE="
- bindist? ( !faac )
dga? ( X )
dvdnav? ( dvd )
enca? ( iconv )
@@ -187,6 +186,7 @@
xscreensaver? ( X )
xv? ( X )
xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
1.16 media-video/mplayer/mplayer-1.1.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild?r1=1.15&r2=1.16
Index: mplayer-1.1.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.1.1-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mplayer-1.1.1-r1.ebuild 30 Jan 2015 17:15:57 -0000 1.15
+++ mplayer-1.1.1-r1.ebuild 15 Mar 2015 17:45:19 -0000 1.16
@@ -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 @@
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 @@
# 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 @@
xscreensaver? ( X )
xv? ( X )
xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
PATCHES=(
"${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch"
1.48 media-video/mplayer/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.48&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.48&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.47&r2=1.48
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- metadata.xml 30 Jan 2015 17:15:57 -0000 1.47
+++ metadata.xml 15 Mar 2015 17:45:19 -0000 1.48
@@ -6,12 +6,11 @@
<email>[email protected]</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>
