Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
commit: 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree: 753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-video
parent: be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent: deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)
140 files changed, 1224 insertions, 2653 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fff599d4016c..ea7bac7c784a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest
index 263464a8a26e..4c699049fd5f 100644
--- a/media-video/bino/Manifest
+++ b/media-video/bino/Manifest
@@ -1,3 +1,3 @@
 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8
-EBUILD bino-1.6.7.ebuild 1591 BLAKE2B 41c25fa001c79f5c2a64dc4a1b0082160c44611a6e8be29ad944da4de87094238d5f7b6cc0f6e810f100e3f1acaec18e9ca8b9454bcded1ea096733798f50a33 SHA512 26ecd5431ee278422b4b94ab8e27b38d77ddbec3c200c82a127b93b4ebd9968f4ee69035d8cc7b649f86769b71f05332ea02b239632a847d946fc92035f97239
+EBUILD bino-1.6.7.ebuild 1534 BLAKE2B 28f577b5b83855f516dc5624d910f97d5f27c50c1d9208a9cfbcdb4db658b0822102e2700c9949e72988da77636c5328f4b964627fcd814b7ce8ec453b6c0efc SHA512 c8d185ae01990a161576ebde09079afb23381cdd9847fa494791ceab8d56a8afe96e26783cf304bd6c2bdbb43a3ed92a23ae7c63747bd32802a223500e1f71f0
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index 59ecc6ed03fa..2969055aea7a 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://bino3d.org/releases/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug doc libav lirc video_cards_nvidia"
+IUSE="debug doc lirc video_cards_nvidia"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -23,8 +23,7 @@ RDEPEND="
 	>=media-libs/libass-0.9.9
 	>=media-libs/openal-1.15.1
 	virtual/libintl
-	libav? ( >=media-video/libav-0.7:0= )
-	!libav? ( >=media-video/ffmpeg-0.7:0= )
+	>=media-video/ffmpeg-0.7:0=
 	lirc? ( app-misc/lirc )
 	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
 "
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 70e0b32b867d..647fefe632c3 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,7 +1,5 @@
 AUX cheese-3.34.0-buildfix.patch 736 BLAKE2B b99354dd49acb32201ddcdd104b0581e2a61248053017859ea2f0b20b2a66a4f5bfb5d5a26e458464b9a18ae0e8a8e7bfe801d2cc9758331a5a2ba28aad4a78c SHA512 0a6373485cd07398ac5dca0ed1431ee2ed7b174bb55ee45a839775cb229bfbb223897be2590e238487eb3971fde0d9bbc5c85194239e8ff03d84742f0071acff
 AUX cheese-3.34.0-help-No-more-menu-bars-in-3.34-UI.patch 6545 BLAKE2B 6bd549dc4a26dc4cd1f14b812d4910fb93b19e899a58c6c1e4cd713bc126c059d2f1d148f9e5d3581cf64a8c4f3ea938e684e85535d774fd8861bd87cd93df3c SHA512 6f8f66897252172b68508ded5996213e4660ec00b5172874e0b360ee1c60baf2e579f88998dd78c850d4eb6796a097f74646c28f923f7f11de9302f2dd8023b7
-DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
 DIST cheese-3.34.0.tar.xz 1077052 BLAKE2B 9719818aebb3472b804d96d79b02ee71b818d098b6eeb54f2075939e95ba651c251d561b4bc79c30a0aae6217a8a29f46f045be9279c9100ba1b0344f1279ba5 SHA512 093b4e5f7f15fd0c445fffd254d4a5035a4e3e91bacccdeeda64a4a7182901646daea5c8596c954a67896f9aaf37dab2309c21e8f026583f59d787a2c1e4c200
-EBUILD cheese-3.32.1.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
-EBUILD cheese-3.34.0-r1.ebuild 2140 BLAKE2B f8b9428fae08f7dbcb07d8ad4f54f14535754335ce3abde0724375452cdc4989d4dbe60fe29b1dc95107c09d36a3c6882825bb3f1679750470db4107c0ba4d8c SHA512 eefc8dfd338057eb8c3f885a65f2f279c69d941f48327a61de8186ca9ea2a653c59f9905597eb0fdc0c7e9d0b808b1b309a66a2e1b268e61770a2c4458a1fc63
+EBUILD cheese-3.34.0-r1.ebuild 2153 BLAKE2B d2810285d93ab6b957b87a92ea22b3aa6972dd3cc7ebbf0041ccce088e08225f16efcf0fc59ed968d157fc068539ad8170781e67b496ce34c7bde6af1560721c SHA512 67e6bdd1b6458d34ff5ebf434b85db146301dc7f5bb62e03e28c8ef3c33076d37c05473c825683368b9c8ecdf13298563a7251789a0528eeeb2da86592077d50
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.32.1.ebuild b/media-video/cheese/cheese-3.32.1.ebuild
deleted file mode 100644
index 417c6ee59b6c..000000000000
--- a/media-video/cheese/cheese-3.32.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
-HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # subslot = libcheese soname version
-IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.90:2
-	>=x11-libs/gtk+-3.13.4:3[introspection?]
-	>=gnome-base/gnome-desktop-2.91.6:3=
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=media-libs/clutter-1.13.2:1.0[introspection?]
-	>=media-libs/clutter-gtk-0.91.8:1.0
-	media-libs/clutter-gst:3.0
-	media-libs/cogl:1.0=[introspection?]
-
-	media-video/gnome-video-effects
-	x11-libs/gdk-pixbuf:2[jpeg,introspection?]
-	x11-libs/libX11
-	x11-libs/libXtst
-
-	>=media-libs/gstreamer-1.4:1.0[introspection?]
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection?,ogg,pango,theora,vorbis,X]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/gst-plugins-bad-1.4:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-
-	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
-	>=media-plugins/gst-plugins-vpx-1.4:1.0
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# eautoreconf needs yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		GST_INSPECT=$(type -P true) \
-		GTESTER_REPORT=$(type -P true) \
-		VALAC=$(type -P true) \
-		$(use_enable introspection) \
-		--disable-lcov \
-		--disable-static
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/media-video/cheese/cheese-3.34.0-r1.ebuild b/media-video/cheese/cheese-3.34.0-r1.ebuild
index eff0c76372eb..ee709712638f 100644
--- a/media-video/cheese/cheese-3.34.0-r1.ebuild
+++ b/media-video/cheese/cheese-3.34.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome.org meson vala virtualx xdg
+inherit gnome.org gnome2-utils meson vala virtualx xdg
 
 DESCRIPTION="A cheesy program to take pictures and videos from your webcam"
 HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index d2d077b7634e..5c04fbe10a6a 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg4.patch 3163 BLAKE2B 2c7ce91de448b09d34da82d5bef7f23804d37932ad80d2717162e56141f189a2beb12cd6baf2a82712747fd547268e08c2661ce99531ba7553ba351e34a1ba65 SHA512 abaa0d7d63dc3e8ac931ebadd2d9f0057a24ca829c582b5f9e00e2d5fe1d8c9c5f92f3e7d5f8c2422bb1c4a8f6221baaa0679296ac8945ade71bb1a2e9b60262
 DIST CinelerraCV-2.3.tar.xz 25705608 BLAKE2B 70efe03d8c928faca0b60f76b83d7147a7ef68ebee06e7afcb589fd24d73ecbe96e16a375c38f5c89cf337593c824cc22dd6301790ac988946671cb12ba901e6 SHA512 908dc097af8507e3b60b4787e0350500b8ba8c4340bbbdbf3716e61d74074e5f0617500b94ed1d450e030f88f3821f948cfa37c247ec2c2571fd76974374868e
 DIST cinelerra-2.3-patchset.tar.xz 10056 BLAKE2B c50d65a991a2643267f4c9aff11fb8caf09ba1fae0abe89125207312e8129b28f5ca86846b30a94a90b6958704c1733635b0987752a4d2ec442ea185bf870d89 SHA512 9825729ed15e106b1ec2ca58da4d587597d58a6b62f4440e08e984660821fa0e3cc3dcded5da0a5daae16edf1564a45a32490f50e51d77795ce47e4a5ba39122
-EBUILD cinelerra-2.3.ebuild 3272 BLAKE2B 0e96ecae629c9ddc436db8a2ae44d7b29f618f6cea624fc8a00c5fb43bbac6d230e5c6eeab3bc15d1aeec2abf2784dce6b96eb9dc319944555c198bba15c88d2 SHA512 20100665aab4ab0e7e208941c939b94d9876bff23b93770c8e3182596a52e8e7064a52b64211c3bfb1e6823655cc2bb344db0dc1ddefdd8d9431cd12c7caa986
+EBUILD cinelerra-2.3-r1.ebuild 3276 BLAKE2B 0a555de7a6a06b2231b2654b32fd7875b3d564864faf7f37b885d4989b34b8082123ad98a4a719e340a3cc43d975dd04ce04a6744c1b0c37b132e6ef61bfb45d SHA512 03453b6317ad3abb4afb54ac582eb3ecafff2e635906c2be65ffbcdcc19da93a892f3facb50e2d1d48a5031496349494053492c32f2ca6552259c12d520efbce
 MISC metadata.xml 259 BLAKE2B d0ebadef8dc30ed8fcc89ae38ab6a5d4af940b2cd75dea1494d96c37557532dea21ef0e014d09e32ae49eca64fe3d6bd56494fb7460ad69b70f40dd4b7ebc8b0 SHA512 c81aea0e68817fa210dc6f66313aee75246139e50d6324338707f11bca2173c64e88ce8440794c85eb64194ff97cf6c6760a06b4822a121e40629bdc3a04e1fd
diff --git a/media-video/cinelerra/cinelerra-2.3.ebuild b/media-video/cinelerra/cinelerra-2.3-r1.ebuild
index da327aea18b5..d75728d066f9 100644
--- a/media-video/cinelerra/cinelerra-2.3.ebuild
+++ b/media-video/cinelerra/cinelerra-2.3-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="media-libs/a52dec:=
 	x11-libs/libXv:=
 	x11-libs/libXvMC:=
 	x11-libs/libXxf86vm:=
-	virtual/ffmpeg
+	media-video/ffmpeg
 	|| ( media-video/ffmpeg:0[postproc(-)] media-libs/libpostproc )
 	virtual/jpeg:0
 	alsa? ( media-libs/alsa-lib:= )
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index f5233226ecf4..84c37b6ccc99 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,6 +1,6 @@
 AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb
 DIST devedeng-4.15.0.tar.bz2 1759602 BLAKE2B 31f08dec66623f68fba17bbaf657d5865796ca63b37f3e0a72213692ac1fa79fd14123d33112dc4713c42d682fb216fa61b971454efa4304ec7ce10015af4c99 SHA512 90a1dd5f2e7dfd78bff38fb682e021e6bb489a0ca16cc29b533926b242e4a3322372ad383acf61338dea7873448f649534fe9a2ac9e22294de490b95df55a4f0
 DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a
-EBUILD devedeng-4.15.0.ebuild 1175 BLAKE2B e3917282d6e0a2042572b98fe45af7e359b9b941495e7211507443d25461813c015ea71f28f4a602290f3fe4eacd4f6659e23d7d8092421f1384b05ef8267792 SHA512 6e51ac3e79d6f06dc3beef998284b4e3feff640879fe308fc4fc67703e466d7e4cda08ce771533db81493adea9b21dbfce237e5e66a1b3fcd7ef2701158f2a0c
-EBUILD devedeng-4.16.0.ebuild 1175 BLAKE2B e3917282d6e0a2042572b98fe45af7e359b9b941495e7211507443d25461813c015ea71f28f4a602290f3fe4eacd4f6659e23d7d8092421f1384b05ef8267792 SHA512 6e51ac3e79d6f06dc3beef998284b4e3feff640879fe308fc4fc67703e466d7e4cda08ce771533db81493adea9b21dbfce237e5e66a1b3fcd7ef2701158f2a0c
+EBUILD devedeng-4.15.0.ebuild 1120 BLAKE2B a5ff3c71cf2b79649b225d860244e942be8807f238e806a35039f3bb78811edfe93dba3415312dcda815d86cf5f68ed0d01adea6831a9796c8a58d52f08cc4be SHA512 3b5659480a43aada207ef0c665e69efc65bbc6760ab88f00c6c0a7c6c2407e3cbde930a45b18755b3bdd13e6cc58ca3dfbdafab2271e0694f4e780b58f1bb827
+EBUILD devedeng-4.16.0.ebuild 1120 BLAKE2B a5ff3c71cf2b79649b225d860244e942be8807f238e806a35039f3bb78811edfe93dba3415312dcda815d86cf5f68ed0d01adea6831a9796c8a58d52f08cc4be SHA512 3b5659480a43aada207ef0c665e69efc65bbc6760ab88f00c6c0a7c6c2407e3cbde930a45b18755b3bdd13e6cc58ca3dfbdafab2271e0694f4e780b58f1bb827
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.15.0.ebuild b/media-video/devedeng/devedeng-4.15.0.ebuild
index 2d220b281340..b721702eb12d 100644
--- a/media-video/devedeng/devedeng-4.15.0.ebuild
+++ b/media-video/devedeng/devedeng-4.15.0.ebuild
@@ -14,14 +14,12 @@ SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
 
 RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3
 	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	!libav? ( media-video/ffmpeg )
-	libav? ( media-video/libav )
+	media-video/ffmpeg
 	media-video/dvdauthor
 	media-video/vcdimager
 	virtual/cdrtools
diff --git a/media-video/devedeng/devedeng-4.16.0.ebuild b/media-video/devedeng/devedeng-4.16.0.ebuild
index 2d220b281340..b721702eb12d 100644
--- a/media-video/devedeng/devedeng-4.16.0.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0.ebuild
@@ -14,14 +14,12 @@ SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
 
 RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3
 	|| ( media-video/vlc media-video/mpv media-video/mplayer )
-	!libav? ( media-video/ffmpeg )
-	libav? ( media-video/libav )
+	media-video/ffmpeg
 	media-video/dvdauthor
 	media-video/vcdimager
 	virtual/cdrtools
diff --git a/media-video/dv2sub/Manifest b/media-video/dv2sub/Manifest
index b7a0ecf823d0..115976894aab 100644
--- a/media-video/dv2sub/Manifest
+++ b/media-video/dv2sub/Manifest
@@ -1,3 +1,3 @@
 DIST dv2sub-0.3.tar.gz 121756 BLAKE2B 7cb66255964ed9d566da8297ef82b3ab653230c7980005d73ff5881dc1b90ac53359513d9154f07a3c0bce74675a420346fe525c6ee1407582cec8624acdbbec SHA512 3284afd6b9698d7a464771e244eed567c7937d5b022f7f98f6dfc1ae73fde220bb816cc16d44c22cbf2112a0b7621f41a2223f25e2b8d3cad469275db4e8cfe2
-EBUILD dv2sub-0.3.ebuild 647 BLAKE2B 6c6a4f888c9552dd2c08afbf6af42154bcc883f56bc1501481d7e0b73565f0b6e56c7e8e5b6eee50e618d7509596302e91d85080f0188923a2a68aea24f6d899 SHA512 9cced93722acd682dbd2263e7b3de54f64438aff58bbb33c16f16f9249ff584a89b1adb7b345c50b7a02f067c4e3ac8667065d3bfd50b0e4875e9dc334246b76
+EBUILD dv2sub-0.3-r1.ebuild 651 BLAKE2B dc8cdbfe51ed075fbef1a1dab62007a7cf839d5e91069750f24c2522b6681153ef97677221927c2813225297a469d646c5c3f123fc1bdf174096ad93dd08c39f SHA512 f2abef0459587e8dea5c4cc586fdccef9a68b830a00caaa8cd2b4df5c7cfe3779bbc17f1f6c8f3a19503431b79d628886d8571db69e22d5627428c3cf7417789
 MISC metadata.xml 667 BLAKE2B d16408995824b43f912898a73e92e431806cb4cfaa88edac29c1284b735540048192ab32a2d4ca9cbb02e4f39fb911d5e09883c81eaeb93d773362bcfe7084fa SHA512 549e626d3f62df95ad729d73bcb78af5064eefb1cf16b0907709970e018cc1210b482423b55a8e1f4fc3afc3c289d1a42a440b26b3bd5cde10746e34bf41751b
diff --git a/media-video/dv2sub/dv2sub-0.3.ebuild b/media-video/dv2sub/dv2sub-0.3-r1.ebuild
index bed7d5473ffa..a45a239bcfd4 100644
--- a/media-video/dv2sub/dv2sub-0.3.ebuild
+++ b/media-video/dv2sub/dv2sub-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ RDEPEND="${DEPEND}
 	kino? (
 		media-video/kino
 		media-video/dvdauthor
-		virtual/ffmpeg
+		media-video/ffmpeg
 	)"
 
 src_install() {
diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest
index 49770aea20d1..45931c4fb06c 100644
--- a/media-video/dvdrip/Manifest
+++ b/media-video/dvdrip/Manifest
@@ -1,6 +1,4 @@
 AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9
-AUX dvdrip-0.98.11-libav.patch 1183 BLAKE2B 68681c5c67b619fcf3a5b4e8d3b2023ef0c9f2f582804e95e09e9197a026879b5db8d3af65d79051558b32a5673d8bfd6d058378a9666cef1754d558f956d8e7 SHA512 38a4d034acb9f4cc0dcbe7deb274d820be5e8b623b8852316599fa76dc6407c7a0dd1c8fa204c659d075f0f5a0a7f73e99f6ca978859e845cc88b99ee51042ea
 DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce
-EBUILD dvdrip-0.98.11-r3.ebuild 1990 BLAKE2B 6abf8a9b0006f2b00445385c4352434f3d04fdcba7e4fe120f2e91a0628e81d2cecf7bc0237840fba8dc55c5c6090f4d584c692c25ffbf579264dce007718a76 SHA512 c9514775bac93f552dd5e28d2feb0dc8e0b11eb273d5e74b44cece1dd33884b00276649b2c7a6b20a7f5e095f97d551ccd5db49693afdd4440e7ea1a5e67c629
-EBUILD dvdrip-0.98.11-r4.ebuild 2136 BLAKE2B 633f8bdf5b5132880f0d15fc8c8a67e75291fa9ca08a8cd68f7cf5c6dad8ddaaa3690b796979e87f85a884ed616a26e5c0205ecda2eaf61d677b14d4107546d8 SHA512 40cb865d09ff9f507af317678e45b9dae06bc461ac2994d76be2986b564fc4b0f677c8b3fb14f48e234d0cef09e79da0a3c2f1c6fa315ef82b01359383186a3a
+EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B 88b897b6d13b4e42f76ecb503d59694cfadf9b13e1c61281c06de9d5c79aca4ed3fa694a8a33bd9705398ebb25a06e0007348ae5629bd9b9f061d7570ef7ce1a SHA512 59dc2744f1484a9b35e7547b38e4d4384566884416e47252a2240caf5f2664fcc59e6a4b9e5be94200eee18ba50fa383050f5a96704f595418cb60510430e486
 MISC metadata.xml 389 BLAKE2B 85a367f916a737f8a0010c54746610a34408c68919ce3d8b6728203597cdd1d155839c20e50de6565844c63d27f9e7305aba8d5ec1bb6b7e82384e577c2657c7 SHA512 f9762a6801b0f060cff8b36f328729aa20c71ec34fa33be7c6088e20004d3b42ac4d45b60c82774d7519b6be09b76aa9ea06b18fa252300b47fada916620ecfd
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
deleted file mode 100644
index 3c99edbd3c5c..000000000000
--- a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic perl-module
-
-DESCRIPTION="dvd::rip is a graphical frontend for transcode"
-HOMEPAGE="https://www.exit1.org/dvdrip/"
-SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
-
-DEPEND=">=dev-perl/Event-ExecFlow-0.64
-	>=dev-perl/Event-RPC-0.89
-	dev-perl/Gtk2
-	>=dev-perl/gtk2-ex-formfactory-0.65
-	>=dev-perl/libintl-perl-1.16
-	>=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
-	virtual/imagemagick-tools
-	>=virtual/perl-podlators-2.5.3
-"
-RDEPEND="${DEPEND}
-	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-libs/gtk+:2
-	ffmpeg? ( virtual/ffmpeg )
-	fping? ( >=net-analyzer/fping-2.2 )
-	mplayer? ( media-video/mplayer )
-	ogg? ( media-sound/ogmtools )
-	subtitles? ( media-video/subtitleripper )
-	vcd? (
-		media-video/transcode[mjpeg]
-		>=media-video/mjpegtools-1.6.0
-	)
-	vorbis? ( media-sound/vorbis-tools )
-	xine? ( media-video/xine-ui )
-	xvid? ( media-video/xvid4conf )
-	>=media-video/lsdvd-0.15"
-
-pkg_setup() {
-	filter-flags -ftracer
-	export SKIP_UNPACK_REQUIRED_MODULES=1 #255269
-
-	perl_set_version
-}
-
-src_prepare() {
-	sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739
-	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
-	# Fix default device for >=udev-180 wrt #224559
-	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
-}
-
-src_install() {
-	newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
-	make_desktop_entry dvdrip dvd::rip
-
-	mydoc="Changes* Credits README TODO" perl-module_src_install
-}
-
-pkg_postinst() {
-	# bug 173924
-	if use fping; then
-		ewarn "For dvdrip-master to work correctly with cluster mode,"
-		ewarn "the fping binary must be setuid."
-		ewarn ""
-		ewarn "Run this command to fix it:"
-		ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-		ewarn ""
-		ewarn "Note that this is a security risk when enabled."
-	fi
-}
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
index e6bca9fb326a..e26b6462724b 100644
--- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
+++ b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid"
+IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid"
 
 DEPEND=">=dev-perl/Event-ExecFlow-0.64
 	>=dev-perl/Event-RPC-0.89
@@ -24,10 +24,7 @@ DEPEND=">=dev-perl/Event-ExecFlow-0.64
 RDEPEND="${DEPEND}
 	x11-libs/gdk-pixbuf:2[jpeg]
 	x11-libs/gtk+:2
-	ffmpeg? (
-		libav? ( media-video/libav )
-		!libav? ( media-video/ffmpeg:0 )
-	)
+	ffmpeg? ( media-video/ffmpeg:0 )
 	fping? ( >=net-analyzer/fping-2.2 )
 	mplayer? ( media-video/mplayer )
 	ogg? ( media-sound/ogmtools )
@@ -54,9 +51,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix_parallel_make.patch
 	# Fix default device for >=udev-180 wrt #224559
 	sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
-
-	# Ubuntu patch for supporting libav
-	use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }
 
 src_install() {
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
deleted file mode 100644
index a9d60e2338b1..000000000000
--- a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Port from ffmpeg to avconv.
-Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
-
---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm
-+++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
-@@ -114,10 +114,10 @@ my %TOOLS = (
-     },
-     ffmpeg => {
-         order       => ++$ORDER,
--        command     => "ffmpeg",
-+        command     => "avconv",
-         comment     => __ "FFmpeg video converter command line program",
-         optional    => 1,
--        version_cmd => "ffmpeg -version",
-+        version_cmd => "avconv -version",
-         get_version => sub {
-             my ($cmd) = @_;
-             qx[$cmd 2>&1] =~ /version ([^\s]+)/i;
---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm
-+++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm
-@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command {
-         . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} "
-         . "-M 0 -d 0 -P /dev/null | "
-         . "tcextract -t vob -a 0 -x mpeg2 -d 0 | "
--        . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
-+        . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png ";
- 
-     $command .= " && "
-         . "execflow convert"
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 1fe9ddd83be8..8dce596fd2c8 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg4.patch 541 BLAKE2B ff2ad556e881009ff5ba79b252fd55eb9054ea273f20d4af1bd76440b70d351b03f204ad1ff7648694cab950c49082728b6370a93610dd40c09c10a8609ae5bd SHA512 3ad427f51e5ab24231309f01d410e213df874d01567417ea66bcb88cd39e60d672b4771d8c3f210690eb6d145f3d6f7ff81bca8e1b9c841fb2b895f63070ed11
 DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
-EBUILD dvdstyler-3.0.4.ebuild 1779 BLAKE2B 1a729b70a24919d8e772a1018e01159284f5a582b6caa5a0557fec083f1b60dd2a378bf0a24b84d583ea20cb65aa5f957c65aa125784fdff3fa86c12089ad891 SHA512 df69841ce940b42779db66aa4e3b33a3b329ff22fc2fabb23783c57749a5cf063c60eb9b9b80bb213b618845aabd698eb2ccec72e7a6a17d5c3a66f77278a7b5
+EBUILD dvdstyler-3.0.4.ebuild 1713 BLAKE2B 255f9ea3506b6ee50c6400f254c574be3b7a3e098746eab7850cd611e48b5f8be45c57dc9032a3a0b5112813fda531064af30b361b8859cc26871be66cb89a78 SHA512 b0eaa4118079406f85338a9eaf9963c8531d3f63459a266d6d910dd1047ccdae8d407fae0b531e77830790f90619f48a9def255650f8d1f88bfc3311e409a535
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
index 3df313a5bb0d..a2c8db9c5ebb 100644
--- a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,17 +15,16 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
+IUSE="debug +udev"
 
 COMMON_DEPEND="
 	>=app-cdr/dvd+rw-tools-7.1
 	media-libs/libexif:=
 	>=media-libs/wxsvg-1.5.11:=
 	>=media-video/dvdauthor-0.7.1
+	>=media-video/ffmpeg-2.6:0=[encode]
 	>=media-video/xine-ui-0.99.7
 	virtual/cdrtools
-	libav? ( >=media-video/libav-9:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
 	virtual/jpeg:0
 	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
 	sys-apps/dbus
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index f187adf6e6f1..0830ff64493c 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -4,5 +4,5 @@ DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c
 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86
 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d
 DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5
-EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2093 BLAKE2B 2f238a548745ac8d76a26d2c29035973c638bc9f52e68774778aeddfc7c17418da7952cc5afe44e080e66b236bfa3f2a5b1f33a5e5cde6052511892d221e39e7 SHA512 758686f936ccd3a4523b8d5f61093cacd3a054480d9fde413a0416f586ed957845792c5ca8b4a4add64947fa4e4b66b394126bf81a3e904a9ee407780b68e9c8
+EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2029 BLAKE2B a22c2669a3fd355b42a8176b99f991234ba7f7609fa1f8ccf27419130d3815bbcd27bc8c80913938e8c86806a344829bdb0295490962efa31783a496398a4eff SHA512 01e7f488105fa9ab55692a52aadfa98ed9f83ce508458a3c6d1a8f72efba06ab7ab9a399badd227113b16d00febea0ee1b4e1de165af11d749f30010b10b934a
 MISC metadata.xml 2256 BLAKE2B d224c6932982a05615b3e5094f1f1aa077682cbbe6589ea9806f47a604e7b51063c8382d542b474a078094657690cc8f785889efa696d2aca25f38ea8b3c9369 SHA512 9672bf9ac08cbd33e4effc8456c152edb1d2d7985fd21028ef06b9698077052c509b29d3f72311b5b62d36400c8cda45699026e91cb92f5d63f2f1f10597bbb6
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
index b67615051edc..78ec3bfd11d4 100644
--- a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ LICENSE="GPL-2
 	texturemate? ( CC-BY-3.0 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libav openclipart texturemate"
+IUSE="openclipart texturemate"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
@@ -36,8 +36,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	media-gfx/exiv2:=
-	libav? ( >=media-video/libav-11:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-3:0=[encode] )
+	>=media-video/ffmpeg-3:0=[encode]
 	openclipart? ( media-gfx/openclipart[svg,-gzip] )"
 DEPEND="${RDEPEND}"
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index a8ae1858c4b6..d73b4f50ab18 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,9 +9,9 @@ DIST ffmpeg-4.2.2-ppc64-altivec.patch.gz 7171 BLAKE2B 6676dadb22d2ab4b0f5c19b418
 DIST ffmpeg-4.2.2-ppc64-gcc.patch.gz 750 BLAKE2B 3a9cc7f0135e077c77179a7ca3da917bca3995d99d53b58221b23181a075f330132f83ea90a6110e89f90c7c3b5b2a7837559c5df414d9bd52dbb3ec166b1545 SHA512 701b0635e0819484a31de2062ba52d95ee03883ab56547cd75c3646a9b32bf3ecc7f719690b93f29202cfed0fdeecd26b51b9f3c66e72a999a3e8d9e97389275
 DIST ffmpeg-4.2.2.tar.bz2 10953320 BLAKE2B 53293d01bf0bb15de9a56c11195d6448ac8cad5fae2821d7e61d8fbb13894681a1a73dff44b2d46fda5c14e444c94dde6bcef219ad9d1cfebfb21d7d63318ed2 SHA512 6920bf2efb6ed665ea84c31ff3b28a0e9dc0ba3e0c8dfe4ceee4d8b8172328334490a28dbac93b0f9839d0c90ea588cb79141d88bdd3bf4bbf43fd22deb6a5e6
 EBUILD ffmpeg-3.4.6-r1.ebuild 15657 BLAKE2B 0f6636c1504758869e598b5ac889db781721993635e6e38be0e5519684147976f8ca425262548605f61e950c7be5e3eb02cf59f0984422f70f8e602244e6cfd3 SHA512 5c65848c645f8c22ea077b4a77a4ee4d43cacbe133d6600a8b8b9cfddd1db49ed64ab7fc3363fb912ffb21183f60ea9b38f0861f1761b8400c613ba17687096b
-EBUILD ffmpeg-4.1.3.ebuild 17100 BLAKE2B eb1485d6a751e04dd592af939ae401347d58d51805d4ff31b6f3857754b3544ffaf370ad3748a3d02af52907a9d10ed86cb71f8f53f45fbc580e76efecff2d49 SHA512 ce3b57ef2a0f867173c32bc012d364657e01fccee1ca099aff8f7f5ee0768f646357730436755d5e70368ce701b960ba227700fcafc28e97a00d19c7fefa4d32
-EBUILD ffmpeg-4.1.4.ebuild 17106 BLAKE2B e1935375a52038b6a3c06570fded41a858bb484b4d33e5237fbd843728074712066bc04baab87c711e6cdeb5d45bcc434ae29b92a2a42e754a6bbc08caa1b562 SHA512 f84db133fa01cdf91cd5c60dc3ca410545493d0b9903751c9636ab7210e3bd19f69bc51e2237c80c213c68562dcced2a431c0fc7082214bf1edc7d3ea69217c2
-EBUILD ffmpeg-4.2.1.ebuild 17780 BLAKE2B be10a290333454fdb75b531b9055559667fcc1441a695bc5df78f980a739823001d3e18a599b7e276dd44e6be5fadaeeb2507c6b36604ac0b5a540c5392b01b6 SHA512 0f56840c9d916cc74a19e06d8bfd7711b2db34974f89bed23247b9e5924244bb4c544889c5ef3d31851d0e53d04763e4ba1b60f86b01e2ed9a0efe6fea451fcd
-EBUILD ffmpeg-4.2.2.ebuild 18053 BLAKE2B fe4744e2e965ecf94cfb0bab8e9944fd5ccf4d46550ae7252d97d48c436688712055e8a529f0f1f4ac3a3f96366ddecd5568ea832a878ef7003ae3c94de05756 SHA512 e89b6c4618d28400da643420413b5651476cbc71e71f0d0423f6cff4a78c949a00cf7a6e6f8e713a798b8eb269d6d38e1e59eab692ad0a3d36dffd0634cef1ea
-EBUILD ffmpeg-9999.ebuild 17878 BLAKE2B 73cc0f5f90b7f27a516c604c5c5bf25e933bfd772f7b5a02e8ea107a42fea3042738d556a2ba48b28a99789fbe08945c77228971a81853c28a537adeaec23c1b SHA512 5319a1998d5abd2c33edc62f6c52765671ac3cd29db4a9f909251d4cf0b3f7015f1de064a52452e47a0fd94bfaa9a80300a17bae36d62f4cb8eb2dc378bdec56
+EBUILD ffmpeg-4.1.3.ebuild 17102 BLAKE2B 5a612a6e5c9cc154d0be68a636837f410bed2a195be9d4a802d07a4e5a4a76f7bff818f7d5ce4b7d2af020c26e3c045832fbe292b88e2a3041f25e1771456db7 SHA512 2033c084f4e3ce3eb76164368800e4d8b1cf4fa863f8877cab96f4d3540454570ca6f72daf231094916c9e2cf967be3115d6e5fa30e40bdecfa3c6d5fdc9621d
+EBUILD ffmpeg-4.1.4.ebuild 17108 BLAKE2B cc8ed39c062c69568cb7fa4d7ce5ffb6ef7343cfe98e344e48deaf49726c6e6576d117f160d7f87c39f7609be4859c9ae0e6741605f04b8d5b8ae619bf419e49 SHA512 a62f5151d00b5d389fe111ba383f1d001659473ea20765e25f79eeceda57098fad1838ee5e8e164e9e324e2db506c1a55d130090cb2f37ea3a235f8a8c5dd338
+EBUILD ffmpeg-4.2.1.ebuild 17782 BLAKE2B 3254f46501887fd1d9de39091034d6ff72972e641bc38215326f6b72b215c6ac3ac6b2ddb4c68ded319ec1925216d1de2439c3a3649918535e4b2b55fa493328 SHA512 2016cdbc06e2b6c4adf76a93fde1f67267df6e145265db81fb54411d407713e854031eae0f243651f41418e56e07588d0bdbecfa9697f3c0bd3599f263fe4273
+EBUILD ffmpeg-4.2.2.ebuild 18051 BLAKE2B d9b38af293ea5347dab305f8885dd25f7b57ce7d2dd2a6946860fad2b3e1ef8c0c34bf40a2b4ff0d807522617fac2c05f4cb964d6d82a51a291a8e7c47312590 SHA512 3289338620b246e6d9da61567436df212937c20c8bcfb028eaef6cf7e1c525edd429292c60d822031f3a0e8118d45495178721f73268434b307d4703f7724b22
+EBUILD ffmpeg-9999.ebuild 17880 BLAKE2B 8a233a1d336257897f33bc2a54f3bca431f2f3f1d5343045e7976f873f4808697babf18dbb1d72bd688ddc0866c83108e5d3545fe90d31e7e40142d624e27f42 SHA512 5a9403fa1df8e1c4bff51446bcdba3a1ea4de76e58bb99dcf31305eb08d6aad120079d2a79d581f35def305ee6be5f7535e75d6289c8e01a284e27e67b80a022
 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc
diff --git a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
index bfc0b6cb8710..8bec452d4ea6 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.3.ebuild
@@ -208,7 +208,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
index 8130eda690a5..cc95a886113b 100644
--- a/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -208,7 +208,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
index 1cdef0857c6c..a162e226c929 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -213,7 +213,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
index d6b8dbd286a4..cf69d359c7ec 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild
@@ -62,7 +62,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~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.
@@ -216,7 +216,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9328f10bb9b6..7805600ea529 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -215,7 +215,7 @@ RDEPEND="
 	)
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libaom? ( >=media-libs/libaom-1.0.0-r1[${MULTILIB_USEDEP}] )
+	libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
 	libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
 	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
index a3e34428679c..b44c564d0c99 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,5 +1,5 @@
 AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73
 AUX ffmpeg2theora-0.29-underlinking.patch 503 BLAKE2B 2d6d4fb7c23a2fc439b519348a2b39ea30ab00c5a12f5c37f2ae8965d42af5baa4465172e163cd66a63810b3c13923068d8debad495197ec1bc7d469710dbdc5 SHA512 a9c16e115d72400cd29c60e9893b89e37a1c4800edebc23ebd576c47b49c37ec69e31fe2de4bef50a32c1f60a1be5df5dae2b62000e8f558b30c440938652632
 DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1
-EBUILD ffmpeg2theora-0.30.ebuild 1105 BLAKE2B 9b9ee9658b61e6c81c14406685276b0c0f8aa102b31b505e40ba881993f8dd87ad46d0c8fa45fcbde141502936648511135cf57902676f1ef95f0f72dfc83edf SHA512 25aa470fd34f4218bd0e6808b065e2f76b0e75b97799c1e5a0e4e38f1df2184c695dd826e97cc34fd4de79ab83775381494381d1ec1b576090953a3130d20f94
+EBUILD ffmpeg2theora-0.30.ebuild 1023 BLAKE2B 6315347ccdf5cbed4c800a8f8bf12171cd386150bc9d2f193e106cf110982f299af03ef81670a77d00068d560629d6b225bdf2ad72f4893c4e74ee08411c236b SHA512 e1714a54d6d9309bbee045459dccec01fceb9ffca413de14021f8aca6487dd3de8ae08fd9fdf5676ad4cb16d5793126caca717fc45574b2c4ca56df76ce03478
 MISC metadata.xml 314 BLAKE2B d200d644a8e139816ef36f882f1adf6025a292cfcc6fbfc820265b84a8fc564ad427b0815fb30024ca3d90cf7f42738896cee49e92fc5f8a1e55566051015220 SHA512 2cc51e06842a129ba5e490939f29861b36a1919086aae97a1f5639b56b211700b3839ac66898d0e14b25a3b1471869266ccbff47d2fd98a0baae429514466f54
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
index 60c0a9a5362e..49c6e4674e0a 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,12 +11,10 @@ SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="kate libav"
+IUSE="kate"
 
 RDEPEND="
-	!libav? ( media-video/ffmpeg:0=[postproc] )
-	libav? ( media-libs/libpostproc:0=
-		media-video/libav:0= )
+	media-video/ffmpeg:0=[postproc]
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
 	>=media-libs/libtheora-1.1[encode]
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 2a94978450ba..39a57af84524 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpegthumbnailer-2.2.0-pkgconfig-libdir.patch 675 BLAKE2B b6b00228900e3fb1894eb4ca4872a2be645cb3a6aecbb9d3581ff1fc00b7290eab72196fb9c5f6ac4924eb3e4b1b82093669128fe32c01ce56e4c36ee53528b4 SHA512 facfdf9693710c93896590b8814af0b6ed98fe9fe4ecde013a3554032ed733b3ab713a4a840212808c84b1277c9c4e7951fd1fbc641ad9c001f78635e4e539be
 DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 BLAKE2B 1babd01672f927a9ae043488e67225490f732b26544ad92e4c55ae683eb7d852cb90233e76a52cbda2f6aec26654b57907d7706e3ad4ae6d76ca3bca163c78eb SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf
-EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1142 BLAKE2B 969cd748628e6fac1a6fb73f87006ad99168f571386ab702a380400b548fb543533d551ce1aa99634c7cbbdfa7f0698e83e3e16220ea0f9f3b89908fc18a8a75 SHA512 2ea8f7e05e4a6ef4c938adef5e1c40edfb69872f0d9ba1f8884a60cc8e0942a3eb2b163ea4cda7a86caf056225b460c5cae620f679283f36d6c736214823941a
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1086 BLAKE2B 5a244c16fac1c6c3f20227c165345cf6dfe31c940ee7cf6d7e07c83d37956742c6d51049cfe0d111d2c3124a814dfbb86362ca960444592a02bd5e582513e840 SHA512 d5ea165c0b6518279c509f43c4bbe5933eed0017478871e65206af1c7b4dc5cd1ad6dbb21eb21399af9bd0632efcbf7fae9ef7fdc170b6dd9d759b4f01796cc5
 MISC metadata.xml 375 BLAKE2B 95c0757230dcb40e028a904cfeb17bc44d651e2c5840fb9bd45222f56217ab72cee863157c014fa301a69611eee2e5b574fe9351f066bba1a846ad2b458ae52e SHA512 a3b8d0dc66f4660489b8e084a310da37b5379843b5e4a661a7c1150a4c2a7c4924f6d92366edefa6e57ed77016577d86c4aef084238df06925395f21c3078ab0
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
index 7681b363ac5e..4ceb37088e75 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="gnome gtk jpeg libav png test"
+IUSE="gnome gtk jpeg png test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="gnome? ( gtk )
@@ -24,8 +24,7 @@ BDEPEND="
 RDEPEND="
 	gtk? ( dev-libs/glib:2= )
 	jpeg? ( virtual/jpeg:0= )
-	!libav? ( >=media-video/ffmpeg-2.7:0= )
-	libav? ( >=media-video/libav-11:0= )
+	>=media-video/ffmpeg-2.7:0=
 	png? ( media-libs/libpng:0= )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index c154ea3cde0d..f2cfd511fd7c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,6 +3,6 @@ AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f
 AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
-EBUILD gpac-0.7.1-r1.ebuild 3403 BLAKE2B 670cb9de16fbce8d058ff435171f93c10f0ebc1f3344752714e051d0c9e5545f8ea961eb3d6c919bd7657524184f6ea156c67f6e62605be9572691ef25aaa88d SHA512 9a0a99a0493a8d81c3c7a900ba075fd9d2630f127e0de58839b20bf3128317ba8f23bcde6c73ac49311988c9d5636dfe69f3fd5fe0c52f49bf0db462e48569bd
-EBUILD gpac-9999.ebuild 3171 BLAKE2B 2df32484ff5587c46ba6f4e177e9dda7d31dcb8ae275c4840257fa7ed0b03460c7d3be1cbb72b83e3af9e4ab92ae66d516c61b40d41662e920eca0b34f681fe7 SHA512 fcb635819a2123c46140ba4a92df760e68f00d96d17143cd43acafae40bd5f433c3bef16861d2d16f64418e00df87b6f2430249e9ce4aab517f5ac57db82e7cc
+EBUILD gpac-0.7.1-r1.ebuild 3348 BLAKE2B 794caa4244cca181c66bac42ddcb1fa1fa1a640e10629cfe5d4aa34f431d4bbd567e7c92f9e9a969edda01edd6294302027d5a2528bd4739e5a0989648ba4ed9 SHA512 b92577b53cbe98971be2eeb9464a1607cd0be5c153e9d532b89ea395461038f632cb2c3acdf86d35b64917d08851c2b4ffe019345f066eddc069d0d7751bb7c8
+EBUILD gpac-9999.ebuild 3116 BLAKE2B ebce6b15686887a082521e278f48b33045641ce1c4fd891d5fdbc00d08e841b0c13ec9217ced028a087643f9cc2f487489fcc406daf757ec2add2031bf036c27 SHA512 0a0772d18c18c0a6e5af1878c000ddbf8657afe38486f3ad357d659eaba4650b750b47b0270a2bd2d1b0d094587bcfe86dc4168f3e99539ed98e064e2f5820a0
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 3266238bf224..bdac8071f899 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index c39142d90179..5c4fcbaddd14 100644
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
 	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:0 )
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 872df4a1cbfd..10b709297cef 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,3 +1,3 @@
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
-EBUILD guvcview-2.0.6.ebuild 1657 BLAKE2B 6d3a8da54455143dcdd4d83b8f01c21e001dba80bf83cb862bea4abc5ee43117e6ee5daf4da44dc050ea5f5a26880ab81f622657c380117621da4f8153339534 SHA512 e80b0f97844b7c2b7cb3b2cf37eed6601d251da34f06de0da140b51a18726e25026f015077491ca4ab8440277477a24a82f308fdc6fd93d9f54a257d978efc2c
+EBUILD guvcview-2.0.6-r1.ebuild 1611 BLAKE2B 0c0f731a3571920247b32aab7b0695360ebd4f8fe5c21d3fad200cb60253cfe1fd1a93eb5fed0d529580ff9081410463ad7949689ef5f369956808491986637e SHA512 b72f4fe652f11956684bba8aecf1146b136eba94a8e99d91a3ea11285c2716821a65299fd5bbd91c2145080a009bc87aaa641e99f4ec749ada9ff39b82ef3df3
 MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
index 92634f1db14d..76ae9ce37c01 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gsl libav pulseaudio qt5"
+IUSE="gsl pulseaudio qt5"
 
 RDEPEND="
 	>=dev-libs/glib-2.10
@@ -22,12 +22,11 @@ RDEPEND="
 	media-libs/libsdl2
 	media-libs/libv4l
 	>=media-libs/portaudio-19_pre
-	virtual/ffmpeg
+	media-video/ffmpeg
 	virtual/libusb:1
 	virtual/udev
 	gsl? ( >=sci-libs/gsl-1.15 )
-	!libav? ( >=media-video/ffmpeg-2.8:0= )
-	libav? ( media-video/libav:= )
+	>=media-video/ffmpeg-2.8:0=
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index c3a1cc690acd..ae26c03ddb52 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -6,7 +6,7 @@ AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d
 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
-EBUILD handbrake-1.2.2-r3.ebuild 4117 BLAKE2B 03d2185c1a1e8533dcb3b99b1c3ac2c2b48aee108ca6bd5c6901781b5e8d571616f7f50cd99801499c2df06c72731da885e5b86d9d0f5362376ca81c9de84ec1 SHA512 3dd3f38c4881fe5a90257019b8989081ef8dbf5f55120759953af31a75266df8d5c7fe547548ebbfcdaeae4e4ba43f3e33ae991fae530279079332d9a89a4c5b
-EBUILD handbrake-1.3.0-r2.ebuild 4267 BLAKE2B 85984ee4a3f6f53b95d6e080a84594b9d1f0bc3ada96ca525df6c55fb2d28227fbb924086ea4665b215f470826863b7a6b8b46da612ddf3c3e03fd491fa10096 SHA512 c5f3a0ca79158f3787567b4d6aae3dc5804a5e81bbe060c512da9445eb6cade28595227a662a6c071de13e3feca276235ed18f717eca3872d42f7590de69937b
-EBUILD handbrake-9999.ebuild 4205 BLAKE2B eca7b60f132cde9d1fc2e9c6f2f59475e31c879d4b00a56e640aedff9d360a70dd323cf98e58be2f865524ebbe5a55774a85d1ab2ada318e8f4238bca4020d46 SHA512 94128bc68bef69d7478e04e51619ec760b3e500d95b3fc0d5d786da147c6ebc55860f36bd78e73d05e4e12e6eaae209ffc40c9b5ce863c15913f774c8eb53cfb
+EBUILD handbrake-1.2.2-r3.ebuild 4053 BLAKE2B cfd4cccdeeaccdb243d14dc2ef8ffb645d69604ddab11eca57ef9c3b59a73ba6ced001f1c3b345fd6baab060408b730377229b0b967a3d7b0e2b3a3c366e4111 SHA512 948b6247b83f802106a8fb17443702f4ccc1018e34179c7df08b9d75b13ea8ae2b7888c6b7035ec00305cd05b17ebb9dcf97c119381d9d8fb5a6ba4b7b160787
+EBUILD handbrake-1.3.0-r2.ebuild 4203 BLAKE2B 89736df13485b16b800b1d8f9a06e8554b7340a007fb95fd88f260a53a76510e21f3b2c63a37cde91bbcbf87999d195d38ef0035dc3bcf8de5da77659e7620fd SHA512 bcea747db43f8fe530771480dd77c84e0cf0e58db32880d908d563a6eb00d3829e31a800662271e6a26249540fbe5123926dce2a75250bedf3e41ef2c293ed21
+EBUILD handbrake-9999.ebuild 4141 BLAKE2B 6da162374851a5a0283c9404587e17386913dca3e39c747831007eeb8a102e4d68d828de48e99876c90848679ae0451fb62f5b7c870f676c91de6ef3847a6cbb SHA512 df20db4d5da687c300af75302890028141b9a7acbe7e09dfded90d6454dec6b1579a6ff832e3c7a6ace6377ac88d12cf8902db8e56580162296d18227f48c081
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
index a2e9041ccde2..723f649b7e26 100644
--- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -45,8 +45,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index 2f99c1e31eb0..e7362b5877d8 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.2.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index c1345ae1ac6c..ed8a647b082c 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.2.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/harvid/Manifest b/media-video/harvid/Manifest
index 3220881b59d5..c2f04ad5e115 100644
--- a/media-video/harvid/Manifest
+++ b/media-video/harvid/Manifest
@@ -2,7 +2,7 @@ AUX ffmpeg29.patch 11613 BLAKE2B 3ec6dcdf43cfefc26ce9e0fb94f66bb33251430ac563628
 DIST harvid-0.8.0.tar.gz 116079 BLAKE2B 17e92f9100d4874604d524b31d3bfd50f2b4f1bbd4d53ab82b05e65f4ff7d43176bad2cf57e197d54d4fb1281dc863d6afae50f8b312933014b92def51538dea SHA512 8e999e91e36708df7264fc351e5b6cac6c47fa5e0e612d0917bbfa02e98d13f9758f43312e6febebe56e7b8f2f72b80b6c47598de7100d3b5479b80720b91568
 DIST harvid-0.8.1.tar.gz 116277 BLAKE2B 1382625d241e63f3733817e57be4ad6cc57411aca6fbb7ba472e1b2959362fd384b1e2d1a35594656c30778fae4f54a1c89d1bb6565d006ad801e29c6d657d7d SHA512 b425eca844bb9eec3ec8caa324f783132a3e83938b258a5f8e92ce6dc47108ae491a009223b7e3c8051d965a1ff1b5e5509a804d1462641128a8524cde5ae60a
 DIST harvid-0.8.2.tar.gz 116541 BLAKE2B e3f82ad0b30fa0c1eefe84b85ba658c1897890d2b35aef355dfc029c26140ee5809a42d4e82a2ea515a277f4cc8cd24fdc032f6a42875bcddcb5bd4a77b6282a SHA512 fde352124008cd3d6230950c79a3a2b8d581803f952c7313c941226b00e80f8078053d941f2c5ead04672639a8db696f0c33482f69dab78187801d7ebce23fce
-EBUILD harvid-0.8.0.ebuild 1026 BLAKE2B 73c8bbdc97c82c37fa8a413028a6c9bb247a3906a54e17ba8eb58431206ff42f4d85fc6eb2027125a9fba2285bdbe66fe879af845e63f595229cc0a0ec63ce9f SHA512 151afcf1b30f5e074f8ed29123f67e3dbfe9904cb0b57ea7bcab8d58fbead3620affd35078555e82a472a1ed5e2eca918a88e8f2b9dd0fdcfd64941649217be3
-EBUILD harvid-0.8.1.ebuild 970 BLAKE2B e67483ce6a8960f42754818495d6e013df63591d42a00c62f653bd4a82c3f6086ae8a4676da99aff8cbd557379a58539c1cd5663ed4ed52516795a54a7c8ab56 SHA512 1ecb3b7435b828af3708f3be3646f38dd98adc4933bb8a4fd9e6309bcf9b8fbddf8213ac466df7c0b8f3d4054e7c0faf4fd9d6910b53d8a3dd71a2031ee806f6
-EBUILD harvid-0.8.2.ebuild 970 BLAKE2B 2e782b70eefd826fee8020968a0d44c2062c4e43335229c59ceef757c1cb8c2540243b3c85931bcb68ed5f0c0cfb8ac1230d7c860fb38d73d6d3aad0e51d5936 SHA512 a0d70a007258c7f13a55c9a8605e616b414acbbdc82b79647f9b8fe502c8757db7e284b80f62b4011ff01556b5b93dfa82adca3656bbf0b8c31ec0aaa2659ae8
+EBUILD harvid-0.8.0.ebuild 961 BLAKE2B e4357dc555a4dbc0a071cdb1aacae0236f6fbf4bc95c9a7f036b0dc02a707aa6c10b68fdfd1f4c6ab32f17f89870b5b1899a7919308404ea3faee37b5efaf6c5 SHA512 77429081faeccf5bf2f36ee9e28ca972256eb2b85762bef355a478c11885885b9145ab4f34ea681186abdb6872554b61f15820361d8ebbfb40809ecd489ac43f
+EBUILD harvid-0.8.1.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
+EBUILD harvid-0.8.2.ebuild 905 BLAKE2B 025184861535e8073613e1be3a4daf26a534ee1ce84885c25ade482607bc3c511990755f5d81807dccc4f4bbabf9ab3cf7e32949fd76034ae105ff2431b79ed0 SHA512 a00c58f253a040b927198d96591229c660832b9406cd373e3cc45831a4ce691a19e2662468d8efc2caca2f30f4654a4ef4cd6a085936b5e12f88b7ddfb68e70f
 MISC metadata.xml 306 BLAKE2B 5c1fba580f975a8cbd2247e002f0565de5a1f406f4361e312865e9e7b6fdd406a3e128fee109fddcf37b5978e865850a7de3abbe656f50d3c1642650d8f371f2 SHA512 4fa6b478e09481b73a9c1743c79b108e115a9452c31f3a37134d9ef939f4118c27690e9e7f33fcd0fa7a558d73840b84b944e14344d1ebffc10febc16cbf2315
diff --git a/media-video/harvid/harvid-0.8.0.ebuild b/media-video/harvid/harvid-0.8.0.ebuild
index 324ebb2f22f5..45de47a567e3 100644
--- a/media-video/harvid/harvid-0.8.0.ebuild
+++ b/media-video/harvid/harvid-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "
diff --git a/media-video/harvid/harvid-0.8.1.ebuild b/media-video/harvid/harvid-0.8.1.ebuild
index 56e380ac9d6e..d7829ef1ef59 100644
--- a/media-video/harvid/harvid-0.8.1.ebuild
+++ b/media-video/harvid/harvid-0.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "
diff --git a/media-video/harvid/harvid-0.8.2.ebuild b/media-video/harvid/harvid-0.8.2.ebuild
index 8dbd4423ebc4..d7829ef1ef59 100644
--- a/media-video/harvid/harvid-0.8.2.ebuild
+++ b/media-video/harvid/harvid-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,11 +12,9 @@ SRC_URI="https://github.com/x42/harvid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libav"
 
 RDEPEND="
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	libav? ( >=media-video/libav-9:0= )
+	>=media-video/ffmpeg-2.6:0=
 	media-libs/libpng:0=
 	virtual/jpeg:0
 "
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index a724e728a197..d10cece8c80e 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -2,5 +2,5 @@ AUX imagination-3.0-cflags.patch 834 BLAKE2B 7f3a995282a4e6fb0c505a6ad6fd1cb813a
 AUX imagination-3.0-enable-translations.patch 231 BLAKE2B 210deeb69fdc4d9236519f0eec6571789236c4ff2e8a9379312a11f0c8792e3d1ec4e078d805c91ebc21265e5fa90737ef2d3643904829425712da52cd77a5c8 SHA512 5c086aaf8fc28494250c08655b4f6a05f16efd853d42c47cef503e2e846bec2665a6ec339660aad63de47d094aa29cafddcb4ac0e46e24f2fd27660fd2dc417a
 AUX imagination-3.0-fix-htmldir.patch 2198 BLAKE2B bca0f907f386ebde1ec46db6c5c5a7952557fa3ef9a16984f133c175c5ee70897bfa88204c00250f9c243dc5e157ef370478a1fe94e53fb03a9a4ffecdb31b24 SHA512 e7537354418f71ffa50666a197cc9dc46a3b4a8441ee75bd3b31b1e8b5636e7f304b8b9df6a1df4012ac31b9538a2c73a26b888e02850c2d6fbda8ae1531ffad
 DIST imagination-3.0.tar.gz 3327784 BLAKE2B 0322a68ab6c44e2b0d47bb89de6522249ca3507808ee3733f2f195923c4269591c2225271ef27b24c648cb6784a5c85bd6ca97142072e52641bdf7f80b9a9bc7 SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8
-EBUILD imagination-3.0-r1.ebuild 755 BLAKE2B b891b9d212085e971cf000ef79499c0db65da7d511c316ed62d12efd2ce0561de434ed0938b09601cf91c58e3ed17b81edb25d650d405c847939fcf77fa59d39 SHA512 5e4369fea43a47dc348d03c53f26d34bd5bfcb792f0cf4671ba3399827ac82428b8d908a4146e26b2c46c567979bd8cbb4dea93d7687b5c768bb933c932c529f
+EBUILD imagination-3.0-r2.ebuild 759 BLAKE2B 538f4611f6eca7e213b1e5772ff6bd45dfed36945f90dd35840f0415c1afb09b6689f5e5f045814ae6ebfa77d5eec0ed556c23eb6c290588c12fa65ff6f37e06 SHA512 7e2d6c08e2e2e79f90b779a4883651de70c733ea3bb03a7730a735b226e239b66c2f57e7a3daa74766fcea5682d6eb67688f0b2eedfd8e3f16c8aa5c72e7385e
 MISC metadata.xml 248 BLAKE2B 3ab98ae1a4ef9f5b48116280f559a78a05aff568f1464a23c3ffd8c25e0f788481c046c094d2b76a8cb8e9198c1caadc4234efcda268ec4517d53f4d86df9838 SHA512 edb9d1136a99fbf3a5340bcd6957639bbd0b75a8772a319f60ce6505404cacd90d4fc6aabd06c3529c87f7471a3dce7f96a6e11b2fe1a6c6913164bad7ac04fd
diff --git a/media-video/imagination/imagination-3.0-r1.ebuild b/media-video/imagination/imagination-3.0-r2.ebuild
index dbf5d971be68..83f5220125d8 100644
--- a/media-video/imagination/imagination-3.0-r1.ebuild
+++ b/media-video/imagination/imagination-3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="
 	x11-libs/cairo:=
 	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}
-	virtual/ffmpeg"
+	media-video/ffmpeg"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 79ac1dac8ea2..06ba68b0a3b4 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -5,5 +5,5 @@ AUX kino-1.3.4-libav-0.8.patch 2622 BLAKE2B 7345a43a6bfb6473dda9899ab675426db102
 AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60a39ee743e08e88e736e91db2728a19653c6d0eba22b3883e99e6c54f14b6f1262227aa883c067cd577eb69eef66caac3ee49339 SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847
 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77
 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32
-EBUILD kino-1.3.4-r1.ebuild 2757 BLAKE2B e2ee06d5487717336bd91cef35c5b693cf719d3b3e12b83d74d6bafb51367be5c73aaf61ccb754142a0719188d3ac2b6b44e51122b83ff8ebd8069c36c19d216 SHA512 a74a49dc3d46838d6554cb5784c9441af7f52e0158ad3d84f291c5e20681a4038bf50b25c3598ff4f4f479e4755bbe876544fdf0f1904e9f847fd922b7254948
+EBUILD kino-1.3.4-r1.ebuild 2706 BLAKE2B 44f37d06b3e6d178ec1cc9ebef41121825b65168d54c48b85b966a6299a81e6364e8e7422e2979eaa43e1111025ac95b22c0cb3a80ab6e9209af4fe8d081a28a SHA512 dd441c4e05665548a8cc111c440b38c3ca3df3bb8d20ff7a162585a150641b9a12c4ea17f10bd7a67201f60d892f99b83fe7a5811aafa7dbd2a72b4bae9f5488
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
index 9fc8dbb085ae..e9af9289d67a 100644
--- a/media-video/kino/kino-1.3.4-r1.ebuild
+++ b/media-video/kino/kino-1.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa dvdr gpac lame libav quicktime sox vorbis"
+IUSE="alsa dvdr gpac lame quicktime sox vorbis"
 
 # Optional dependency on cinelerra-cvs (as a replacement for libquicktime)
 # dropped because kino may run with it but won't build anymore.
@@ -30,8 +30,7 @@ CDEPEND="
 	media-libs/libiec61883
 	media-libs/libv4l:0=
 	alsa? ( >=media-libs/alsa-lib-1.0.9 )
-	!libav? ( >=media-video/ffmpeg-3:0= )
-	libav? ( media-video/libav:0= )
+	>=media-video/ffmpeg-3:0=
 	quicktime? ( >=media-libs/libquicktime-0.9.5 )
 "
 DEPEND="${CDEPEND}
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
deleted file mode 100644
index e6bfcacf3e81..000000000000
--- a/media-video/libav/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libav-12.3-x264.patch 2466 BLAKE2B 8dd7fe5a6699f34bd1662f10eebbe5f189a22c43f827a0bb2b323a99da3e3699168fdd8c20f6513c44b2f59d089a10751ca1522c78e302fa8086beab1ad27c6e SHA512 25aeb874b4a08654b22f45cd79d9aec91e790233d93369422d3547e0ca853724347b22a2f7d404b4f076b96aae6e9b84466cd24c11e8601b4cede48e183ee15f
-DIST fate-12-r1.tar.xz 763758260 BLAKE2B 299e1a2a773e49c7a51c1222ac34eaea24f77420570a1b0c0b18db5517736656f52ad0a7ca807f65f5e9f9597709265fcd950cf989ad995aa4289ba0e364950e SHA512 084f584c34d34b66c1f4d4742a11376ee2b90f6a07529b5aba6d50421dc8f863fded73dd57ad2c201aadfd529f0f923fa531ea9b41aaaa7b682846ef565a1018
-DIST libav-12.3.tar.xz 5267988 BLAKE2B 92147dde4f41a5aa05d93824d3ffa9a21b067f99cec5fa17bc4b8e3600f2b1913f7e74d4ea766c864cdba686dd14d5d3a8bc8af8f9e6de4c956f14cb8e20ab88 SHA512 fd4838a934792797a975ece034cbd63760c94ee6becc99b8707e8345e41777baf26e30ef6937ab30b7d2f722977e69aabc2cfca3fcdf88373d579f9cc9d69162
-DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c168aa81d25e2fb08d99e300dc47d7ea28f61500fcfab0b16fa136261a5af27631b7536eb3aefa0e1feb4d615af57f9f5a36 SHA512 0c9b59957f1fbbff8f5b95b02c11014a4efdddf4b7e1b158cd0fda3af8b89bd90d48263ed0239915adfb7abcd7a8b22c278cd5cf1d01822bd22df65cc7f69689
-EBUILD libav-12.3.ebuild 11254 BLAKE2B 00e844bd89a96b95ab1d8b0d9353aae57fb7048b6d314de072af0e5fce598495e9d2c125d17a97068d2c9e38c54a6bdc0f4469070c940a8f957952653398ceab SHA512 d451ceaf823109e244df0d0d24985567dfbbf4ef41d6674fabf0e9d723644badf1b35030f093feaaf476bc282ddf55dcc96ebd86538e8553b970aad32a482be2
-EBUILD libav-13_pre20171219.ebuild 10634 BLAKE2B 95e63624680d6540816c98a3149a880ca767069961ed62348ab5b7164cdf7a94c62e4b5d3e7dcea91785cd1ab09d60b4222fb98d496b21a4e56ac7137e0c4fde SHA512 581ad4f2abb15b234246293444f14ba95d5fab2c6148a96745fab4dc21b119e9fea37ca65e081cde8fe0d75ef974919bd5e293f1a305fafa7417047efe4fee0e
-EBUILD libav-9999.ebuild 10775 BLAKE2B da974d58efd0d1810ef13d143b434af9ef384ed4c07384e40774038ddc7ff3f1491863e2fcbb475121574f2cdc31577f911f9f58f70169f5e166b36b89796511 SHA512 2bdd2c8331821ca21f96fdc8b6ed3645e21ff6dec1cc8b3a034c98b028ae7f2ab4fc359af1d71e734ad6f819aa61f0b10455df81ee5670fb0dbc6d951a11b527
-MISC metadata.xml 2601 BLAKE2B d09d7ca403657b7d446f2504ff22c74ebb86303db22d4df43cb4b026ca39c059e754459f5f99ffc5cf6c5a29a189ed47754fbe709bc4897901cab96ed6928ab3 SHA512 12d2a41647e3e9ca824de3276098f742c9a068a8d4b33b2dbc45f32329ccdbdbe13c1f6f52cc4028ef5511c9f8557cea39bf1926c2433c7ae85687bf1f6ea7a1
diff --git a/media-video/libav/files/libav-12.3-x264.patch b/media-video/libav/files/libav-12.3-x264.patch
deleted file mode 100644
index 25c089bfeac1..000000000000
--- a/media-video/libav/files/libav-12.3-x264.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From c6558e8840fbb2386bf8742e4d68dd6e067d262e Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-Date: Tue, 26 Dec 2017 12:32:42 +0100
-Subject: [PATCH] x264: Support version 153
-
-It has native simultaneus 8 and 10 bit support.
----
- libavcodec/libx264.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
-index 0dec12edd..3dc53aaf3 100644
---- a/libavcodec/libx264.c
-+++ b/libavcodec/libx264.c
-@@ -243,7 +243,11 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
- 
-     x264_picture_init( &x4->pic );
-     x4->pic.img.i_csp   = x4->params.i_csp;
-+#if X264_BUILD >= 153
-+    if (x4->params.i_bitdepth > 8)
-+#else
-     if (x264_bit_depth > 8)
-+#endif
-         x4->pic.img.i_csp |= X264_CSP_HIGH_DEPTH;
-     x4->pic.img.i_plane = 3;
- 
-@@ -395,6 +399,9 @@ static av_cold int X264_init(AVCodecContext *avctx)
-     x4->params.p_log_private        = avctx;
-     x4->params.i_log_level          = X264_LOG_DEBUG;
-     x4->params.i_csp                = convert_pix_fmt(avctx->pix_fmt);
-+#if X264_BUILD >= 153
-+    x4->params.i_bitdepth           = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
-+#endif
- 
-     if (avctx->bit_rate) {
-         x4->params.rc.i_bitrate   = avctx->bit_rate / 1000;
-@@ -659,6 +666,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
-     return 0;
- }
- 
-+#if X264_BUILD < 153
- static const enum AVPixelFormat pix_fmts_8bit[] = {
-     AV_PIX_FMT_YUV420P,
-     AV_PIX_FMT_YUVJ420P,
-@@ -685,15 +693,37 @@ static const enum AVPixelFormat pix_fmts_10bit[] = {
-     AV_PIX_FMT_NV20,
-     AV_PIX_FMT_NONE
- };
-+#else
-+static const enum AVPixelFormat pix_fmts_all[] = {
-+    AV_PIX_FMT_YUV420P,
-+    AV_PIX_FMT_YUVJ420P,
-+    AV_PIX_FMT_YUV422P,
-+    AV_PIX_FMT_YUVJ422P,
-+    AV_PIX_FMT_YUV444P,
-+    AV_PIX_FMT_YUVJ444P,
-+    AV_PIX_FMT_NV12,
-+    AV_PIX_FMT_NV16,
-+    AV_PIX_FMT_NV21,
-+    AV_PIX_FMT_YUV420P10,
-+    AV_PIX_FMT_YUV422P10,
-+    AV_PIX_FMT_YUV444P10,
-+    AV_PIX_FMT_NV20,
-+    AV_PIX_FMT_NONE
-+};
-+#endif
- 
- static av_cold void X264_init_static(AVCodec *codec)
- {
-+#if X264_BUILD < 153
-     if (x264_bit_depth == 8)
-         codec->pix_fmts = pix_fmts_8bit;
-     else if (x264_bit_depth == 9)
-         codec->pix_fmts = pix_fmts_9bit;
-     else if (x264_bit_depth == 10)
-         codec->pix_fmts = pix_fmts_10bit;
-+#else
-+    codec->pix_fmts = pix_fmts_all;
-+#endif
- }
- 
- #define OFFSET(x) offsetof(X264Context, x)
--- 
-2.21.0
-
diff --git a/media-video/libav/libav-12.3.ebuild b/media-video/libav/libav-12.3.ebuild
deleted file mode 100644
index 8ef66ef03759..000000000000
--- a/media-video/libav/libav-12.3.ebuild
+++ /dev/null
@@ -1,350 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	FATE_VER=${PV%%_*}
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
-fi
-
-# 9999 does not have fate-*.tar.xz
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/12"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network nvidia openssl opus oss pic pulseaudio rtmp sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	nvidia? ( media-video/nvidia-video-codec )
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( dev-lang/yasm )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="
-	!test? ( test )
-	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist ) nvidia? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	eapply_user
-	eapply "${FILESDIR}/${P}-x264.patch" # bug 681888
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	NVIDIA_INCLUDES="-I/opt/nvidia-video-codec/include -I/opt/cuda/include"
-	NVIDIA_LIBS="-L/opt/cuda/lib64"
-	use nvidia && myconf+=( --enable-nonfree --enable-cuda --enable-libnpp
-						    --extra-cflags="$NVIDIA_INCLUDES" --extra-ldflags="$NVIDIA_LIBS" )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		use nvidia && myconf+=( --enable-nvenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-	# Outdevs
-	for i in alsa oss ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && use arm && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# 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
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -j1 fate V=1
-}
diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
deleted file mode 100644
index 316231001656..000000000000
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-fi
-
-SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-12-r1.tar.xz )"
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/13"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="
-	!test? ( test )
-	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	epatch_user
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/avbuild/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && use arm && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# 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
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
deleted file mode 100644
index 72b3d24390d9..000000000000
--- a/media-video/libav/libav-9999.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://git.libav.org/libav.git"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video"
-HOMEPAGE="https://libav.org/"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )"
-else # Official release
-	SRC_URI="https://libav.org/releases/${P}.tar.xz"
-	SRC_URI+=" test? ( https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
-fi
-
-LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
-SLOT="0/13"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk
-	frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k libressl mp3
-	+network openssl opus oss pic pulseaudio rtmp sdl speex ssl
-	static-libs test theora threads tools truetype twolame v4l vaapi vdpau vorbis vpx X
-	wavpack webp x264 x265 xvid +zlib"
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="altivec armv5te armv6 armv6t2 armvfp:vfp neon"
-X86_CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext mmx mmxext sse sse2 sse3 ssse3 sse4_1:sse4 sse4_2:sse42 avx xop fma3 fma4 avx2"
-for i in ${X86_CPU_FEATURES} ; do
-	CPU_FEATURES+=" cpu_flags_x86_${i%:*}:${i#*:}"
-done
-for i in ${CPU_FEATURES} ; do
-	IUSE+=" ${i%:*}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg:0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-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}] )
-	encode? (
-		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-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}] )
-		vorbis? (
-			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	ssl? (
-		openssl? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		)
-		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-	)
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( app-text/texi2html )
-	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/nasm-2.13 )
-	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	test? ( sys-devel/bc )
-	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# openssl support marked as nonfree
-# faac and aac are concurent implementations
-# amr and aac require at least lgpl3
-# x264 requires gpl2
-REQUIRED_USE="
-	rtmp? ( network )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) cdio? ( gpl ) x265? ( gpl )
-	test? ( encode zlib )
-	fontconfig? ( truetype )
-"
-RESTRICT="
-	!test? ( test )
-	faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_unpack() {
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && default_src_unpack
-}
-
-src_prepare() {
-	eapply_user
-
-	# if we have snapshot then we need to hardcode the version
-	if [[ ${PV%_p*} != ${PV} ]]; then
-		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
-	fi
-
-	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
-	use zlib && TOOLS+=( cws2fws )
-
-	MAKEOPTS+=" V=1"
-
-	# needed at leasts for tests in live ebuild
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_LIBAV_CONF} )
-	local uses i
-
-	# 9999 does not have fate-*.tar.xz
-	[[ ${PV%9999} != "" ]] && use test && myconf+=( --samples="${WORKDIR}/fate" )
-
-	myconf+=(
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-avfilter
-	)
-
-	# enabled by default
-	uses="debug doc network zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=( --disable-${i} )
-	done
-	use bzip2 || myconf+=( --disable-bzlib )
-	use sdl || myconf+=( --disable-avplay )
-
-	if use ssl; then
-		use openssl && myconf+=( --enable-openssl --enable-nonfree ) \
-			|| myconf+=( --enable-gnutls )
-	fi
-
-	use custom-cflags && myconf+=( --disable-optimizations )
-	use cpudetection && myconf+=( --enable-runtime-cpudetect )
-
-	use vdpau || myconf+=( --disable-vdpau )
-
-	use vaapi && myconf+=( --enable-vaapi )
-
-	# Encoders
-	if use encode; then
-		use faac && myconf+=( --enable-nonfree )
-		use mp3 && myconf+=( --enable-libmp3lame )
-		use amr && myconf+=( --enable-libvo-amrwbenc )
-		use aac && myconf+=( --enable-libvo-aacenc )
-		uses="faac theora twolame vorbis wavpack webp x264 x265 xvid"
-		for i in ${uses}; do
-			use ${i} && myconf+=( --enable-lib${i} )
-		done
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# libavdevice options
-	use cdio && myconf+=( --enable-libcdio )
-	use ieee1394 && myconf+=( --enable-libdc1394 )
-	use pulseaudio && myconf+=( --enable-libpulse )
-
-	# Indevs
-	# v4l1 is gone since linux-headers-2.6.38
-	myconf+=( --disable-indev=v4l )
-	use v4l || myconf+=( --disable-indev=v4l2 )
-	for i in alsa oss jack; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-	use X && myconf+=( --enable-libxcb )
-
-	# libavfilter options
-	use bs2b && myconf+=( --enable-libbs2b )
-	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
-	use truetype && myconf+=( --enable-libfreetype )
-	use fontconfig && myconf+=( --enable-libfontconfig )
-
-	# Threads; we only support pthread for now
-	use threads && myconf+=( --enable-pthreads )
-
-	# Decoders
-	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
-	use fdk && myconf+=( --enable-nonfree --enable-libfdk-aac )
-	uses="gsm opus rtmp speex vpx"
-	for i in ${uses}; do
-		use ${i} && myconf+=( --enable-lib${i} )
-	done
-	use jpeg2k && myconf+=( --enable-libopenjpeg )
-
-	# CPU features
-	for i in ${CPU_FEATURES}; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	# pass the right -mfpu as extra
-	use neon && use arm && append-cflags -mfpu=neon
-
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC for x86.
-	if use pic && [[ ${ABI} == x86 ]]; then
-		myconf+=( --disable-mmx --disable-mmxext )
-	fi
-
-	# Option to force building pic
-	use pic && myconf+=( --enable-pic )
-
-	# 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
-
-	# Misc stuff
-	use hardcoded-tables && myconf+=( --enable-hardcoded-tables )
-
-	# Forcing arm would make the compiler break left and right
-	if [[ ${ABI} == arm ]]; then
-		filter-flags -marm
-	fi
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ ${ABI} == x86 ]]; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if use debug; then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	set -- "${S}"/configure \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--shlibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		--extra-cflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-}
-
-multilib_src_compile() {
-	emake
-
-	if use tools; then
-		tc-export CC
-
-		emake ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install install-man
-	use doc && dodoc doc/*.html
-
-	if use tools; then
-		dobin ${TOOLS[@]/#/tools/}
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md INSTALL
-}
-
-multilib_src_test() {
-	local _libs="$(for i in lib*/;do echo -n "${BUILD_DIR}/${i%/}:";done)"
-	einfo "LD_LIBRARY_PATH is set to \"${_libs}\""
-	LD_LIBRARY_PATH="${_libs}" emake -k -j1 fate
-}
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
deleted file mode 100644
index 82ff0f291ef6..000000000000
--- a/media-video/libav/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
-	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
-	<flag name="armv5te">Enable optimizations for armv5te processors</flag>
-	<flag name="armv6">Enable optimizations for armv6 processors</flag>
-	<flag name="armv6t2">Enable optimizations for armv6t2 processors</flag>
-	<flag name="armvfp">Enable VFP optimizations for ARM processors</flag>
-	<flag name="bs2b">Enable <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural audio filter</flag>
-	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
-	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag>
-	<flag name="faac">Use external faac library for AAC encoding</flag>
-	<flag name="fdk">Use external fdk-aac library for AAC encoding and decoding</flag>
-	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
-	<flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag>
-	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
-	<flag name="network">Enable network streaming support.</flag>
-	<flag name="nvidia">Enable nvidia video codec hardware acceleration support.</flag>
-	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
-	<flag name="opus">Use the external opus library for encoding and decoding.</flag>
-	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
-	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
-	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag>
-	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>net-libs/gnutls</pkg>.</flag>
-	<flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag>
-	<flag name="twolame">Enable MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder</flag>
-	<flag name="vpx">Enable vp8 encoding support using <pkg>media-libs/libvpx</pkg>.</flag>
-	<flag name="x265">Enable HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
-</use>
-</pkgmetadata>
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 31859d224522..ae5c16f47423 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,5 +1,5 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
 DIST makemkv-bin-1.15.1.tar.gz 8338636 BLAKE2B 4eafd3dacfc27a5f855d4c8e620f191a0abfa4e6795992533ed75a82e8ca2cd490aafa52207da32774c9059b196b1bf834877f4c3e96b0a661b03c8c9226ad1a SHA512 bc1184a951f20d7320c8f048afb7af7f958b6a8f231e0ea51193c1841bb0878201db17750caf18c60483cd71e1e8a6956a029f114d8f246d590b68a69f268ce8
 DIST makemkv-oss-1.15.1.tar.gz 6403114 BLAKE2B e0642c0c740b0817a0d347e4588691282cfae1f81e827431ecad7fcd64b4cfca687829b7646614833f2123216c304e2705b2ecaf9a30904735c6c3c0cc05a845 SHA512 f96474c82349277ef6a4e35af8009cf63fbc5a5e8444891950e26466f7167cea9014190053d3750f79a8df9415507e8e8b8c17cfa2b638123f64487a0d74b045
-EBUILD makemkv-1.15.1.ebuild 2938 BLAKE2B 1bd9597c1fdc238cd63c910f707ae38231cef81a8f34216a6a8b5cb56f29c331d93b55747ce6762d463a431eefa3763aaf1ea27bedffb9105ece7a4359f04ef0 SHA512 df34f7ac1edb082ad1ba096d4549efacbeaba6b663ca6502b55fcd18dbdc68aeadc916bb6c4b7336d9fe6c0c98baad3518701009692c33509bdc927f65fb6281
+EBUILD makemkv-1.15.1.ebuild 2879 BLAKE2B c3481fff8d3298ccf3cbe0ea361df0f9edcf809faf29689fa979f8cfcb28f271b4504e9626067a128821973fd9302a5fa5f3997a1a9a9e3e9a3afcb96187fb6c SHA512 4091a63c40a3384dc2c3caae9ee48ba32b94d133c8d55e8072d3bf227ad0ce8487f41875811f35642f0210171d8da80a61502b2aadc57947a16fe516e4707bea
 MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/makemkv-1.15.1.ebuild b/media-video/makemkv/makemkv-1.15.1.ebuild
index ff30a137bbc1..67d80b4b86e0 100644
--- a/media-video/makemkv/makemkv-1.15.1.ebuild
+++ b/media-video/makemkv/makemkv-1.15.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+gui libav libressl"
+IUSE="+gui libressl"
 RESTRICT="bindist mirror"
 
 QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
@@ -31,8 +31,7 @@ DEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
 	)
-	!libav? ( >=media-video/ffmpeg-1.0.0:0= )
-	libav? ( >=media-video/libav-0.8.9:0= )
+	>=media-video/ffmpeg-1.0.0:0=
 	!libressl? ( dev-libs/openssl:0=[-bindist(-)] )
 	libressl? ( dev-libs/libressl:0= )
 "
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index b281313e0d5a..9b58d6d2b852 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,3 @@
-DIST mediainfo_19.09.tar.xz 1906920 BLAKE2B 926a13dd4b059eb613acf89b3b3e12918a86ad45c8551948be2d55478bbe94a93a3fdf7a49fbc087e44fd81232a9fa85cb6dfbd25efb11b9997b1f90b49090e4 SHA512 ddcfa92d822a28fa804d5bddc0d29bdb8cff3779b924c2caef0e59b0f79f857a4140dc94bd2ed9158954f6400778572975ac63f45ee2b87664e3e3b5ed9327a0
 DIST mediainfo_20.03.tar.xz 1983420 BLAKE2B d0f7557c231bc1cca261e8f002d060b0df4c2063cc32185c315ccc08a94e00fe9f5c0116f8ea65ce1a9df9f159d119264046a9bb607bd25a3b6231092c541799 SHA512 608b86f50139b0cbb21331922447b85dc2012b133915696ca9fceb7f524895f779c8cbfaccfa351c5b79c330587bc48d0f419f4908977fdc3eb4cd0490580399
-EBUILD mediainfo-19.09.ebuild 1600 BLAKE2B 73ddba373cd77ac61a13705931958022ea238e16482a6d8d859b43b26e70ccd9c587b7b08c9db574e013b6e577524d76220c1301983458d65e9ef8a2712a647e SHA512 3ccaf944aadde48141b9971e8e6ee547ba1fe5d32f8303a672178a86edb2b5dc8a360c457cc10ff178d0d92a67e9c15dbc4162973bcb21ff68aa39b3760a0e22
-EBUILD mediainfo-20.03.ebuild 1583 BLAKE2B baac9d8a581b1d936650d122a72fcc309004744accf1f2d4b3a7080bfd3b462a0dabb6c67d7110fa65ddaafe12935f88e64edbe78a539a321165752cc2b4d91e SHA512 88714894cbffe34641c90b55b172a7c8d5710219e997df5595e3437ef5e836590f10e140376b0d51ae0481ce97092f7b3e6298f715acb96bd827018c00e67170
+EBUILD mediainfo-20.03.ebuild 1581 BLAKE2B 627f4f7c702c4c64c66004fc47b010ea331029ac28183d389b81d8d6682f4dd6b915f135f3d0f9cfaa3eff3066013e83cef477103ba5a784867e63fdcd98368b SHA512 1bad9e19544f7bf7a290f9927c83d4fe56189e8265afbfea1644eb39634b03c97488283d1250bdbcaee4c3696aeb62e59529cf02276b85b76170263f71e5a289
 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3
diff --git a/media-video/mediainfo/mediainfo-19.09.ebuild b/media-video/mediainfo/mediainfo-19.09.ebuild
deleted file mode 100644
index 37cd73d53baf..000000000000
--- a/media-video/mediainfo/mediainfo-19.09.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit gnome2-utils xdg-utils autotools wxwidgets
-
-DESCRIPTION="MediaInfo supplies technical and tag information about media files"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl mms wxwidgets"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/libzen-0.4.37
-	~media-libs/lib${P}[curl=,mms=]
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/MediaInfo
-
-pkg_setup() {
-	TARGETS="CLI"
-	if use wxwidgets; then
-		TARGETS+=" GUI"
-		setup-wxwidgets
-	fi
-}
-
-src_prepare() {
-	default
-
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		sed -i -e "s:-O2::" configure.ac || die
-		eautoreconf
-	done
-}
-
-src_configure() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		local args=""
-		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
-		econf ${args}
-	done
-}
-
-src_compile() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-	done
-}
-src_install() {
-	local target
-	for target in ${TARGETS}; do
-		cd "${S}"/Project/GNU/${target} || die
-		default
-		dodoc "${S}"/History_${target}.txt
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/mediainfo/mediainfo-20.03.ebuild b/media-video/mediainfo/mediainfo-20.03.ebuild
index dec60a2ece9e..a79f1f182702 100644
--- a/media-video/mediainfo/mediainfo-20.03.ebuild
+++ b/media-video/mediainfo/mediainfo-20.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl mms wxwidgets"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest
index 08f03847dedf..83d248f54a29 100644
--- a/media-video/mjpg-streamer/Manifest
+++ b/media-video/mjpg-streamer/Manifest
@@ -4,4 +4,4 @@ AUX mjpg-streamer.initd 1268 BLAKE2B cf516a21368667b3f88db2d5541f61dc30b0d524dd6
 AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8
 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332
 EBUILD mjpg-streamer-0_pre20120621-r2.ebuild 1895 BLAKE2B f78c80d7b4b94b4d91082f7a332d11dde3f6b994f30d0c1f1d704a80d725f3231a4fe492f5e69a40baa71ee1b1de638d65d4fb73dd9d77b2ccfcd98db5d220ea SHA512 6ada19dc511b45b5a565cdbcc9651269e559b70007663062531e6892e8b3b08bd306b13e4b3b72506a609a985dfe10814d01f52a887feae833ebd996e55033cf
-MISC metadata.xml 1824 BLAKE2B 7a6dca05ede2ae433285cc089eb5cdca27b60e160749186efc687499ba1a7f1c32b27e93667e2f13534aa0c860b3dbec782955676e90a11565faa2a6647f3201 SHA512 8921e69edf4bc474d345f0b0d5ca5d0ff7eecd9f690cffd6f29d5d172829c01785660f6f8221bd4d24c094a2c189b3b151200cda5094d584c7f3187fadb308bc
+MISC metadata.xml 1709 BLAKE2B e68108cfd6fba5555d3834c00c6a43493fb278b499102da1432c78af65baea7c81084258d0ad7b562b563edc9018c862fd099c397ee7d97377eccb4e14f0b293 SHA512 df182d8bf1ea185956bd63b6e0bca6edddd279d515beb9745013c4f9be4130a49feeae3ff5f5a0fbfa5ef834f1d0869ddeb852efb22487c68167d720f662e0d5
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index 27a772223ceb..65cd83e8d96f 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -5,10 +5,6 @@
 		<email>andrzej.pauli@gmail.com</email>
 		<name>Andrzej Pauli</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>aidecoe@gentoo.org</email>
-		<name>Amadeusz Żołnowski</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index f3e65258a4b4..6a9b53dcfc70 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -4,5 +4,5 @@ AUX motion.confd-r1 272 BLAKE2B bb395beafecf0498158ff0358b489ab251d79e005148715e
 AUX motion.initd-r3 1163 BLAKE2B 1926b3468c1b49651377c2704fe8f5cb65c9eed5a4bd11efe365aa01b9acd5300d7dae2f22c93748c2e1c1c49be9d707ad7d1c14d49dc092f18e6ddfe0e06ac5 SHA512 7c7201768fd868f851bb35b8df5e22d43688f1729178fd94d10f21436db6d5c178811bcef8b51c5b79b426bb92d542892edd65ee0414acaa799639a3a226934e
 AUX motion.service 356 BLAKE2B 089fa555b8de569824ff7c063961d13db811cb44cdf7dacee9638a72b95c5db047f93f1387b0067ee7e61816e9af29aec8215bc76e6838a2e12b404299817175 SHA512 03f875b1e0c7051496eaa28a0af50164b20c6f7646d40ec09e1a360e81747135299fe092c91e57a28464bac826a0ace54267ceecd9abf41e63fe505d58ecf7ed
 DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc95c6a8bd85d4bd333f66638b2e815b3c59b2e42dd93811601b2ee7870100a0a21eaa789633056f74a5cc9f39f4f92229f SHA512 3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143
-EBUILD motion-4.1.1-r1.ebuild 2201 BLAKE2B 4d13ce93172ccd468b3ecefcfb29b05c2bb269eae814f5f3b8fac49375c0b62b5ad17ae86f444e361f1325bdbf584427e3e4a398ee938f388c21ab477ee04915 SHA512 2cb06799e59e465feebb41ce49065521f6f02d0b4ac337ff58f55b965f3369095bd38ae105b6ec6b8c8fce831e62400a0570e1c09414903ea7f462b24a7a437d
+EBUILD motion-4.1.1-r1.ebuild 2147 BLAKE2B e777945ae02d5ce78163e263a57285b285a0f6f0b16ead212b35282ff9f363f44ca8ed97dcdbcfac39eb83d4ce29cae69b8dd7ac452afdb391f03583343e2367 SHA512 c2a33ccbc3c7e234084a6c1485357bd389e44f0312fbfaad91dee899248da85328a7df513bfc53aa3d6ccbfa3ba635731452984d718dfe665998416b7c9f3238
 MISC metadata.xml 450 BLAKE2B 39d7909c8d8dc5c691540bdbc0e1971e9e04131208ec74a9750dcf09e607a160d6b7beceaab9325c58ecf4c6e92da3ab3dc0ffb059d9b917bb4ccc87582a3ff7 SHA512 75ad87d6a0a305f87ac034413698fc33c3d564e580a76626d9a9867a5bc691180838e96d7198c330b75b209a014be8f836170a7cce668ab590b8ee3ceaff44e8
diff --git a/media-video/motion/motion-4.1.1-r1.ebuild b/media-video/motion/motion-4.1.1-r1.ebuild
index 05a3311cb026..e751c82097a2 100644
--- a/media-video/motion/motion-4.1.1-r1.ebuild
+++ b/media-video/motion/motion-4.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,11 @@ SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz ->
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="ffmpeg libav mmal mysql postgres sqlite v4l webp"
+IUSE="ffmpeg mmal mysql postgres sqlite v4l webp"
 
 RDEPEND="
 	virtual/jpeg:=
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	mmal? ( media-libs/raspberrypi-userland )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 20974b3f32da..db2e68048f81 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -9,6 +9,6 @@ DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a3
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r6.ebuild 17151 BLAKE2B 8d379415123b6c31c15629ff4ae55749689619b9b3ceeae6a91869885af8d18186265d23fa8774fb644e531dcb972172ccddddb05d52ceb451bc8ce88780a63e SHA512 0e0e0bbd991e0d9de5c8ad4f4b51e5dca13a4dc1163556d1412c9a5835b5a4bf5ad0ec3f1b8316d8c1f4a538b0c86be3d4b7369b795b5969def2632abdf9c39e
-EBUILD mplayer-9999.ebuild 16771 BLAKE2B 0b48d039c29389831d49f39deb12324a3216aa15cb14bca797745f219837c40f0ee5d9b956a25fd26f4c1b3e78918bec940b9ed3a5987e342d30749314ac58ac SHA512 2b67974377401ffed7cd58f6019b03ecb281f4a3292a911f3655f754a3c293ef70da6b79bc85a748b73462d225cc8ee22604d00b51ec627bc10cff3e4f3e51c2
+EBUILD mplayer-1.3.0-r6.ebuild 16909 BLAKE2B 4400fc9fbf0481a93f8296a910539edb60027024cc44e78ce524de4565200836fe90af1a75c033c5e11188ac9bd0b444f0b947908ea533df5a497e5283265ea5 SHA512 849b52555eebe6248f0dcb230201f184bcd51100b3545881cb675f7353187e997288284e8f198bb96e9a64833dc43c0c95faa912b4fa16b0d955e2b4bf8da69c
+EBUILD mplayer-9999.ebuild 16529 BLAKE2B d00c2c38ed4826e30e605b8ced6235d001a53432f6d7e6eb268d086535136bc571a0c08f3e6fe3d88ecc24b5c964764a639cb5d6799245f39807830373122a31 SHA512 b632219712d1db3f939591b97573648ae7a9d80fc8968d7e98531073a5f0e061b5d9972320aab88c309aff7da5bf4f5b80a2e3c6b37b8d331b82f31933c511a4
 MISC metadata.xml 2536 BLAKE2B 1a8ff751e68c46c921cd09a9364e8046372cf0a77aaf062c26ed1356eebfaa8b90eb36cac6e101fe22f9f7ddcec611806271683e76d53c642dfc1fc87ba0baa5 SHA512 01fadd14038f9bda1fb3b521f65ab92e2cfed58628352b02f26dfef710d4d5a6fd964ef00e3a123a76046557b15ae29bc7c221c5a8a692cb06763e478b3b58c7
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 5b834d90e39b..f03b8e204b76 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -198,12 +198,6 @@ pkg_setup() {
 		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
 }
 
 src_unpack() {
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index ab5fe353ff59..c43a664ee9e9 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -196,12 +196,6 @@ pkg_setup() {
 		ewarn "mplayer for this system. Also, if your compile fails, try"
 		ewarn "disabling this use flag."
 	fi
-
-	if has_version 'media-video/libav' ; then
-		ewarn "Please note that upstream uses media-video/ffmpeg."
-		ewarn "media-video/libav should be fine in theory but if you"
-		ewarn "experience any problem, try to move to media-video/ffmpeg."
-	fi
 }
 
 src_unpack() {
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 089f29363d3d..8c2d09cff1be 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
 DIST mpv-0.32.0.tar.gz 3148730 BLAKE2B 085c38f0074dd005462aef52ef01ad7cfd70ebf9286a1f6544635e49c8c99bf4fcc5559eeb6e07ef8471388eb77794019fb50c44ea5fcc16842b63ee382e9e7c SHA512 f6426c0254ec0bf2f120e2196904f1e15fe17032b06764abca1d5e074f0cabb452eaf1cd09f8fd9b25b591accee7b881bfc3b06c19d5c98980305c4712486bd6
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.32.0-r1.ebuild 9752 BLAKE2B 926e586faf79a753df308cb0e5adcea61116be17d29d1110485e967975c78dd9daa9b9bdbb9e08750936a1c40e2680cb84127f2e260a1b9a723c495e4e75b147 SHA512 286efaa7ae6c68545bfbf7667e122dc5785e2e37b7e6cb00a4bf828b10fcf337874c43203f9e425b2682a35cd3929e77307056fdc7ae3fc54863146223727bd1
-EBUILD mpv-9999.ebuild 9460 BLAKE2B 5d8e87020765c886bbc7fd5ca218a99c600429e33f4ee82b5f9977519eb3908630b9cb8082cee130631d3ea7cb33d67058e0551941af3a3cea3748615c3bf1f6 SHA512 0817f3ae8f0b6e7765a8f4f23eb67af329a41fb6a48d4389a05cea64a953ee42735a7e9476780fe89bfc1faecaf7d277824f12c2d05f22e8586d9740c6fe558c
+EBUILD mpv-0.32.0-r1.ebuild 9761 BLAKE2B 116c16d24362d2479b55f13c95628d045128aa1831d8bec3eefc4225987874898a0aed34a0149b0a395e439055de139cb8a33afcfe1e4a37b0e3e21e443b3fa7 SHA512 8ad6801252fcf40876dc38cfa59c582a142d10c00670094bc3089b042853a5b517ba15bea0423c979091cde140f554d54b946e5abf51a8c2d5d215211204bec7
+EBUILD mpv-9999.ebuild 9469 BLAKE2B d3e40acfeab951b51f6d8f344db274d025ed0dddaabcfb425c0db5a91e4e86f9481838e28fb3aed2037420ddac434f4e0610e592a9893b021c2eb4e6935832c1 SHA512 77c9c680a04d2ec7da2579002cf1e6b506aa81ec4b1d279a9ae9d5dad66df517db9694b4ea2448319468d982bdb7b8aa8b077ee353c76c384f0915625f52ba45
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/mpv-0.32.0-r1.ebuild b/media-video/mpv/mpv-0.32.0-r1.ebuild
index df53a7db5b15..eb6ccc9c6530 100644
--- a/media-video/mpv/mpv-0.32.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.32.0-r1.ebuild
@@ -162,7 +162,7 @@ src_configure() {
 		--disable-static-build
 		# See deep down below for build-date.
 		--disable-optimize # Don't add '-O2' to CFLAGS.
-		$(use_enable debug debug-build)
+		$(usex debug '' '--disable-debug-build')
 
 		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index d6d2829b4b15..c714f2d8b0c2 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -159,7 +159,7 @@ src_configure() {
 		--disable-static-build
 		# See deep down below for build-date.
 		--disable-optimize # Don't add '-O2' to CFLAGS.
-		$(use_enable debug debug-build)
+		$(usex debug '' '--disable-debug-build')
 
 		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 8bf9af487b4b..70cb39d79717 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -6,6 +6,6 @@ AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9
 DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02
 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9
 DIST noad-0.8.6.tar.gz 226169 BLAKE2B c8aa44a868a7592b66a94a58065df5b3dc19562bf6bfb946fe60acebd2ea9f9090750836368bc6aeecf2fbd9938b0ec3f653d7908d3b34f27c3362fcea48e445 SHA512 abec49ea7d4dc4233d42bd42ba267bc7b235aace1597c5cd3dcbb7b4ede00c3778eaa2a0d8697fca4caf2b0ca94b540b87a862523a3028eb5cfe84db3c460ede
-EBUILD noad-0.8.6-r3.ebuild 1857 BLAKE2B 8d9c8d53830b308bad041d8d4e8da7c60b2b53a774370381728b1750dcd0023a6ee0f63603206a6c104d502a3a25a8631703597fc1fbcf7a1e3014bb66a6abbc SHA512 319c2d1e328ebf769ed9d7f44d7f07d8223c1412b95c7d1bc49883f2f28dcc479832e14b8a46e6003e3a7fb85522880fe3ab670fe307fa936fbf562a7a58c9af
-EBUILD noad-0.8.6-r4.ebuild 1873 BLAKE2B ea6c5a407a88532145e2c6e64cd08f1be3a15ddf50ffa283c64b0fb1cb0ad85393f37b0f229ed54ce56b568eb2700217db437aebbae9e00871a16c70fd0f8a19 SHA512 f8e78c678a7ee69236ac41c3a3756c959f18dd0778233ebe6f2d181ef4b518ab6cb52cd6bd935d616043a52e7a7c8ae4a650a39f3658f2cdd5fcbfb8497e6485
+EBUILD noad-0.8.6-r5.ebuild 1861 BLAKE2B 17ef4655086dc08d5f9d1b16a09f9915432af3249ada1615ce115b77645e902aec5941d340ca51615d4c8914e0e04c8ae7d2a5e43258b472e6feaec3a4977f3f SHA512 fb000cb51506bf86cdf5bd4f86d81e04038dba65b7b1c7d222bf91ee2378b4e9bc2852ac8e6e77c7ac51aba5aa92321e2028b9f0d7f3ea52a4275b305a34440d
+EBUILD noad-0.8.6-r6.ebuild 1877 BLAKE2B 883f67181c265f0f2a0427150d5dbe864fac7abf5f33c2ad4f4608ad0b29a38c5bf1f5447076874cbbc876a37833dcf28b18d5a46a99db8d8818931f032fc8c3 SHA512 5ba550ee36d2c6c84737a5cc32eb59e8f839cc71f12b947a3f1fa272b01f8c8eda02867c05c0ebf6d34bb56ec50e0486c91d5c6263c23662773ae85565b763c9
 MISC metadata.xml 489 BLAKE2B 21d3e8e42096fed4a5b7b9d138f8e0e627a3a7dc23fe93e1ed84d50b03c20629db9aea90c0284d9016a9b4aa13c8ed6052551f418e246cb4c32fe91ad02902e9 SHA512 1430cd34fce2dc1640655aeadf95f88a1d0cfd90f958f2907c8f281cc3d2bb08a4496e4cbea62cebef960d43e97104f952e653c79f690a948948cf53713c19a0
diff --git a/media-video/noad/noad-0.8.6-r3.ebuild b/media-video/noad/noad-0.8.6-r5.ebuild
index d4506cccd055..d899fd371e72 100644
--- a/media-video/noad/noad-0.8.6-r3.ebuild
+++ b/media-video/noad/noad-0.8.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE="+ffmpeg imagemagick libmpeg2"
 
 RDEPEND="
 	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	imagemagick? ( media-gfx/imagemagick )
 	!media-plugins/vdr-markad"
 DEPEND="${RDEPEND}
diff --git a/media-video/noad/noad-0.8.6-r4.ebuild b/media-video/noad/noad-0.8.6-r6.ebuild
index 170684dc966e..3235fcc88d74 100644
--- a/media-video/noad/noad-0.8.6-r4.ebuild
+++ b/media-video/noad/noad-0.8.6-r6.ebuild
@@ -17,7 +17,7 @@ IUSE="+ffmpeg imagemagick libmpeg2"
 
 RDEPEND="
 	libmpeg2? ( media-libs/libmpeg2:= )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	imagemagick? ( media-gfx/imagemagick )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index bb7c66c13c3d..4d35df2a35a7 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,6 +1,5 @@
-DIST obs-studio-24.0.5.tar.gz 7901198 BLAKE2B 79c9712f3523114a70e0df3e0631c19067fd7ead5fd9031123dd4c82d9b92dee69473fb51a495f938430540505a5cf45258eeee01d61a7aaa6654255fee14aca SHA512 99be46046b70597474f25a85036ebe5a2f704eef47c77bc27e2ba8890b877da346ff6008c5922d7a83a4cead9df7214c6a3be885430693e609a42d9d06fedfaf
-DIST obs-studio-25.0.3.tar.gz 8367286 BLAKE2B c87025f57fd2907f01c9b53464ba7174db2e19295bfd030aa8ad21356ef76d934bf9929c92c024f9ed9b96aa29a2e89dd08670baed94d2f4808f23533eec09c7 SHA512 16974bb1fbc54f3239dd92491186e608c14e209a77c485993db5815b50f2d7fd2462168377d7c254ad01c02a7daf30131efd9d2a8fe801628a0856f16e76cee0
-EBUILD obs-studio-24.0.5.ebuild 3113 BLAKE2B b90cb4c686df16687e4a8fb3dc2f6b15a3d2f022fbd8d951c147e01086d9be521eb84cef9198ce58d7a90b966036dd9a7ab59823cd28c136a97e6d2d28c9d3e7 SHA512 516cce429f9139d9f9607fce8afa1eefe079751fa2de8b15af22d9bcca341ed277fb877aa388bef47af9cf1f2371a2922386ad3edc9e35072bcca39777d3f8dc
-EBUILD obs-studio-25.0.3.ebuild 3303 BLAKE2B e8a91627cd8eb223ecd5dbb3e1942c469869077dad2e9f5002480e469cb32ef90291e343b5ddb76ae7217a5b800d9b0c8bbd530a86a9e56ee70c7e8626606675 SHA512 8a1ac4260ee446de6dc01f7fd4edb1bb125bd8c3ac2689bd0294dad5c59f57870b086a96a2b5ba03891ba365283cf8d32b4622b7f27f56bd5d0589a4ceea3818
+AUX obs-studio-25.0.8-gcc-10-build.patch 1050 BLAKE2B ccf18ba3f51de72f967fbab5b1526d1fc9a9bb628a25d1caed44ca308f4a988a15fe0ab235b218b2edc4e4eef40c86545cda989f0d748af942352ad8eb091f51 SHA512 1ff0e088eed61554268009f3d8c5a23c0888bfbe860d6cb288ddf348108446c152fd87e2cb8f54613a88378d8474550632c90f924005d5e0343bf1a801339ccc
+DIST obs-studio-25.0.8.tar.gz 9531713 BLAKE2B 4775ca8305e1beee4d926eff728351b699ca4d52f66e53409dbcfe1f73699df0286fadc0c138cb76b8eb73e70a143719e46f030b6d15d43629bdcbf23bdb88af SHA512 a97c03dc218a4e03e48f6a7dc82b4a59ebeee2039f17be66bb847681ce9ff3d25e6e015be4af78fe44739f6fad5089b6e683d7657c2e4fde8e547df9a2594a08
+EBUILD obs-studio-25.0.8.ebuild 3362 BLAKE2B 04879c362d42af156306d92cb6cbab49200c310c5840113731f378085bb896255f32be6f0ed8a645751ffcb67bdca172f75baa73be46761de759bc8c55009583 SHA512 576a73250a45d5e475e10c310f2b34ebc4284f36b4a2fc677cd93cddf6b5ec99c42f88ce8d4f743347d5bb0cb79158765e2ea6135ed6bf1c7d9486bab39ab4f7
 EBUILD obs-studio-9999.ebuild 3303 BLAKE2B e8a91627cd8eb223ecd5dbb3e1942c469869077dad2e9f5002480e469cb32ef90291e343b5ddb76ae7217a5b800d9b0c8bbd530a86a9e56ee70c7e8626606675 SHA512 8a1ac4260ee446de6dc01f7fd4edb1bb125bd8c3ac2689bd0294dad5c59f57870b086a96a2b5ba03891ba365283cf8d32b4622b7f27f56bd5d0589a4ceea3818
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch
new file mode 100644
index 000000000000..352ea2c937c7
--- /dev/null
+++ b/media-video/obs-studio/files/obs-studio-25.0.8-gcc-10-build.patch
@@ -0,0 +1,30 @@
+From c7f84f8fc4e90ef779a204ac268f5ee1a962e324 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Sun, 9 Feb 2020 05:23:55 +0200
+Subject: [PATCH] deps/glad: Fix build with GCC-10
+
+GCC-10 defaults to '-fno-common' [1], which triggers issues with
+defining global variables multiple times.  To fix the build, use
+'extern' to turn the first definition of 'gladGetProcAddressPtr'
+into a declaration.
+
+1. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85678
+
+Closes https://github.com/obsproject/obs-studio/issues/2828
+---
+ deps/glad/src/glad_glx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/glad/src/glad_glx.c b/deps/glad/src/glad_glx.c
+index 7c55b9fc01..58086f1039 100644
+--- a/deps/glad/src/glad_glx.c
++++ b/deps/glad/src/glad_glx.c
+@@ -35,7 +35,7 @@ static void* libGL;
+ 
+ #ifndef __APPLE__
+ typedef void* (APIENTRYP PFNGLXGETPROCADDRESSPROC_PRIVATE)(const char*);
+-PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
++extern PFNGLXGETPROCADDRESSPROC_PRIVATE gladGetProcAddressPtr;
+ #endif
+ 
+ static
diff --git a/media-video/obs-studio/obs-studio-24.0.5.ebuild b/media-video/obs-studio/obs-studio-24.0.5.ebuild
deleted file mode 100644
index 80a9b245d34a..000000000000
--- a/media-video/obs-studio/obs-studio-24.0.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-single-r1 xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git"
-	EGIT_SUBMODULES=()
-else
-	SRC_URI="https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Software for Recording and Streaming Live Video Content"
-HOMEPAGE="https://obsproject.com"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	luajit? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-DEPEND="
-	>=dev-libs/jansson-2.5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg:=[x264]
-	net-misc/curl
-	x11-libs/libXcomposite
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	alsa? ( media-libs/alsa-lib )
-	fdk? ( media-libs/fdk-aac:= )
-	imagemagick? ( media-gfx/imagemagick:= )
-	jack? ( virtual/jack )
-	luajit? ( dev-lang/luajit:2 )
-	nvenc? (
-		|| (
-			<media-video/ffmpeg-4[nvenc]
-			>=media-video/ffmpeg-4[video_cards_nvidia]
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	speex? ( media-libs/speexdsp )
-	ssl? ( net-libs/mbedtls:= )
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DDISABLE_ALSA=$(usex !alsa)
-		-DDISABLE_FREETYPE=$(usex !truetype)
-		-DDISABLE_JACK=$(usex !jack)
-		-DDISABLE_LIBFDK=$(usex !fdk)
-		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
-		-DDISABLE_SPEEXDSP=$(usex !speex)
-		-DDISABLE_V4L2=$(usex !v4l)
-		-DDISABLE_VLC=$(usex !vlc)
-		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
-		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
-		-DOBS_VERSION_OVERRIDE=${PV}
-		-DUNIX_STRUCTURE=1
-		-DWITH_RTMPS=$(usex ssl)
-	)
-
-	if use luajit || use python; then
-		mycmakeargs+=(
-			-DDISABLE_LUA=$(usex !luajit)
-			-DDISABLE_PYTHON=$(usex !python)
-			-DENABLE_SCRIPTING=yes
-		)
-	else
-		mycmakeargs+=( -DENABLE_SCRIPTING=no )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! use alsa && ! use pulseaudio; then
-		elog
-		elog "For the audio capture features to be available,"
-		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
-		elog "be enabled."
-		elog
-	fi
-
-	if ! has_version "sys-apps/dbus"; then
-		elog
-		elog "The 'sys-apps/dbus' package is not installed, but"
-		elog "could be used for disabling hibernating, screensaving,"
-		elog "and sleeping.  Where it is not installed,"
-		elog "'xdg-screensaver reset' is used instead"
-		elog "(if 'x11-misc/xdg-utils' is installed)."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/obs-studio/obs-studio-25.0.3.ebuild b/media-video/obs-studio/obs-studio-25.0.8.ebuild
index 33ca63777c33..a97ec6617d42 100644
--- a/media-video/obs-studio/obs-studio-25.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-25.0.8.ebuild
@@ -78,6 +78,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-25.0.8-gcc-10-build.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 0fc7ff6f12a5..26452201675f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,3 +1,3 @@
 DIST pipewire-0.2.7.tar.gz 421644 BLAKE2B d2ccb56a9ea5ea7782678deb6eae0b0a70da1fa69e807398062d388733901839f15a2f0f7db982fbebd2b2759f443709e6c1950b6367f3ed4801d6c2d6109e73 SHA512 10d3e20cc3d233fbcd1fc39702ae3043a656ebcd9cd3c39c77f0cc2bf42ff4956fc03e7933c7b397bca446c63f45ddacea948d5ec7e4a3300499fa2794f14334
-EBUILD pipewire-0.2.7.ebuild 1655 BLAKE2B cfc3943f488b9b85d042cae663bc9edc9bb486bfcd9da5ae487889aef6229ee3cfa0b01f01c20ef991674b6bc1584426b376b0c7f3425ea7ef3dfe1e6d45e34f SHA512 a4e513569e19701349638055aff383344d4730adfd1c4668ab249864ed7c1c7b0ff93d908fb7e7ada313cac07ba3bf1ac715ae2f67133cece8c165af3f643fa9
+EBUILD pipewire-0.2.7.ebuild 1601 BLAKE2B 0da14c2d7297aed2394df2a5d01385954f4e211766bee36718e564f55c1833cb6db5f04defaf8250bf699e2c56ab37a9b3c9df43abb1898877ec298799288da8 SHA512 c970d4d4d9501878b8e66c6998ee2681d418ea3fc9a645c9a8b6b3ba9486fa01e7d3fdc3ae36d42f79cf67ec243f592e69a9249baa281a0543ca32451180125a
 MISC metadata.xml 449 BLAKE2B c580fa69fbecd1046123d51f0a556bf54e7dd76a7ced768ae31289969a3fcb0c03f301a214da222201bad2cd0bcf68674807e28efcdee27edd9fa6d913cdc146 SHA512 73c4b73b417e92d1bdf802ce38939afdff2ba42bc638e0c6ba42593894755ce6f197678e8676f763bd66bb0b2bb9175c1369c173be3ab64e7323795d3b00bf0c
diff --git a/media-video/pipewire/pipewire-0.2.7.ebuild b/media-video/pipewire/pipewire-0.2.7.ebuild
index 7d2c690e1a0d..f8111e7a7281 100644
--- a/media-video/pipewire/pipewire-0.2.7.ebuild
+++ b/media-video/pipewire/pipewire-0.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://pipewire.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0.2"
-IUSE="bluetooth doc ffmpeg libav gstreamer sdl systemd vaapi X"
+IUSE="bluetooth doc ffmpeg gstreamer sdl systemd vaapi X"
 
 BDEPEND="
 	app-doc/xmltoman
@@ -32,10 +32,7 @@ DEPEND="
 	sys-apps/dbus
 	virtual/libudev
 	bluetooth? ( media-libs/sbc )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 282c92e35e5c..bf306bfa2d6b 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,5 @@
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.999-r1.ebuild 2500 BLAKE2B a588b27acf90e8adc38585e091e5c20f8e975b87a3ecc84b994c6f50549c4a80b19fd5e7e97bb8027c70a4c5d934a23bfe72930bfdf2b00bfb63fd2f6a4355ab SHA512 26119b42f0a1a7ab0099e092e6de114afa88fd508ede595f0061d63035ba56f326062ce60c89184427d146f11f7077d6833bd6a9177d1c318936972addddee5f
+EBUILD pitivi-0.999-r2.ebuild 2543 BLAKE2B 48e09e49d2667caefb7e47d1987950cc2a1463ac7f7d88e50c86820b39b553e8d731122980aecaf4a3b88e7afc61e6e4ba341c768ba15e0d67edd7f85bb1cfc6 SHA512 e644113a4e148bc5e31f0e1612a0e0402491fc59fc426af6c86547ba77bf04727607edb475f491b174869082dc94e888e37b3aeba3d4ff40d1d26a85324a31e4
+EBUILD pitivi-0.999-r3.ebuild 2545 BLAKE2B e9e20d05b39983be8c9d835adc8c07b2c9c3e7b7a569c05534b58fa2aef4e3e3800088b79f282b9b0a53190719e222bacb5473d7c40e7016899db980376ef954 SHA512 f229af53f7b9a9ea38f86b445555463ce8a59b6968ebdd0fea0f657fbea1956d6e5aeb97c14778cbba0c9e8a615688043beb7e5ea36d9fb4eaed95fa1b20d8ce
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999-r1.ebuild b/media-video/pitivi/pitivi-0.999-r2.ebuild
index aa8949946c6b..86247a23bced 100644
--- a/media-video/pitivi/pitivi-0.999-r1.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r2.ebuild
@@ -51,7 +51,8 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
 	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
 	>=media-libs/gst-plugins-good-${GST_VER}:1.0
 	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
 	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
diff --git a/media-video/pitivi/pitivi-0.999-r3.ebuild b/media-video/pitivi/pitivi-0.999-r3.ebuild
new file mode 100644
index 000000000000..563d758487ba
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 virtualx xdg
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="v4l test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, libav, libnotify and liwnck are optional
+GST_VER="1.14.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.14.1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+	')
+
+	gnome-base/librsvg:=
+	>=media-libs/gsound-1.0
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	>=x11-libs/libnotify-0.7[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# Make tests optional, bug #594096
+	# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 58b4c5c12a8d..2519740557f1 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,4 +1,6 @@
+DIST QMPlay2-src-20.05.02.tar.xz 1553364 BLAKE2B f436a8e970278d47ef1ade86d07fd3460c2628d7f93c238093425779f896c44b3e0c7b4c6a40ffc8b79f1749563016cb62ac853c94b236859287066bfbdbe59f SHA512 b587d80128c334450552b2a6f0fa4c7426409b4d7a7bcca2065f83eab3e2f8b7ecc0df92f50fa276f42c84a201222cae2dd7f5c3f4bbdabf321895212db936b6
 DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
 EBUILD qmplay2-19.12.19-r2.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-EBUILD qmplay2-9999.ebuild 3482 BLAKE2B 79cd37a3a6cf4298dccfe958f7a5d2dd39d28dbf07cf60dacaf90a3a750ca5d41261086ce28c5b3ca28acf733eee2bab18c22465c486b614c0791eefe4a5bd51 SHA512 5298d2fb7995031bb24657254dfc89fb3852e02458c9fee7fae621ee4d9852e5920bb4db5ef67d0a476b66f827ec51644c6c7bb23f84a380754b0d4597a63b71
-MISC metadata.xml 1577 BLAKE2B ebb3b018d3a1ed0c8591e6379448a327c1a09ccf2582660536074fae02c16df7cebbef551edc58c54a288d6c57853302acc5ef15f632d7633e5c4323ab6e7956 SHA512 af7dac9bfc6f0f26c00ca1b6ab40bcfece84b4028924f6881469ef1a1f96bd23bdd2e23d66d6785df5b7bf0a01a6cbd5ba06b7fb35fe5cd95774523aeb95af6d
+EBUILD qmplay2-20.05.02.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
+EBUILD qmplay2-9999.ebuild 3568 BLAKE2B c0bc46703a4c2741f37a0e3bd876cc35e3b91b564ec444043685e38e9dbac280d507a0080558d9d8da7261ae06fef9cbb01363ce432d270d182824c23d977ce5 SHA512 8bf66ca740baa00bf00da12a089ce1b97f6dec21bc8978b47ae0727a9a65d1c6f157ddfd6a37db2932aa277d5287ae72ac2b0fc031ca952fe8230cd9f42309bc
+MISC metadata.xml 1822 BLAKE2B d6c18ae3653d2a809609ed350c20796a690ecb69e5f3b9b06d134524596379f8ebfb565b22c584a3fccff153b0771ede17d67c91d029f6e26668ba91e0ee5d79 SHA512 5ed1acf242b8e02dd3f31564000b13dc91c9c25f750ba6f93a296e5fa9c83b48a0a6c92f868a5b088187870af8b3c345ab0c79935e8afcea7f86125ceed80afc
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
index 9d4d0d19d765..0a9ff717a2af 100644
--- a/media-video/qmplay2/metadata.xml
+++ b/media-video/qmplay2/metadata.xml
@@ -22,16 +22,19 @@
 		<flag name="avresample">Use libavresample instead of libswresample</flag>
 		<flag name="cdio">Build with AudioCD module</flag>
 		<flag name="cuvid">Build with CUVID module</flag>
-		<flag name="extensions">Build with Extensions module</flag>
+		<flag name="extensions">Build with Extensions module and enable other plugins</flag>
 		<flag name="gme">Build Chiptune with GME support</flag>
 		<flag name="inputs">Build with Inputs module</flag>
 		<flag name="lastfm">Build with LastFM support</flag>
+		<flag name="libass">Build with SSA/ASS subtitles rendering support</flag>
 		<flag name="lyrics">Build with lyrics support</flag>
 		<flag name="mediabrowser">Build with MediaBrowser support</flag>
 		<flag name="mpris2">Build Extensions with MPRIS2 support</flag>
 		<flag name="notifications">Build additional notifications module</flag>
 		<flag name="sid">Build Chiptune with SIDPLAY support</flag>
+		<flag name="shaders">Compile Vulkan shaders using <pkg>media-libs/shaderc</pkg></flag>
 		<flag name="videofilters">Build with VideoFilters module</flag>
 		<flag name="visualizations">Build with Visualizations module</flag>
+		<flag name="vulkan">Build with Vulkan support</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/qmplay2/qmplay2-20.05.02.ebuild b/media-video/qmplay2/qmplay2-20.05.02.ebuild
new file mode 100644
index 000000000000..9556ffd4007a
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-20.05.02.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
+HOMEPAGE="https://github.com/zaps166/QMPlay2"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
+else
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
+fi
+
+LICENSE="LGPL-3"
+SLOT="0"
+
+IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
+	gme inputs libass modplug notifications opengl portaudio
+	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa portaudio pulseaudio ) )
+	extensions? ( dbus )
+	shaders? ( vulkan )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg
+	|| (
+		dev-qt/qtgui:5[X(-)]
+		dev-qt/qtgui:5[xcb(-)]
+	)
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	dbus? ( dev-qt/qtdbus:5 )
+	extensions? (
+		dev-qt/qtdeclarative:5
+		media-libs/taglib
+	)
+	gme? ( media-libs/game-music-emu )
+	libass? ( media-libs/libass )
+	opengl? ( virtual/opengl )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplayfp )
+	shaders? ( media-libs/shaderc )
+	vaapi? (
+		>=media-video/ffmpeg-4.1.3[vaapi]
+		x11-libs/libva[drm,opengl]
+	)
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	videofilters? ( dev-qt/qtconcurrent:5 )
+	vulkan? (
+		>=dev-qt/qtgui-5.14.1:5[vulkan]
+		>=media-libs/vulkan-loader-1.2.133
+	)
+	xv? ( x11-libs/libXv )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_prepare() {
+	# disable compress man pages
+	sed -r \
+		-e 's/if\(GZIP\)/if\(TRUE\)/' \
+		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
+		-i src/gui/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# core
+		-DUSE_LINK_TIME_OPTIMIZATION=false
+		-DUSE_ALSA=$(usex alsa)
+		-DUSE_AUDIOCD=$(usex cdio)
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+		-DUSE_LIBASS=$(usex libass)
+		-DUSE_NOTIFY=$(usex notifications)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
+		-DUSE_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
+		# modules
+		-DUSE_AUDIOFILTERS=$(usex audiofilters)
+		-DUSE_CUVID=$(usex cuvid)
+		-DUSE_INPUTS=$(usex inputs)
+		-DUSE_MODPLUG=$(usex modplug)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_VIDEOFILTERS=$(usex videofilters)
+		-DUSE_VISUALIZATIONS=$(usex visualizations)
+
+		# extensions
+		-DUSE_EXTENSIONS=$(usex extensions)
+		-DUSE_TAGLIB=$(usex extensions)
+		-DUSE_LASTFM=$(usex extensions)
+		-DUSE_LYRICS=$(usex extensions)
+		-DUSE_MEDIABROWSER=$(usex extensions)
+		-DUSE_MPRIS2=$(usex extensions)
+	)
+
+	# find and link vulkan libs permanently
+	if use vulkan; then
+		mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( USE_GIT_VERSION=true )
+	else
+		mycmakeargs+=( USE_GIT_VERSION=false )
+	fi
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 62cc3038bdd2..9556ffd4007a 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -12,55 +12,57 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
 else
-	SRC_URI="https://github.com/zaps166/QMPlay2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/QMPlay2-${PV}"
+	S="${WORKDIR}/QMPlay2-src-${PV}"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
 
-IUSE="avdevice +audiofilters avresample +alsa cdio cuvid dbus +extensions
-	+ffmpeg gme inputs +lastfm libass lyrics mediabrowser modplug mpris2
-	notifications opengl portaudio pulseaudio sid svg taglib vaapi vdpau
-	+videofilters visualizations xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
+	gme inputs libass modplug notifications opengl portaudio
+	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
 
 REQUIRED_USE="
 	audiofilters? ( || ( alsa portaudio pulseaudio ) )
-	avdevice? ( ffmpeg )
-	avresample? ( ffmpeg )
-	lastfm? ( extensions )
-	lyrics? ( extensions )
-	mediabrowser? ( extensions )
-	mpris2? ( extensions dbus )
-	vaapi? ( ffmpeg opengl )
-	vdpau? ( ffmpeg )"
+	extensions? ( dbus )
+	shaders? ( vulkan )"
 
 RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
 	dev-qt/qtcore:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg
 	|| (
 		dev-qt/qtgui:5[X(-)]
 		dev-qt/qtgui:5[xcb(-)]
 	)
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
 	dbus? ( dev-qt/qtdbus:5 )
-	ffmpeg? ( media-video/ffmpeg )
+	extensions? (
+		dev-qt/qtdeclarative:5
+		media-libs/taglib
+	)
 	gme? ( media-libs/game-music-emu )
 	libass? ( media-libs/libass )
-	mediabrowser? ( dev-qt/qtdeclarative:5 )
 	opengl? ( virtual/opengl )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
-	svg? ( dev-qt/qtsvg:5 )
-	taglib? ( media-libs/taglib )
+	shaders? ( media-libs/shaderc )
 	vaapi? (
-		>=media-video/ffmpeg-4.1.0[vaapi]
-		x11-libs/libva[drm,opengl] )
+		>=media-video/ffmpeg-4.1.3[vaapi]
+		x11-libs/libva[drm,opengl]
+	)
 	vdpau? ( media-video/ffmpeg[vdpau] )
+	videofilters? ( dev-qt/qtconcurrent:5 )
+	vulkan? (
+		>=dev-qt/qtgui-5.14.1:5[vulkan]
+		>=media-libs/vulkan-loader-1.2.133
+	)
 	xv? ( x11-libs/libXv )"
 
 DEPEND="${RDEPEND}"
@@ -81,25 +83,29 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		# core
+		-DUSE_LINK_TIME_OPTIMIZATION=false
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_AVRESAMPLE=$(usex avresample)
 		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
 		-DUSE_LIBASS=$(usex libass)
 		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL2=$(usex opengl)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_VULKAN=$(usex vulkan)
+		-DUSE_GLSLC=$(usex shaders)
 		-DUSE_XVIDEO=$(usex xv)
 
 		# ffmpeg
-		-DUSE_FFMPEG=$(usex ffmpeg)
 		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
 		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
 		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
 
+		# chiptune
+		-DUSE_CHIPTUNE_GME=$(usex gme)
+		-DUSE_CHIPTUNE_SID=$(usex sid)
+
 		# modules
 		-DUSE_AUDIOFILTERS=$(usex audiofilters)
 		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_EXTENSIONS=$(usex extensions)
 		-DUSE_INPUTS=$(usex inputs)
 		-DUSE_MODPLUG=$(usex modplug)
 		-DUSE_PORTAUDIO=$(usex portaudio)
@@ -107,24 +113,24 @@ src_configure() {
 		-DUSE_VIDEOFILTERS=$(usex videofilters)
 		-DUSE_VISUALIZATIONS=$(usex visualizations)
 
-		# gui
-		-DUSE_TAGLIB=$(usex taglib)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
 		# extensions
-		-DUSE_LASTFM=$(usex lastfm)
-		-DUSE_LYRICS=$(usex lyrics)
-		-DUSE_MEDIABROWSER=$(usex mediabrowser)
-		-DUSE_MPRIS2=$(usex mpris2)
+		-DUSE_EXTENSIONS=$(usex extensions)
+		-DUSE_TAGLIB=$(usex extensions)
+		-DUSE_LASTFM=$(usex extensions)
+		-DUSE_LYRICS=$(usex extensions)
+		-DUSE_MEDIABROWSER=$(usex extensions)
+		-DUSE_MPRIS2=$(usex extensions)
 	)
 
+	# find and link vulkan libs permanently
+	if use vulkan; then
+		mycmakeargs+=( -DQMVK_FIND_VULKAN=true )
+	fi
+
 	if [[ ${PV} == *9999 ]]; then
-		mycmakeargs+=( USE_GIT_VERSION=ON )
+		mycmakeargs+=( USE_GIT_VERSION=true )
 	else
-		mycmakeargs+=( USE_GIT_VERSION=OFF )
+		mycmakeargs+=( USE_GIT_VERSION=false )
 	fi
 
 	cmake_src_configure
diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
index ed9c7e520a0e..dcbaa5c808df 100644
--- a/media-video/raspberrypi-omxplayer/Manifest
+++ b/media-video/raspberrypi-omxplayer/Manifest
@@ -4,8 +4,8 @@ AUX cross-0_p20160528.patch 520 BLAKE2B d7c69d51a04cf7c458ed97e3911ea6732dd7e51c
 AUX fonts-path.patch 881 BLAKE2B 3d95639c3aa0bc2d724b44477edc3f9699d627822df12504cf0a3e7beed7fc80a1d1b8a30d2dc4012a2ba0c9869dea5f8801610685b472a4a50b9a0d91748440 SHA512 995e9b5850a240e07814697054178fc19e94483d51b11a3786b8eff6c609619be2d7caa97c63ebdc1d194acb1d24a85b8acd34bbb4d5c0c7cc92a14da7b368dd
 DIST raspberrypi-omxplayer-0_p20160217.tar.gz 1204486 BLAKE2B 4c6739f9cf3f8c401966581a84634aa2187d00110a2a7a5b9077cf1b9efafb1a21c03c4cfaaad4f225b7f2f2d1bb6c777d6d01c1268c14049a2eb03cabf60dbb SHA512 5137ba534ce3b0698c6ace8f570594c97ef978aaa97e6cc902f7895412c5d0282c7c4fa1f7b03f043d5281f0a282caf494602e45aae6a12d6d35bc26aaa4000f
 DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572
-EBUILD raspberrypi-omxplayer-0_p20160217.ebuild 1067 BLAKE2B 7bda91117e7a74a2dcaa8923aecc424f1b6faf5d9d4f03b71c7e1f4626d7b2d8409b3d879c935b0a8dbc06093b8133b42ad0aaaa0e33bd433ddb0c81eefaf259 SHA512 62213cc1fc99dcac836e2254314070752143037f739f995f9ba173a0bed016518b0b1b24837ec07b17decfdf8054f938019480ed8e2c7aa84cf092905eaf3bed
-EBUILD raspberrypi-omxplayer-0_p20160528-r1.ebuild 1200 BLAKE2B f4b9cc6ef83f89cb438f868b9112a38572a8922306f924b0305a829e4a04545a5ec448bbad8bd7b0d6994d1ba811434c04462cbc83f97f29a9888d55b2044eb0 SHA512 02752cc2c3b6b27b115355d1ee88a493cd5dd2323b70cc41817ca6da06cd8346521c3adaf1b93239b7a5c0fc82e8e84c2510542a5a3b654af6dbf687ebe37bc5
-EBUILD raspberrypi-omxplayer-0_p20160528.ebuild 1129 BLAKE2B 4abc3174fe99eff7eb99f0b8b15e91463bbc787cb002ff16f7297afa32af72c8b35f67a48539164d6eef6baab723d50be03542b1c32c3043b935b8af9082d033 SHA512 a96c8bf14e56605c9ce5a0d436e9ec36e981f4222a5377b0ea9d52f6e44b67fe1cc8580716551c3c34a7364e2595bf3a610227cb2bddf06f459bca5f951eebc4
-EBUILD raspberrypi-omxplayer-9999.ebuild 1022 BLAKE2B 593a9c6d2c60bec0e3f6c725b62f9d43c3172b0310998e894642c79be874e4e987a3c7d60185fc953fcd9cac9e29c23d4e9b64a65b98f78df336eefb28709783 SHA512 2c1441c7254ec193c8c7dbe2186af6aa24a7be6617fe3850606bd5643ea48cb9667c0cad1418fe3c53ff65d2aa08413979f58f1f190e53a1b831479ef1abb1ce
+EBUILD raspberrypi-omxplayer-0_p20160217-r1.ebuild 1068 BLAKE2B 1fb694b3a2487b33c751e72dfe6d33cbfbc54c64627a85b113a703bb50f5ccbcbb72ba7eb3ddd9d61c641b78327a963a84e6c8836d2045a5c66364e57314bbb9 SHA512 85f57873b23a94e04b238b65df974ef7dc1339761b1be19f9be376e2bc944cb683f063e88e36de49f2ffcf939d942fa0719d3f58903722637fbf4bf4669962af
+EBUILD raspberrypi-omxplayer-0_p20160528-r2.ebuild 1130 BLAKE2B f5bf083c0f2aa4591fb6453a6708979487dd99b2791e4d687e20bf97288a6d799e130e4dc923313b4c7790344ceb8fee908e6846c930cb26287d56ce7d7b6a50 SHA512 46e9e58f8fbc17adf465ca5cf18056f8f461ec849b91176f9ed96cf4c1a785ec2fcbfeb3d9961aa9cef96616fc03fb3c17c3e34403dabe8d7ca83aad084baed9
+EBUILD raspberrypi-omxplayer-0_p20160528-r3.ebuild 1201 BLAKE2B 82f21e01576c9ec997d464f1e29fc93dd46895e074896f84cf25b1c03cd8070036b1cd937ffdeb6cd5f4bfcbd65303dc1c4a0f6e3d085612115d5a2d9b494ea8 SHA512 289f39d62a0a3d4ac0534d2060c91284709f15ac05ce889e7edeca7bfa9d2de5618a8bd948443605fc531bbb1766876b708198bae913903528304f31bc93c336
+EBUILD raspberrypi-omxplayer-9999.ebuild 1023 BLAKE2B f5e6889287bf8f4c571ac856eb0dde6a34300b43507e66e79a6158e92b814ffd5f244bd11afe2436f9080e2e5438832c779fcb19871d0224a48cc594993fa78a SHA512 7e1a47f4931183b411b09b4db4d9e517c7b087545410673aef0851421a04e75cefb1d2f6f9ae7c062d6df4bd39d288ff1313d63b3f1dc449157881f54d56e191
 MISC metadata.xml 417 BLAKE2B 61c4b93783c4781a6cc65040e95930246eec81e9a7d2907acb2062d552bdec0913491d960a4cac60d9fe6dfb9bdf83729be1b1855bbd5f5850ba90bbdbdcf039 SHA512 9558aefbd95a7ffef7c3714d41582531eadee6b1d6579338f036f7964ffbec1d217460d3a5cfff674cd0f915ad5efec9c97670769fb5abf19c57e5ccaa88c9b5
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
index 4a1c214969f9..862d38275e34 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/libpcre
 	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
 	sys-apps/dbus
 	sys-apps/fbset
-	virtual/ffmpeg
+	media-video/ffmpeg
 	x11-apps/xrefresh
 	x11-apps/xset"
 DEPEND="${RDEPEND}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
index da741441c5d4..a5a79ed5c0b2 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/libpcre
 	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
 	sys-apps/dbus
 	sys-apps/fbset
-	virtual/ffmpeg
+	media-video/ffmpeg
 	dev-libs/boost
 	media-libs/freetype:2
 	X? (
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild
index 5592e2b50c30..41a9e22a347a 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r1.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ RDEPEND="dev-libs/libpcre
 	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
 	sys-apps/dbus
 	sys-apps/fbset
-	virtual/ffmpeg
+	media-video/ffmpeg
 	dev-libs/boost
 	media-libs/freetype:2
 	X? (
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
index 2cac67b90a01..3cefa5dab0e0 100644
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
+++ b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="dev-libs/libpcre
 	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
 	sys-apps/dbus
 	sys-apps/fbset
-	virtual/ffmpeg
+	media-video/ffmpeg
 	dev-libs/boost
 	media-libs/freetype:2
 	X? (
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 076a9a03994e..42d57d8fa952 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,7 +1,7 @@
 AUX simplescreenrecorder-0.4.0-metainfo.patch 1332 BLAKE2B 717e54de67f5fb8d535351adea928dce5c3645ed721bdb3b297d675d8d5628c4125f54ed8f25672fe18908c360efc938f04a4d16928d98a5397bbc353407dece SHA512 3746d9d693849927f9c79365d4014aa36145aaeced2dc6be7b47222b5651fc500ebf747ae64b79eaa125d60e536b7152ac43659524a9d058c8f4a5b6d8ea4e25
-DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
 DIST simplescreenrecorder-0.4.0.tar.gz 1867593 BLAKE2B 0997c4e72c142ebfa74658c1fd27d8d01ceb3810f659df0bf899004224d3944a58476fd6b54b318d712fa4d284684a221f387c7e3e63d4b397312ab9e0786988 SHA512 aa4970aba010884153c9d3155a0869288a5b9b8723cf617471148ad875f1af29f594403c1682303345c578cc0dc3f0a4b3596e4937d3afa949a652b83dcd0b36
-EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3085 BLAKE2B 457b037bd45f41207985b9df2de80de39e022097a58ca81864a8c31c919c8b9005a08c6ae359a307df1814c74912df2e4b4848b4912544227a2351331ce61f19 SHA512 fc94fc80c7a11afaa4df84e5f7f3d052c14df33c05ec0c41ef8ce0ff6cc6d8dfe3da931131a6ba153fa3b0e86a4d9e88d71f4007a7ee1b56660b19e6c209e4ba
-EBUILD simplescreenrecorder-0.4.0.ebuild 3032 BLAKE2B e715ee6f78f9d4646944fbcfe65f18f31c52e30444d7c7a56293030e27108d12e4455b44557718eda8332251576f4975c4d81eb87602813ba44ecf7eef26de4b SHA512 4dc50901fa0c0dd715ee8842bb0bc348ce1632f0191529f50f392af8ec19a4772811d31db6c953516b415baa97d1483bdad03681efc3a7845359bf7d485846c8
-EBUILD simplescreenrecorder-9999.ebuild 2977 BLAKE2B 87c06c03fa23b8313c1d79ecc9e2128d92c8bcca8f6996509f2b4775be4868fbdc7176a7170680f6c8a9f78aa3c2b4f4020f6d1afa264a15da465fd4b297b8ba SHA512 9f42d007bc25569976f97af89b7b90785e50da365a107735be7e919096edeb0650f72b6c3630279bba10cfa630b255e82971480d27bcdb2d1a7d6a4e9dd1b3fd
+DIST simplescreenrecorder-0.4.1.tar.gz 1893293 BLAKE2B d05765788b23073bd03997b92dfa34e3437514ccd88216dea429305f4d43ac25019d141b248ee4a4844d72fd6a87f196579e876ee16a235da34cb3f2404ce5e3 SHA512 b890fafb65a87c298562d25388384577408d7ccbb0b1280bb4fdad198c9b9581893e68b99aa9e478a61c59736689ae40be0f30132d56ee9a9796b8885541d8d5
+EBUILD simplescreenrecorder-0.4.0.ebuild 2714 BLAKE2B 1c8b16b796bd070cddae51575ac83bfc329073556f119c70d114ff2abbefe3844e6d41136986918566731ae85a25b9f8874167636a37e82e14aef588cf406ff7 SHA512 8339288cef69d808926462250f617879c84d840ec1d3ef3e45d40785d66d3a3528cbf6deb8e6eba88e68eed864aad6fffe4725b1cec3dcd494723d37aaa19d1a
+EBUILD simplescreenrecorder-0.4.1.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
+EBUILD simplescreenrecorder-9999.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
index 4edd7070ece7..6e9238488995 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.0.ebuild
@@ -33,10 +33,7 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
 	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
+	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
@@ -60,7 +57,7 @@ pkg_pretend() {
 		elog
 	fi
 
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
 		ewarn
 		ewarn "media-libs/x264 is currently built with 10bit useflag."
 		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
@@ -90,12 +87,6 @@ multilib_src_configure() {
 		-DWITH_GLINJECT="true"
 	)
 
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
 	if multilib_is_native_abi ; then
 		mycmakeargs+=(
 			-DENABLE_32BIT_GLINJECT="false"
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild
index 54eeceee53ad..98efd341c929 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,10 +33,7 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
 	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
+	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
@@ -56,7 +53,7 @@ pkg_pretend() {
 		elog
 	fi
 
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
 		ewarn
 		ewarn "media-libs/x264 is currently built with 10bit useflag."
 		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
@@ -86,12 +83,6 @@ multilib_src_configure() {
 		-DWITH_GLINJECT="true"
 	)
 
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
 	if multilib_is_native_abi ; then
 		mycmakeargs+=(
 			-DENABLE_32BIT_GLINJECT="false"
@@ -108,15 +99,3 @@ multilib_src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 099655b743d9..98efd341c929 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -33,10 +33,7 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
 	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
+	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
@@ -56,7 +53,7 @@ pkg_pretend() {
 		elog
 	fi
 
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
+	if has_version media-video/ffmpeg[x264] && has_version media-libs/x264[10bit] ; then
 		ewarn
 		ewarn "media-libs/x264 is currently built with 10bit useflag."
 		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
@@ -86,12 +83,6 @@ multilib_src_configure() {
 		-DWITH_GLINJECT="true"
 	)
 
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
 	if multilib_is_native_abi ; then
 		mycmakeargs+=(
 			-DENABLE_32BIT_GLINJECT="false"
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 1d601384d91c..110cee30c8ba 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,12 +3,10 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 AUX smplayer-18.2.0-jobserver.patch 423 BLAKE2B 04452fa5992dd2cef5be64dc9a9c78ca775336174dbef69e6054361173886be26d941cabfe2c5b486a05f2b3bee7029b439652d4dfb10e5651a7db68db8b70af SHA512 6bdb6d57be84c1d020c6f2e2f547eda9a0118bfcd0e4d2cdbb940501a0853ec388f359e04a52b8ff9c6c6b38d60f3837ed2c2e127a4df5bf79751486d9ed9ed6
 AUX smplayer-18.3.0-disable-werror.patch 367 BLAKE2B 68b0f5b9cb34afb3843de4dd366a0a2e77eea881277d7b8a7928e851d2456f8fe5220ee50ae77296b622187758b7f6f3a4c298c0400becfee0d2fa074e7706e3 SHA512 b330aee54397a3fce5cda3a1244918351831ffe37cc7d45bcfa93384952bdce3166875afd5cd4bae9f1d6e83281b6b6bfc3ad777317a0b2c6c5dcc5593ddcb54
-AUX smplayer-19.5.0-mpv-0.30.0.patch 969 BLAKE2B 3e2942b9e732418c14bb306492506dab0185fbb77f09856c40ca6035506ad8f2677611796478755ded1b1028d21304d7d6f78a4cc06fe832be6d8cb1acd0a3ce SHA512 d903010b237a7bdf0356ffb5068e802a7c96575f518c6a0f5862da8ae90ef117cee9dab36a7a05e909f1bbd39175fd4c829000fca1698d3c98c530a77200f1a8
 DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8
 DIST smplayer-19.10.2.tar.bz2 5178186 BLAKE2B e87efa8e433a304d4579bd852590690d23eb3cc93a50bb4aa2bfb1a4c2cbc6db63d4c8cb996b44018fb5b155d3f98104c8842d604a626fd76b39fdfa89866e91 SHA512 46327a1f988cfe8fe4e04f456057c2395f5ad011513988c1ffecf5c91cf2fdedbe8095cfba15f0f61c3e1cabc7f34b78d676bce430a79fcf542d74e14a33ec62
-DIST smplayer-19.5.0.tar.bz2 5175017 BLAKE2B e7160ca7d404dd6a8d7c316df3c39b2e238410435960d714aec271d2034030f9e1b59997d11d758188e327117f0eb773cb8baccc1defc20cd071e40c87deb07c SHA512 ee19186b3f4eac94b06a1e389e42edb8c2b22f8182b679bdc40e3ae1569a6c69f168260abfee3b2827b71b10eb353e7a3821805798f37aae2600af3b73d25ca1
+DIST smplayer-20.4.2.tar.bz2 5197394 BLAKE2B fe5f3ce279be478f93a71c521070e2564df331c56c6ac9410e0707101b7e662a16cbe65b439a194d253d3c4f49ce8e735eb19ad9a195e0e1f5d42461d3162925 SHA512 03404c2e7ba00d257ab2db82fe837eb4ab314c2b32a262ad18e75b245d43f812533f7e4609a6fe335c5c2e370cfb5fac8f0b3b8917c33a22c5b84f0074039156
 EBUILD smplayer-18.6.0.ebuild 3198 BLAKE2B 9308361b80dda582ba1894bed9e47e2fd66a48be962d21fb267fa5909f1b73cc523aac8cc87f4d2ecc43be9044a18c5585be0e54da2935cd57e0336be068754b SHA512 c9f8da664cc37fdb2e7ac780f15ed87d4b6089a6c4015ad747f36e3a9ae0b96e4fd66c2ace62a15cb9b42887cd81b6f7e83dafd59b215f71117ea90e77f714a2
 EBUILD smplayer-19.10.2.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
-EBUILD smplayer-19.5.0-r1.ebuild 3199 BLAKE2B d61dd1ebe3b0792c8436db40e857fb9724a9b3a990d8b9adfc1df8fdc89358211748a1275ee84339b042ff3a5874efbe6889a7a6b171fbbd1b6d3b0678a23cd8 SHA512 e63e5622eefb97d301a6847fa7b6396b7ee7018f9be93862be98179513a88b292c13ca72206e53ee3626076dd766701a60bef4f7f72cb33f6138d78118408afb
-EBUILD smplayer-19.5.0.ebuild 3154 BLAKE2B de825ff508e94ef4a44612134b3eef149bf603dadbd6b1439321537cb49d64fe132b83c48865e15834d68024c0eb28743981912e333d04873e57e817c126d9bc SHA512 49615613aeca2723f69d4e262e93ff09343c030fae71746873cd8a25e7725f757d47b2160fd171433601fc43c0064ca8c9ebf531c62e73ecf7a0201aa222eb13
+EBUILD smplayer-20.4.2.ebuild 3275 BLAKE2B 2b0e9f7e85d207057ba72f3accbb734b8f08e9832d47eb72fbc73628a79cdd4684408397c9e3c1633c889f33c7687827d4b8b6d6ad9d7579a7a2e2d148ba799d SHA512 a4036169b5bbceed17ecbd94f3a155edfaf08f60d318b42b525cb02fbe7db0bc3b5a89e09f71a613675462e4f78d09793cd6df49a36978f27d6b1a0c1670383a
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
deleted file mode 100644
index fd2bdc8ed9cd..000000000000
--- a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: smplayer/src/mpvprocess.cpp
-===================================================================
---- smplayer/src/mpvprocess.cpp	(revision 9231)
-+++ smplayer/src/mpvprocess.cpp	(revision 9232)
-@@ -122,7 +122,7 @@
- 
- void MPVProcess::initializeRX() {
- #ifdef CUSTOM_STATUS
--	rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
-+	rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
- #else
- 	rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
- #endif
-@@ -197,7 +197,7 @@
- 	static double last_sec = -1;
- 
- 	// Parse A: V: line
--	//qDebug("MPVProcess::parseLine: %s", line.toUtf8().data());
-+	//qDebug() << "MPVProcess::parseLine:" << line;
- 	if (rx_av.indexIn(line) > -1) {
- 		#ifdef CUSTOM_STATUS
- 		double sec = rx_av.cap(1).toDouble();
diff --git a/media-video/smplayer/smplayer-19.5.0.ebuild b/media-video/smplayer/smplayer-19.5.0.ebuild
deleted file mode 100644
index 1863a883169d..000000000000
--- a/media-video/smplayer/smplayer-19.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit l10n qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="https://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	autoshutdown? ( dev-qt/qtdbus:5 )
-	mpris? ( dev-qt/qtdbus:5 )
-"
-RDEPEND="${DEPEND}
-	|| (
-		media-video/mpv[libass,X]
-		media-video/mplayer[bidi?,libass,png,X]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
-	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
-	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-)
-
-src_prepare() {
-	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
-
-	default
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	eqmake5
-}
-
-gen_translation() {
-	local mydir="$(qt5_get_bindir)"
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "If you want URL support with media-video/mpv, please install"
-	elog "net-misc/youtube-dl."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-video/smplayer/smplayer-19.5.0-r1.ebuild b/media-video/smplayer/smplayer-20.4.2.ebuild
index 28b157da0979..2b1009f423cd 100644
--- a/media-video/smplayer/smplayer-19.5.0-r1.ebuild
+++ b/media-video/smplayer/smplayer-20.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2007-2019 Gentoo Authors
+# Copyright 2007-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
 	"${FILESDIR}/${PN}-18.2.0-jobserver.patch"
 	"${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
-	"${FILESDIR}/${P}-mpv-0.30.0.patch" #698738
 )
 
 src_prepare() {
@@ -88,6 +87,10 @@ src_prepare() {
 
 	# Commented out because it gives false positives
 	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+
+	# Do not default compress man page
+	sed '/gzip -9.*\.1$/d' -i Makefile || die
+	sed 's@\.gz$@@' -i smplayer.spec || die
 }
 
 src_configure() {
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 7c1a1729f85c..0b621c7f0d75 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,4 +1,4 @@
 AUX subtitlecomposer-0.7.0-tests-optional.patch 242 BLAKE2B 6a3d88a537ad39a151b8a6ac071376eda0d1e5d504e92052b9f55e4693633b47fc2b6986d560bd086adf76630ad24bc3671b88f3bc97f9cb429a9e14ad9376bc SHA512 65f5c8db0c5e99b51600db772c918acb7154c7999bbbbbed18ed859f4defcb70d4f907c02a08d9a7529f3aaf4867d6154b9987fb3528cb100f4daa4466e33e74
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
-EBUILD subtitlecomposer-0.7.0.ebuild 1957 BLAKE2B 33c736ff86796225fa475e5c454fb0a19e8c0aa64e8f7b5b9011cc006337699a55360f24b37c6439454d6d65f43aa6bef5720b1a8e547c7cf51cfa62640a9c22 SHA512 c5f5884eb4e6a975cc78efc0e3e4fbbf7f1d019f74e58a151b65a42227c7a150d0879420efbf0dbb9fb0ac1e0eaaf0678578425f026b84500b05a5b6227adf5d
+EBUILD subtitlecomposer-0.7.0.ebuild 1907 BLAKE2B 321c225b3ec067ddeaa16e69ba076fde1a23e8c2f0fb4708f2b171f97bb1e91a6e0913e8b2599899bfca5939de2259b8b4fde274d16afd34c6d5dce3f0d98a24 SHA512 665e46d1246f8cc680926fdfb86d7f7e634e324ea333f4bef45fc16f243bd1bb3ce483bc0e15325e744461f1e272e838bfa831aab1a5b2f58f9b143377ff6832
 MISC metadata.xml 524 BLAKE2B 662474bada941eadcab48ae4432e72af4f786ff61d2bc1db20115e2f70ca4953e01c38fd550cce72908fe5c36077d9e1b240f53e24142c7556802f3a7783d1bd SHA512 c2ef5d88d2b12534ba76ba4949c4ceee405f88b546f3b749704d8f7529d1b19b3ce8b20b18b496203259dcbde74ba7bf948ae9e4fa4601984554f8f0664a6efe
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index f974a2076cba..f61bf8ca94d2 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="5"
 KEYWORDS="amd64 x86"
-IUSE="gstreamer libav mpv unicode xine"
+IUSE="gstreamer mpv unicode xine"
 
 BDEPEND="
 	sys-devel/gettext
@@ -43,8 +43,7 @@ DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
+	media-video/ffmpeg:0=
 	mpv? ( media-video/mpv[libmpv] )
 	unicode? ( dev-libs/icu:= )
 	xine? (
diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
deleted file mode 100644
index 16c868cea713..000000000000
--- a/media-video/syncplay/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST syncplay-1.5.0.tar.gz 1588514 BLAKE2B 0f2bddf3500758c3081bdba993b21fe60a0d3af7081c5edd0f684e1d60a2a95edce133a597e79747350e681dd40768226226f0b26e295850a8c218107b1da3e9 SHA512 8a57add8a845c041c02147415fc4b7941a41edfb80fc037c3af4e246d9ca6391be9f3886407470b1b51b8783ad6306e42bb34991e7cbb08eea87e781e3cd2200
-DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 0d7edb0c2129f67ce457cffb57f5600d0c0d6bee017119efc866d748f63e6e984becd21f88324e19dcac3f0ce52e2e2f1bf65326aab6237ea41b04bdecf26334 SHA512 8d7f99132b49148003dcdc83b5afc3158ebd7ad0b8a161229f8f576e7683e3c432d09793db071239e6344490f6e08d01c9061a32556b5bce6dcd68823b47a0cf
-EBUILD syncplay-1.5.0.ebuild 1208 BLAKE2B e1b8c7436fef2df2989ee928cc7bf1fbfbd20537d069637d6b43228fe640098b20d7c371bd976652666188077541c6d001afca0aaed9c5acdd7d44ec4ec9c32c SHA512 8e7a534ce588010f018d275a415940c216f2b1aa290c8b3ec8629ffda45e4c27a6bb158d23ac0fd1c7cf0b9a4dadf26cdd34da7d66e05527e42ab0eed98ee7eb
-EBUILD syncplay-1.5.1.ebuild 1248 BLAKE2B 8b5c902388a92f19d1a0eb1c177a6a39c1ab3c973a64d47c7d8f2812c06c1a401cfa6deb21c3b2dc3b0bb65cc34ec6464adc593b29f07cd8d79a96edd843c80b SHA512 fbbc12b87668a0ed6ed29e9eb88dcac490dfdc06f452971400d9ac26e27863031face150696bfda5ec0898f37626f21e9445e4af018c2c98cf559092a02af358
-EBUILD syncplay-9999.ebuild 1160 BLAKE2B 9e29eb0534352d2e27cd351cdd6ba9c815864dcc615a52ed2827426f7c58661662ea592dc2f6052bc4b364aaae6b7f9ee4d230569bb6e462426c4a20121e37a5 SHA512 8b36ee9c23c924cfc0fc253cb8e0de4b0395a77a83cc45983c8292ed565a12d3eaba46aebde21655f726c15029df9485c90b9ab27468eeb8701b28ab74db67b3
-MISC metadata.xml 418 BLAKE2B c0f750a484c73516067fcb3f901fcf67cd7be620026b9069506a9d3d3ee2bd44f3aaa26c2ca8cc35e8af9796642815346ee55ef0265b905d61c6d9e88d9d11cc SHA512 5cb0bf2283d2e801542d3dd21e6b4b7bc3e1d8b8b904009a31cf90baa09de965a5c3003265e0b0d1384106ac79580c23c3fb73a0f028e7d75829051d68e30dc6
diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml
deleted file mode 100644
index 7c4c9284a32e..000000000000
--- a/media-video/syncplay/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Syncplay/syncplay</remote-id>
-	</upstream>
-	<use>
-		<flag name="client">Install Syncplay client</flag>
-		<flag name="server">Install Syncplay server</flag>
-		<flag name="vlc">Enable VLC2.x support</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-video/syncplay/syncplay-1.5.0.ebuild b/media-video/syncplay/syncplay-1.5.0.ebuild
deleted file mode 100644
index 2300d465955e..000000000000
--- a/media-video/syncplay/syncplay-1.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PV=${PV/_rc/-RC}
-
-DESCRIPTION="Client/server to synchronize media playback"
-HOMEPAGE="https://syncplay.pl"
-SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+client +server vlc"
-REQUIRED_USE="vlc? ( client )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	vlc? ( media-video/vlc[lua] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	sed -i 's/"noGui": False,/"noGui": True,/' \
-		syncplay/ui/ConfigurationGetter.py \
-		|| die "Failed to patch ConfigurationGetter.py"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-	use client && \
-		emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) install-client
-	use server && \
-		emake "${MY_MAKEOPTS[@]}" install-server
-}
-
-pkg_postinst() {
-	if use client; then
-		einfo "Syncplay supports the following players:"
-		einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
-	fi
-}
diff --git a/media-video/syncplay/syncplay-1.5.1.ebuild b/media-video/syncplay/syncplay-1.5.1.ebuild
deleted file mode 100644
index 57714f0b4faf..000000000000
--- a/media-video/syncplay/syncplay-1.5.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Client/server to synchronize media playback"
-HOMEPAGE="https://syncplay.pl"
-SRC_URI="https://github.com/Syncplay/syncplay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
-IUSE="+client +server vlc"
-REQUIRED_USE="vlc? ( client )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-# TODO: investigate the possibility of enabling PyQt5 gui
-# possible licensing concerns
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	vlc? ( media-video/vlc[lua] )"
-
-src_prepare() {
-	default
-	sed -i 's/"noGui": False,/"noGui": True,/' \
-		syncplay/ui/ConfigurationGetter.py \
-		|| die "Failed to patch ConfigurationGetter.py"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-	use client && \
-		emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) install-client
-	use server && \
-		emake "${MY_MAKEOPTS[@]}" install-server
-}
-
-pkg_postinst() {
-	if use client; then
-		einfo "Syncplay supports the following players:"
-		einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
-	fi
-}
diff --git a/media-video/syncplay/syncplay-9999.ebuild b/media-video/syncplay/syncplay-9999.ebuild
deleted file mode 100644
index d1c1f6fabbbd..000000000000
--- a/media-video/syncplay/syncplay-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit git-r3 python-r1
-
-MY_PV=${PV/_rc/-RC}
-
-DESCRIPTION="Client/server to synchronize media playback"
-HOMEPAGE="https://syncplay.pl"
-EGIT_REPO_URI="https://github.com/Syncplay/${PN}.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+client +server vlc"
-REQUIRED_USE="vlc? ( client )
-	${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	vlc? ( media-video/vlc[lua] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	sed -i 's/"noGui": False,/"noGui": True,/' \
-		syncplay/ui/ConfigurationGetter.py \
-		|| die "Failed to patch ConfigurationGetter.py"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-	use client && \
-		emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) install-client
-	use server && \
-		emake "${MY_MAKEOPTS[@]}" install-server
-}
-
-pkg_postinst() {
-	if use client; then
-		einfo "Syncplay supports the following players:"
-		einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
-	fi
-}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index de479692e9b2..17b4335ecffe 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,8 +1,4 @@
-AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b
-AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 AUX 3.34.1-gst-inspect-sandbox.patch 1828 BLAKE2B 9abd87afc62c784c4e5f79374d0172da0295cee520a9aa3ce2d4a2471f3e94accd7f14746fb93873767a5a11a2c9143b9387bf70295cc792199df62f501f73de SHA512 c312ddee62695b4344917eb2c7cca67284f3c7b24b21f35646f8b315bded9827aec05056fd17eadfe35da3dd876f20fd7b2cadd2141d04843c3c96d5f0346b21
-DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
 DIST totem-3.34.1.tar.xz 2157160 BLAKE2B 9ae9c8f6485c7377af07803c328e8ea3cc6fa80d8e30a7045bd2b50f7bc3d5a12582e5b60d901d22683f89e994c619c26ddb8b0890e343c873d4457fa177786d SHA512 9a3556f5cf522fca29926db185c2e5d25bdb80a25e14d0ba3062a7f15fc3ec40ae9f25752763bc444d4fd82ec2098efd732da662a1b1c5923ec19fde432606db
-EBUILD totem-3.32.1-r2.ebuild 3186 BLAKE2B d75f3aa485c4a540306121e78410880135f3e62fe72197840a12a7b54d4558c0d762bb5eabeee1b50db748807fbd450247e71733ad461e8ba50410f29563a0ae SHA512 6663251bb8990af94e942ce6da26e7e10b4100fcf0392bea09e7c97e3e37f4ddf36858379110bef8df239054cef4ea4adb06fb42be641b729df8098824419e75
 EBUILD totem-3.34.1.ebuild 2789 BLAKE2B 4c96dd229f6bd75a88d0a7ea0884729937ad666e86ba5511e5e0d3de2ce45342f8414c1516c5f1050eb5987befafa8aa573c1a1652ad95439d80bb788280837e SHA512 ee9104562111d305cf32373aea7d131759e4fd266dcab18658a143ad02822162057384bebbd8c10dad41b5de9ff0139ba1d236c8200cc419a7b545ff6ee2dc49
-MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b
+MISC metadata.xml 1017 BLAKE2B de40f52bc4cc3c838b473d4c444e9c41673cd3c2925f17508d03f5130fe237784d4ee4d02581718c06ccd30fa204d27ba7691fb8046009a540c00f3535f6909d SHA512 9b89a8eaa90ad2f55abf7a53bfba7c065be999233a7bbfe243f4514ca1c3ec5a3934f23ea8ecd6b2674ac82d5e55e2f3e25e3869a0cec019485c9bb99549b625
diff --git a/media-video/totem/files/3.26-gst-inspect-sandbox.patch b/media-video/totem/files/3.26-gst-inspect-sandbox.patch
deleted file mode 100644
index 016368a69b97..000000000000
--- a/media-video/totem/files/3.26-gst-inspect-sandbox.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 742b64b7a74eabd67344ef1cc260427dc402588f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 7 Jun 2018 23:47:48 +0200
-Subject: [PATCH 5/5] Make gst-inspect calls optional at build-time
-
-Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
----
- meson_options.txt       | 1 +
- src/backend/meson.build | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 6e056952..631b8cca 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -32,3 +32,4 @@ option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value:
- option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension')
- option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
- option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)')
-+option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
-diff --git a/src/backend/meson.build b/src/backend/meson.build
-index 28c8e123..55037a6a 100644
---- a/src/backend/meson.build
-+++ b/src/backend/meson.build
-@@ -1,5 +1,6 @@
- backend_inc = include_directories('.')
- 
-+if get_option('gst-inspect')
- gst_inspect = find_program(
-   'gst-inspect-1.0',
-   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
-@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
-   assert(r.returncode() == 0,
-          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
- endforeach
-+endif
- 
- sources = files(
-   'bacon-time-label.c',
--- 
-2.17.0
-
diff --git a/media-video/totem/files/3.32.1-control-plugins.patch b/media-video/totem/files/3.32.1-control-plugins.patch
deleted file mode 100644
index 2abcd75bac59..000000000000
--- a/media-video/totem/files/3.32.1-control-plugins.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 4944c498633f913c07a2680563a64d47c233630d Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Sun, 14 Jul 2019 20:18:45 -0400
-Subject: [PATCH] 3.32.1 control plugins
-
-update From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Sun, 10 Jun 2018 10:09:16 +0200
-Subject: [PATCH] Allow full control over which plugins are built
----
- meson_options.txt       | 24 +++++++++++++++++++++++-
- src/plugins/meson.build | 30 +++++++++++++++++++++---------
- 2 files changed, 44 insertions(+), 10 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index e1c5909..085380e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,5 +1,27 @@
- option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer')
- option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
--option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
-+option('with-plugins', type: 'array', choices: [
-+  'all',
-+  'auto',
-+  'apple-trailers',
-+  'autoload-subtitles',
-+  'brasero-disc-recorder',
-+  'dbusservice',
-+  'im-status',
-+  'lirc',
-+  'media-player-keys',
-+  'opensubtitles',
-+  'properties',
-+  'pythonconsole',
-+  'recent',
-+  'rotation',
-+  'samplepython',
-+  'save-file',
-+  'screensaver',
-+  'screenshot',
-+  'skipto',
-+  'variable-rate',
-+  'vimeo',
-+], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
- option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
- option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)')
-diff --git a/src/plugins/meson.build b/src/plugins/meson.build
-index 552cc22..cddda3f 100644
---- a/src/plugins/meson.build
-+++ b/src/plugins/meson.build
-@@ -37,8 +37,8 @@ allowed_plugins = [
- plugins = []
- 
- plugins_option = get_option('with-plugins')
--if plugins_option != 'none'
--  plugins += [
-+if plugins_option.length() > 0
-+  foreach plugin: [
-     'apple-trailers',
-     'autoload-subtitles',
-     'im-status',
-@@ -53,15 +53,22 @@ if plugins_option != 'none'
-     'variable-rate',
-     'vimeo'
-   ]
-+    if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
-+      plugins += plugin
-+    endif
-+  endforeach
-+  
-+  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc')
-+    lirc_dep = dependency('lirc', required: false)
-+  else
-+    lirc_dep = disabler()
-+  endif
- 
--  plugin_error = (plugins_option == 'all')
--
--  lirc_dep = dependency('lirc', required: false)
-   if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
-     plugins += 'lirc'
-   else
-     str = 'you need lirc_client installed for the lirc plugin'
--    if plugin_error
-+    if plugins_option.contains('all') or plugins_option.contains('lirc')
-       error(str)
-     endif
-     message(str)
-@@ -70,23 +77,28 @@ if plugins_option != 'none'
-   libxml_req_version = '>= 2.6.0'
-   libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
-   gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)
--  if libxml_dep.found() and gtk_x11_dep.found()
-+  if libxml_dep.found() and gtk_x11_dep.found() and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder'))
-     plugins += 'brasero-disc-recorder'
-   else
-     str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin'
--    if plugin_error
-+    if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder')
-       error(str)
-     endif
-     message(str)
-   endif
- 
-   if have_python
--    plugins += [
-+    foreach plugin: [
-       'dbusservice',
-       'opensubtitles',
-       'pythonconsole',
-       'samplepython'
-     ]
-+      if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
-+        plugins += plugin
-+      endif
-+    endforeach
-+
-   endif
- endif
- 
--- 
-2.22.0
-
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 39dcd3765107..55bc80b2f34f 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -17,8 +17,6 @@
 Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
 	</longdescription>
 	<use>
-		<flag name="lirc">Enable support for controlling Totem with a remote control
-			using <pkg>app-misc/lirc</pkg></flag>
 		<flag name="python">Build <pkg>dev-lang/python</pkg> using plugins (dbusservice for notifications and MPRIS control, interactive python console and opensubtitles lookup)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/totem/totem-3.32.1-r2.ebuild b/media-video/totem/totem-3.32.1-r2.ebuild
deleted file mode 100644
index dc7f5d912604..000000000000
--- a/media-video/totem/totem-3.32.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="cdr gtk-doc +introspection lirc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[introspection?]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
-	>=media-libs/gst-plugins-good-1.6.0:1.0
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.8.1:1.0
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
-	cdr? ( >=dev-libs/libxml2-2.6:2 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins
-	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Disabled: samplepython
-	local plugins="apple-trailers,autoload-subtitles"
-	plugins+=",im-status,media-player-keys,properties"
-	plugins+=",recent,rotation,save-file,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo"
-	use cdr && plugins+=",brasero-disc-recorder"
-	use lirc && plugins+=",lirc"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=${plugins}
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Denable-introspection=$(usex introspection yes no)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
index a1a07c18f15b..59f40de704c8 100644
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@@ -1,3 +1,3 @@
 DIST tovid-0.35.2.tar.gz 527332 BLAKE2B 8cc8452d2d08f77fa66684e84702ac4ade3853af68ab51e7d2ac259f15460f6a7e0766e567a51545514aa2fa5b53f0ed7ea0ff0f892d3246be63e55a10b4a893 SHA512 35e1d2a9584127498ee7d4b772fff0643860270dd38018a7fd9c20ef2875bf037235c341b0a001b0fe9a020fb74f9d348729dec0ccb7d97ccdeec508e6fa674e
-EBUILD tovid-0.35.2-r1.ebuild 1587 BLAKE2B 3d66463c73b1d53b8d5f9391008f09b8b8475a42edcefaa5568a9fee09fd0cd1c3f13f0f89c4c1e06b97241f4c8437360f12e282afcceab74b68db1161623f00 SHA512 db34f1cd1180a58cf83e433e6a2295c376d19c2a3dfc0315e427b19c6d1755bb266992a205b39e1bd98b22f2481f3abed8336007c72156c4403059e6393984be
+EBUILD tovid-0.35.2-r2.ebuild 1588 BLAKE2B 5067c66ba03c266263dd62eea223d8491081a6e5e2a581278561f2e1e4bf3c5d164791b8dced24111b8bdb39df8769237cb438cdc1ab745f3b648a3a85eceed2 SHA512 710b72402c232ee45d3cd74247fb8bd41afae579dc45ea9b20c7a12bf0e35e4066d706a09cd54928d4fdfbfc383656311ab2cd6abbeaf1d1dcc01a4bd17ab325
 MISC metadata.xml 391 BLAKE2B 6693657fd2bfeddefbc038861ce8281ac6779a59829f7292e097ea5fa2ea777b4597be0500b2443670dd0c3f4d2789d8e221199f858fb46ff9b94546a7429c05 SHA512 e1096231249166eeb2536b9f9fad1f9391f4c43abc658f7bc56afb375b4ca9213b6e287ac65c48e6980b674c18a5a222ed2ee6e256611fcc758ec0d93b1ba681
diff --git a/media-video/tovid/tovid-0.35.2-r1.ebuild b/media-video/tovid/tovid-0.35.2-r2.ebuild
index 4ad27d6a1211..c58f5de2dc2e 100644
--- a/media-video/tovid/tovid-0.35.2-r1.ebuild
+++ b/media-video/tovid/tovid-0.35.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ RDEPEND="app-cdr/dvd+rw-tools
 	>=media-video/mjpegtools-2.0.0
 	|| ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] )
 	sys-devel/bc
-	virtual/ffmpeg
+	media-video/ffmpeg
 	virtual/imagemagick-tools[png]"
 DEPEND="app-text/txt2tags"
 
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index a21b17e58acf..e33e302959b1 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,5 +1,7 @@
 AUX ffmpeg4.patch 28911 BLAKE2B f1189589a39ea9801e1620bd138499f5f5a29429cc7372ebf65b38901f1f4f0b71957a216a65367108660709ea5ca001e5ce68d67dfd478ed471963acef087a3 SHA512 1550b2de1ca0265703513d3b7fca3441f6216d89792dc68e224f5f2d99386275cdfdf7ef7b01abaf69f5de5d9af1f221617697aff6345d3d1b2e5a06d30e1f6d
+AUX transcode-1.1.7-swresample.patch 674 BLAKE2B 733a3490d2a25b20555cce3624f8e1753d22e3ae945a9656b835a5bf0eabf1b2f16fc1df1f817931dfc618b644c9e359c1c37939ef169f3f59006455a4fa2c75 SHA512 a9a79215082506882f1d1549cbe51706670f7ccf9d5da1400f9bf81482d4f410a855772183eeac8d9fa865d5d6086e10cbe8f4d7176802959a0a8b5df0759abb
 DIST transcode-1.1.7-patchset.tar.bz2 16379 BLAKE2B fbdc188bffeb8751814abfa7e119a1053e482f194bc1b87a721c48e2b66e107df146d38b3ea11a88d066c49d8862489b88b74f61fa36ce3f8a1a782da3762615 SHA512 bedc82aa4fbc17774e34d8fc24799d70b8460c6c1dd728549bcaa5c387492f56e520674fdf8bb976c0b5fcc9ccefb765f2ee26816e0d2b96a83402a21cee3f6d
 DIST transcode-1.1.7.tar.bz2 2183627 BLAKE2B 25001d4cae83d86e5295917bcd9e2e77dd61637e238394a2d603398baf810201dc61d8b0de5b54a7b8848ac3bcef5fb211e8f2b43ed7da4e56e335b8d4d2fbe1 SHA512 d6f9674f3f5c3346194120585741ca660eb9ee133085cfce9460a14eaa0cf16fdf291761bd1db78e1c784e4d69a9481c7470cf8357dc7638ee3017620500f45f
-EBUILD transcode-1.1.7-r3.ebuild 4176 BLAKE2B 888248858ca78b0d19100fc4fc3dfe83d0f659e636a021e75d9a1710b93af7dafdf7121ee5b970bb2a8be82714c5065772e9c803231270a37865c946464428c5 SHA512 b58e9bb75201e8655ca88ddd86d780b61934136ccf057976a561ce79775c079e94c616024349414921bb087fd96311e56dd9d5df4cdb765b666fd644003d7b69
+EBUILD transcode-1.1.7-r4.ebuild 4131 BLAKE2B ebcdf29ad43555dc557fc9f05c8830efa680cf8f50286850b3d0d8b36ae0c931293f2e7ac69f95b471b2ef458470ab75a465757323ae6fe05d3f329846c41733 SHA512 1134536dcfcbbc4418bd8b9a4a7fac6aa2e87f7c4aa1c2897a373fa46a5e0f48692859b67dcf696634a36dbb89e3fa89821e6cec54d778a4156112a8f2939f18
+EBUILD transcode-1.1.7-r5.ebuild 4189 BLAKE2B a25f43e7bd15eb2b45a4414a4d8b4350f3d8539d471d16ac82fa5c201e5e3bf3ef79dd7ca08ae5020ba57be9b149f1dec56eee24fb9ea0a867e71637922b242d SHA512 db8f579e41169dbee17b34835a8244d872ae514f2f135497409a50ef5a9976fb9ae88dc102de65661ae2909a7b55e9fe7f3e062c1a86cea3137a6a8a2d1b44f0
 MISC metadata.xml 619 BLAKE2B fa440f0f00bd7afe2834108078f48dc93dfe5ea38d343587267e2b45f4c4187762fdf16e1f023e4fc3af69d181ec77cbedec4a39df98eb8d4a098b98248c7b56 SHA512 043d39001850f8088e33e7277a579af7cb45b6fd2b3fe4483eb7771340dae8eab14927184f0fab9aedc8934a6d2599ce6231726308079d0ae16e7710f826ad1b
diff --git a/media-video/transcode/files/transcode-1.1.7-swresample.patch b/media-video/transcode/files/transcode-1.1.7-swresample.patch
new file mode 100644
index 000000000000..b9a908d122ef
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.1.7-swresample.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/722296
+https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-swresample.patch?h=packages/transcode&id=7fb278671fbd0a201de8d32aefee888fd253db44
+
+--- transcode-1.1.7/filter/filter_resample.c
++++ transcode-1.1.7/filter/filter_resample.c
+@@ -37,7 +37,7 @@
+ #include "libtc/optstr.h"
+ #include "libtc/tcavcodec.h"
+ #include "libtc/tcmodule-plugin.h"
+-#include <libavresample/avresample.h>
++#include <libswresample/swresample.h>
+ 
+ 
+ typedef struct {
+@@ -46,7 +46,7 @@
+ 
+     int bytes_per_sample;
+ 
+-    AVAudioResampleContext *resample_ctx;
++    SwrContext *resample_ctx;
+ } ResamplePrivateData;
+ 
+ static const char resample_help[] = ""
diff --git a/media-video/transcode/transcode-1.1.7-r3.ebuild b/media-video/transcode/transcode-1.1.7-r4.ebuild
index 952e736767f4..1091cd557b80 100644
--- a/media-video/transcode/transcode-1.1.7-r3.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit autotools libtool multilib
 
-DESCRIPTION="A suite of utilities for transcoding video and audio codecs in different containers"
+DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
 HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
 SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
 
 RDEPEND="
-	>=virtual/ffmpeg-0.10
+	>=media-video/ffmpeg-0.10
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faac )
 	alsa? ( media-libs/alsa-lib )
@@ -29,7 +29,7 @@ RDEPEND="
 	mp3? ( media-sound/lame )
 	mpeg? ( media-libs/libmpeg2 )
 	ogg? ( media-libs/libogg )
-	postproc? ( >=virtual/ffmpeg-0.10 )
+	postproc? ( >=media-video/ffmpeg-0.10 )
 	quicktime? ( >=media-libs/libquicktime-1 )
 	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
 	theora? ( media-libs/libtheora )
@@ -69,8 +69,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	if has_version '>=media-video/ffmpeg-2.8' ||
-		has_version '>=media-video/libav-12'; then
+	if has_version '>=media-video/ffmpeg-2.8'; then
 		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
 	fi
 
diff --git a/media-video/transcode/transcode-1.1.7-r5.ebuild b/media-video/transcode/transcode-1.1.7-r5.ebuild
new file mode 100644
index 000000000000..7a878b4fd548
--- /dev/null
+++ b/media-video/transcode/transcode-1.1.7-r5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2002-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib
+
+DESCRIPTION="Utilities for transcoding video and audio codecs in different containers"
+HOMEPAGE="http://www.transcoding.org/ https://bitbucket.org/france/transcode-tcforge"
+SRC_URI="https://www.bitbucket.org/france/${PN}-tcforge/downloads/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_3dnow a52 aac alsa altivec dv dvd +iconv imagemagick jpeg lzo mjpeg cpu_flags_x86_mmx mp3 mpeg nuv ogg oss pic postproc quicktime sdl cpu_flags_x86_sse cpu_flags_x86_sse2 theora truetype v4l vorbis X x264 xml xvid"
+
+RDEPEND="
+	>=media-video/ffmpeg-0.10
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faac )
+	alsa? ( media-libs/alsa-lib )
+	dv? ( media-libs/libdv )
+	dvd? ( media-libs/libdvdread:0= )
+	iconv? ( virtual/libiconv )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jpeg? ( virtual/jpeg:0= )
+	lzo? ( >=dev-libs/lzo-2 )
+	mjpeg? ( media-video/mjpegtools )
+	mp3? ( media-sound/lame )
+	mpeg? ( media-libs/libmpeg2 )
+	ogg? ( media-libs/libogg )
+	postproc? ( >=media-video/ffmpeg-0.10 )
+	quicktime? ( >=media-libs/libquicktime-1 )
+	sdl? ( >=media-libs/libsdl-1.2.5[X?] )
+	theora? ( media-libs/libtheora )
+	truetype? ( >=media-libs/freetype-2 )
+	v4l? ( media-libs/libv4l )
+	vorbis? ( media-libs/libvorbis )
+	X? ( x11-libs/libXpm x11-libs/libXaw x11-libs/libXv )
+	x264? ( media-libs/x264:= )
+	xml? ( dev-libs/libxml2 )
+	xvid? ( media-libs/xvid )
+	"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	v4l? ( >=sys-kernel/linux-headers-2.6.11 )
+"
+
+REQUIRED_USE="
+	cpu_flags_x86_sse? ( cpu_flags_x86_mmx )
+	cpu_flags_x86_sse2? ( cpu_flags_x86_mmx cpu_flags_x86_sse )
+	cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+	nuv? ( lzo )
+	"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg-0.11.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-free.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-9.patch
+	"${WORKDIR}"/${P}-patchset/${P}-libav-10.patch
+	"${WORKDIR}"/${P}-patchset/${P}-preset-force.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg2.patch
+	"${WORKDIR}"/${P}-patchset/${P}-freetype251.patch
+	"${WORKDIR}"/${P}-patchset/${P}-ffmpeg24.patch
+	"${FILESDIR}"/${P}-swresample.patch #722296
+)
+
+src_prepare() {
+	if has_version '>=media-video/ffmpeg-2.8'; then
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-ffmpeg29.patch )
+	fi
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		PATCHES+=( "${WORKDIR}"/${P}-patchset/${P}-imagemagick7.patch )
+	fi
+
+	if has_version '>=media-video/ffmpeg-4' ;  then
+		PATCHES+=( "${FILESDIR}/ffmpeg4.patch" )
+	fi
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use x86 && myconf="$(use_enable !pic x86-textrels)" #271476
+
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable altivec)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l libv4lconvert)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mpeg libmpeg2convert)
+		--enable-experimental
+		--enable-deprecated
+		$(use_enable v4l)
+		$(use_enable oss)
+		$(use_enable alsa)
+		$(use_enable postproc libpostproc)
+		$(use_enable truetype freetype2)
+		$(use_enable mp3 lame)
+		$(use_enable xvid)
+		$(use_enable x264)
+		$(use_enable ogg)
+		$(use_enable vorbis)
+		$(use_enable theora)
+		$(use_enable dvd libdvdread)
+		$(use_enable dv libdv)
+		$(use_enable quicktime libquicktime)
+		$(use_enable lzo)
+		$(use_enable a52)
+		$(use_enable aac faac)
+		$(use_enable xml libxml2)
+		$(use_enable mjpeg mjpegtools)
+		$(use_enable sdl)
+		$(use_enable imagemagick)
+		$(use_enable jpeg libjpeg)
+		$(use_enable iconv)
+		$(use_enable nuv)
+		$(use_with X x)
+		--with-mod-path=/usr/$(get_libdir)/transcode
+		${myconf}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir=/usr/share/doc/${PF} install
+	dodoc AUTHORS ChangeLog README STYLE TODO
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index abf0cf139360..f9de9fe62e57 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7.ebuild 863 BLAKE2B 917d7785b47e026fa4ddfff75d36b724a3a09d7026a46d0c98645b26dde661e39346c35acb3f22e138749930bc098035191416bf0b32f3d8ea87e442ce3755d0 SHA512 dead935223a5a0ad2907b04592c276d6bbaf99b687f098c85cbee355bd582b691f3f6445d1be6da55763d1450dc1cedb39dc9a864fbfb660b4c96615cb768899
+EBUILD vcsi-7-r1.ebuild 697 BLAKE2B 5881f62403259248611f01942a22323b0787ef1fb94e2a0a46517d3b0fc20ecfe063e4da6311bf07d15b4c8215acc6121069051a37dc6cf919d83773b35820d3 SHA512 99954c8e1eaae8ea2fed9f6aea9bcba1db4c1d5f5418be635ad99f48ce5f0435eb5d4915d3f88427fb609b412eee3170382bb889be8aee9c41bc7cd393527037
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/vcsi/vcsi-7.ebuild b/media-video/vcsi/vcsi-7-r1.ebuild
index 15d9f32e1f64..d659df03186c 100644
--- a/media-video/vcsi/vcsi-7.ebuild
+++ b/media-video/vcsi/vcsi-7-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,24 +15,13 @@ SRC_URI="https://github.com/amietn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-python/jinja-2[${PYTHON_USEDEP}]
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-RDEPEND="
 	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	>=dev-python/texttable-1.0[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/texttable[${PYTHON_USEDEP}]
 	media-fonts/dejavu
-	media-video/ffmpeg
-"
+	media-video/ffmpeg"
 
-python_test() {
-	nosetests -v tests || die "python tests failed with nose"
-}
+distutils_enable_tests nose
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index 4756b48f1db5..d07eab70d833 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -3,7 +3,7 @@ AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 BLAKE2B 0ade0368504c397be765446cf88a078fa6
 AUX vdr2jpeg-0.1.9-libav9.patch 2072 BLAKE2B f9ace5a099c3030234524065aceefe3f5f72d65d3e62763a53d1c02057e4ad23737b454afcc6362159729d255c92843d78629b302cff4c823a844bc96440fb80 SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a
 DIST vdr2jpeg-0.1.9.tgz 31160 BLAKE2B 6f84e82167f45b8fe3c2a00e72ed5ad660b7a895e1c33110ce47e1cbb2d6f5fc979454761e693f1793f1fae0c1f1694af77a0f47b4483bb6359840ffcc88e6e9 SHA512 e2309fd08591d5efa08246c2ecde70811036ea293e21f7e5ae989af5acef5e795216cbc31455d2f0b65de575a876863efe55ddf4397ab4eadf3d67a627579d99
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
-EBUILD vdr2jpeg-0.1.9-r1.ebuild 915 BLAKE2B b480b02f7d33f693c59941a3d5774142a3b2babc253b36e9dc13608db4403e0afecc576a66e1ba267193f50ea9b7bea5dbc2eacb36c421ad4f40de884d23fa62 SHA512 5091eee9033acef859bf3e94ba8dd28b7b27f18d1261c7819c9261f4fe603c86feb674ca09195bdd9397a8a8f6a5f88794709b0da3ba36a877ac4e4842b13fa0
-EBUILD vdr2jpeg-0.2.0-r1.ebuild 884 BLAKE2B fbc1dcee9ab6a470449cc097846c2c0e48f5335c4b6e83575d67d687446a5cb0fc5c2bffbc222938ea54e30d6a28236a6280c5dd0864679687ce34f6ac2abd9e SHA512 7fb77e524306cbcaa9601f356d2cf6818407e99f23402dfab3f5e937fd5c0565714cc32262d851bb5ae2ac5c8b9fcb85e370c17b2697425added8c8c5ddc06f0
-EBUILD vdr2jpeg-0.2.0.ebuild 896 BLAKE2B 76e2844841070922de6582eb022cc283834a4659c00ef0534b02d391b78c66e93419bcd80982cafa656ea7a74bec3bc3c90136d40a0b430c41a2acf85ab37dfc SHA512 a14256d860e8da83960099cb1e3fae3c9f4e60673922343af2a28e4e969fd04b4797497168ca630b34e0d12130b0bfc66ce5b2300120e93acfd2c1d67638ddd1
+EBUILD vdr2jpeg-0.1.9-r2.ebuild 916 BLAKE2B eb61f6015259445e215f7f18b9095b4684ae4cf74eb42d0aaad773ff1538bba426e38a078f2a4453e01e0dd5e9520acb321a2e86cedbfd94d506ac9b0510c55e SHA512 45a256d52fd3ed4f2ff28bee3e425e6c3cfd578a6d555774814b28ebbd6e50bd3c86df09923243eb4e703153a5973d0b70a64d37be95917188c963e5163d19f4
+EBUILD vdr2jpeg-0.2.0-r1.ebuild 737 BLAKE2B 60c1dcbb7fbe62e3bc3341f50246a1b8c8bd07b6a128764486d762d0d82d890113aa0734b5a1402675ecd92498d905fdd51a97d4294e497eae7974492f936be9 SHA512 85c17e3fc1579bd6a5101517d55057ae235027ac465598104293d5c2d14fcd5cb560ee6b9526aeebf05338a5937bcfb7296d3aa55926c4a8a880cb8275650f0b
+EBUILD vdr2jpeg-0.2.0.ebuild 746 BLAKE2B 75735a74aa5919f60c0c6a0f96819171804924b4bf9fda3960b91917eb318adf5ed0e0eecf5e96e38307ef5d739128728e4dcc288e0c279787978ae9fca88582 SHA512 7926d51958586a15fca14872298dab5d97e46c3c7d4fbf82a81fb018bc5a027863337288a10f0534c6c93fb74f97d342c77ab8f6c95c69dca0c95499f119ad33
 MISC metadata.xml 372 BLAKE2B 09d9b98f1ba8033a7ec2df65cc2358ce180dc647bd986587f696fc951fd69e2e9dbb5521dc61d93432f3ea5aec677c21b6388ee1de443538beb02747241aebc8 SHA512 b8b077cff248569cff49f30519346cd85efa88e5d19adca6fd13fc2ee49966630b4d6fb161845a301a18ff2f94da763c68d2c37237fdbe68aa63c452a612e5de
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
index 12ba97470925..1966f4a0dae8 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r1.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="virtual/ffmpeg"
+RDEPEND="media-video/ffmpeg"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
index be8cbb63595d..6c594ef78975 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0-r1.ebuild
@@ -14,12 +14,8 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libav"
 
-RDEPEND="
-	libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg:0 )
-"
+RDEPEND="media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 BDEPEND="virtual/pkgconfig"
@@ -35,11 +31,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use libav; then
-		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/avconv
-	else
-		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-	fi
+	emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
 
 	einstalldocs
 }
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
index 23f80a5191c5..c6f14a605b83 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,12 +17,8 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libav"
 
-RDEPEND="
-	libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg:0 )
-"
+RDEPEND="media-video/ffmpeg:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
@@ -35,11 +31,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use libav; then
-		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/avconv
-	else
-		emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
-	fi
+	emake DESTDIR="${D}" install FFMPEG_BIN=/usr/bin/ffmpeg
 
 	dodoc README LIESMICH
 }
diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest
index 8cb1c6dab1f8..d7f65d59e1c7 100644
--- a/media-video/videotrans/Manifest
+++ b/media-video/videotrans/Manifest
@@ -1,4 +1,3 @@
-AUX videotrans-1.6.1-libav.patch 2171 BLAKE2B 998906434b8c7da81646ae8565015871d90927e18999c7e4b9204d1dfd7c88e3d5ba4205b25f3bafcdd249be49ea77149f47f68c9f35e8fdd82408fc00262beb SHA512 0e51b01f0ed54dc9f2d7952c8d0cd2574ce7122bafc1baf7288d7a57f7dd6999fae9aa1ca85dc3d6a20969d79aaf9c22a6e3dbfa6314b377ea6fd29cfd630626
 DIST videotrans-1.6.1.tar.bz2 98091 BLAKE2B 47adcceb81889979a3af14deb214369fac792fd340e47383b8296082071db9d5b53f389869b478f4ea0faaf14744a99f9538750f6267e60e0683fc6156b701d9 SHA512 8d2ab30316d099d7bf37e712eab04089bcc24d2f8b59cb1fd464970a66ca1c480e4b9bb67b0a3e26b509c7711e92ea346713e3ec5d2fd3e8d4ff0a4372e2787a
-EBUILD videotrans-1.6.1-r2.ebuild 871 BLAKE2B 185a3c0d957b1ef6e765732cfe615606fbea5683b7fd6563355ba61f0081cf5ae59945ccb53e97e6b5a98024d6daece0c5274323bdbc7aad28ad5093cbd78532 SHA512 bd71a23229b503d6d6c7f1d0e774d6f3df4a4a325604347e3a2812fe3aef6195d4b30b86a6c27ebfef40c4e47ae9039c1c6571e3e20ab2fa956f78864de2fc7d
+EBUILD videotrans-1.6.1-r2.ebuild 698 BLAKE2B e3da74c005c63245ab6bcdc27ff74402d0e677915949d4ece86708d1af00c94a199becfbaf72c800d39074c70c8ab637ec3d5a1a5f80c86d7ba503e5cb05d410 SHA512 16f393be9e235780d29e0edf6e53cbe1e50fc327b937bb13452deddd327563039e8f9a69667b0d59b8082c03f615baf49789995b2dcf5cf4438c37b15f62b57f
 MISC metadata.xml 626 BLAKE2B 499cc48b705cf9924da80a3a4739a86e5eddcabd27606de27b0da8e27cafff80fd685338c71e61a764626f1bff137a95018b6ed6fa82c250605223984276209a SHA512 f5ffbd260504fbd9c4594b42494b809c9341ec93786958ce06e6e866b83c6f23645e3a8a69d4739bf4d43b224100a48381b45e172f453202972b1a71a76e31f0
diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
deleted file mode 100644
index 2b4cd0a15b8e..000000000000
--- a/media-video/videotrans/files/videotrans-1.6.1-libav.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Migrate from ffmpeg to avconv.
-Author: Alessio Treglia <alessio@debian.org>
----
- data/library.sh.in  |    8 ++++----
- src/movie-title.in  |    2 +-
- src/movie-to-dvd.in |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- videotrans.orig/data/library.sh.in
-+++ videotrans/data/library.sh.in
-@@ -250,15 +250,15 @@ audio_params()
- 	then
- 		if [ "${force_or_auto}" = "ac3" ]
- 		then
--			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
-+			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
- 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			elif [ "${new_ch}" = "2" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			else
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			fi
- 			audio_ext="ac3"
- 		else
---- videotrans.orig/src/movie-title.in
-+++ videotrans/src/movie-title.in
-@@ -961,7 +961,7 @@ else
- 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
- 		mplayer_pid="$!"
- 
--		# Start mp2enc or ffmpeg to encode the audio
-+		# Start mp2enc or avconv to encode the audio
- 
- 		{
- 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
---- videotrans.orig/src/movie-to-dvd.in
-+++ videotrans/src/movie-to-dvd.in
-@@ -698,7 +698,7 @@ do
- 	} > "${TEMP}.video" 2>&1 &
- 	video_enc_pid="$!"
- 
--	# Start mp2enc or ffmpeg to encode the audio
-+	# Start mp2enc or avconv to encode the audio
- 
- 	{
- 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
diff --git a/media-video/videotrans/videotrans-1.6.1-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
index 969d72bc3b7f..ea33b07bb2a6 100644
--- a/media-video/videotrans/videotrans-1.6.1-r2.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,17 +11,12 @@ SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="libav"
-
 DEPEND="
 	media-video/mplayer
 	media-video/mjpegtools[png]
 	media-video/dvdauthor
 	virtual/imagemagick-tools
-	libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg:0 )
+	media-video/ffmpeg:0
 "
 
 RDEPEND="${DEPEND}
@@ -36,6 +31,4 @@ src_prepare() {
 	# fixing LDFLAGS usage
 	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
 
-	# Debian patch to support libav
-	use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index f366239203f5..e10fdd42df5e 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,8 +4,10 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-3.0.8-qt-5.15.patch 1003 BLAKE2B 44a64b0448a235ce1dcf7100d084c85f9ffe6cdebf6cf0b5561e915a2ab6fbf348c152ff6e3c9beb1f073157a8ce8b15f3317a29c5410d3131462aac8d7c1ea4 SHA512 ff61fdc64e2bf4bc19536e76d7b824b0f77d8aa7a1fe61578f57b400ccda1bb51a5f5d97486c42ca6760b137ada68faedc73697dc39005babc839428fafee731
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
+DIST vlc-3.0.10.tar.xz 26096828 BLAKE2B c189c91e9b4b3601552ea5c00faa6bee9944550e0591a451723464ef6c1884388286638c0e4c936ff4299cac92eff026ba683c71e0e1ffd25f2a9fd701c86d55 SHA512 dcfa39e3e61bf522ea3a0e1686251356ec262dd8826fc64ccae5ac34a62f72ddc9fe9f2e2b45588013d5907e39649cf39d0c9156980d1eb679eac9b9cb434341
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13071 BLAKE2B 3a9d9a25f13a2bee1fbde33f96d58869e15dfe45d45395586e5ded8bd516361165bf72c22ec89bdd8655b8c159652ee5f10adfe3339532c7705183cdcfb7a202 SHA512 8a4fb45dcf660a18a3f77da1bcaef72b91360ce53dc8c5cab0b43975aac65681613bfd3035a86e6d8a00c3991794782ba465572cad3519e751e8f576a555215b
-EBUILD vlc-3.0.9999.ebuild 13137 BLAKE2B 1935bc3011f01d26b825562d5544709190428240f44c0881339087cfd94e26202e8423875be20ac5cbe6f743f54d79f0c18a747b111fc0e6168183ab3495cf87 SHA512 c58cd0be92ddd9e8c43d54afd7daa806d25f8cd7b05999b95322f9daaedabfa26b8fe152bd3ad9df40fd2bbf69dbc86c0009102507b7a61ece06da1138b0bd50
-EBUILD vlc-9999.ebuild 13018 BLAKE2B c2f1ac10246d77bd6a0b71bfa243dd1fa63fa9ba7d02c9862fb4868f9e2941002e733eea19d7eceb9514b0121101e59bfda3cf817e3345a60155810bb465c8cb SHA512 5df5798ddf32b894c230f51f311f02baf38a2f28e1dbdac5cc2ede39a05776374e9c99b8313068fc8ca92a65d881bd17da08530fb5c5d39a146881ccc187de1c
-MISC metadata.xml 4839 BLAKE2B 287526d901bb5868a0cf1a8212a3afeb61d32a9d8ee87352a569fdfaf159ce09448ee4d5b759c06f380e04a6fe241e3ab28637fcbcb9cf25ec9d163d54adf1a1 SHA512 9898bff1e5a183f722010348d8f47ea9a02a8067bdea7ed61347091e212bb3bb94fd6f76fe093eecfe0b95d061cd88e6be9e00d4ee38b6362f460fb5bd5b455d
+EBUILD vlc-3.0.10-r1.ebuild 12997 BLAKE2B a31b43dfec44afef1ac10f33a4983a5353abb1e8792afa7f280b2221691c309c5f1f12b0f25d1dad76e1ea6c66003e306c69b72bb9948df16a29a5f3bcb2e841 SHA512 df72bce7d63a9df17ba4384b7f37bca2763ebefbe223da89f31ba472ac9b03eec82052c6f31d20fbae65f8dff2b71878c2d05333f6e6a4feb1c44a9fa9d4d4b4
+EBUILD vlc-3.0.8-r1.ebuild 12953 BLAKE2B 127a5f74a9c7e88a7f1929261c2334213abfdba7c105cb7e6bd1d0ba61abbb07eb65a9bb1a5b2c76e0dd1311ea5da57a08efe0b7de4d298f6cc1491c9cbb3480 SHA512 b13e4e6b896d433f0ff3132663059470c74f6812a85b99e513e7e9d1a7f7a261c7dd13531f1f4c5953daf6336622db7730d80c9a1bb8c6b7bc3f9d817f9ce207
+EBUILD vlc-3.0.9999.ebuild 13019 BLAKE2B 6331fcc72c164b70a82240811e65c43cdb76e0a1646ea15d9446ece6d6174688b5bfaa68e3a8171dfe237c95c9cecf93107ed2c8e942915938ff1745f523f149 SHA512 4311201b2966d3013ee195083ab22bc7b8a06bcfec190e02f54cb62f07a7d42b7a3c5f65a38bbd67450edf111d5692740f151cd1aa322aa226f550f08f7db943
+EBUILD vlc-9999.ebuild 12900 BLAKE2B bcc4c8ec26fb90538d98399a466fd6cec60b3abc0ef74a485c6e46e699d9f7248d85e14154837ed4bf53c64206936ff1dc5aeb798d14f19bc363c9eb13fa34f0 SHA512 a1ad27c395f7549ab5e0530272984d4e709ac5fb4f481ac22348617fce9fcdd2e677abe4aa9869afbeb07ed9a743433767195c8d077cbe163c9964cb5cb4978d
+MISC metadata.xml 4746 BLAKE2B 797c2f7c113915fe8e1508eef1a110db4c7717fa0ee5bfdd49c4260532be2929b6551a453a79c08aa9a6e62f109396778ce9efc823eb18db2bf25f3e9db10068 SHA512 49828ab8f168e49210c7c259b7c0242f9c68bfc9fa9151e5663a8dea781d34f40a6cb22e354332b9efba0610b70995b511ffef20b844914d0dea0118251905b8
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index fdc2df2324f1..8442a26823a0 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -37,7 +37,6 @@
 		<flag name="nfs">Enable support for nfs protocol via <pkg>net-fs/libnfs</pkg></flag>
 		<flag name="omxil">Enable OpenMAX Integration Layer codec module</flag>
 		<flag name="optimisememory">Enable optimisation for memory rather than performance</flag>
-		<flag name="postproc">Enable image post-processing via libpostproc (part of FFmpeg)</flag>
 		<flag name="projectm">Enable the projectM visualization plugin</flag>
 		<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
 		<flag name="sdl-image">Enable sdl image video decoder (depends on sdl)</flag>
diff --git a/media-video/vlc/vlc-3.0.10-r1.ebuild b/media-video/vlc/vlc-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..b323abbd162a
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.10-r1.ebuild
@@ -0,0 +1,490 @@
+# Copyright 2000-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *9999 ]] ; then
+	if [[ ${PV%.9999} != ${PV} ]] ; then
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
+	else
+		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
+	fi
+	inherit git-r3
+else
+	if [[ ${MY_P} = ${P} ]] ; then
+		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
+	else
+		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
+	fi
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
+fi
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
+	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
+	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
+	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
+	cpu_flags_x86_sse
+"
+REQUIRED_USE="
+	chromecast? ( encode )
+	directx? ( ffmpeg )
+	fontconfig? ( truetype )
+	libcaca? ( X )
+	libtar? ( skins )
+	libtiger? ( kate )
+	skins? ( qt5 truetype X xml )
+	ssl? ( gcrypt )
+	vaapi? ( ffmpeg X )
+	vdpau? ( ffmpeg X )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
+RDEPEND="
+	net-dns/libidn:=
+	sys-libs/zlib[minizip]
+	virtual/libintl
+	virtual/opengl
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
+	aom? ( media-libs/libaom:= )
+	archive? ( app-arch/libarchive:= )
+	aribsub? ( media-libs/aribb24 )
+	bidi? (
+		dev-libs/fribidi
+		media-libs/freetype:2[harfbuzz]
+		media-libs/harfbuzz
+		virtual/ttf-fonts
+	)
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
+	chromecast? (
+		>=dev-libs/protobuf-2.5.0:=
+		>=net-libs/libmicrodns-0.0.9:=
+	)
+	dav1d? ( media-libs/dav1d:= )
+	dbus? ( sys-apps/dbus )
+	dc1394? (
+		media-libs/libdc1394:2
+		sys-libs/libraw1394
+	)
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
+	dvd? (
+		>=media-libs/libdvdnav-4.9:0=
+		>=media-libs/libdvdread-4.9:0=
+	)
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
+	flac? (
+		media-libs/flac
+		media-libs/libogg
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	gcrypt? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	gme? ( media-libs/game-music-emu )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	ieee1394? (
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	jack? ( virtual/jack )
+	jpeg? ( virtual/jpeg:0 )
+	kate? ( media-libs/libkate )
+	libass? (
+		media-libs/fontconfig:1.0
+		media-libs/libass:=
+	)
+	libcaca? ( media-libs/libcaca )
+	libnotify? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
+	linsys? ( media-libs/zvbi )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
+	mad? ( media-libs/libmad )
+	matroska? (
+		>=dev-libs/libebml-1.3.6:=
+		media-libs/libmatroska:=
+	)
+	modplug? ( >=media-libs/libmodplug-0.8.9.0 )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	nfs? ( >=net-fs/libnfs-0.10.0:= )
+	ogg? ( media-libs/libogg )
+	opus? ( >=media-libs/opus-1.0.3 )
+	png? ( media-libs/libpng:0= )
+	projectm? (
+		media-fonts/dejavu
+		media-libs/libprojectm
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
+	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
+	sid? ( media-libs/libsidplay:2 )
+	skins? (
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
+	)
+	soxr? ( >=media-libs/soxr-0.1.2 )
+	speex? (
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
+	)
+	srt? ( net-libs/srt )
+	ssl? ( net-libs/gnutls:= )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
+	truetype? (
+		media-libs/freetype:2
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
+	)
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
+	upnp? ( net-libs/libupnp:= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
+	wayland? (
+		>=dev-libs/wayland-1.15
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util
+		x11-libs/xcb-util-keysyms
+	)
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
+	xml? ( dev-libs/libxml2:2 )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zvbi? ( media-libs/zvbi )
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
+	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch
+)
+
+DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	xdg_src_prepare # bug 608256
+
+	has_version 'net-libs/libupnp:1.8' && \
+		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
+	# Bootstrap when we are on a git checkout.
+	if [[ ${PV} = *9999 ]] ; then
+		./bootstrap
+	fi
+
+	# Make it build with libtool 1.5
+	rm m4/lt* m4/libtool.m4 || die
+
+	# We are not in a real git checkout due to the absence of a .git directory.
+	touch src/revision.txt || die
+
+	# Don't use --started-from-file when not using dbus.
+	if ! use dbus ; then
+		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
+	fi
+
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
+	eautoreconf
+
+	# Disable automatic running of tests.
+	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-aa
+		--disable-optimizations
+		--disable-rpath
+		--disable-update-check
+		--enable-fast-install
+		--enable-screen
+		--enable-vcd
+		--enable-vlc
+		$(use_enable a52)
+		$(use_enable alsa)
+		$(use_enable aom)
+		$(use_enable archive)
+		$(use_enable aribsub)
+		$(use_enable bidi fribidi)
+		$(use_enable bidi harfbuzz)
+		$(use_enable bluray)
+		$(use_enable cddb libcddb)
+		$(use_enable chromaprint)
+		$(use_enable chromecast)
+		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable dav1d)
+		$(use_enable dbus)
+		$(use_enable dbus kwallet)
+		$(use_enable dc1394)
+		$(use_enable debug)
+		$(use_enable directx)
+		$(use_enable directx d3d11va)
+		$(use_enable directx dxva2)
+		$(use_enable dts dca)
+		$(use_enable dvbpsi)
+		$(use_enable dvd dvdnav)
+		$(use_enable dvd dvdread)
+		$(use_enable encode sout)
+		$(use_enable encode vlm)
+		$(use_enable faad)
+		$(use_enable fdk fdkaac)
+		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
+		$(use_enable ffmpeg swscale)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable fontconfig)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable gme)
+		$(use_enable gnome-keyring secret)
+		$(use_enable gstreamer gst-decode)
+		$(use_enable ieee1394 dv1394)
+		$(use_enable jack)
+		$(use_enable jpeg)
+		$(use_enable kate)
+		$(use_enable libass)
+		$(use_enable libcaca caca)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable libtar)
+		$(use_enable libtiger tiger)
+		$(use_enable linsys)
+		$(use_enable lirc)
+		$(use_enable live live555)
+		$(use_enable lua)
+		$(use_enable macosx-notifications osx-notifications)
+		$(use_enable mad)
+		$(use_enable matroska)
+		$(use_enable modplug mod)
+		$(use_enable mp3 mpg123)
+		$(use_enable mpeg libmpeg2)
+		$(use_enable mtp)
+		$(use_enable musepack mpc)
+		$(use_enable ncurses)
+		$(use_enable nfs)
+		$(use_enable ogg)
+		$(use_enable omxil)
+		$(use_enable omxil omxil-vout)
+		$(use_enable optimisememory optimize-memory)
+		$(use_enable opus)
+		$(use_enable png)
+		$(use_enable projectm)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qt5 qt)
+		$(use_enable rdp freerdp)
+		$(use_enable run-as-root)
+		$(use_enable samba smbclient)
+		$(use_enable sdl-image)
+		$(use_enable sftp)
+		$(use_enable shout)
+		$(use_enable sid)
+		$(use_enable skins skins2)
+		$(use_enable soxr)
+		$(use_enable speex)
+		$(use_enable srt)
+		$(use_enable ssl gnutls)
+		$(use_enable svg)
+		$(use_enable svg svgdec)
+		$(use_enable taglib)
+		$(use_enable theora)
+		$(use_enable tremor)
+		$(use_enable twolame)
+		$(use_enable udev)
+		$(use_enable upnp)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi libva)
+		$(use_enable vdpau)
+		$(use_enable vnc)
+		$(use_enable vorbis)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with X x)
+		$(use_enable X xcb)
+		$(use_enable X xvideo)
+		$(use_enable x264)
+		$(use_enable x264 x26410b)
+		$(use_enable x265)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf avahi)
+		$(use_enable zvbi)
+		$(use_enable !zvbi telx)
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
+		--disable-asdcp
+		--disable-coverage
+		--disable-cprof
+		--disable-crystalhd
+		--disable-decklink
+		--disable-gles2
+		--disable-goom
+		--disable-kai
+		--disable-kva
+		--disable-libplacebo
+		--disable-macosx-qtkit
+		--disable-maintainer-mode
+		--disable-merge-ffmpeg
+		--disable-mfx
+		--disable-mmal
+		--disable-opencv
+		--disable-opensles
+		--disable-oss
+		--disable-rpi-omxil
+		--disable-schroedinger
+		--disable-shine
+		--disable-sndio
+		--disable-spatialaudio
+		--disable-vsxu
+		--disable-wasapi
+		--disable-wma-fixed
+	)
+	# ^ We don't have these disabled libraries in the Portage tree yet.
+
+	# Compatibility fix for Samba 4.
+	use samba && append-cppflags "-I/usr/include/samba-4.0"
+
+	if use x86; then
+		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
+		append-cflags $(test-flags-CC -fno-stack-check)
+		# Bug 569774
+		replace-flags -Os -O2
+	fi
+
+	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
+	append-cxxflags -std=c++11
+
+	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
+
+	if use truetype || use bidi; then
+		myeconfargs+=( --enable-freetype )
+	else
+		myeconfargs+=( --disable-freetype )
+	fi
+
+	if use truetype || use projectm; then
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
+		myeconfargs+=(
+			--with-default-font=${dejavu}/DejaVuSans.ttf
+			--with-default-font-family=Sans
+			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
+			--with-default-monospace-font-family=Monospace
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
+	# Other values may break the build (bug 523144), so definition should not be removed.
+	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
+	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
+}
+
+src_test() {
+	virtx emake check-TESTS
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
+		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
+	else
+		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
+		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
+		ewarn "If you do not do it, vlc will take a long time to load."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
+		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
+	xdg_pkg_postrm
+}
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8-r1.ebuild
index 090c04ddbb20..bdfb4ef11006 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8-r1.ebuild
@@ -32,9 +32,9 @@ SLOT="0/5-9" # vlc - vlccore
 IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
 	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
 	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
 	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
@@ -46,7 +46,6 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
@@ -95,10 +94,7 @@ RDEPEND="
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
 	flac? (
 		media-libs/flac
 		media-libs/libogg
@@ -152,7 +148,6 @@ RDEPEND="
 	ogg? ( media-libs/libogg )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
 		media-fonts/dejavu
 		media-libs/libprojectm
@@ -168,7 +163,7 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	sdl-image? ( media-libs/sdl-image )
 	sftp? ( net-libs/libssh2 )
@@ -314,6 +309,7 @@ src_configure() {
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
 		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
 		$(use_enable ffmpeg swscale)
 		$(use_enable flac)
 		$(use_enable fluidsynth)
@@ -345,13 +341,13 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
+		$(use_enable nfs)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
 		$(use_enable optimisememory optimize-memory)
 		$(use_enable opus)
 		$(use_enable png)
-		$(use_enable postproc)
 		$(use_enable projectm)
 		$(use_enable pulseaudio pulse)
 		$(use_enable qt5 qt)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8af1fe6e259e..8e8124b25a95 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -32,9 +32,9 @@ SLOT="0/5-9" # vlc - vlccore
 IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
-	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
 	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
 	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
 	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
@@ -96,10 +95,7 @@ RDEPEND="
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
 	flac? (
 		media-libs/flac
 		media-libs/libogg
@@ -153,7 +149,6 @@ RDEPEND="
 	ogg? ( media-libs/libogg )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
 		media-fonts/dejavu
 		media-libs/libprojectm
@@ -169,7 +164,7 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	sdl-image? ( media-libs/sdl-image )
 	sftp? ( net-libs/libssh2 )
@@ -315,6 +310,7 @@ src_configure() {
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
 		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
 		$(use_enable ffmpeg swscale)
 		$(use_enable flac)
 		$(use_enable fluidsynth)
@@ -346,13 +342,13 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
+		$(use_enable nfs)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
 		$(use_enable optimisememory optimize-memory)
 		$(use_enable opus)
 		$(use_enable png)
-		$(use_enable postproc)
 		$(use_enable projectm)
 		$(use_enable pulseaudio pulse)
 		$(use_enable qt5 qt)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 87341a4212c9..4721bdb00aaf 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -32,9 +32,9 @@ SLOT="0/12-9" # vlc - vlccore
 IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms
-	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
+	libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png postproc projectm pulseaudio +qt5 rdp
+	nfs ogg omxil optimisememory opus png projectm pulseaudio +qt5 rdp
 	run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib
 	theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X
 	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
@@ -47,7 +47,6 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	postproc? ( ffmpeg )
 	skins? ( qt5 truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
@@ -96,10 +95,7 @@ RDEPEND="
 	)
 	faad? ( media-libs/faad2 )
 	fdk? ( media-libs/fdk-aac:= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] )
 	flac? (
 		media-libs/flac
 		media-libs/libogg
@@ -155,7 +151,6 @@ RDEPEND="
 	ogg? ( media-libs/libogg )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
 		media-fonts/dejavu
 		media-libs/libprojectm
@@ -171,7 +166,7 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	sdl-image? ( media-libs/sdl-image )
 	sftp? ( net-libs/libssh2 )
@@ -316,6 +311,7 @@ src_configure() {
 		$(use_enable fdk fdkaac)
 		$(use_enable ffmpeg avcodec)
 		$(use_enable ffmpeg avformat)
+		$(use_enable ffmpeg postproc)
 		$(use_enable ffmpeg swscale)
 		$(use_enable flac)
 		$(use_enable fluidsynth)
@@ -349,12 +345,12 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
+		$(use_enable nfs)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable optimisememory optimize-memory)
 		$(use_enable opus)
 		$(use_enable png)
-		$(use_enable postproc)
 		$(use_enable projectm)
 		$(use_enable pulseaudio pulse)
 		$(use_enable qt5 qt)
diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index 7162b0df7102..4ba483329ed3 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,4 +1,4 @@
 AUX webcamoid-8.1.0-ffmpeg-4.patch 7369 BLAKE2B 64c7e45b9b8b29efe6982dff8205eb30d51fbbca751fed9afca0644d571c2a99b9151130f90c7fbe3cc20d08b40ed5585cdd34e59cf405c71fd89e6b9fcf294d SHA512 0e91d8e5b85972ccb057ef56a847e8dbe48f09eaea6de3cb37a483f04dc2a79379ca847ce3e13701ff33b697e02db46c1786d79198f4476279e296acdf314d8e
 DIST webcamoid-8.1.0.tar.gz 10062681 BLAKE2B e9501ace9ba42abdae4be4e9e689329b02796198fe2610ef3a404535d389a6aa7a7e540148548dd63ea6ba78c9b650b30f5497396e49b37d7ab06ca8708ad056 SHA512 6db53ed29288889c05955967d961b53fa0e4171aeed12cd1557829c26bb2e2031804319fcead4c5b888a695cfd84f531a27f992be56c38366076ff2945ec2dbb
-EBUILD webcamoid-8.1.0.ebuild 2194 BLAKE2B 56f685e00f74290e2d0e33c9551cd4a593fe7c8046479accc573b97396ae1845fdcbc3e0a4b3dc0c8332219699201c2bfe2493c8f5fc8889d9a92798f20ca664 SHA512 c6659577f769026b918c97f215ecbc7c9426b8243fcd06a69cae7ac21931b0f79189facd7011893347fcc6566d708f3db451c5e4da38964bb9ae1ff4d2bc61e7
+EBUILD webcamoid-8.1.0.ebuild 2121 BLAKE2B f7d4037f1010b2731e6279121f4107bf32776656c98c5f296b366d42ab4d58d347106155ba915c48cf547d14e3bab145532dc733d7dd9623d90222f3d61f4063 SHA512 4d6af28f201077bcf7c7e159dae5990597045c42f1befa7c1614206c7aa36996df32b716e6a07e8b6c13dbc63c74eb2be317c807740afde1d3cfe28874246fa8
 MISC metadata.xml 784 BLAKE2B ce617d4a9bcbf3f8e4ce651fd673bf3c0015e13bc8814d4b4e97eaa4a6c5428553d4a314054315fd3dc8a6b1362b4a322a4af78745f3c3d2378e2e731bdc9ef9 SHA512 6518965213e9deffdb6163243865c9e37ec0a14b6e83558761ff27ad7984003be1b6c6518d455631cd2af29f663b6e91f60dd061151e63b3a4f5ad73e35df5cf
diff --git a/media-video/webcamoid/webcamoid-8.1.0.ebuild b/media-video/webcamoid/webcamoid-8.1.0.ebuild
index 0069489ecf2d..6a7fccc1ad1b 100644
--- a/media-video/webcamoid/webcamoid-8.1.0.ebuild
+++ b/media-video/webcamoid/webcamoid-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,10 +16,9 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
-IUSE="${IUSE_AVKYS[@]} debug headers libav v4l"
+IUSE="${IUSE_AVKYS[@]} debug headers v4l"
 
 REQUIRED_USE="
-	libav? ( ffmpeg )
 	v4lutils? ( v4l )
 "
 
@@ -33,10 +32,7 @@ RDEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
+	ffmpeg?	( media-video/ffmpeg:= )
 	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
 	jack? ( virtual/jack )
 	libuvc? ( media-libs/libuvc )
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 811ffc9767f1..a4ab8f9645a1 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,7 +1,7 @@
 AUX gpac.patch 507 BLAKE2B 7872c56ed87e96a247b63b92c6a23c094346fea9ee5127a6086a45efd064b4c00ddf2cd2191772bcbd54365c56ef550f3f5e0ecf2c2ab35a2e0c9dc3197ec9b9 SHA512 9da7a1ffe637e39863e5828547923424b9c072d194d3ddadcc9a6c31f7803f5456b3ba88d470458a84d37b0c07374983adc124f3710ae7122a81a13ea9b4ae0e
 DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
-EBUILD x264-encoder-0.0.20190214.ebuild 2123 BLAKE2B 9723fe01f4a70ae1b15c7439b43f29e8040f3c7d48334ecf7d7e9b5568ac8d02bf7af36611422519554ac5f35cb64fcd79c10b48ebb0dbd606971e9df6aadcaa SHA512 6fea3377290b50177a3c455e4487bd7336b11143f3084296b1d207653030ee193351f073034b8685af6185e579834bce5bdd02de82edff0e6acac16928c14022
-EBUILD x264-encoder-0.0.20190903.ebuild 2125 BLAKE2B bbf4bea8aa2b6984ea20b5a2b1f59821314d426bb95ba00b467c2d509685890cb4d41c07bba85dede9d12a85761a45973f7cd22daebd84c8b333171b74c455d6 SHA512 2ea659ea355be0da7da6b0a94a67780743c94c4cb06dd8b2cf9fd25a58c6e924ddd1489993f92c3003fcf686082e709fc49c7f7987ee259695b15d632e154960
-EBUILD x264-encoder-9999.ebuild 2125 BLAKE2B bbf4bea8aa2b6984ea20b5a2b1f59821314d426bb95ba00b467c2d509685890cb4d41c07bba85dede9d12a85761a45973f7cd22daebd84c8b333171b74c455d6 SHA512 2ea659ea355be0da7da6b0a94a67780743c94c4cb06dd8b2cf9fd25a58c6e924ddd1489993f92c3003fcf686082e709fc49c7f7987ee259695b15d632e154960
+EBUILD x264-encoder-0.0.20190214.ebuild 2069 BLAKE2B f77cab7e07231377dbc85448b377c60dec0ac663ee487736f9b4b1bcfc320a1e5f8e6582173b844f2525175b649dfc3646b89c70e008948a4db4198570a97e65 SHA512 05e6d5749f6fe09542c086da53d20aa803b4736acd367a8fb6226901897d72eb6b9e7c09a79c050dc102971349368182aa2a247c7fc7ebd899454f29ccb254ad
+EBUILD x264-encoder-0.0.20190903.ebuild 2071 BLAKE2B 362439e044f4f9669008c52a067de93f120c652e4d7d1f2c373a17f7f617925117d5fe260be00f59fb31b70ca4f86241f635d773307350e2f4fe5b72043de062 SHA512 584335789c74c47b4fd988b9239abb663a0a442eeed21f4b143c767e15896bd669ec47ca24fd04296dde1befb74259b55cf2a6e3b32e6b9e921bdf835c65cb8c
+EBUILD x264-encoder-9999.ebuild 2071 BLAKE2B 362439e044f4f9669008c52a067de93f120c652e4d7d1f2c373a17f7f617925117d5fe260be00f59fb31b70ca4f86241f635d773307350e2f4fe5b72043de062 SHA512 584335789c74c47b4fd988b9239abb663a0a442eeed21f4b143c767e15896bd669ec47ca24fd04296dde1befb74259b55cf2a6e3b32e6b9e921bdf835c65cb8c
 MISC metadata.xml 530 BLAKE2B 19afea6649cc9611b31fce82055c949d8bbb8de99df320d390591d0e3abe27126b54af9c91bc7b96a8d2fac705427ba2c8cc19bdcddfadc304419a7966c40617 SHA512 01eabe2c536c89cc9ed8cd4295ce68941a626b6675c808294a4828704f9f3c89c87d70f5898f60f326c783a77d7e1dc8213e3bfbadbbca8b71f268959232a577
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index a597d419a813..893ddce8fed1 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
 	~media-libs/x264-${PV}[interlaced=,threads=]
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.5.2:= )"
 
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 6ad1f8d7a6c7..18dccd367cb0 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
 	~media-libs/x264-${PV}[interlaced=,threads=]
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.5.2:= )"
 
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 6ad1f8d7a6c7..18dccd367cb0 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
 	~media-libs/x264-${PV}[interlaced=,threads=]
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
+	ffmpeg? ( media-video/ffmpeg:= )
 	ffmpegsource? ( media-libs/ffmpegsource )
 	mp4? ( >=media-video/gpac-0.5.2:= )"
 
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index cae2503fd928..3b431d86bbd7 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,5 @@
 DIST yle-dl-20200222.tar.gz 87059 BLAKE2B 25d645505d67d71b3662589c77c30f905ded81e2d64874cf6036dcaf0738e521e96650543a78c18031a4477fc3bcf121e7497c980d22c84e21bebc2bd7cb154a SHA512 2b4a98c19a12812bc3c00de6173d50c78c981de0186c29021c8d88349ae88759a4987f6488d758ee5397d2b0992cd03029680bb08a4882cb2280a28807d4bf14
 DIST yle-dl-20200419.tar.gz 87267 BLAKE2B 2637620758c1a083502eb9468bbe5e7353855051c3379d448f6a4b9adcf8113293e4a7a8887138df68fcfd16938ab3846034a8f57cb9d366467a22c23b53ebaa SHA512 3d064e080e0c9172e15134eaa179ae96240ed9fc74a7a8a9a9aa18049397e0fea62465f5768db488928f23af1fa1195d78a8a4a6bbafcab4bcda6d05cda70ccf
-EBUILD yle-dl-20200222.ebuild 1713 BLAKE2B c6948d5b99001ea73938cb3a79a1b5dc3224bd8d0072b8760eb3c2e7c971a8240e8fc0e1a94cc9d08d8495b886ea766f80b6e78b89b1071420178a7b90d2bda1 SHA512 7e24b218bde4767186d02089202ce55e63d908d432f5cb53fe7f0b46ebde9bed88a24516f997f4bb60959443e2b67bd0928f1065eefcc80bab39f79a616eba51
-EBUILD yle-dl-20200419.ebuild 2011 BLAKE2B d6bb23ecc061d9a73f2701e9fbbc516f6ae5bd2f54e2301f17a304ccab7c3fdb08d0fb13b073742065226d7fc127301976aefaa3657b02b29a2742fdd3c286bb SHA512 d3d46569d76eb1472d6390af7e324c602f2c7281c9027c5bb8f2cb4d86c5287be0694da25518346266d699251570b3eb612b1202991ae503022ba8440fbbd05d
+EBUILD yle-dl-20200222.ebuild 1695 BLAKE2B 25884cea797340b5796c15f591fad21fc0af4f5b2afe32465659baf6d9ea2768a97db8a07691a5a5e8a93502a7702d7ce08d57a2fb67de1c591022dcc91bc52a SHA512 43c9c542c50bd715dc0ebb0c41a85cd220dbf50698233a2d9c74ce9379b1c7f982469a3da2391703e9e2355f889cf671b83b9246826403abfbe9b64743a20dbd
+EBUILD yle-dl-20200419.ebuild 1993 BLAKE2B 0e7ad46255054a3a764f52ea85a865bdf6cb5bd14ee10273c8342e7177f98985186252020c40fb99d5cc6424fe504d2b064928a6be132926265b03b898725b88 SHA512 ef9791616b96f526a66d57f70f95da4fc3c133a28970a59b6687d3e5b991e4f12e77bf461f4fc490c984abea582c1128ed3b70f0f5e43fdf9fff95013ae8dc4c
 MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
diff --git a/media-video/yle-dl/yle-dl-20200222.ebuild b/media-video/yle-dl/yle-dl-20200222.ebuild
index 54743cdf09ad..9f7caaad6307 100644
--- a/media-video/yle-dl/yle-dl-20200222.ebuild
+++ b/media-video/yle-dl/yle-dl-20200222.ebuild
@@ -16,13 +16,12 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="libav php test +youtube-dl"
+IUSE="php test +youtube-dl"
 
 # Requires an active internet connection during tests
 RESTRICT="test"
 
 RDEPEND="
-	!libav? ( media-video/ffmpeg )
 	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
@@ -31,6 +30,7 @@ RDEPEND="
 	dev-python/progress[${PYTHON_USEDEP}]
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	media-video/ffmpeg
 	net-misc/wget
 	php? (
 		dev-lang/php:*[bcmath,cli,curl,simplexml]
diff --git a/media-video/yle-dl/yle-dl-20200419.ebuild b/media-video/yle-dl/yle-dl-20200419.ebuild
index edff6ecff973..51021c5c90a3 100644
--- a/media-video/yle-dl/yle-dl-20200419.ebuild
+++ b/media-video/yle-dl/yle-dl-20200419.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="libav test"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Requires an active internet connection during tests,
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
-	!libav? ( media-video/ffmpeg )
+	media-video/ffmpeg
 	net-misc/wget
 	$(python_gen_cond_dep '
 		>=dev-python/attrs-18.1.0[${PYTHON_MULTI_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
commit	51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree	753b6b08624c34d1ed8414bbe22c45409f7741b9 /media-video
parent	be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent	deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)