ulm         15/03/15 17:33:24

  Modified:             libav-11.2.ebuild libav-10.9999.ebuild
                        libav-11.3.ebuild libav-9999.ebuild
                        libav-10.5.ebuild libav-11.9999.ebuild ChangeLog
                        metadata.xml libav-9.17.ebuild libav-9.14.ebuild
  Log:
  Add conditional bindist restriction and remove bindist USE flag, bug 541592.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
9433907D693FB5B8!)

Revision  Changes    Path
1.3                  media-video/libav/libav-11.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.2.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.2.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.2.ebuild?r1=1.2&r2=1.3

Index: libav-11.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libav-11.2.ebuild   30 Jan 2015 16:57:31 -0000      1.2
+++ libav-11.2.ebuild   15 Mar 2015 17:33:24 -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/libav/libav-11.2.ebuild,v 1.2 
2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.2.ebuild,v 1.3 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -29,8 +29,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 
jack jpeg2k
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack 
jpeg2k
        mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl 
speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 x265 xvid +zlib"
@@ -127,15 +127,14 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? 
( gpl )
        test? ( encode zlib )
        fontconfig? ( truetype )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
+RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.11                 media-video/libav/libav-10.9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.9999.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.9999.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.9999.ebuild?r1=1.10&r2=1.11

Index: libav-10.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libav-10.9999.ebuild        30 Jan 2015 16:57:31 -0000      1.10
+++ libav-10.9999.ebuild        15 Mar 2015 17:33:24 -0000      1.11
@@ -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/libav/libav-10.9999.ebuild,v 
1.10 2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 
1.11 2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -29,8 +29,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
mp3
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
        +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 xvid +zlib"
@@ -124,14 +124,13 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
        test? ( encode zlib )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
+RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.2                  media-video/libav/libav-11.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.3.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.3.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.3.ebuild?r1=1.1&r2=1.2

Index: libav-11.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libav-11.3.ebuild   14 Mar 2015 16:56:02 -0000      1.1
+++ libav-11.3.ebuild   15 Mar 2015 17:33:24 -0000      1.2
@@ -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/libav/libav-11.3.ebuild,v 1.1 
2015/03/14 16:56:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.2 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 
jack jpeg2k
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack 
jpeg2k
        mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl 
speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 x265 xvid +zlib"
@@ -129,14 +129,12 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? 
( gpl )
        test? ( encode zlib )
        fontconfig? ( truetype )
 "
-
-# Test on live ebuild are not possible as they require trunk fate
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.78                 media-video/libav/libav-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.78&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?rev=1.78&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9999.ebuild?r1=1.77&r2=1.78

Index: libav-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- libav-9999.ebuild   30 Jan 2015 16:57:31 -0000      1.77
+++ libav-9999.ebuild   15 Mar 2015 17:33:24 -0000      1.78
@@ -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/libav/libav-9999.ebuild,v 1.77 
2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.78 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -29,8 +29,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 
jack jpeg2k
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack 
jpeg2k
        mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl 
speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 x265 xvid +zlib"
@@ -124,15 +124,14 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? 
( gpl )
        test? ( encode zlib )
        fontconfig? ( truetype )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
+RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.4                  media-video/libav/libav-10.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.5.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.5.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-10.5.ebuild?r1=1.3&r2=1.4

Index: libav-10.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.5.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libav-10.5.ebuild   30 Jan 2015 16:57:31 -0000      1.3
+++ libav-10.5.ebuild   15 Mar 2015 17:33:24 -0000      1.4
@@ -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/libav/libav-10.5.ebuild,v 1.3 
2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.5.ebuild,v 1.4 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -29,8 +29,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
mp3
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
        +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 xvid +zlib"
@@ -124,14 +124,13 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
        test? ( encode zlib )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
+RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.3                  media-video/libav/libav-11.9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.9999.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.9999.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-11.9999.ebuild?r1=1.2&r2=1.3

Index: libav-11.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libav-11.9999.ebuild        30 Jan 2015 16:57:31 -0000      1.2
+++ libav-11.9999.ebuild        15 Mar 2015 17:33:24 -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/libav/libav-11.9999.ebuild,v 
1.2 2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.9999.ebuild,v 
1.3 2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -29,8 +29,8 @@
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc 
~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 
jack jpeg2k
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack 
jpeg2k
        mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl 
speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        wavpack webp x264 x265 xvid +zlib"
@@ -127,15 +127,14 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? 
( gpl )
        test? ( encode zlib )
        fontconfig? ( truetype )
 "
 
 # Test on live ebuild are not possible as they require trunk fate
-RESTRICT="test"
+RESTRICT="test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.242                media-video/libav/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.242&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?rev=1.242&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/ChangeLog?r1=1.241&r2=1.242

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog   14 Mar 2015 16:56:02 -0000      1.241
+++ ChangeLog   15 Mar 2015 17:33:24 -0000      1.242
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.241 
2015/03/14 16:56:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.242 
2015/03/15 17:33:24 ulm Exp $
+
+  15 Mar 2015; Ulrich Müller <[email protected]> libav-9.14.ebuild,
+  libav-9.17.ebuild, libav-10.5.ebuild, libav-10.9999.ebuild,
+  libav-11.2.ebuild, libav-11.3.ebuild, libav-11.9999.ebuild,
+  libav-9999.ebuild, metadata.xml:
+  Add conditional bindist restriction and remove bindist USE flag, bug 541592.
 
 *libav-11.3 (14 Mar 2015)
 



1.19                 media-video/libav/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?rev=1.19&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?rev=1.19&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/metadata.xml?r1=1.18&r2=1.19

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/metadata.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- metadata.xml        30 Jan 2015 16:57:31 -0000      1.18
+++ metadata.xml        15 Mar 2015 17:33:24 -0000      1.19
@@ -8,7 +8,6 @@
 <use>
        <flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
        <flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
-       <flag name="bindist">Build binary redistributable version without 
including nonfree decoders and encoders.</flag>
        <flag name="cdio">Enable audio CD grabbing with 
<pkg>dev-libs/libcdio</pkg>.</flag>
        <flag name="cpudetection">Enables runtime CPU detection (useful for 
bindist, compatibility on other CPUs).</flag>
        <flag name="faac">Use external faac library for AAC encoding</flag>



1.12                 media-video/libav/libav-9.17.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.17.ebuild?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.17.ebuild?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.17.ebuild?r1=1.11&r2=1.12

Index: libav-9.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.17.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libav-9.17.ebuild   30 Jan 2015 16:57:31 -0000      1.11
+++ libav-9.17.ebuild   15 Mar 2015 17:33:24 -0000      1.12
@@ -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/libav/libav-9.17.ebuild,v 1.11 
2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.17.ebuild,v 1.12 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@
 [[ ${PV} == *9999 ]] || \
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
mp3
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
        +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        x264 xvid +zlib"
@@ -124,11 +124,11 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
        test? ( encode zlib )
 "
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h



1.14                 media-video/libav/libav-9.14.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.14.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.14.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/libav-9.14.ebuild?r1=1.13&r2=1.14

Index: libav-9.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.14.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libav-9.14.ebuild   30 Jan 2015 16:57:31 -0000      1.13
+++ libav-9.14.ebuild   15 Mar 2015 17:33:24 -0000      1.14
@@ -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/libav/libav-9.14.ebuild,v 1.13 
2015/01/30 16:57:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.14.ebuild,v 1.14 
2015/03/15 17:33:24 ulm Exp $
 
 EAPI=5
 
@@ -31,8 +31,8 @@
 [[ ${PV} == *9999 ]] || \
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 
-IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
-       +encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
mp3
+IUSE="aac alsa amr +bzip2 cdio cpudetection custom-cflags debug doc    +encode
+       faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
        +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
        static-libs test theora threads tools truetype v4l vaapi vdpau vorbis 
vpx X
        x264 xvid +zlib"
@@ -124,11 +124,11 @@
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
 # x264 requires gpl2
-REQUIRED_USE="bindist? ( !faac !openssl !fdk )
-       rtmp? ( network )
+REQUIRED_USE="rtmp? ( network )
        amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
        test? ( encode zlib )
 "
+RESTRICT="faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
 
 MULTILIB_WRAPPED_HEADERS=(
        /usr/include/libavutil/avconfig.h




Reply via email to