[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Alexis Ballier]

commit:     7ac9605fe579c8d93a89e31c984e15397bed4539
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 08:34:34 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed May 11 08:45:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac9605f

media-video/ffmpeg: nvenc does not require nonfree binary anymore; required 
header is MIT.

Package-Manager: portage-2.2.28

 media-video/ffmpeg/ffmpeg-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 5a5c2e0..04c1164 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -279,7 +279,7 @@ REQUIRED_USE="
        ${GPL_REQUIRED_USE}
        ${CPU_REQUIRED_USE}"
 RESTRICT="
-       encode? ( faac? ( bindist ) nvenc? ( bindist ) )
+       encode? ( faac? ( bindist ) )
        gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 "
 
@@ -311,7 +311,7 @@ multilib_src_configure() {
                if use amrenc ; then
                        myconf+=( --enable-version3 )
                fi
-               if use faac || use nvenc ; then
+               if use faac ; then
                        myconf+=( --enable-nonfree )
                fi
        else