commit:     587ca78f0114a1718bd803ebc8a18e322510efdd
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 10:46:00 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 11:59:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587ca78f

media-video/ffmpeg: remove old

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

 media-video/ffmpeg/Manifest                        |   5 -
 media-video/ffmpeg/ffmpeg-3.2.6.ebuild             | 457 -------------------
 media-video/ffmpeg/ffmpeg-3.2.7.ebuild             | 457 -------------------
 media-video/ffmpeg/ffmpeg-3.3.4.ebuild             | 505 ---------------------
 media-video/ffmpeg/ffmpeg-3.3.6.ebuild             | 505 ---------------------
 media-video/ffmpeg/ffmpeg-3.3.8.ebuild             | 505 ---------------------
 media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch | 106 -----
 media-video/ffmpeg/files/openjpeg22.patch          | 106 -----
 media-video/ffmpeg/files/openjpeg23.patch          | 109 -----
 media-video/ffmpeg/metadata.xml                    |   6 -
 10 files changed, 2761 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 125dc130555..e9f02b9e227 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,8 +1,3 @@
-DIST ffmpeg-3.2.6.tar.bz2 9623111 BLAKE2B 
76ed10d969ec5e85c0ad23fee1118ccfd66689b07062dc51526fca5427507124751d957b57b1a002ba585b9d35afc80cc6f3113c559b160b2751fc526b3d304f
 SHA512 
eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285
-DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 
7d6f094ca0bd5e2cab02e051acc8e554873bca2d165fc9326de0b12e145ec939567aed95c01589c47291970a89fb3462c75d32db1c4c2c8cf6d4a14956cd8a79
 SHA512 
a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4
-DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 
72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7
 SHA512 
d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
-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-3.4.6.tar.bz2 10190001 BLAKE2B 
4c7842900171cf871f8524f08f435797b1a168faa11877100fe74c3ecd4a2c2e004a5110dc23bda818f69b0a484f63d8f34c7904c4827c88894d877cdd70c6fe
 SHA512 
0228751b288096e368f9049854936930b7c1fd89aac31a5382f5de78d3282b4e86a6f562c79833d1635222f0ad56b2e5401a150574714e1b7e0ab4f5d8939812
 DIST ffmpeg-4.1.1.tar.bz2 10686360 BLAKE2B 
47f4716d7e184d7318eb1a99ab1cdc188009464e973162e583f7ca4ae79fa3b103f9d5329c8993b72d20667e42e5a749123709a4640f07762568300b5c3c897f
 SHA512 
0241c44e1dffd0d890a3d30a1b2387ea167d578bb39ba0c804fb417e132d343a9e43da9247b205e18b893d8cf75d8528e9971569be67ac380b88618ef0a75ed4

diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild 
b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
deleted file mode 100644
index a6291d34e90..00000000000
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ /dev/null
@@ -1,457 +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=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_REPO_URI="git://source.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="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd 
~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 lzma +network 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
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite 
frei0r
-               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-               rubberband:librubberband 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 nvenc:nvenc
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
-       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-       alsa 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=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 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 )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply 
to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-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}] )
-       ebur128? ( >=media-libs/libebur128-1.1.0[${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}] )
-               nvenc? ( media-video/nvidia_video_sdk )
-               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}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] )
-       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}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${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}]
-               !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zimg? ( media-libs/zimg[${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 )
-"
-
-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/yasm-1.2 )
-       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 ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       default
-
-       # the version script on Solaris causes invalid symbol version problems
-       # we don't want their hacky workarounds, we're having a GNU ld
-       sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; 
add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' 
configure || die
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl && 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
-       use xcb || ffuse+=( X:x11grab )
-
-       # 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
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       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}- )
-               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
-}
-
-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
-       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
-       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-3.2.7.ebuild 
b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
deleted file mode 100644
index ac8492a79df..00000000000
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ /dev/null
@@ -1,457 +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=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_REPO_URI="git://source.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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 
~amd64-fbsd ~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 lzma +network 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
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b chromaprint ebur128:libebur128 flite:libflite 
frei0r
-               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-               rubberband:librubberband 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 nvenc:nvenc
-       openh264:libopenh264 snappy:libsnappy theora:libtheora 
twolame:libtwolame
-       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-       alsa 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=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 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 )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply 
to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-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}] )
-       ebur128? ( >=media-libs/libebur128-1.1.0[${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}] )
-               nvenc? ( media-video/nvidia_video_sdk )
-               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}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] )
-       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}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${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}]
-               !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zimg? ( media-libs/zimg[${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 )
-"
-
-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/yasm-1.2 )
-       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 ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=( "${FILESDIR}/ffmpeg32-openjpeg22.patch" )
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       default
-
-       # the version script on Solaris causes invalid symbol version problems
-       # we don't want their hacky workarounds, we're having a GNU ld
-       sed -i -e 's/sunos)/sunos) network_extralibs="-lsocket -lnsl"; 
add_cppflags -D__EXTENSIONS__; enable pic; disable symver ;; no-sunos)/' 
configure || die
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl && 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
-       use xcb || ffuse+=( X:x11grab )
-
-       # 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
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       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}- )
-               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
-}
-
-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
-       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
-       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-3.3.4.ebuild 
b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
deleted file mode 100644
index d55a0875bac..00000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ /dev/null
@@ -1,505 +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=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_REPO_URI="git://source.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 ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd 
~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 lzma +network 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
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-               rubberband:librubberband sofalizer:netcdf 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 nvenc:nvenc
-       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 )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply 
to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-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}] )
-       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}] )
-               nvenc? ( media-video/nvidia_video_sdk )
-               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}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] )
-       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}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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}] )
-       sofalizer? (
-               >=sci-libs/netcdf-4.3.2-r1[hdf5]
-               >=sci-libs/hdf5-1.8.18[hl]
-       )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${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.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 )
-"
-
-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/yasm-1.2 )
-       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 ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-       "${FILESDIR}"/openjpeg22.patch
-       "${FILESDIR}"/openjpeg23.patch
-       "${FILESDIR}"/chromium.patch
-)
-
-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 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
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r netcdf libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       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; then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-               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
-                       einfo "Compiling for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 libffmpeg
-                       popd >/dev/null || die
-               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
-                       einfo "Installing for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 DESTDIR="${D}" install-libffmpeg
-                       popd >/dev/null || die
-               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-3.3.6.ebuild 
b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
deleted file mode 100644
index c86f3c9aece..00000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ /dev/null
@@ -1,505 +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=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_REPO_URI="git://source.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 ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd 
~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 lzma +network 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
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-               rubberband:librubberband sofalizer:netcdf 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 nvenc:nvenc
-       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 )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply 
to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-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}] )
-       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}] )
-               nvenc? ( media-video/nvidia_video_sdk )
-               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}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] )
-       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}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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}] )
-       sofalizer? (
-               >=sci-libs/netcdf-4.3.2-r1[hdf5]
-               >=sci-libs/hdf5-1.8.18[hl]
-       )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${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.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 )
-"
-
-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/yasm-1.2 )
-       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 ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-       "${FILESDIR}"/openjpeg22.patch
-       "${FILESDIR}"/openjpeg23.patch
-       "${FILESDIR}"/chromium.patch
-)
-
-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 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
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r netcdf libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       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; then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-               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
-                       einfo "Compiling for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 libffmpeg
-                       popd >/dev/null || die
-               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
-                       einfo "Installing for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 DESTDIR="${D}" install-libffmpeg
-                       popd >/dev/null || die
-               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-3.3.8.ebuild 
b/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
deleted file mode 100644
index fe80b8d1262..00000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.8.ebuild
+++ /dev/null
@@ -1,505 +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=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-r3"
-       EGIT_REPO_URI="git://source.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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 
~amd64-fbsd ~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 lzma +network 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
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
-               mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-               speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b chromaprint flite:libflite frei0r
-               fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-               rubberband:librubberband sofalizer:netcdf 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 nvenc:nvenc
-       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 )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${ARM_CPU_REQUIRED_USE}
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply 
to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-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}] )
-       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}] )
-               nvenc? ( media-video/nvidia_video_sdk )
-               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}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${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}] )
-       libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${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}] )
-       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}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${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}] )
-       sofalizer? (
-               >=sci-libs/netcdf-4.3.2-r1[hdf5]
-               >=sci-libs/hdf5-1.8.18[hl]
-       )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${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.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 )
-"
-
-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/yasm-1.2 )
-       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 ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-       "${FILESDIR}"/openjpeg22.patch
-       "${FILESDIR}"/openjpeg23.patch
-       "${FILESDIR}"/chromium.patch
-)
-
-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 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
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r netcdf libzmq ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       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; then
-               einfo "Configuring for Chromium"
-               mkdir -p ../chromium || die
-               pushd ../chromium >/dev/null || die
-               set -- "${@}" \
-                       --disable-shared \
-                       --enable-static \
-                       --enable-pic \
-                       --extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-               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
-                       einfo "Compiling for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 libffmpeg
-                       popd >/dev/null || die
-               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
-                       einfo "Installing for Chromium"
-                       pushd ../chromium >/dev/null || die
-                       emake V=1 DESTDIR="${D}" install-libffmpeg
-                       popd >/dev/null || die
-               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/ffmpeg32-openjpeg22.patch 
b/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
deleted file mode 100644
index 0ee648641be..00000000000
--- a/media-video/ffmpeg/files/ffmpeg32-openjpeg22.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
-Author: Reino17 <rwijn...@xs4all.nl>
-Date:   Fri Jun 23 23:49:31 2017 +0200
-
-    Add support for LibOpenJPEG v2.2/git
-    
-    Signed-off-by: Michael Bradshaw <mjbs...@google.com>
-
-Index: ffmpeg-3.2.7/configure
-===================================================================
---- ffmpeg-3.2.7.orig/configure
-+++ ffmpeg-3.2.7/configure
-@@ -1831,6 +1831,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5721,7 +5722,9 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h 
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h 
cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h 
WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib2 openjpeg-2.1/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib2 openjpeg-2.2/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib2 openjpeg-2.2/openjpeg.h opj_version 
-lopenjp2 ||
-+                               { check_lib2 openjpeg-2.1/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib2 openjpeg-2.1/openjpeg.h opj_version 
-lopenjp2 ||
-                                { check_lib2 openjpeg-2.0/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib2 openjpeg-1.5/openjpeg.h 
opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-Index: ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
-===================================================================
---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.2.7/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-Index: ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
-===================================================================
---- ffmpeg-3.2.7.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.2.7/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -306,7 +308,7 @@ static av_cold int libopenjpeg_encode_in
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCo
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);

diff --git a/media-video/ffmpeg/files/openjpeg22.patch 
b/media-video/ffmpeg/files/openjpeg22.patch
deleted file mode 100644
index a458c15208a..00000000000
--- a/media-video/ffmpeg/files/openjpeg22.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-commit 078322f33ced4b2db6ac3e5002f98233d6fbf643
-Author: Reino17 <rwijn...@xs4all.nl>
-Date:   Fri Jun 23 23:49:31 2017 +0200
-
-    Add support for LibOpenJPEG v2.2/git
-    
-    Signed-off-by: Michael Bradshaw <mjbs...@google.com>
-
-Index: ffmpeg-3.3.3/configure
-===================================================================
---- ffmpeg-3.3.3.orig/configure
-+++ ffmpeg-3.3.3/configure
-@@ -1875,6 +1875,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5805,7 +5806,9 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h 
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h 
cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h 
WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib openjpeg-2.2/openjpeg.h opj_version 
-lopenjp2 ||
-+                               { check_lib openjpeg-2.1/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.1/openjpeg.h opj_version 
-lopenjp2 ||
-                                { check_lib openjpeg-2.0/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib openjpeg-1.5/openjpeg.h 
opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-Index: ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-===================================================================
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);

diff --git a/media-video/ffmpeg/files/openjpeg23.patch 
b/media-video/ffmpeg/files/openjpeg23.patch
deleted file mode 100644
index 4398769a22c..00000000000
--- a/media-video/ffmpeg/files/openjpeg23.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From: Michael Bradshaw <mjbshaw at google.com>
-
-Signed-off-by: Michael Bradshaw <mjbshaw at google.com>
----
- configure                   |  5 ++++-
- libavcodec/libopenjpegdec.c |  8 +++++---
- libavcodec/libopenjpegenc.c | 10 ++++++----
- 3 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index 391c141e7a..77c9a18c3c 100755
---- a/configure
-+++ b/configure
-@@ -1930,6 +1930,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_3_openjpeg_h
-     openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-@@ -5950,7 +5951,9 @@ enabled libopencv         && { check_header 
opencv2/core/core_c.h &&
-                                  require opencv opencv2/core/core_c.h 
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h 
cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h 
WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib openjpeg-2.3/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib openjpeg-2.3/openjpeg.h opj_version 
-lopenjp2 ||
-+                               { check_lib openjpeg-2.2/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.2/openjpeg.h opj_version 
-lopenjp2 ||
-                                { check_lib openjpeg-2.1/openjpeg.h 
opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.1/openjpeg.h opj_version 
-lopenjp2 ||
-diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
-index 1210123265..67d47bd6a0 100644
---- a/libavcodec/libopenjpegdec.c
-+++ b/libavcodec/libopenjpegdec.c
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- #  include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
-@@ -46,7 +48,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || 
HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || 
HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
-index b67e533d1d..92b4433b04 100644
---- a/libavcodec/libopenjpegenc.c
-+++ b/libavcodec/libopenjpegenc.c
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H
-+#  include <openjpeg-2.3/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
- #  include <openjpeg-2.2/openjpeg.h>
- #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || 
HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || 
HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext 
*avctx)
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || 
HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, 
AVPacket *pkt,
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || 
HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);
--- 
-2.13.5 (Apple Git-94)

diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index e5686d5da12..183c78718dc 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -8,10 +8,6 @@
        <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
        <flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support 
with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
        <flag name="appkit">Enables Apple AppKit framework</flag>
-       <flag name="armv5te">Enables optimizations for armv5te 
processors.</flag>
-       <flag name="armv6">Enables optimizations for armv6 processors.</flag>
-       <flag name="armv6t2">Enables optimizations for armv6t2 
processors.</flag>
-       <flag name="armvfp">Enables VFP optimizations for ARM processors.</flag>
        <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
        <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer 
stereo-to-binaural filter.</flag>
        <flag name="cdio">Enables audio CD grabbing with 
<pkg>dev-libs/libcdio</pkg>.</flag>
@@ -21,7 +17,6 @@
        <flag name="cpudetection">Enables runtime CPU detection (useful for 
bindist, compatibility on other CPUs)</flag>
        <flag name="cuda">Enables CUDA-based acceleration. Mostly used for 
specific filters.</flag>
        <flag name="dav1d">Enables AV1 decoding via 
<pkg>media-libs/dav1d</pkg>.</flag>
-       <flag name="ebur128">Enables EBU R128 loudness normalization filter via 
<pkg>media-libs/libebur128</pkg></flag>
        <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
        <flag name="flite">Adds a text-to-speech filter based on 
<pkg>app-accessibility/flite</pkg>.</flag>
        <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
@@ -54,7 +49,6 @@
        <flag name="postproc">Build and install libpostproc.</flag>
        <flag name="rubberband">Adds time-stretching and pitch-shifting audio 
filter based on <pkg>media-libs/rubberband</pkg>.</flag>
        <flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required 
for e.g. Vidvox Hap encoder.</flag>
-       <flag name="sofalizer">Enables Sofalizer filter</flag>
        <flag name="srt">Enable support for Secure Reliable Transport (SRT) via 
<pkg>net-libs/srt</pkg></flag>
        <flag name="ssh">Enable SSH/sftp support via 
<pkg>net-libs/libssh</pkg>.</flag>
        <flag name="twolame">Enables MP2 encoding via 
<pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>

Reply via email to