gentoo resync : 23.09.2020

21 files changed, 5 insertions, 2008 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4cb130c7fefa..7607c0cea7fe 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 0f104a27d08b..4905065fb4ef 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,5 +1,4 @@
 AUX gpac-0.8.1-configure.patch 3221 BLAKE2B 702dc30844d48091f13b01c344a877095c09250a274be64610d49553691c24bce3b8cb4cb41bbcb06e5655a3ed9ced23a5120a90d32a5bf59508a5ac401964cf SHA512 4217ee7034ae70bd7edf9ce2c3b0d090841c314bea27a9368da34b84dd593d9d5553955423f229912f6d8d1561ba7f25330b11bb2ab0e334d6051ce6c391b993
-AUX gpac-1.0.0-makefile-debian.patch 508 BLAKE2B 1f8c39abf868392df1bbbd9836272895a9c324dde43eedf27763e49974fcb8bb796c1d7828389a36bdc9bf6cee7eb5f2e74aa7ef31408af81903014995565d8b SHA512 1f1a57934eca75f41a876bd2c2fca89d44e9b807ef32139cdabf733a24b22df0d863c0e28cc87227418804973a6e475de88638e380d92d3e4c5d64b8cd90d2cf
 AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
 AUX gpac-1.0.1-configure.patch 3414 BLAKE2B 30ab11d0e215429ea5fae9664817b3a0bac242c5e31248d26cc59f646bddb78670f5370ffd65db3bdd2025aa1d17e554f6479e9aab5e6d68c3b73c081bd2a230 SHA512 1b141de1b6bdb58970e4e3361e70ec1ff7675935f2039cd28e80deb4c21c118c56f1dca5bd6539b12332cbc2a1c13298568cc90c981e84fecea23914185d2ca8
 DIST gpac-0.8.1.tar.gz 11432459 BLAKE2B 5c08d6c903b4865c19818c5cee07c0a0ebd1775f168740eadc3722d6b19ed685d4f6089cee4bbd68a52bf7cce4cf564c083deb629c47ba35eac66c754f3136cf SHA512 f2039fe91a502ea8c54330abf893d52d10fb57d4459f5f3aae28122f565ab8964011b67e6af0d79c170fa55b125ac1385fd1d280021da7d1d37b27c74ee5b6c1
diff --git a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch b/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
deleted file mode 100644
index 8bb8074b1ce8..000000000000
--- a/media-video/gpac/files/gpac-1.0.0-makefile-debian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index b147725..244b07c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -164,7 +164,7 @@ ifneq ($(CONFIG_DARWIN),yes)
- 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
- 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
- 
--ifeq ($(IS_DEB_MAKE),undefined)
-+ifeq ($(IS_DEB_MAKE),)
- 	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
- 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
- else
diff --git a/media-video/orion/Manifest b/media-video/orion/Manifest
index bae7a56b808b..10b9ae23fcb3 100644
--- a/media-video/orion/Manifest
+++ b/media-video/orion/Manifest
@@ -1,8 +1,3 @@
-AUX orion-1.6.6-fix_login.patch 999 BLAKE2B 43f37299be369aa56d612ec6393c4a240c06a65b37a9e22dd499b774497c22eb5fe342ecd6b030912cab2354ef4774d067b10c1fa0288f5a6c8554dea9aef1e3 SHA512 a5b45ca8dae9008bb21ca73a8fa57ccff56da46cdb0aa3f9cc03299ca9d864bfa311a622e7735505a52b4a6c7cc66399756f159fa3757ef17a0f00d7b4304792
-AUX orion-1.6.6-mpv_backwards.patch 4470 BLAKE2B 19ca0d4e5226038d5e8bc528856d2f145a6750a87d9f20591810165d513a1fd3067bda2e483088d3e2cf1a44a963ff7498e530d03099ddc6b6ef2a4661d4ac84 SHA512 79f421e95a97f22e91dda2e350c94e8612230123ee64a18f15926bc111c67a6965dc740def5d9624575024f6b0e11871dfa3c26ce0e4e7abb4e3d3c1811ddd9b
-AUX orion-1.6.6-mpv_compilation.patch 1108 BLAKE2B 021660340ba3f6cf7f70fda13af65544ea26edafb50331b4f5bba0af0b1662840ec25a5993b1f19335c7c2ebb5129c04d487640fad975cb797a1a07bd400ca29 SHA512 ffff325f22eace89c0b2f59701e0f119c759ea3d2f2c5d2422b6e3f0eac74e08fa56e442502895ab78cc41be9fe2182f2a62d036ba872c3dfc9457ad61e324af
-DIST orion-1.6.6.tar.gz 629917 BLAKE2B 303af947533aeb26561fb3fc57d4ffbbd6d168e1e51ffe196a0de82fca3406599cfb84c1ae361c9b7b84c9c01b47bb6147b98f62cc5b1dec3d08d0588cbc7327 SHA512 88c7efe1796d1135f18bd53c83a25747df1bbf35163b27c625711ab5027e988425e3ba13ff6e3349d30cdc99d24cae0642d1d058e401a24b240d73c6b47a2aaf
 DIST orion-1.6.7.tar.gz 644899 BLAKE2B 7aa188bc5eaf1f1781735416152a9324a2945f10b2c1ccd55fa5a2b557c31e4bdad55d282c4efc0552dbf998db7193bc19ec0679034ec53cbd97f688b572f74c SHA512 dc4c4d364423cae52f95c4ad2d241e311d6947066c2a7b02b5754df2b69a7bb7aeed54d4515afe31b4437b8e47057e939e9444e7812ca0125ba3a8c65678d3d0
-EBUILD orion-1.6.6.ebuild 1156 BLAKE2B d1277c411bdcc32e73169f249c0c2e9abad004cb87bb8dcaa12a40596d7d999a3f0f90ee7d57817a4d120aed74c3053b15be5867d3c292ca47c9038e08029fed SHA512 16d0c26553e3afc5ae71f694cc528db25d74b3662079285aba7b7bd1fc3a0b1872a310f558066adf1170df6610c9bb31b425a1a312e80cf136ea30ed33169cc8
-EBUILD orion-1.6.7.ebuild 1025 BLAKE2B a87a4eacdeeacd6ebf1e62389064b3308a46ed9aff13121e034226553bddc295b33df98be4bb1b7dc177c53557c19437d5accb5df9efccfd58e001b50a67289d SHA512 ceea89157cdac2e2dbbd5027791754de2a8431ea4ae4204b4e88276124eba4c8ea7902b6c925a90abffe65bd56ecc662539c14de5088e7a4e7f64b8d20232c0f
+EBUILD orion-1.6.7.ebuild 1048 BLAKE2B 3e3078f2d55514ac96928d982697e9b7e342709e242f6cd1d0ed3e4659878fa31d7169141468189c039e030dc26d3880986d6b43917bb5578151a2f01a8a69fd SHA512 11c13933d6598b859c6945285eba8e8adf4f1248bd6ca1d7e5e3b2fcbc6517e949b17e747f554993e2450b0b23232633c85be9a408d09f2cb0f6c4dba2590803
 MISC metadata.xml 574 BLAKE2B de16e0fa5f9fbb443c5218a093048811e4ad9e633ec0e23cbd8b00e5322f7709af121ff3fa8cc4ef9cbc164f84d57cbf9ce9c542b7753195f09735e859fb5a55 SHA512 4ffbe221d97a40411dbaefc31fad97978f2ae823d14e1fbfef1aa9d84697c9ea06f7d58c7174ff1daa3b8f64863d62350dc469414e0b55917a227e2953b86bc9
diff --git a/media-video/orion/files/orion-1.6.6-fix_login.patch b/media-video/orion/files/orion-1.6.6-fix_login.patch
deleted file mode 100644
index c6aced452ca7..000000000000
--- a/media-video/orion/files/orion-1.6.6-fix_login.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 69c58ba5af5f83903be70629b02f348fc3ad8757 Mon Sep 17 00:00:00 2001
-From: Andrew Tonner <rakslice@gmail.com>
-Date: Tue, 26 Mar 2019 14:58:40 -0700
-Subject: [PATCH] Fix HTTP request socket output
-
----
- src/network/httpserver.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/network/httpserver.cpp b/src/network/httpserver.cpp
-index 235e073..b0368eb 100644
---- a/src/network/httpserver.cpp
-+++ b/src/network/httpserver.cpp
-@@ -89,7 +89,6 @@ void HttpServer::onRead() {
- 
-     // Respond with 200
-     QByteArray block;
--    QDataStream out(&block, QIODevice::WriteOnly);
- 
-     // http payload message body
-     QByteArray content;
-@@ -111,9 +110,7 @@ void HttpServer::onRead() {
-     response += "Content-Length: " + QString::number(content.length()) + "\n";
-     response += "\n" + content;
- 
--    out << response.toUtf8();
--
--    socket->write(block);
-+    socket->write(response.toUtf8());
-     socket->waitForBytesWritten();
-     socket->disconnectFromHost();
- 
diff --git a/media-video/orion/files/orion-1.6.6-mpv_backwards.patch b/media-video/orion/files/orion-1.6.6-mpv_backwards.patch
deleted file mode 100644
index 4cd302cb3d1f..000000000000
--- a/media-video/orion/files/orion-1.6.6-mpv_backwards.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 755fae82a31105808ec978855803f52affa01f87 Mon Sep 17 00:00:00 2001
-From: mrgreywater <mr.greywater@googlemail.com>
-Date: Fri, 19 Oct 2018 22:21:07 +0200
-Subject: [PATCH] opengl-cb backward compatibility
-
----
- src/player/mpvobject.cpp | 43 ++++++++++++++++++++++++++++++++++------
- src/player/mpvobject.h   | 15 +++++++++++++-
- 2 files changed, 51 insertions(+), 7 deletions(-)
-
-diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
-index 2955063..31cdf73 100644
---- a/src/player/mpvobject.cpp
-+++ b/src/player/mpvobject.cpp
-@@ -48,16 +48,25 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-     MpvRenderer(MpvObject *new_obj)
-         : obj{new_obj}
-     {
--
-+#ifdef USE_OPENGL_CB
-+    int r = mpv_opengl_cb_init_gl(obj->mpv_gl, nullptr, &get_proc_address_mpv, nullptr);
-+    if (r < 0)
-+        throw std::runtime_error("could not initialize OpenGL");
-+#endif
-     }
- 
-     virtual ~MpvRenderer()
--    {}
-+    {
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_uninit_gl(obj->mpv_gl);
-+#endif
-+    }
- 
-     // This function is called when a new FBO is needed.
-     // This happens on the initial frame.
-     QOpenGLFramebufferObject * createFramebufferObject(const QSize &size)
-     {
-+#ifndef USE_OPENGL_CB
-         // init mpv_gl:
-         if (!obj->mpv_gl)
-         {
-@@ -72,15 +81,17 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-                 throw std::runtime_error("failed to initialize mpv GL context");
-             mpv_render_context_set_update_callback(obj->mpv_gl, on_mpv_redraw, obj);
-         }
--
-+#endif
-         return QQuickFramebufferObject::Renderer::createFramebufferObject(size);
-     }
- 
-     void render()
-     {
-         obj->window()->resetOpenGLState();
--
-         QOpenGLFramebufferObject *fbo = framebufferObject();
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_draw(obj->mpv_gl, fbo->handle(), fbo->width(), fbo->height());
-+#else
-         mpv_opengl_fbo mpfbo{static_cast<int>(fbo->handle()), fbo->width(), fbo->height(), 0};
-         int flip_y{0};
- 
-@@ -97,7 +108,7 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
-         // See render_gl.h on what OpenGL environment mpv expects, and
-         // other API details.
-         mpv_render_context_render(obj->mpv_gl, params);
--
-+#endif
-         obj->window()->resetOpenGLState();
-     }
- };
-@@ -115,11 +126,27 @@ MpvObject::MpvObject(QQuickItem * parent)
-     mpv_set_option_string(mpv, "msg-level", "all=v");
- #endif
- 
-+#ifdef USE_OPENGL_CB
-+    mpv_set_option_string(mpv, "vo", "opengl-cb");
-+#endif
-+
-     if (mpv_initialize(mpv) < 0)
-         throw std::runtime_error("could not initialize mpv context");
- 
-     // Request hw decoding, just for testing.
--    mpv::qt::set_option_variant(mpv, "hwdec", "auto");
-+    mpv_set_option_string(mpv, "hwdec", "auto");
-+
-+#ifdef USE_OPENGL_CB
-+    // Setup the callback that will make QtQuick update and redraw if there
-+    // is a new video frame. Use a queued connection: this makes sure the
-+    // doUpdate() function is run on the GUI thread.
-+    mpv_gl = (mpv_opengl_cb_context *)mpv_get_sub_api(mpv, MPV_SUB_API_OPENGL_CB);
-+
-+    if (!mpv_gl)
-+        throw std::runtime_error("OpenGL not compiled in");
-+
-+    mpv_opengl_cb_set_update_callback(mpv_gl, MpvObject::on_update, (void *)this);
-+#endif
- 
-     mpv_set_wakeup_callback(mpv, wakeup, this);
- 
-@@ -130,7 +157,11 @@ MpvObject::~MpvObject()
- {
-     if (mpv_gl) // only initialized if something got drawn
-     {
-+#ifdef USE_OPENGL_CB
-+        mpv_opengl_cb_set_update_callback(mpv_gl, nullptr, nullptr);
-+#else
-         mpv_render_context_free(mpv_gl);
-+#endif
-     }
- 
-     mpv_terminate_destroy(mpv);
-diff --git a/src/player/mpvobject.h b/src/player/mpvobject.h
-index 0ec0b7a..eeaa250 100644
---- a/src/player/mpvobject.h
-+++ b/src/player/mpvobject.h
-@@ -6,8 +6,21 @@
- 
- #include <QtQuick/QQuickFramebufferObject>
- 
-+
- #include <mpv/client.h>
-+
-+#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(1, 28)
-+#define USE_OPENGL_CB
-+#endif
-+
-+#ifdef USE_OPENGL_CB
-+#include <mpv/opengl_cb.h>
-+typedef mpv_opengl_cb_context mpv_context;
-+#else
- #include <mpv/render_gl.h>
-+typedef mpv_render_context mpv_context;
-+#endif
-+
- #include <mpv/qthelper.hpp>
- 
- class MpvRenderer;
-@@ -17,7 +30,7 @@ class MpvObject : public QQuickFramebufferObject
-     Q_OBJECT
- 
-     mpv_handle *mpv;
--    mpv_render_context *mpv_gl;
-+    mpv_context *mpv_gl;
-     std::vector<std::unique_ptr<QJSValue>> callbacks;
- 
-     friend class MpvRenderer;
diff --git a/media-video/orion/files/orion-1.6.6-mpv_compilation.patch b/media-video/orion/files/orion-1.6.6-mpv_compilation.patch
deleted file mode 100644
index c9163d3376c5..000000000000
--- a/media-video/orion/files/orion-1.6.6-mpv_compilation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-index def79f5..7fd9d93 100644
---- a/orion.pro
-+++ b/orion.pro
-@@ -8,7 +8,7 @@ QT     += gui qml network widgets quickcontrols2
- 
- QMAKE_CXXFLAGS += -Wall -O2
- 
--CONFIG += c++11
-+CONFIG += c++14
- #CONFIG += console
- 
- TARGET = orion
-@@ -86,8 +86,8 @@ android: {
-     android/src/com/orion/MainActivity.java
- 
-     ANDROID_EXTRA_LIBS = \
--        $$PWD/../openssl-1.0.2l/libcrypto.so \
--        $$PWD/../openssl-1.0.2l/libssl.so
-+        $$PWD/libs/libcrypto.so \
-+        $$PWD/libs/libssl.so
- }
- 
- #Backend for player, uses mpv as default
-diff --git a/src/player/mpvobject.cpp b/src/player/mpvobject.cpp
-index 2c30462..2955063 100644
---- a/src/player/mpvobject.cpp
-+++ b/src/player/mpvobject.cpp
-@@ -103,8 +103,10 @@ class MpvRenderer : public QQuickFramebufferObject::Renderer
- };
- 
- MpvObject::MpvObject(QQuickItem * parent)
--    : QQuickFramebufferObject(parent), mpv{mpv_create()}, mpv_gl(nullptr)
-+    : QQuickFramebufferObject(parent), mpv_gl(nullptr)
- {
-+    std::setlocale(LC_NUMERIC, "C");
-+    mpv = mpv_create();
-     if (!mpv)
-         throw std::runtime_error("could not create mpv context");
- 
diff --git a/media-video/orion/orion-1.6.6.ebuild b/media-video/orion/orion-1.6.6.ebuild
deleted file mode 100644
index 740953442c02..000000000000
--- a/media-video/orion/orion-1.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Cross-platform Twitch client"
-HOMEPAGE="https://alamminsalo.github.io/orion/"
-SRC_URI="https://github.com/alamminsalo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mpv qtav qtmedia"
-
-DEPEND=">=dev-qt/qtquickcontrols-5.8:5
-	>=dev-qt/qtquickcontrols2-5.8:5
-	>=dev-qt/qtsvg-5.8:5
-	>=dev-qt/qtwebengine-5.8:5
-	mpv? ( media-video/mpv[libmpv] )
-	qtav? ( media-libs/qtav )
-	qtmedia? ( >=dev-qt/qtmultimedia-5.8:5 )"
-RDEPEND="${DEPEND}
-	!mpv? ( media-plugins/gst-plugins-hls )"
-
-REQUIRED_USE="^^ ( mpv qtav qtmedia )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix_login.patch
-	"${FILESDIR}"/${P}-mpv_compilation.patch
-	"${FILESDIR}"/${P}-mpv_backwards.patch
-)
-
-src_configure() {
-	local PLAYER
-	if use mpv; then
-		PLAYER=mpv
-	elif use qtav; then
-		PLAYER=qtav
-	else
-		PLAYER=multimedia
-	fi
-	eqmake5 ${PN}.pro CONFIG+=${PLAYER}
-}
-
-src_install() {
-	dobin ${PN}
-	domenu distfiles/*.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins distfiles/${PN}.svg
-}
diff --git a/media-video/orion/orion-1.6.7.ebuild b/media-video/orion/orion-1.6.7.ebuild
index 406bf1c592ec..095b3c005cf1 100644
--- a/media-video/orion/orion-1.6.7.ebuild
+++ b/media-video/orion/orion-1.6.7.ebuild
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mpv qtav qtmedia"
 
-DEPEND=">=dev-qt/qtquickcontrols-5.8:5
+DEPEND=">=dev-qt/qtdbus-5.8:5
+	>=dev-qt/qtquickcontrols-5.8:5
 	>=dev-qt/qtquickcontrols2-5.8:5
 	>=dev-qt/qtsvg-5.8:5
 	>=dev-qt/qtwebengine-5.8:5
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
deleted file mode 100644
index 3eca912fbdee..000000000000
--- a/media-video/photofilmstrip/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539
-DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb
-EBUILD photofilmstrip-3.7.1-r1.ebuild 2145 BLAKE2B 3267b0722f89fec4910143062c028e36e9a82a2bfefff26d0f4ad126069248170d8fba4365f3dd7cde378700f3d0d0117b6943da17181c09c5f03da62849960a SHA512 f106d02d147f5eb542578f3fc2fc0762754e565196984e6fad410087c4a6967e4ad05b19367b2f55dd1463c542f12d2b1f97468e1f65726c75d15c3e735a3260
-MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch b/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch
deleted file mode 100644
index 78dd6697ca72..000000000000
--- a/media-video/photofilmstrip/files/photofilmstrip-3.7.1-disable-docs-by-default.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/setup.py b/setup.py
---- a/setup.py	2019-07-29 20:46:23.212292642 +0300
-+++ b/setup.py	2019-07-29 20:47:47.426300796 +0300
-@@ -20,10 +20,7 @@
- from distutils.dir_util import remove_tree
- from distutils.sysconfig import get_python_lib
- 
--try:
--    from sphinx.application import Sphinx
--except ImportError:
--    Sphinx = None
-+Sphinx = None
- 
- try:
-     import py2exe
diff --git a/media-video/photofilmstrip/metadata.xml b/media-video/photofilmstrip/metadata.xml
deleted file mode 100644
index e317c382d289..000000000000
--- a/media-video/photofilmstrip/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-PhotoFilmStrip creates movies out of your pictures in just three steps.
-There are several output possibilities for VCD, SVCD, DVD up to FULL-HD.
-First select your photos, customize the motion path of the Ken Burns effect and
-render the video. Comments of the pictures are generated into a subtitle file. 
-Furthermore an audio file can be specified to setup the background music for the
-slideshow.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">photostoryx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
deleted file mode 100644
index 28f898ce3108..000000000000
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="Movie slideshow creator using Ken Burns effect"
-HOMEPAGE="https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip"
-SRC_URI="https://github.com/PhotoFilmStrip/PFS/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
-	')
-	media-plugins/gst-plugins-jpeg:1.0
-	x11-libs/wxGTK:*[X]"
-DEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
-
-src_prepare() {
-	default
-
-	# fix 'unexpected path' QA warning on einstalldocs
-	sed -i 's|"share", "doc", "photofilmstrip"|"share", "doc", "'${PF}'"|g' setup.py ||
-	die "Fixing unexpected path failed."
-
-	# build html docs
-	if use doc; then
-		sed -i 's/Sphinx = None/from sphinx.application import Sphinx/g' -i setup.py ||
-		die "Failed to enable building docs with sphinx."
-	fi
-
-	# fix a QA issue with .desktop file
-	sed -i '/Version=/d' data/photofilmstrip.desktop || die "Failed to update .desktop file."
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	doman docs/manpage/*.1
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	optfeature "additional rendering formats" media-plugins/gst-plugins-bad
-	optfeature "additional rendering formats" media-plugins/gst-plugins-good
-	optfeature "additional rendering formats" media-plugins/gst-plugins-ugly
-	optfeature "ogg/theora support" media-libs/gst-plugins-base[theora]
-	optfeature "h264 (MKV/MP4) support" media-plugins/gst-plugins-x264
-	optfeature "h265 (MKV) support" media-plugins/gst-plugins-x265
-	optfeature "MPEG 1/2 (DVD) support" media-plugins/gst-plugins-mpeg2enc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/vdr2jpeg/Manifest b/media-video/vdr2jpeg/Manifest
index cf10eefbefb3..144e19d7fea7 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,6 +1,3 @@
-AUX vdr2jpeg-0.1.9-ffmpeg.patch 13036 BLAKE2B 4e8aac9ba3ad62c80c7ce739cc9f87d1935ba92c39f1e74cd4fc3b4e25c6cee2b4d27a70c69e27b8b73f5e819877abc7b14f304c23dc7a8c4f051e34223bb15e SHA512 0a7d261dffe1960bb69366b0645b0f5543a2ee82f821f34b3d70606689e971e29981ea5888870e0de9515da5e7419f6a919fc9ac9d82043cff587f0399de1070
-AUX vdr2jpeg-0.1.9-ffmpeg1.patch 8787 BLAKE2B 0ade0368504c397be765446cf88a078fa6e9b5bc13ac7fe431f582afc390213193fd9c12456eb45209d8eae33369cdfa78a494eb58962221148b0c30f607a4c4 SHA512 d7ab3a5d5dff70d914036da98c42fa6931e71f54b88580bcfac84a81a2c256811d8c59e25b55e3bf3f2cfed1d6c3997c68e24b81b9d5ac7bc0c13b97693a5ee3
-AUX vdr2jpeg-0.1.9-libav9.patch 2072 BLAKE2B f9ace5a099c3030234524065aceefe3f5f72d65d3e62763a53d1c02057e4ad23737b454afcc6362159729d255c92843d78629b302cff4c823a844bc96440fb80 SHA512 d8122499f7f5db79f359bd38801fcc3b72b9ddce1305a854260d40d6f55e2162fb1a23b2a8acd3902c3a93aab1ee66bce418fcd6f5ad72363d98c4bf5f68400a
 DIST vdr2jpeg-0.2.0.tgz 20027 BLAKE2B c79a84c6e7010eae762fb31bdd9771dcdae1e78761afd07c536a55e834b0271fb55dcd4bb49f87a2d28695496d37f94c90350dd70b50229bb6248026422faee0 SHA512 65f3e0acb2ecd3a5341e527c45fafd454266841f1369c89b10750fce86f2326fba76329abd17a05d67aea3b43a7b1299a49cfa9eee9a784bb99c940253ca5952
 EBUILD vdr2jpeg-0.2.0-r5.ebuild 955 BLAKE2B 833f5f39df32de9e61346dc163a264a297de2405acc019dfd423a2e6bd5056b0e1adb332d23d6d959837c70d7a13ae863447bcf5f082effe869b1ec9c1cf48a3 SHA512 7691acf8b96078c33a0704c11156a8a6635af97f6cbdaa13793c15e056e94b142cfecd09ae843b3bdb37b762016b2c8ab1e83d30a7f8b93c9d8217f1934355b9
 EBUILD vdr2jpeg-0.2.0.ebuild 746 BLAKE2B 75735a74aa5919f60c0c6a0f96819171804924b4bf9fda3960b91917eb318adf5ed0e0eecf5e96e38307ef5d739128728e4dcc288e0c279787978ae9fca88582 SHA512 7926d51958586a15fca14872298dab5d97e46c3c7d4fbf82a81fb018bc5a027863337288a10f0534c6c93fb74f97d342c77ab8f6c95c69dca0c95499f119ad33
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch
deleted file mode 100644
index 549a6c8f60ee..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-diff -urN vdr2jpeg-0.1.9.old/ffm.cpp vdr2jpeg-0.1.9/ffm.cpp
---- vdr2jpeg-0.1.9.old/ffm.cpp	2012-04-21 09:53:26.727892390 +0200
-+++ vdr2jpeg-0.1.9/ffm.cpp	2012-04-21 09:57:25.555890271 +0200
-@@ -21,6 +21,7 @@
- 
- extern "C" {
- #include <libavutil/avutil.h>
-+#include <libavutil/mathematics.h>
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
-@@ -185,7 +186,7 @@
-     }else
-         ost->sync_opts= lrintf(get_sync_ipts(ost) / av_q2d(enc->time_base));
- 
--    nb_frames= FFMIN(nb_frames, max_frames[CODEC_TYPE_VIDEO] - ost->frame_number);
-+    nb_frames= FFMIN(nb_frames, max_frames[AVMEDIA_TYPE_VIDEO] - ost->frame_number);
-     if (nb_frames <= 0)
-         return true;
- 
-@@ -221,7 +222,7 @@
-             if(dec->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
-                 pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base);
-             if(dec->coded_frame && dec->coded_frame->key_frame)
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
- 
-             av_interleaved_write_frame(s, &pkt);
-             enc->coded_frame = old_frame;
-@@ -245,7 +246,7 @@
-                 big_picture.quality = (int)ist->st->quality;
-             }else
-                 big_picture.quality = (int)ost->st->quality;
--                big_picture.pict_type = 0;
-+                big_picture.pict_type = (AVPictureType) 0;
- //            big_picture.pts = AV_NOPTS_VALUE;
-             big_picture.pts= ost->sync_opts;
- //            big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den);
-@@ -268,7 +269,7 @@
-    pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
- 
-                 if(enc->coded_frame && enc->coded_frame->key_frame)
--                    pkt.flags |= PKT_FLAG_KEY;
-+                    pkt.flags |= AV_PKT_FLAG_KEY;
-                 av_interleaved_write_frame(s, &pkt);
-                 *frame_size = ret;
-             }
-@@ -316,13 +317,17 @@
-         data_size = 0;
-         if (ist->decoding_needed) {
-             switch(ist->st->codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                     data_size = (ist->st->codec->width * ist->st->codec->height * 3) / 2;
-                     /* XXX: allocate picture correctly */
-                     avcodec_get_frame_defaults(&picture);
-+		    AVPacket pkt;
-+		    av_init_packet( &pkt );
-+		    pkt.data = ptr;
-+		    pkt.size = len;
- 
--                    ret = avcodec_decode_video(ist->st->codec,
--                                               &picture, &got_picture, ptr, len);
-+                    ret = avcodec_decode_video2(ist->st->codec,
-+                                               &picture, &got_picture, &pkt);
-                     ist->st->quality= picture.quality;
-                     if (ret < 0)
-                         goto fail_decode;
-@@ -341,7 +346,7 @@
-                 goto fail_decode;
-             }
-         } else {
--            if(ist->st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+            if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-                 if (ist->st->codec->time_base.num != 0) {
-                     ist->next_pts += ((int64_t)AV_TIME_BASE *
-                                       ist->st->codec->time_base.num) /
-@@ -354,16 +359,6 @@
-             len = 0;
-         }
- 
--        /* frame rate emulation */
--        if (ist->st->codec->rate_emu) {
--            int64_t pts = av_rescale((int64_t) ist->frame * ist->st->codec->time_base.num, 1000000, ist->st->codec->time_base.den);
--            int64_t now = av_gettime() - ist->start;
--            if (pts > now)
--                usleep(pts - now);
--
--            ist->frame++;
--        }
--
- #if 0
-         /* mpeg PTS deordering : if it is a P or I frame, the PTS
-            is the one of the next displayed one */
-@@ -398,7 +393,7 @@
- 
-                     if (ost->encoding_needed) {
-                         switch(ost->st->codec->codec_type) {
--                        case CODEC_TYPE_VIDEO:
-+                        case AVMEDIA_TYPE_VIDEO:
-                             if(!do_video_out(os, ost, ist, &picture, &frame_size))
-                                return -1;
-                             break;
-@@ -415,9 +410,9 @@
- 
-                         avcodec_get_frame_defaults(&avframe);
-                         ost->st->codec->coded_frame= &avframe;
--                        avframe.key_frame = pkt->flags & PKT_FLAG_KEY;
-+                        avframe.key_frame = pkt->flags & AV_PKT_FLAG_KEY;
- 
--                        if (ost->st->codec->codec_type == CODEC_TYPE_VIDEO) {
-+                        if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-                             ost->sync_opts++;
-                         }
- 
-@@ -438,7 +433,7 @@
-                         opkt.flags= pkt->flags;
- 
-                         //FIXME remove the following 2 lines they shall be replaced by the bitstream filters
--                        if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & PKT_FLAG_KEY))
-+                        if(av_parser_change(ist->st->parser, ost->st->codec, &opkt.data, &opkt.size, data_buf, data_size, pkt->flags & AV_PKT_FLAG_KEY))
-                             opkt.destruct= av_destruct_packet;
- 
-                         av_interleaved_write_frame(os, &opkt);
-@@ -459,7 +454,7 @@
-                 AVCodecContext *enc= ost->st->codec;
-                 os = output_files[ost->file_index];
- 
--                if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
-+                if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (os->oformat->flags & AVFMT_RAWPICTURE))
-                     continue;
- 
-                 if (ost->encoding_needed) {
-@@ -469,10 +464,10 @@
-                         pkt.stream_index= ost->index;
- 
-                         switch(ost->st->codec->codec_type) {
--                        case CODEC_TYPE_VIDEO:
-+                        case AVMEDIA_TYPE_VIDEO:
-                             ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, NULL);
-                             if(enc->coded_frame && enc->coded_frame->key_frame)
--                                pkt.flags |= PKT_FLAG_KEY;
-+                                pkt.flags |= AV_PKT_FLAG_KEY;
-                             break;
-                         default:
-                             ret=-1;
-@@ -547,11 +542,6 @@
-             ist->index = k;
-             ist->discard = 1; /* the stream is discarded by default
-                                  (changed later) */
--
--            if (ist->st->codec->rate_emu) {
--                ist->start = av_gettime();
--                ist->frame = 0;
--            }
-         }
-     }
- 
-@@ -641,20 +631,20 @@
-             else
-                 codec->time_base = ist->st->time_base;
-             switch(codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 codec->pix_fmt = icodec->pix_fmt;
-                 codec->width = icodec->width;
-                 codec->height = icodec->height;
-                 codec->has_b_frames = icodec->has_b_frames;
-                 break;
--            case CODEC_TYPE_SUBTITLE:
-+            case AVMEDIA_TYPE_SUBTITLE:
-                 break;
-             default:
-                 return false;
-             }
-         } else {
-             switch(codec->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 ost->video_resample = ((codec->width != icodec->width) ||
-                         (codec->height != icodec->height) ||
-                         (codec->pix_fmt != icodec->pix_fmt));
-@@ -686,7 +676,7 @@
-                 return false;
-             }
-         }
--        if(codec->codec_type == CODEC_TYPE_VIDEO){
-+        if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
-             int size= codec->width * codec->height;
-             bit_buffer_size= FFMAX(bit_buffer_size, 4*size);
-         }
-@@ -738,7 +728,7 @@
-                         ist->file_index, ist->index);
-                 return false;
-             }
--            //if (ist->st->codec->codec_type == CODEC_TYPE_VIDEO)
-+            //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-             //    ist->st->codec->flags |= CODEC_FLAG_REPEAT_FIELD;
-         }
-     }
-@@ -786,7 +776,7 @@
-             ost = ost_table[i];
-             os = output_files[ost->file_index];
-             ist = ist_table[ost->source_index];
--            if(ost->st->codec->codec_type == CODEC_TYPE_VIDEO)
-+            if(ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-                 opts = ost->sync_opts * av_q2d(ost->st->codec->time_base);
-             else
-                 opts = ost->st->pts.val * av_q2d(ost->st->time_base);
-@@ -924,22 +914,22 @@
- void print_error(const char *filename, int err)
- {
-     switch(err) {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EINVAL):
-         fprintf(stderr, "%s: Incorrect image filename syntax.\n", 
-                 filename);
-         break;
-     case AVERROR_INVALIDDATA:
-         fprintf(stderr, "%s: Error while parsing header\n", filename);
-         break;
--    case AVERROR_NOFMT:
-+    case AVERROR(EILSEQ):
-         fprintf(stderr, "%s: Unknown format\n", filename);
-         break;
--    case AVERROR_IO:
-+    case AVERROR(EIO):
-         fprintf(stderr, "%s: I/O error occured\n"
- 	        "Usually that means that input file is truncated and/or corrupted.\n",
- 		filename);
-         break;
--    case AVERROR_NOMEM:
-+    case AVERROR(ENOMEM):
-         fprintf(stderr, "%s: memory allocation error occured\n", filename);
-         break;
-     default:
-@@ -968,9 +958,9 @@
-     ap->pix_fmt = frame_pix_fmt;
-     ap->channel = 0;
-     ap->standard = 0;
--    ap->video_codec_id = CODEC_ID_NONE;
-+    ic->video_codec_id = CODEC_ID_NONE;
-     if(pgmyuv_compatibility_hack)
--        ap->video_codec_id= CODEC_ID_PGMYUV;
-+        ic->video_codec_id= CODEC_ID_PGMYUV;
- 
-     /* open the input file with generic libav function */
-     err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
-@@ -999,7 +989,7 @@
-         AVCodecContext *enc = ic->streams[i]->codec;
-         enc->thread_count= 1;
-         switch(enc->codec_type) {
--        case CODEC_TYPE_VIDEO:
-+        case AVMEDIA_TYPE_VIDEO:
-             frame_height = enc->height;
-             frame_width = enc->width;
-             frame_aspect_ratio = av_q2d(enc->sample_aspect_ratio) * enc->width / enc->height;
-@@ -1020,13 +1010,12 @@
-             frame_rate      = rfps;
-             frame_rate_base = rfps_base;
- 
--            enc->rate_emu = 0;
-             break;
--        case CODEC_TYPE_DATA:
-+        case AVMEDIA_TYPE_DATA:
-             break;
--        case CODEC_TYPE_SUBTITLE:
-+        case AVMEDIA_TYPE_SUBTITLE:
-             break;
--        case CODEC_TYPE_UNKNOWN:
-+        case AVMEDIA_TYPE_UNKNOWN:
-             break;
-         default:
-             //av_abort();
-@@ -1058,12 +1047,12 @@
-         for(i=0;i<ic->nb_streams;i++) {
-             AVCodecContext *enc = ic->streams[i]->codec;
-             switch(enc->codec_type) {
--            case CODEC_TYPE_VIDEO:
-+            case AVMEDIA_TYPE_VIDEO:
-                 has_video = 1;
-                 break;
--            case CODEC_TYPE_DATA:
--            case CODEC_TYPE_UNKNOWN:
--            case CODEC_TYPE_SUBTITLE:
-+            case AVMEDIA_TYPE_DATA:
-+            case AVMEDIA_TYPE_UNKNOWN:
-+            case AVMEDIA_TYPE_SUBTITLE:
-                 break;
-             default:
-                 //av_abort();
-@@ -1086,14 +1075,14 @@
-         fprintf(stderr, "Could not alloc stream\n");
-         return false;
-     }
--    avcodec_get_context_defaults2(st->codec, CODEC_TYPE_VIDEO);
-+    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
- 
-     video_enc = st->codec;
- 
-     {
-         AVCodec *codec;
- 
--        codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
-+        codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
- 
-         video_enc->codec_id = codec_id;
-         codec = avcodec_find_encoder(codec_id);
-@@ -1203,7 +1192,7 @@
-     oc = avformat_alloc_context();
- 
-     if (!file_oformat) {
--        file_oformat = guess_format(NULL, filename, NULL);
-+        file_oformat = av_guess_format(NULL, filename, NULL);
-         if (!file_oformat) {
-             fprintf(stderr, "Unable for find a suitable output format for '%s'\n",
-                     filename);
-@@ -1239,7 +1228,7 @@
-     /* check filename in case of an image number is expected */
-     if (oc->oformat->flags & AVFMT_NEEDNUMBER) {
-         if (!av_filename_number_test(oc->filename)) {
--            print_error(oc->filename, AVERROR_NUMEXPECTED);
-+            print_error(oc->filename, AVERROR(EINVAL));
-             return false;
-         }
-     }
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch
deleted file mode 100644
index 4d032d89235e..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-ffmpeg1.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Index: vdr2jpeg-0.1.9/ffm.cpp
-===================================================================
---- vdr2jpeg-0.1.9.orig/ffm.cpp
-+++ vdr2jpeg-0.1.9/ffm.cpp
-@@ -22,6 +22,7 @@
- extern "C" {
- #include <libavutil/avutil.h>
- #include <libavutil/mathematics.h>
-+#include <libavutil/pixdesc.h>
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
-@@ -55,14 +56,12 @@ static int video_qdiff = 3;
- static const char *video_rc_eq="tex^qComp";
- static int me_method = ME_EPZS;
- 
--static int same_quality = 1;
- 
- static int top_field_first = -1;
- 
- 
- 
- 
--static float mux_preload= 0.5;
- static float mux_max_delay= 0.7;
- 
- static int64_t input_ts_offset = 0;
-@@ -150,7 +149,7 @@ static bool do_video_out(AVFormatContext
-                          int *frame_size)
- {
-     int nb_frames, i, ret;
--    AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
-+    AVFrame *final_picture, *formatted_picture, *resampling_dst;
-     AVFrame picture_crop_temp, picture_pad_temp;
-     AVCodecContext *enc, *dec;
- 
-@@ -195,11 +194,9 @@ static bool do_video_out(AVFormatContext
-     }
- 
-     final_picture = formatted_picture;
--    padding_src = formatted_picture;
-     resampling_dst = &ost->pict_tmp;
- 
-     if (ost->video_resample) {
--        padding_src = NULL;
-         final_picture = &ost->pict_tmp;
-         sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
-               0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
-@@ -242,10 +239,7 @@ static bool do_video_out(AVFormatContext
- 
-             /* handles sameq here. This is not correct because it may
-                not be a global option */
--            if (same_quality) {
--                big_picture.quality = (int)ist->st->quality;
--            }else
--                big_picture.quality = (int)ost->st->quality;
-+            big_picture.quality = ist->st->codec->global_quality;
-                 big_picture.pict_type = (AVPictureType) 0;
- //            big_picture.pts = AV_NOPTS_VALUE;
-             big_picture.pts= ost->sync_opts;
-@@ -328,7 +322,7 @@ static int output_packet(AVInputStream *
- 
-                     ret = avcodec_decode_video2(ist->st->codec,
-                                                &picture, &got_picture, &pkt);
--                    ist->st->quality= picture.quality;
-+                    ist->st->codec->global_quality= picture.quality;
-                     if (ret < 0)
-                         goto fail_decode;
-                     if (!got_picture) {
-@@ -618,31 +612,6 @@ static bool av_encode(AVFormatContext **
-         codec = ost->st->codec;
-         icodec = ist->st->codec;
- 
--        if (ost->st->stream_copy) {
--            /* if stream_copy is selected, no need to decode or encode */
--            codec->codec_id = icodec->codec_id;
--            codec->codec_type = icodec->codec_type;
--            if(!codec->codec_tag) codec->codec_tag = icodec->codec_tag;
--            codec->bit_rate = icodec->bit_rate;
--            codec->extradata= icodec->extradata;
--            codec->extradata_size= icodec->extradata_size;
--            if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000)
--                codec->time_base = icodec->time_base;
--            else
--                codec->time_base = ist->st->time_base;
--            switch(codec->codec_type) {
--            case AVMEDIA_TYPE_VIDEO:
--                codec->pix_fmt = icodec->pix_fmt;
--                codec->width = icodec->width;
--                codec->height = icodec->height;
--                codec->has_b_frames = icodec->has_b_frames;
--                break;
--            case AVMEDIA_TYPE_SUBTITLE:
--                break;
--            default:
--                return false;
--            }
--        } else {
-             switch(codec->codec_type) {
-             case AVMEDIA_TYPE_VIDEO:
-                 ost->video_resample = ((codec->width != icodec->width) ||
-@@ -675,7 +644,6 @@ static bool av_encode(AVFormatContext **
-             default:
-                 return false;
-             }
--        }
-         if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
-             int size= codec->width * codec->height;
-             bit_buffer_size= FFMAX(bit_buffer_size, 4*size);
-@@ -690,7 +658,7 @@ static bool av_encode(AVFormatContext **
-     /* dump the file output parameters - cannot be done before in case
-        of stream copy */
-     for(i=0;i<nb_output_files;i++) {
--        dump_format(output_files[i], i, output_files[i]->filename, 1);
-+        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
-     }
- 
-     /* open each encoder */
-@@ -749,7 +717,7 @@ static bool av_encode(AVFormatContext **
-     /* open files and write file headers */
-     for(i=0;i<nb_output_files;i++) {
-         os = output_files[i];
--        if (av_write_header(os) < 0) {
-+        if (avformat_write_header(os,NULL) < 0) {
-             fprintf(stderr, "Could not write header for output file #%d (incorrect codec parameters ?)\n", i);
-             ret = false; //AVERROR(EINVAL);
-             goto fail;
-@@ -941,36 +909,32 @@ void print_error(const char *filename, i
- static bool opt_input_file(const char *filename)
- {
-     AVFormatContext *ic;
--    AVFormatParameters params, *ap = &params;
-     int err, ret, rfps, rfps_base;
-     unsigned int i;
-     int64_t timestamp;
-+    AVDictionary *opts = NULL;
-+    char buf[1024];
- 
-     /* get default parameters from command line */
-     ic = avformat_alloc_context();
- 
--    memset(ap, 0, sizeof(*ap));
--    ap->prealloced_context = 1;
--    ap->time_base.den = frame_rate;
--    ap->time_base.num = frame_rate_base;
--    ap->width = frame_width + 0 + 0;
--    ap->height = frame_height + 0 + 0;
--    ap->pix_fmt = frame_pix_fmt;
--    ap->channel = 0;
--    ap->standard = 0;
-+    snprintf(buf, sizeof(buf), "%d/%d", frame_rate, frame_rate_base);
-+    av_dict_set(&opts, "framerate", buf, 0);
-+    snprintf(buf, sizeof(buf), "%dx%d", frame_width, frame_height);
-+    av_dict_set(&opts, "video_size", buf, 0);
-+    av_dict_set(&opts, "pixel_format", av_get_pix_fmt_name(frame_pix_fmt), 0);
-+
-     ic->video_codec_id = CODEC_ID_NONE;
-     if(pgmyuv_compatibility_hack)
-         ic->video_codec_id= CODEC_ID_PGMYUV;
- 
-     /* open the input file with generic libav function */
--    err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
-+    err = avformat_open_input(&ic, filename, file_iformat, &opts);
-     if (err < 0) {
-         print_error(filename, err);
-         return 0;
-     }
- 
--    ic->loop_input = 0;
--
-     /* If not enough info to get the stream parameters, we decode the
-        first frames to get it. (used in mpeg case for example) */
-     ret = av_find_stream_info(ic);
-@@ -1027,7 +991,7 @@ static bool opt_input_file(const char *f
-     input_files_ts_offset[nb_input_files] = input_ts_offset - timestamp;
-     /* dump the file content */
-     if (verbose >= 0)
--        dump_format(ic, nb_input_files, filename, 0);
-+        av_dump_format(ic, nb_input_files, filename, 0);
- 
-     nb_input_files++;
-     file_iformat = NULL;
-@@ -1133,11 +1097,8 @@ static bool new_video_stream(AVFormatCon
- 
- /*      if (intra_only)
-             video_enc->gop_size = 0;*/
--        if (same_quality) {
-             video_enc->flags |= CODEC_FLAG_QSCALE;
--            st->quality = FF_QP2LAMBDA;
--            video_enc->global_quality= (int)st->quality;
--        }
-+            video_enc->global_quality= FF_QP2LAMBDA;
- 
-         video_enc->max_qdiff = video_qdiff;
-         video_enc->rc_eq = video_rc_eq;
-@@ -1187,7 +1148,6 @@ static bool opt_output_file(const char *
- {
-     AVFormatContext *oc;
-     int use_video, input_has_video = 0;
--    AVFormatParameters params, *ap = &params;
- 
-     oc = avformat_alloc_context();
- 
-@@ -1219,8 +1179,6 @@ static bool opt_output_file(const char *
-                 return false;
-         }
- 
--        oc->timestamp = 0;
--
-     }
- 
-     output_files[nb_output_files++] = oc;
-@@ -1233,16 +1191,7 @@ static bool opt_output_file(const char *
-         }
-     }
- 
--    memset(ap, 0, sizeof(*ap));
--    if (av_set_parameters(oc, ap) < 0) {
--        fprintf(stderr, "%s: Invalid encoding parameters\n",
--                oc->filename);
--        return false;
--    }
--
--    oc->preload= (int)(mux_preload*AV_TIME_BASE);
-     oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE);
--    oc->loop_output = AVFMT_NOOUTPUTLOOP;
- 
-     /* reset some options */
-     file_oformat = NULL;
-@@ -1323,7 +1272,7 @@ bool decode (const char* szMPVfile, /* c
-         AVFormatContext *s = output_files[i];
- 
-         if (!(s->oformat->flags & AVFMT_NOFILE))
--	    url_fclose(s->pb);
-+	    avio_close(s->pb);
- 	for(j=0;j<s->nb_streams;j++)
- 	    av_free(s->streams[j]);
-         av_free(s);
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
deleted file mode 100644
index c984cfc4cff5..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ffm.cpp.old	2013-06-22 20:12:27.972712290 +0200
-+++ ffm.cpp	2013-06-22 20:13:33.586709956 +0200
-@@ -672,7 +672,7 @@
-                         ost->file_index, ost->index);
-                 return false;
-             }
--            if (avcodec_open(ost->st->codec, codec) < 0) {
-+            if (avcodec_open2(ost->st->codec, codec, NULL) < 0) {
-                 fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
-                         ost->file_index, ost->index);
-                 return false;
-@@ -691,7 +691,7 @@
-                         ist->st->codec->codec_id, ist->file_index, ist->index);
-                 return false;
-             }
--            if (avcodec_open(ist->st->codec, codec) < 0) {
-+            if (avcodec_open2(ist->st->codec, codec, NULL) < 0) {
-                 fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
-                         ist->file_index, ist->index);
-                 return false;
-@@ -937,7 +937,7 @@
- 
-     /* If not enough info to get the stream parameters, we decode the
-        first frames to get it. (used in mpeg case for example) */
--    ret = av_find_stream_info(ic);
-+    ret = avformat_find_stream_info(ic, NULL);
-     if (ret < 0 && verbose >= 0) {
-         fprintf(stderr, "%s: could not find codec parameters\n", filename);
-         return false;
-@@ -1034,12 +1034,13 @@
-     AVCodecContext *video_enc;
-     CodecID codec_id;
- 
--    st = av_new_stream(oc, oc->nb_streams);
-+    st = avformat_new_stream(oc, NULL);
-     if (!st) {
-         fprintf(stderr, "Could not alloc stream\n");
-         return false;
-     }
--    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
-+    st->id = oc->nb_streams;
-+    avcodec_get_context_defaults3(st->codec, NULL);
- 
-     video_enc = st->codec;
- 
-@@ -1204,7 +1205,7 @@
- {
-     av_log_set_level(verbose);
-     av_register_all();
--    avctx_opts= avcodec_alloc_context();
-+    avctx_opts= avcodec_alloc_context3(NULL);
- }
- 
- void ffm_deinitalize(void)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c069c456f376..e832f9f0d033 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,12 +4,8 @@ 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.11.1.tar.xz 25886644 BLAKE2B b3cf3f8776086fcd45ca20918be8951960bf3d18c219d0d512f64bfe89d3e947300875b4b8e1a27742132400fd9a3b32f5e84afd08f52254899a23922a682361 SHA512 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
-DIST vlc-3.0.11.tar.xz 26041744 BLAKE2B 1afa0ae9e54449e32a441e9ec563fedc78476b4c0438286cbe273d9f8185f6f8be1e14688878e40180db5c6a7673f14ed53c0e763d376f5e6bb9dc1b02719bf2 SHA512 8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444
-EBUILD vlc-3.0.10-r1.ebuild 13009 BLAKE2B 915363b2715e7271fb89c6fac555681283253093365b9ef5ccfdf2eee7b5be0ffe2160ad815851828b31f3af93760b2a1c556b159cdea76ab3c101ebe473de72 SHA512 432477a62d98ad60fd95feaef9c990b1f8af0f388f8c950b8afb1981d370633ea9c1c86a6c516e79d97cc284c1e545eb55fa1f33bdf22aa262404a6363cda060
-EBUILD vlc-3.0.11.1.ebuild 13034 BLAKE2B 51d55a3eb1f0be21bf1c77051bcd7efe3ef58e6410dc054acf0a54638d087582a91e2979c6dc91fed093c237aeff0a3d05cbf9db7db51b6d43ff417963f03a87 SHA512 6fe634a69d04cdee4a4472afcfbbd8b589a8c1bb475c8fdcbcce92e32ea7fea61adb70b9c363fd3c2f6930545f7fbdf9d38d4279a6d866f272fdb6c01485c35d
-EBUILD vlc-3.0.11.ebuild 13013 BLAKE2B 60a4e52693fdc2bd57c9ceddfb162219b5880d3e56f03c43277f4e015bf400a293978edec82b22d5233cb554abdd9d4749db2b930724489c0bfe35e7f94c5c6a SHA512 eeb8ad807680cb9e23a37ba21c8a96876a6b85f9c9369d44bcaf1fc4e7b875a997048bef2c211128a6d52475874fa32eeb28f744ed402d27aa565474cca6b9b0
+EBUILD vlc-3.0.11.1.ebuild 13032 BLAKE2B fa553af69eefea08a196bf942278bfca08e21a6547eaa3ab1b49f1f676081e85f31ace2c64b9a509cc6f7e8bd6de6665f8fe1bde56a58819afc0d348540535c7 SHA512 5f4f5eb7547cc178379ce620f526ff054c92090cb4106e24e20b4e8a856991b9c01374954f047a48896e768f156a51eb015d106af76d89fa9dd79213ab33720d
 EBUILD vlc-3.0.9999.ebuild 12972 BLAKE2B 8e482bb570241a0dd0f521969ee61ac27ca778e543b7a3a4fa929a7625cd0e665996a35cc0372029b89f2be7371b45027228d1b34122aaa5dd2a759d4b0796ae SHA512 deabd1124cf6b8a265c0efc6ae9d594a3d46a820fe857acddae873b0bc3c24ab2abcc56329579b1049845879860626fc9be94cd70ce29796fdf02f1eaa326fc1
 EBUILD vlc-9999.ebuild 12993 BLAKE2B 9229920f8ebd589629e6d01e41a4ebb6e6cd60cc90522eae3e5fab31248416f6ac3fbc11c2fa14fe99ec5dc8b2d5f79bc5d6bdd619f39c25cce8add803d45753 SHA512 9d582e9ef7529630471a6c6f79db22425c10cfb3ba0d7ce50f0713efce8f12829e9834b4fb79ede558513238ae180f204635f6816074465e292122920a9f4e68
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/vlc-3.0.10-r1.ebuild b/media-video/vlc/vlc-3.0.10-r1.ebuild
deleted file mode 100644
index 3e8e9eef5c77..000000000000
--- a/media-video/vlc/vlc-3.0.10-r1.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# 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 -x BUILDCC=$(tc-getBUILD_CC)
-
-	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-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.11.1.ebuild b/media-video/vlc/vlc-3.0.11.1.ebuild
index 14d2c16fc755..6de775401010 100644
--- a/media-video/vlc/vlc-3.0.11.1.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1.ebuild
@@ -19,7 +19,7 @@ else
 	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"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 -sparc x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
diff --git a/media-video/vlc/vlc-3.0.11.ebuild b/media-video/vlc/vlc-3.0.11.ebuild
deleted file mode 100644
index 362aad443acd..000000000000
--- a/media-video/vlc/vlc-3.0.11.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# 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.1.2:=
-	)
-	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 -x BUILDCC=$(tc-getBUILD_CC)
-
-	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-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
-}