commit:     bbef43a06aa93bf7a6bd3cfd4c5694e51183724e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 15:08:13 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 15:18:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbef43a0

media-video/ffmpeg: Remove old

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-video/ffmpeg/Manifest                        |   3 -
 media-video/ffmpeg/ffmpeg-4.0.2.ebuild             | 522 --------------------
 media-video/ffmpeg/ffmpeg-4.0.3.ebuild             | 523 --------------------
 media-video/ffmpeg/ffmpeg-4.1.ebuild               | 528 ---------------------
 .../ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch      |  27 --
 5 files changed, 1603 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index ea1b277291f..dac93f02dbb 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,7 +4,4 @@ DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 
72d42a16396882b30641fb057bb597f8e98ecf
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 
2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03
 SHA512 
1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
 DIST ffmpeg-3.3.8.tar.bz2 9953307 BLAKE2B 
edd3c2ce9730494455a05ec9d81b6c2ceb0ebf526124f95a530214cdb113ffe91aa13b80a66501aefa4f571c5b8f2eedb97f8086370d08e3b4e2a98d517eb92b
 SHA512 
a793f6d0a06ff5244a580d9e54e1252d3ac88e2513dad4d137081103327ae4440ebe9b0d60a13f93536cb6b35097982ea76acc4056bfa31683063eef5c211ede
 DIST ffmpeg-3.4.5.tar.bz2 10183082 BLAKE2B 
f72157baefcd6a0ca8f389309bbe947ad21996e0f2eb3c46c6bfc90f1ebbb14bfd007d001e46ea51efef5db5f9fcee24b1a90b6862136aeebecdc95bb61b23a5
 SHA512 
e12707d47404a9ce02790b77d2852fc1a1573c8108e980c7355fa48ba891d1649464d4fe4d08394ecd6d871f651ac4388486b7654cb54a7aaeedaf05c55513ec
-DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 
0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9
 SHA512 
92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b
-DIST ffmpeg-4.0.3.tar.bz2 10425117 BLAKE2B 
1517d66d5a0c931b866df5206ae660a01daf49d375f7750a7b027ce62ab7dc8131fc02b8a6320e5ff7295b9bccdafbbaf25e206c55fad420ea206c1b9638e777
 SHA512 
8d600adf55f2fc1574a7013700129766a4a3db83bb33ec32fe07759310f1d8804c00e74b58fd1fcbdd91efec214764e4b2fadf7b01c948dc2ccdcd1b4d56e303
 DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 
47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f
 SHA512 
0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4
-DIST ffmpeg-4.1.tar.bz2 10687291 BLAKE2B 
07293af1b13c6c6cad72e368207db21bdbc4b991931166c24ff40b00c3b3c8e1242be1876af8e3f154cc840fcd90d87b762fe77faccf06936dd096478d5d074b
 SHA512 
ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417

diff --git a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild 
b/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
deleted file mode 100644
index 4cb26fd9047..00000000000
--- a/media-video/ffmpeg/ffmpeg-4.0.2.ebuild
+++ /dev/null
@@ -1,522 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_MIN_CLONE_TYPE="single"
-       EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git";
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. 
Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/";
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-       SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-       SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2";
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-       !gpl? ( LGPL-2.1 )
-       gpl? ( GPL-2 )
-       amr? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       gmp? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       encode? (
-               amrenc? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-       )
-       samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-               +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls 
gmp
-               +gpl +hardcoded-tables +iconv libressl:libtls lzma +network 
opencl
-               openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi 
vdpau
-               X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-               # libavdevice options
-               cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca 
openal
-               opengl
-               # indevs
-               libv4l:libv4l2 pulseaudio:libpulse libdrm
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 
fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex svg:librsvg video_cards_nvidia:ffnvcodec
-               vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-               # libavfilter options
-               appkit
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass lv2 
truetype:libfreetype
-               rubberband:librubberband zeromq:libzmq zimg:libzimg
-               # libswresample options
-               libsoxr
-               # Threads; we only support pthread for now but ffmpeg supports 
more
-               +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-       amrenc:libvo-amrwbenc mp3:libmp3lame
-       kvazaar:libkvazaar libaom
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
-       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-       alsa chromium doc +encode jack oss pic static-libs test v4l
-       ${FFMPEG_FLAG_MAP[@]%:*}
-       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-       cpu_flags_arm_thumb:armv5te
-       cpu_flags_arm_v6:armv6
-       cpu_flags_arm_thumb2:armv6t2
-       cpu_flags_arm_neon:neon
-       cpu_flags_arm_vfp:vfp
-       cpu_flags_arm_vfpv3:vfpv3
-       cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-       arm64? ( cpu_flags_arm_v8 )
-       cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-       cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-       cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-       cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-       cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx 
avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 
ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-       ${ARM_CPU_FEATURES[@]}
-       ${MIPS_CPU_FEATURES[@]}
-       ${PPC_CPU_FEATURES[@]}
-       ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-       ${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot 
ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-       bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-       codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-       encode? (
-               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
-               kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-               mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-               snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-               theora? (
-                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-               )
-               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-               wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-               webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-               x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-               x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-       )
-       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-       frei0r? ( media-plugins/frei0r-plugins )
-       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-       gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-       gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-       iec61883? (
-               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-       )
-       ieee1394? (
-               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       )
-       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-       jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-       libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-       libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-       libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-       libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-       libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-       lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] 
media-libs/lilv[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-       mmal? ( media-libs/raspberrypi-userland )
-       modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-       openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-       rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-       video_cards_nvidia? ( media-libs/nv-codec-headers[${MULTILIB_USEDEP}] )
-       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-       vorbis? (
-               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       )
-       vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zeromq? ( >=net-libs/zeromq-4.1.6 )
-       zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-       !media-video/qt-faststart
-       postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-       !libressl? (
-               openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-               !openssl? ( gnutls? ( 
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-       )
-"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/make-3.81
-       doc? ( sys-apps/texinfo )
-       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-       cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-       test? ( net-misc/wget sys-devel/bc )
-       v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-       postproc? ( gpl )
-       frei0r? ( gpl )
-       cdio? ( gpl )
-       samba? ( gpl )
-       encode? (
-               x264? ( gpl )
-               x265? ( gpl )
-               xvid? ( gpl )
-               X? ( !xcb? ( gpl ) )
-       )
-"
-REQUIRED_USE="
-       libv4l? ( v4l )
-       fftools_cws2fws? ( zlib )
-       test? ( encode )
-       ${GPL_REQUIRED_USE}
-       ${CPU_REQUIRED_USE}"
-RESTRICT="
-       gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-       "${FILESDIR}"/chromium-r1.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-       use opencl
-}
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       default
-       echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-       use samba && myconf+=( --enable-version3 )
-
-       # Encoders
-       if use encode ; then
-               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-               # Licensing.
-               if use amrenc ; then
-                       myconf+=( --enable-version3 )
-               fi
-       else
-               myconf+=( --disable-encoders )
-       fi
-
-       # Indevs
-       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-       for i in alsa oss jack ; do
-               use ${i} || myconf+=( --disable-indev=${i} )
-       done
-
-       # Outdevs
-       for i in alsa oss sdl ; do
-               use ${i} || myconf+=( --disable-outdev=${i} )
-       done
-
-       # Decoders
-       use amr && myconf+=( --enable-version3 )
-       use gmp && myconf+=( --enable-version3 )
-       use fdk && use gpl && myconf+=( --enable-nonfree )
-
-       for i in "${ffuse[@]#+}" ; do
-               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-       done
-
-       # Incompatible features: openssl or libressl and gnutls
-       if use libressl ; then
-               myconf+=( --disable-gnutls --disable-openssl )
-       elif use openssl ; then
-               myconf+=( --disable-gnutls )
-       fi
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in "${CPU_FEATURES_MAP[@]}" ; do
-               use ${i%:*} || myconf+=( --disable-${i#*:} )
-       done
-
-       if use pic ; then
-               myconf+=( --enable-pic )
-               # disable asm code if PIC is required
-               # as the provided asm decidedly is not PIC for x86.
-               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-       fi
-       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-       # Try to get cpu type based on CFLAGS.
-       # Bug #172723
-       # We need to do this so that features of that CPU will be better used
-       # If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
-       # will just ignore it.
-       for i in $(get-flag mcpu) $(get-flag march) ; do
-               [[ ${i} = native ]] && i="host" # bug #273421
-               myconf+=( --cpu=${i} )
-               break
-       done
-
-       # LTO support, bug #566282
-       is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-       # Mandatory configuration
-       myconf=(
-               --enable-avfilter
-               --enable-avresample
-               --disable-stripping
-               --disable-libcelt # bug #664158
-               "${myconf[@]}"
-       )
-
-       # cross compile support
-       if tc-is-cross-compiler ; then
-               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) 
--cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-               case ${CHOST} in
-                       *freebsd*)
-                               myconf+=( --target-os=freebsd )
-                               ;;
-                       *mingw32*)
-                               myconf+=( --target-os=mingw32 )
-                               ;;
-                       *linux*)
-                               myconf+=( --target-os=linux )
-                               ;;
-               esac
-       fi
-
-       # doc
-       myconf+=(
-               $(multilib_native_use_enable doc)
-               $(multilib_native_use_enable doc htmlpages)
-               $(multilib_native_enable manpages)
-       )
-
-       set -- "${S}/configure" \
-               --prefix="${EPREFIX}/usr" \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-               --mandir="${EPREFIX}/usr/share/man" \
-               --enable-shared \
-               --cc="$(tc-getCC)" \
-               --cxx="$(tc-getCXX)" \
-               --ar="$(tc-getAR)" \
-               --optflags="${CFLAGS}" \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-       echo "${@}"
-       "${@}" || die
-
-       if multilib_is_native_abi && use chromium && build_separate_libffmpeg; 
then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --disable-opencl
-               echo "${@}"
-               "${@}" || die
-               popd >/dev/null || die
-       fi
-}
-
-multilib_src_compile() {
-       emake V=1
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               emake V=1 tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Compiling for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install() {
-       emake V=1 DESTDIR="${D}" install install-doc
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               dobin tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Installing for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-       
LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample"
 \
-               emake V=1 fate
-}

diff --git a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild 
b/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
deleted file mode 100644
index 8e011cb6e0b..00000000000
--- a/media-video/ffmpeg/ffmpeg-4.0.3.ebuild
+++ /dev/null
@@ -1,523 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_MIN_CLONE_TYPE="single"
-       EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git";
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. 
Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/";
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-       SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-       SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2";
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-       !gpl? ( LGPL-2.1 )
-       gpl? ( GPL-2 )
-       amr? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       gmp? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       encode? (
-               amrenc? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-       )
-       samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-               +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls 
gmp
-               +gpl +hardcoded-tables +iconv libressl:libtls lzma +network 
opencl
-               openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi 
vdpau
-               X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-               # libavdevice options
-               cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca 
openal
-               opengl
-               # indevs
-               libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 
fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex srt:libsrt svg:librsvg 
video_cards_nvidia:ffnvcodec
-               vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-               # libavfilter options
-               appkit
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass lv2 
truetype:libfreetype
-               rubberband:librubberband zeromq:libzmq zimg:libzimg
-               # libswresample options
-               libsoxr
-               # Threads; we only support pthread for now but ffmpeg supports 
more
-               +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-       amrenc:libvo-amrwbenc mp3:libmp3lame
-       kvazaar:libkvazaar libaom
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
-       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-       alsa chromium doc +encode oss pic static-libs test v4l
-       ${FFMPEG_FLAG_MAP[@]%:*}
-       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-       cpu_flags_arm_thumb:armv5te
-       cpu_flags_arm_v6:armv6
-       cpu_flags_arm_thumb2:armv6t2
-       cpu_flags_arm_neon:neon
-       cpu_flags_arm_vfp:vfp
-       cpu_flags_arm_vfpv3:vfpv3
-       cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-       arm64? ( cpu_flags_arm_v8 )
-       cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-       cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-       cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-       cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-       cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx 
avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 
ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-       ${ARM_CPU_FEATURES[@]}
-       ${MIPS_CPU_FEATURES[@]}
-       ${PPC_CPU_FEATURES[@]}
-       ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-       ${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot 
ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-       bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-       codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-       encode? (
-               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
-               kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-               mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-               snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-               theora? (
-                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-               )
-               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-               wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-               webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-               x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-               x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-       )
-       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-       frei0r? ( media-plugins/frei0r-plugins )
-       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-       gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-       gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-       iec61883? (
-               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-       )
-       ieee1394? (
-               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       )
-       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-       jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-       libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-       libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-       libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-       libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-       libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-       lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] 
media-libs/lilv[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-       mmal? ( media-libs/raspberrypi-userland )
-       modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-       openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-       rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       srt? ( net-libs/srt[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-       video_cards_nvidia? ( 
>=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] )
-       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-       vorbis? (
-               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       )
-       vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zeromq? ( >=net-libs/zeromq-4.1.6 )
-       zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-       !media-video/qt-faststart
-       postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-       !libressl? (
-               openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-               !openssl? ( gnutls? ( 
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-       )
-"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/make-3.81
-       doc? ( sys-apps/texinfo )
-       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-       cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-       test? ( net-misc/wget sys-devel/bc )
-       v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-       postproc? ( gpl )
-       frei0r? ( gpl )
-       cdio? ( gpl )
-       samba? ( gpl )
-       encode? (
-               x264? ( gpl )
-               x265? ( gpl )
-               xvid? ( gpl )
-               X? ( !xcb? ( gpl ) )
-       )
-"
-REQUIRED_USE="
-       libv4l? ( v4l )
-       fftools_cws2fws? ( zlib )
-       test? ( encode )
-       ${GPL_REQUIRED_USE}
-       ${CPU_REQUIRED_USE}"
-RESTRICT="
-       gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-       "${FILESDIR}"/chromium-r1.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-       use opencl
-}
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       default
-       echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-       use samba && myconf+=( --enable-version3 )
-
-       # Encoders
-       if use encode ; then
-               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-               # Licensing.
-               if use amrenc ; then
-                       myconf+=( --enable-version3 )
-               fi
-       else
-               myconf+=( --disable-encoders )
-       fi
-
-       # Indevs
-       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-       for i in alsa oss jack ; do
-               use ${i} || myconf+=( --disable-indev=${i} )
-       done
-
-       # Outdevs
-       for i in alsa oss sdl ; do
-               use ${i} || myconf+=( --disable-outdev=${i} )
-       done
-
-       # Decoders
-       use amr && myconf+=( --enable-version3 )
-       use gmp && myconf+=( --enable-version3 )
-       use fdk && use gpl && myconf+=( --enable-nonfree )
-
-       for i in "${ffuse[@]#+}" ; do
-               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-       done
-
-       # Incompatible features: openssl or libressl and gnutls
-       if use libressl ; then
-               myconf+=( --disable-gnutls --disable-openssl )
-       elif use openssl ; then
-               myconf+=( --disable-gnutls )
-       fi
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in "${CPU_FEATURES_MAP[@]}" ; do
-               use ${i%:*} || myconf+=( --disable-${i#*:} )
-       done
-
-       if use pic ; then
-               myconf+=( --enable-pic )
-               # disable asm code if PIC is required
-               # as the provided asm decidedly is not PIC for x86.
-               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-       fi
-       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-       # Try to get cpu type based on CFLAGS.
-       # Bug #172723
-       # We need to do this so that features of that CPU will be better used
-       # If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
-       # will just ignore it.
-       for i in $(get-flag mcpu) $(get-flag march) ; do
-               [[ ${i} = native ]] && i="host" # bug #273421
-               myconf+=( --cpu=${i} )
-               break
-       done
-
-       # LTO support, bug #566282
-       is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-       # Mandatory configuration
-       myconf=(
-               --enable-avfilter
-               --enable-avresample
-               --disable-stripping
-               --disable-libcelt # bug #664158
-               "${myconf[@]}"
-       )
-
-       # cross compile support
-       if tc-is-cross-compiler ; then
-               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) 
--cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-               case ${CHOST} in
-                       *freebsd*)
-                               myconf+=( --target-os=freebsd )
-                               ;;
-                       *mingw32*)
-                               myconf+=( --target-os=mingw32 )
-                               ;;
-                       *linux*)
-                               myconf+=( --target-os=linux )
-                               ;;
-               esac
-       fi
-
-       # doc
-       myconf+=(
-               $(multilib_native_use_enable doc)
-               $(multilib_native_use_enable doc htmlpages)
-               $(multilib_native_enable manpages)
-       )
-
-       set -- "${S}/configure" \
-               --prefix="${EPREFIX}/usr" \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-               --mandir="${EPREFIX}/usr/share/man" \
-               --enable-shared \
-               --cc="$(tc-getCC)" \
-               --cxx="$(tc-getCXX)" \
-               --ar="$(tc-getAR)" \
-               --optflags="${CFLAGS}" \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-       echo "${@}"
-       "${@}" || die
-
-       if multilib_is_native_abi && use chromium && build_separate_libffmpeg; 
then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --disable-opencl
-               echo "${@}"
-               "${@}" || die
-               popd >/dev/null || die
-       fi
-}
-
-multilib_src_compile() {
-       emake V=1
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               emake V=1 tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Compiling for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install() {
-       emake V=1 DESTDIR="${D}" install install-doc
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               dobin tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Installing for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-       
LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample"
 \
-               emake V=1 fate
-}

diff --git a/media-video/ffmpeg/ffmpeg-4.1.ebuild 
b/media-video/ffmpeg/ffmpeg-4.1.ebuild
deleted file mode 100644
index 7502a685b96..00000000000
--- a/media-video/ffmpeg/ffmpeg-4.1.ebuild
+++ /dev/null
@@ -1,528 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_MIN_CLONE_TYPE="single"
-       EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git";
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. 
Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/";
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-       SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-       SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2";
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-       !gpl? ( LGPL-2.1 )
-       gpl? ( GPL-2 )
-       amr? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       gmp? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       encode? (
-               amrenc? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-       )
-       samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-               +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls 
gmp
-               +gpl +hardcoded-tables +iconv libressl:libtls lzma +network 
opencl
-               openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi 
vdpau
-               X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-               # libavdevice options
-               cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca 
openal
-               opengl
-               # indevs
-               libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 
fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex srt:libsrt svg:librsvg 
video_cards_nvidia:ffnvcodec
-               vorbis:libvorbis vpx:libvpx zvbi:libzvbi
-               # libavfilter options
-               appkit
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass lv2 
truetype:libfreetype
-               rubberband:librubberband zeromq:libzmq zimg:libzimg
-               # libswresample options
-               libsoxr
-               # Threads; we only support pthread for now but ffmpeg supports 
more
-               +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-       amrenc:libvo-amrwbenc mp3:libmp3lame
-       kvazaar:libkvazaar libaom
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
-       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-       alsa chromium doc +encode oss pic static-libs test v4l
-       ${FFMPEG_FLAG_MAP[@]%:*}
-       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-       cpu_flags_arm_thumb:armv5te
-       cpu_flags_arm_v6:armv6
-       cpu_flags_arm_thumb2:armv6t2
-       cpu_flags_arm_neon:neon
-       cpu_flags_arm_vfp:vfp
-       cpu_flags_arm_vfpv3:vfpv3
-       cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-       arm64? ( cpu_flags_arm_v8 )
-       cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-       cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-       cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-       cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-       cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx 
avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 
ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-       ${ARM_CPU_FEATURES[@]}
-       ${MIPS_CPU_FEATURES[@]}
-       ${PPC_CPU_FEATURES[@]}
-       ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-       ${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot 
ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-       bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-       codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
-       encode? (
-               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] 
)
-               kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-               mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-               snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-               theora? (
-                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-               )
-               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-               wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-               webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-               x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-               x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-       )
-       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-       frei0r? ( media-plugins/frei0r-plugins )
-       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-       gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-       gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-       iec61883? (
-               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-       )
-       ieee1394? (
-               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       )
-       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-       jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-       libaom? ( media-libs/libaom[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-       libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
-       libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-       libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-       libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-       lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] 
media-libs/lilv[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-       mmal? ( media-libs/raspberrypi-userland )
-       modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-       openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-       opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-       rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
-       sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       srt? ( >=net-libs/srt-1.3.0[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-       video_cards_nvidia? ( 
>=media-libs/nv-codec-headers-8.1.24.2[${MULTILIB_USEDEP}] )
-       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-       vorbis? (
-               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       )
-       vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zeromq? ( >=net-libs/zeromq-4.1.6 )
-       zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-       !media-video/qt-faststart
-       postproc? ( !media-libs/libpostproc )
-"
-
-# Crypto & co provider magic
-# - libressl is a useflag meaning it should always favor libressl over openssl
-# - libressl and openssl provide more features to ffmpeg than gnutls
-#
-# The ordering is thus: libressl > openssl > gnutls
-RDEPEND="${RDEPEND}
-       libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-       !libressl? (
-               openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-               !openssl? ( gnutls? ( 
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-       )
-"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/make-3.81
-       doc? ( sys-apps/texinfo )
-       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-       cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-       test? ( net-misc/wget sys-devel/bc )
-       v4l? ( sys-kernel/linux-headers )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-       postproc? ( gpl )
-       frei0r? ( gpl )
-       cdio? ( gpl )
-       samba? ( gpl )
-       encode? (
-               x264? ( gpl )
-               x265? ( gpl )
-               xvid? ( gpl )
-               X? ( !xcb? ( gpl ) )
-       )
-"
-REQUIRED_USE="
-       libv4l? ( v4l )
-       fftools_cws2fws? ( zlib )
-       test? ( encode )
-       ${GPL_REQUIRED_USE}
-       ${CPU_REQUIRED_USE}"
-RESTRICT="
-       gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-       "${FILESDIR}"/chromium-r1.patch
-       "${FILESDIR}/${P}-vaapi-tools.patch"
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
-       use opencl
-}
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       default
-       echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl || use libressl && use gpl && myconf+=( --enable-nonfree )
-       use samba && myconf+=( --enable-version3 )
-
-       # Encoders
-       if use encode ; then
-               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-               # Licensing.
-               if use amrenc ; then
-                       myconf+=( --enable-version3 )
-               fi
-       else
-               myconf+=( --disable-encoders )
-       fi
-
-       # Indevs
-       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-       for i in alsa oss jack ; do
-               use ${i} || myconf+=( --disable-indev=${i} )
-       done
-
-       # Outdevs
-       for i in alsa oss sdl ; do
-               use ${i} || myconf+=( --disable-outdev=${i} )
-       done
-
-       # Decoders
-       use amr && myconf+=( --enable-version3 )
-       use gmp && myconf+=( --enable-version3 )
-       use fdk && use gpl && myconf+=( --enable-nonfree )
-
-       for i in "${ffuse[@]#+}" ; do
-               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-       done
-
-       # Incompatible features: openssl or libressl and gnutls
-       if use libressl ; then
-               myconf+=( --disable-gnutls --disable-openssl )
-       elif use openssl ; then
-               myconf+=( --disable-gnutls )
-       fi
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in "${CPU_FEATURES_MAP[@]}" ; do
-               use ${i%:*} || myconf+=( --disable-${i#*:} )
-       done
-
-       if use pic ; then
-               myconf+=( --enable-pic )
-               # disable asm code if PIC is required
-               # as the provided asm decidedly is not PIC for x86.
-               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-       fi
-       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-       # Try to get cpu type based on CFLAGS.
-       # Bug #172723
-       # We need to do this so that features of that CPU will be better used
-       # If they contain an unknown CPU it will not hurt since ffmpeg's 
configure
-       # will just ignore it.
-       for i in $(get-flag mcpu) $(get-flag march) ; do
-               [[ ${i} = native ]] && i="host" # bug #273421
-               myconf+=( --cpu=${i} )
-               break
-       done
-
-       # LTO support, bug #566282
-       is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-       # Mandatory configuration
-       myconf=(
-               --enable-avfilter
-               --enable-avresample
-               --disable-stripping
-               # This is only for hardcoded cflags; those are used in 
configure checks that may
-               # interfere with proper detections, bug #671746 and bug #645778
-               # We use optflags, so that overrides them anyway.
-               --disable-optimizations
-               --disable-libcelt # bug #664158
-               "${myconf[@]}"
-       )
-
-       # cross compile support
-       if tc-is-cross-compiler ; then
-               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) 
--cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-               case ${CHOST} in
-                       *freebsd*)
-                               myconf+=( --target-os=freebsd )
-                               ;;
-                       *mingw32*)
-                               myconf+=( --target-os=mingw32 )
-                               ;;
-                       *linux*)
-                               myconf+=( --target-os=linux )
-                               ;;
-               esac
-       fi
-
-       # doc
-       myconf+=(
-               $(multilib_native_use_enable doc)
-               $(multilib_native_use_enable doc htmlpages)
-               $(multilib_native_enable manpages)
-       )
-
-       set -- "${S}/configure" \
-               --prefix="${EPREFIX}/usr" \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-               --mandir="${EPREFIX}/usr/share/man" \
-               --enable-shared \
-               --cc="$(tc-getCC)" \
-               --cxx="$(tc-getCXX)" \
-               --ar="$(tc-getAR)" \
-               --optflags="${CFLAGS}" \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-       echo "${@}"
-       "${@}" || die
-
-       if multilib_is_native_abi && use chromium && build_separate_libffmpeg; 
then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --disable-opencl
-               echo "${@}"
-               "${@}" || die
-               popd >/dev/null || die
-       fi
-}
-
-multilib_src_compile() {
-       emake V=1
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               emake V=1 tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Compiling for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install() {
-       emake V=1 DESTDIR="${D}" install install-doc
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               dobin tools/${i}$(get_exeext)
-                       fi
-               done
-
-               if use chromium; then
-                       if build_separate_libffmpeg; then
-                               einfo "Installing for Chromium"
-                               pushd ../chromium >/dev/null || die
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                               popd >/dev/null || die
-                       else
-                               emake V=1 DESTDIR="${D}" install-libffmpeg
-                       fi
-               fi
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-       
LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample"
 \
-               emake V=1 fate
-}

diff --git a/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch 
b/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch
deleted file mode 100644
index e55917471fb..00000000000
--- a/media-video/ffmpeg/files/ffmpeg-4.1-vaapi-tools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4f1e07090a9f6064078cac694f1d7148f86176c3 Mon Sep 17 00:00:00 2001
-From: Mark Thompson <[email protected]>
-Date: Wed, 14 Nov 2018 22:56:18 +0000
-Subject: [PATCH] configure: Add missing xlib dependency for VAAPI X11 code
-
-Fixes #7538.
-
-(cherry picked from commit 2ce3a48f30fe3cec7153aa3f18a1012a366aca3a)
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index e79dae896c..a70c5f9e9e 100755
---- a/configure
-+++ b/configure
-@@ -2812,6 +2812,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder 
ID3D11VideoContext"
- dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32"
- ffnvcodec_deps_any="libdl LoadLibrary"
- nvdec_deps="ffnvcodec"
-+vaapi_x11_deps="xlib"
- videotoolbox_hwaccel_deps="videotoolbox pthreads"
- videotoolbox_hwaccel_extralibs="-framework QuartzCore"
- xvmc_deps="X11_extensions_XvMClib_h"
--- 
-2.11.0
-

Reply via email to