gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-video
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
91 files changed, 1128 insertions, 1328 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 11dc78445117..e90ec3780f7c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a16109db27cf..a5b1c688264c 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-2.7.3.ebuild 3866 BLAKE2B 63c7cdc7d023d62356ae47198a6e22236b45199b1d1dfad06ce7d0343a76e51e379f69871ce4ed2018d74da92806639c975deeead8fe1900070bb4341de2e4c1 SHA512 2b579a10245f6fa062ee88b6d991ded8c77ef3fa5713387836ccb19dbe9270667875716baa48cd6fd10e4570f7d60151c45a6df17ca8b4879dc536c76d21a111
-EBUILD avidemux-2.7.4-r1.ebuild 3676 BLAKE2B 259d76cf3e50e6733645538959732cf4be512b326d3d5fe5c34be1c16532c8979d1113a5deb9e18d55271d689c2bfd61e34b37dbe9f57429d7358da146ac4a93 SHA512 077e1f9950fbb6e88c74bf6c9687f72bb39b56dbd2b17ba96f4b37d35ad5ad03af0595403f68992ccfd961f3726bdbdec4dbb95db55dab6a48233ddb04ce85cf
+EBUILD avidemux-2.7.3.ebuild 3830 BLAKE2B afde6461c3fbc56adc755c281070cfea51c21a93670675da2fcc7e21901370d2cfb666a38b2e592bd8746514de882286cb5f76e3736942b62670c30dfaee67ee SHA512 87670a0162268554bbe029d772c0a2a546a6db5765c1cec98bc4c70e78e17bedb8c8e855ba15eb2e733e9fd45112d3b045749cfc35c025a748eda98050549f93
+EBUILD avidemux-2.7.4-r1.ebuild 3640 BLAKE2B 261db989383e3a46061c5ef0ac65bb7d9b9f26be4cd151c51650fc7680ffb4765cec1a4d2f6a9061159c4fe748d605fe57e895bec5cd93c549bceb2d33b242fb SHA512 432821297e1cfa49fe1542585eddf8359bdeb1f3a20152ec35705d07f70cdc64cb0806a19aa38ea419d0ba98190015dbcc282a02c4dd5cf053423c5eefe75a41
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.3.ebuild b/media-video/avidemux/avidemux-2.7.3.ebuild
index 40f4f5d8b223..5b4a9629c09b 100644
--- a/media-video/avidemux/avidemux-2.7.3.ebuild
+++ b/media-video/avidemux/avidemux-2.7.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils desktop qmake-utils xdg
+inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -50,7 +50,7 @@ src_prepare() {
 	fi
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 
 	# Fix icon name -> avidemux-2.7
@@ -108,28 +108,28 @@ src_configure() {
 
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_test() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_test
+		BUILD_DIR="${build}" cmake_src_test
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 
 	cd "${S}" || die "Can't enter source folder."
diff --git a/media-video/avidemux/avidemux-2.7.4-r1.ebuild b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
index 16632727c8d9..cc9638e1c582 100644
--- a/media-video/avidemux/avidemux-2.7.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.7.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils desktop qmake-utils xdg
+inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
@@ -46,7 +46,7 @@ src_prepare() {
 	use qt5 && processes+=" buildQt4:avidemux/qt4"
 
 	for process in ${processes} ; do
-		CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
+		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 
 	if use qt5; then
@@ -98,28 +98,28 @@ src_configure() {
 
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
 	done
 }
 
 src_compile() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_compile
+		BUILD_DIR="${build}" cmake_src_compile
 	done
 }
 
 src_test() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_test
+		BUILD_DIR="${build}" cmake_src_test
 	done
 }
 
 src_install() {
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
-		BUILD_DIR="${build}" cmake-utils_src_install
+		BUILD_DIR="${build}" cmake_src_install
 	done
 
 	if use qt5; then
diff --git a/media-video/bashnapi/Manifest b/media-video/bashnapi/Manifest
index 29cb634e6a75..c62b8e76830b 100644
--- a/media-video/bashnapi/Manifest
+++ b/media-video/bashnapi/Manifest
@@ -1,3 +1,5 @@
 DIST bashnapi_v1.3.5.tar.gz 98580 BLAKE2B 4a7b42f91c14c7dc24cbf14535700a778d915db0dec31206cd7bb91519f33aa4eedced56aa4efa136e3eef23f6674d1a7dafe6c63686aca4dccf076952da762d SHA512 7cf5abb009021a43261be863f320d6324b02ea25f1388c7cc99a4f695a3eb987971ada172f74d21e3a44deeec35e48c4424fa378de53749f994b6c0d0f76eec8
-EBUILD bashnapi-1.3.5.ebuild 1191 BLAKE2B 9de6ff32cad26dcb7af6bb5887e92319173a60607a928aaf99ae88488e22f332b9c7bbaf4da683d9fe97d2722a52aec19e8cd8415cf0a6889e3f60260aedca5e SHA512 7eaea6de7b4ef121ea70faff2c76ee963c0f76af9ca9440cffd7eea5c86bd6bb2129eeda6b9f56250e15e7a616c5be20a9c4ae589f92dae60bcabadcde7260dc
+DIST napi-2.0.0.tar.gz 104326 BLAKE2B f7fbea40bfbcadbefa44b31ca4689a4ce4470abf715fc7c38f2b06c911cd8a32f8dcf0ae605cdf6bb9afb00b64ae1bbb468ad02e094c3e4d272745177c5ae6e7 SHA512 fc64d8d815c2014e04115623099351226a66268c2b414fa3cee37fd73f4e6a84f41cc57e96184d9f30e72e84ba98f886be45e68b4c9d3c774c874ea40bc6c2b7
+EBUILD bashnapi-1.3.5.ebuild 1122 BLAKE2B d8b0619f91949ffab1781553a9d835b90e8d7c2412e6f0a35cb7ce8241749f5de85878fda067d5e1fbc6aa1448e4c6d943da872f935d9f4e0d89044534650348 SHA512 bec66dd3d47eb4ce7459ad84959d52b0fefb5aabdea312d291b364698e84bc8401d6f25081030c712f14842b19c3c446ef72ac7de6033a77e6db6eded7bc3839
+EBUILD bashnapi-2.0.0.ebuild 979 BLAKE2B 0d455073411ff5787650a09f87be62101300d45530992a46372144393735a15bd169e98a1501dd662576051dc109c6b5ecba587b1ff438ba74e725f4fc001221 SHA512 153173946af9522e44bdb173ca47363270095c3664999c456a850db157453fa927eaf51e0cb7983104bfa3c7a69fb377ed0310e8ac03a3daa6b1157a22cc9959
 MISC metadata.xml 325 BLAKE2B d80d1433192e99fcf314cee37c43606d74f771b7975fe0bea47610268a4cf616fe1f25ddd647b85f7b3bec4829fd268938a8cbae25596902ae589483c56b8a88 SHA512 93311c8909919558e542db42c144d361ee0289e4c61fa2d49508941f1aa93e307fc6f9a6afce008e3fe54a964cfe35b7774fb94eca405cd4dabba8aa9cb80732
diff --git a/media-video/bashnapi/bashnapi-1.3.5.ebuild b/media-video/bashnapi/bashnapi-1.3.5.ebuild
index 9671be6e2615..993294be32e4 100644
--- a/media-video/bashnapi/bashnapi-1.3.5.ebuild
+++ b/media-video/bashnapi/bashnapi-1.3.5.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
@@ -12,9 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# subotage is now integrated into bashnapi
-RDEPEND="app-arch/p7zip
-	!media-video/subotage"
+RDEPEND="app-arch/p7zip"
 
 S=${WORKDIR}/napi-${PV}
 
diff --git a/media-video/bashnapi/bashnapi-2.0.0.ebuild b/media-video/bashnapi/bashnapi-2.0.0.ebuild
new file mode 100644
index 000000000000..00ed00435858
--- /dev/null
+++ b/media-video/bashnapi/bashnapi-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=napi-${PV}
+DESCRIPTION="Napiprojekt.pl subtitle downloader in bash"
+HOMEPAGE="https://sourceforge.net/projects/bashnapi/"
+SRC_URI="https://download.sourceforge.net/bashnapi/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-arch/p7zip
+	net-misc/wget
+	sys-apps/debianutils
+	sys-apps/file"
+
+# tests are normally run via docker
+RESTRICT="test"
+
+pkg_postinst() {
+	# packages that can be used to detect FPS
+	local fps_pkgs=(
+		media-video/ffmpeg
+		media-video/mediainfo
+		media-video/mplayer
+		# also mplayer2
+	)
+	local p found
+
+	for p in "${fps_pkgs[@]}"; do
+		if has_version "${p}"; then
+			found=1
+			break
+		fi
+	done
+
+	if [[ ! ${found} ]]; then
+		elog "In order to support FPS detection, install one of the following packages:"
+		elog
+		for p in "${fps_pkgs[@]}"; do
+			elog "  ${p}"
+		done
+	fi
+}
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index a7e7bff06931..09ad2444e0c2 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,3 @@
-DIST cheese-3.30.0.tar.xz 1546680 BLAKE2B 32cfc9553e1c9ebfe7d3eb5fdf19d74b49e9f69ea005f4c79097d69caa2125803c5c319e98ccd3e8f72157a5fd86c018f1be7af7045f6541ecd36d4162c5cdd1 SHA512 622910cedc8eadec4161f60e2bb3f02cbe11352b2431fdd9783f724b4119ffae6254b1566e1144c25491067f9c683a55eb85b265ef28992d852adce02fbdc8b4
 DIST cheese-3.32.1.tar.xz 1487792 BLAKE2B 6e27b68f590aa4f90a8bbbc72972bed96fe9741b4efd849d226751cfd6abe37241fa214240c4a8b0449fb2bc53de1043ac0abd60a06bc884796a4272c07212af SHA512 bdd0ae72e3df596d19ad467dc0222a49b028f2ad8c285d55360813624ca2dac1956463cfd9cea4f2a6ff123070966544cd7254ee2891e973dca42d07061a6c94
-EBUILD cheese-3.30.0.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
 EBUILD cheese-3.32.1.ebuild 1945 BLAKE2B 389b37c1dbb908d1b41b2ad91c4064059861e949d5c860d7ef226d51bcb4d20cab4fbc8221834b89b880d61ece209519cb06615cc5f7166cac71e5cc91ff8260 SHA512 9e0a2b41c23aba4915e83d44fa6e2dab3f7a89ff87060ae9a53e4cf37ccba0ec2c516cc47479001041fbaa693adf0ddbef862c6957d6d050d1a98dc014de1d52
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.30.0.ebuild b/media-video/cheese/cheese-3.30.0.ebuild
deleted file mode 100644
index 417c6ee59b6c..000000000000
--- a/media-video/cheese/cheese-3.30.0.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/devedeng/Manifest b/media-video/devedeng/Manifest
index f3a1c25c9dbe..f5233226ecf4 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 1177 BLAKE2B b4c966dcf013b6c262d7d415a1caf513ad1b5d0d5846ecc20a419c36930c622271e1cddd37b6f2907943c3dc25c7c67789712893858494cbfcde370a01856763 SHA512 cd784dbadb9348f82cc035f13fdbe0acb3370a999bb9ae19600f11c57a3e414f640ab96824d7187ca02a5b1dca9f589ad1cb0490661616a860ae59bed88defeb
-EBUILD devedeng-4.16.0.ebuild 1177 BLAKE2B b4c966dcf013b6c262d7d415a1caf513ad1b5d0d5846ecc20a419c36930c622271e1cddd37b6f2907943c3dc25c7c67789712893858494cbfcde370a01856763 SHA512 cd784dbadb9348f82cc035f13fdbe0acb3370a999bb9ae19600f11c57a3e414f640ab96824d7187ca02a5b1dca9f589ad1cb0490661616a860ae59bed88defeb
+EBUILD devedeng-4.15.0.ebuild 1175 BLAKE2B e3917282d6e0a2042572b98fe45af7e359b9b941495e7211507443d25461813c015ea71f28f4a602290f3fe4eacd4f6659e23d7d8092421f1384b05ef8267792 SHA512 6e51ac3e79d6f06dc3beef998284b4e3feff640879fe308fc4fc67703e466d7e4cda08ce771533db81493adea9b21dbfce237e5e66a1b3fcd7ef2701158f2a0c
+EBUILD devedeng-4.16.0.ebuild 1175 BLAKE2B e3917282d6e0a2042572b98fe45af7e359b9b941495e7211507443d25461813c015ea71f28f4a602290f3fe4eacd4f6659e23d7d8092421f1384b05ef8267792 SHA512 6e51ac3e79d6f06dc3beef998284b4e3feff640879fe308fc4fc67703e466d7e4cda08ce771533db81493adea9b21dbfce237e5e66a1b3fcd7ef2701158f2a0c
 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 49f2ddc96b22..2d220b281340 100644
--- a/media-video/devedeng/devedeng-4.15.0.ebuild
+++ b/media-video/devedeng/devedeng-4.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 xdg
 
diff --git a/media-video/devedeng/devedeng-4.16.0.ebuild b/media-video/devedeng/devedeng-4.16.0.ebuild
index 49f2ddc96b22..2d220b281340 100644
--- a/media-video/devedeng/devedeng-4.16.0.ebuild
+++ b/media-video/devedeng/devedeng-4.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 xdg
 
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 4d6f924fbe2e..6aaa8c39cfc8 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 1157 BLAKE2B 16f27b9d247139ed5a956ae1310e8bf39b8a844541f4f185f989559e05a20916083e9bd609fa259400cb22bf94175e9e8e7bcdb605f48ce064684faef0f53e97 SHA512 77994fabeb2540f3d5e3183029025bc83927a2c5ac278e8c43451be6f599716a914f2909e7f0e111fc58c0b861a9a8945db4cd201bd1d7d099b929b18c16347b
+EBUILD ffmpegthumbnailer-2.2.0-r1.ebuild 1139 BLAKE2B a29eb552281f3afee3ad87858a26449237221133555750d2ce475d84530578b33b3e1887010c5db645dbc80a8896768888ef52befc67d9c37b988079d120baf4 SHA512 fa93ed97626b7779799e0d1d2fec0bdec9255d25e3154f9ebae9eec52e48878d8cb2ff9273f0e6c74e3f55f98259a292c00312c36a999ea44b0ae375df28dc5b
 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 4f247e2eb8b2..0196f0eff333 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="https://github.com/dirkvdb/ffmpegthumbnailer"
@@ -37,7 +37,7 @@ PATCHES=( "${FILESDIR}/${P}-pkgconfig-libdir.patch" )
 src_prepare() {
 	rm -rf out* || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,5 +48,5 @@ src_configure() {
 		-DHAVE_JPEG=$(usex jpeg)
 		-DHAVE_PNG=$(usex png)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 06a86fdc68d1..65b4c0d20192 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -2,7 +2,7 @@ AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd
 DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
 DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
 DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
-EBUILD gaupol-1.5.ebuild 1415 BLAKE2B da61e1b64b867ae1c95c635eacee570f5bd4ccf956622271fb9d75be4748f507f3391cff10fcc82781df5ebf0efc17662017e3b5ccbf3e260413e82e50cdd21e SHA512 b363c09db0de7ddd4f1431709d65771bcc5b7f25652fb3ee2aff3e131a6c7a8a8e9e240ff9ec771ab8762514bbdd60ecf597db04d83a4ea2f5f18bf674ba2ebd
-EBUILD gaupol-1.6.ebuild 1418 BLAKE2B 94b8905d6040f79341106848cdab64fb1a9a399d832ce059ffef2d667ae85a955ea1722454dcc92dee57fae0ba9913387e827d688590322468cc34b7f5bb2b72 SHA512 72b41ed62994e5c98fe9d5832bad68fddfb81d628d7dda8bc2312cf5b6905f41cae132bcd772f4303d2d78cbdc54bbcf27d646e14abcb612df9c5a8f1fffce57
-EBUILD gaupol-1.7.ebuild 1587 BLAKE2B 7769bc4934541d1e70df9be6818381c2c8a4546bf82243c811ddb228805b7f1b5885e22d98b2ad646df376d5d228e2869a2798db4f6d4dc7376973ff56842d1f SHA512 083d7257c57503759dd770c422a4f4179103864afe9f98bc5687c2ef6b4ad01b80f8830c5e69b629cd1083f2c526d58824ce268c61657d40057c29491360dd85
+EBUILD gaupol-1.5.ebuild 1413 BLAKE2B f708ce550de1a86dea464daf9b0e854b6d822a1931a552a79c8580a9593440fd7aaac0538b718ef5e0ff20c4e1cee594a37eeba95cbb18dfc291b97dec4e3889 SHA512 7a9b28c986850c7b62fcbc0266f41c3fcb130c8227d4b3c9000d7691e60b11040362d5e1e9658218176af42e5ef2ca20a4b223efa8a0c24e6843c3ddcb705b2d
+EBUILD gaupol-1.6.ebuild 1416 BLAKE2B 8d155661f768683a2adcae10f6adfaa3ab44f4c0375e286942cade5c21eb72acbab1cd38695ab4e24b6f888a72a6a906600e73f6b9de2616de371280c726807d SHA512 2e954922a83060040a3b71422703d71801cec11b0883aaeeb3f38923e749d91a2def47ccd7c1efd20ccf12085eca5d4163bea27b31682f657f48a4ba918c95e4
+EBUILD gaupol-1.7.ebuild 1585 BLAKE2B 35ec5e82c552ce47683019f57409a27851fa5c5a3ab12e9983ec9bff0d68e2a3a7a1154d71f3e4f1d93251bb1d5e46513341d4a143022f6c867dd742a20e0b05 SHA512 38839496e3327a5f18e348cce0f67b0f72913c52962ef56c4b07c13228d4fe5c699275b26670b7bee69f781580bcb1daed10daf4171c2cd96b5662c47971271c
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-1.5.ebuild b/media-video/gaupol/gaupol-1.5.ebuild
index 37108f0087bb..a06376d939e2 100644
--- a/media-video/gaupol/gaupol-1.5.ebuild
+++ b/media-video/gaupol/gaupol-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 gnome2-utils virtualx xdg-utils
 
diff --git a/media-video/gaupol/gaupol-1.6.ebuild b/media-video/gaupol/gaupol-1.6.ebuild
index 1c23b089e22f..359bb2291dc2 100644
--- a/media-video/gaupol/gaupol-1.6.ebuild
+++ b/media-video/gaupol/gaupol-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 gnome2-utils virtualx xdg-utils
 
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.7.ebuild
index 2963b31a1fec..25b70f293bfa 100644
--- a/media-video/gaupol/gaupol-1.7.ebuild
+++ b/media-video/gaupol/gaupol-1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 576a83dfcdeb..0dcfceeddeb6 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -7,6 +7,6 @@ AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287
 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 4285 BLAKE2B 76b3ac6dcfc035d42744250557a8676f7a9b0e76ba839fea6fca83d511b10814352f5dec8c92586ee118f301744b87243ad035992df43214895f94e6038c53ef SHA512 e248267ead141ffce001b95ed92fdf395e4cd5cf8be35bf5faae90ae8a7e0b0f55eed12349dd508a45c719a66e094ff3f373e1c977f3d91875032ca9da25f3d8
-EBUILD handbrake-9999.ebuild 4223 BLAKE2B 238d1e5802944693bdbfb7c2f69e9829e16046c17dae1159c77257ed2868f93e4a267bce7d878121bd5d79715823db52f3568ccfb048b91f25d3a731ff42e048 SHA512 9685e8afaa1a62d7410484ff5722fa3a47596fc9cd62d540fbe5e57f7102162783eb3583877248881619d34793f5ec7262dc448db12e6f75107e8423634eb4eb
+EBUILD handbrake-1.3.0-r2.ebuild 4275 BLAKE2B 43fddc9f49b339b9e6257c9e02131334a373f52c503a99be228ce9a5b87b2fd5d8c9abd0a68f119f180911979020c8d9e78efe6d351590e11a4d3412727e9663 SHA512 0a8d3c598653c32da03d568e0a2d5b441cc2b276788d139359bad8388293576f87a389f461650ad59bb3b13d8061abf1e967e4f69be3ef0a6a8374d64edfdd93
+EBUILD handbrake-9999.ebuild 4213 BLAKE2B 4bb317de8260b88f39ddc997c7c2fc60a1901c7105d04f2624d9f324b5851c4d6744d029b0387accc23b3609859c8a334a8c6c9eff7517581683b3b01d7a2e68 SHA512 c035fe2e012f3e2aae938f75628a3f503f5cf76648e46b3ba8deabfde0ce99a8a3e13bfc764b824b0e6182f877881ca42ef1e06752d7e6341da7498e957d2a49
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index 21bb95bbbdbb..e5f8e2714182 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{1,2,3,4,5,6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,7} python2_7 )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index cfc362cad18f..59a9c3a97a83 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{1,2,3,4,5,6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,7} python2_7 )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 3df23e7c53f5..ee6e2d0a4776 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,3 @@
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
-EBUILD kaffeine-2.0.18.ebuild 1307 BLAKE2B b0edff04fb85d8c1030067e597ae4c8a53759ca696967cdb4757904f778e8acea8cba4beb33246c53d54ba359e58b25b35c7ccf5294ebb512890b70f6b3f5536 SHA512 08442396edb506fa76751e44c66b2344d9709c36f3b9d9c64ed56a07f5985fcc5f6cfd05e31e3148cdf1669ad9ff322e159a102a54eaf3f175162d1999e91ba3
+EBUILD kaffeine-2.0.18.ebuild 1444 BLAKE2B ea8a713fc0aaa108c6e28db08a760a0271222318f615a67d006b7295f9f20ac04a14606540cd959773213ed3be28a27f69c9e01224b88542af0fa87a3e097d16 SHA512 34dfcd7123d8d19d3d8079242b89e88f416e7e374ba97751099adca93346ce8c0bbe02b739c3d2ffb6437dbbdf496d555114f50b8b2fced45d6af7122a171832
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.18.ebuild b/media-video/kaffeine/kaffeine-2.0.18.ebuild
index 3c10640660ee..b59bb75d5120 100644
--- a/media-video/kaffeine/kaffeine-2.0.18.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional"
-inherit kde5
+ECM_HANDBOOK="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Media player with digital TV support by KDE"
 HOMEPAGE="https://userbase.kde.org/Kaffeine"
+
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+SLOT="5"
 IUSE="dvb"
 
 BDEPEND="
@@ -21,23 +25,23 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	media-video/vlc[X]
 	x11-libs/libXScrnSaver
 	dvb? ( media-libs/libv4l )
@@ -50,8 +54,8 @@ src_configure() {
 	# tools working on $HOME directory for a local git checkout
 	local mycmakeargs=(
 		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
+		$(cmake_use_find_package dvb Libdvbv5)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 1f1fb0436b55..5c63a8cf8788 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -6,5 +6,5 @@ AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b9
 AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r2.ebuild 2408 BLAKE2B 9101fb98b727227884a223f8e7386b8f166c531a589e2535b7663a4f62280c73114caea7b8a28cbb70e4d909bdf5582804b18afbe1613be0d3000ecb30edff91 SHA512 0c13ed1b2417d115d5360276f54a776599fb3d2585ff2429b3ac09e12a673b71ab11be9917d2cb93e9631090577df6a9abb5f90dde424931647a544a65473bfe
+EBUILD kmplayer-0.12.0b-r3.ebuild 2668 BLAKE2B 6a935c265b743b4416786017c3919eef83ef0c208d2b1def3e194f4c0cd868eb009ef351c31d6180761cebf593c2f1c63ac3a77bea1b8cb8a3bc9df7823f9b02 SHA512 ad3e22e89bdbdb9e70cbf9008a75cad8331592487c7d6be5d92c1cde0f8db6842bad4a5a9959769ce7fdb14266ba77299982e25b1e2ce2c67c9c3dd3b63af6ff
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r3.ebuild
index ddd10e09aab3..12c25a86a3bd 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r2.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r3.ebuild
@@ -1,47 +1,54 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="true"
-inherit kde5
+ECM_HANDBOOK="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
+HOMEPAGE="https://kmplayer.kde.org
+https://kde.org/applications/multimedia/org.kde.kmplayer"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
 
 LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-KEYWORDS="amd64 x86"
+SLOT="5"
 IUSE="cairo npp"
 
 BDEPEND="
 	sys-devel/gettext
 "
 DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kmediaplayer)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kmediaplayer-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[xcb] )
+	cairo? ( x11-libs/cairo[X,xcb(+)] )
 	npp? (
 		dev-libs/dbus-glib
 		dev-libs/glib:2
@@ -66,7 +73,7 @@ PATCHES=(
 src_prepare() {
 	# Prerequisite for ${P}-desktop.patch:
 	mv src/kmplayer.desktop src/org.kde.kmplayer.desktop || die
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if use npp; then
 		sed -i src/kmplayer_part.desktop \
@@ -82,17 +89,17 @@ src_configure() {
 		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	if use npp; then
 		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
 			--group "application/x-shockwave-flash" --key player npp
 		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" \
 			--group "application/x-shockwave-flash" \
-			--key plugin /usr/$(get_libdir)/nsbrowser/plugins/libflashplayer.so
+			--key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
 	fi
 }
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index da3c5e7c3f0f..7afb9c5cec2f 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -2,4 +2,4 @@ AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d38
 DIST makemkv-bin-1.14.7.tar.gz 9487718 BLAKE2B ecba22794035ed022863a2f736572a0da207346d6a3e44e3ca8c319fa672228be23835201ac3b023250d1a6457b8dd37e680573c7a83c53bb8fee1e016d00096 SHA512 cdd2eae8a80b2e564b786dfef0273ef36211327e5f4932b0f580a59c1ac288d5a99a2a1fe6fa0059e0f3fec6bcbc07278e7f7580507f36ca6d01f92d47092626
 DIST makemkv-oss-1.14.7.tar.gz 4384451 BLAKE2B f2a2cff901a4c6d03286a5a4cdd54ac0f61e3c0f04d3adb4089f03fc767dda099b0d4b4e8f76a3ad0ba57fb1af85cd2ab8fb6d966f4fbed490e25250f0be283c SHA512 2e8ab96ae1c1e855ff840fffaedd7ba998021630b61e66337d1027c53b8315ef8c303016a85ae8fddbfc52ae006fadab44fd63e0f2cca3602bfd17086a52aa06
 EBUILD makemkv-1.14.7.ebuild 2982 BLAKE2B c6be006dead8d1e25329fe3a5a0d2deb2fd21d9f28e6b807c9c65b2b7717a6cb968ad0bfdddde30e771834011b3a8daca88d7c54de1331c99015dffe3329654f SHA512 0888197206f82289a7ee24e7ba8db09967a18f066e8a1349ef3d6d0c148fd43a8f0d4ae0569060592d488da44113eea34621b6fb0d5856a4d853e434ff5b6787
-MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
+MISC metadata.xml 1166 BLAKE2B f2e594a7e322225101561a998472a832c3d2559dbfd79817f2fd1eaf9b0e7145fb467b9b0421d13b3df90ece45ff969d97e9e44d9147d4b0a57e4d8fd9104345 SHA512 d8e8d898cf3ee9428fc1b08e292608da7a4f753ad22053a521c475e9445dafa9ac7c2c5139ed4ab9009b0d59e95737f77773d15f8590b8a4cf0f39961d714fb7
diff --git a/media-video/makemkv/metadata.xml b/media-video/makemkv/metadata.xml
index 47f90d86823d..613533077af0 100644
--- a/media-video/makemkv/metadata.xml
+++ b/media-video/makemkv/metadata.xml
@@ -22,7 +22,4 @@
 		may watch Blu-ray and DVD discs with your favorite player on
 		your favorite OS or on your favorite device.
 	</longdescription>
-	<use>
-		<flag name="gui">Build the Qt5 GUI</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 42f21f16421f..e17cef1c0715 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,4 @@
-DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f SHA512 aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
-EBUILD mkvtoolnix-35.0.0.ebuild 2700 BLAKE2B 13f7e93d5c8ca53c0d1bdd00548d330e3292b68ce87274a5c3b6288d23cf141ae3c62a3432dd5961f7af7e590f4d1c4cc668a6d48609c993ec2092de1706a5c1 SHA512 3dab2ded309ff0bddf4cad9997692ba2bad5eceb06f6890fcd391ed0c4e734ee672a8a5e0b38056bc121c0236cf34d532bf36037aa332709d97698bda0540533
 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b
 EBUILD mkvtoolnix-9999.ebuild 2637 BLAKE2B d3f785212fe6937fe2f14ba16037daa79810a65d913dc3b108d41c619ea9c60901ef168ac7ef9e25b38e6e1785981aaad00316836cc7f2009eafbb730344ec0d SHA512 5351bb2f789cea5fb3f61d75e6e56e9bd209650dba2b76ddd71871e56a98b4002694827b6b649ee29b4dea9c3353bdfa36e4d2c09ab85bdd5e909746b7d0c2b7
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
deleted file mode 100644
index 83ca04cff737..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nls pch test qt5"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	>=dev-libs/libfmt-5.3.0:=
-	>=dev-libs/boost-1.49.0:=
-	>=dev-libs/libebml-1.3.7:=
-	dev-libs/pugixml
-	media-libs/flac
-	>=media-libs/libmatroska-1.5.0:=
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		app-text/cmark:0=
-	)
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/utfcpp
-	dev-ruby/rake
-	virtual/pkgconfig
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-	test? ( dev-cpp/gtest )
-"
-
-DOCS="AUTHORS NEWS.md README.md"
-
-pkg_pretend() {
-	# https://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable qt5 qt)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--with-boost="${EPREFIX}"/usr
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	doman doc/man/*.1
-}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 45d50957e2ef..7219c935198f 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,9 +1,7 @@
-AUX mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch 1463 BLAKE2B 94343df8eb4b64462fdf5003bf3cfd028b44e1d5dbf43e2879dc371b0eb71e2569925d7d8b5a988ab38b22ed7ec9375b73d73b9ce7396793d3d96665a4469711 SHA512 7d82e578f9e8bd486f309abd3131cbd98e8f48ce7cc696105f860db032741621498a937b8bf887ee9fee0a4f36d5b476e1722a5c639a0d2842bf82712cd8de86
-AUX mpv-0.29.1-egl-bound.patch 1060 BLAKE2B 3e2c59c4e4c2929cce59735e37059fb3d6b42396287241bc0875fe14dbf2b415571c58af89e8328cb99ab5294e7ca0010ddc18581e36c999aef9f858dd05f0df SHA512 259c9711e33821103ed12c1e07c695d2b93e1d730499abf78352be395e72d870d3ce526504559cd3b69d5854e74acd995cf5a481383fa36e20927bf7a99c6213
-DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086
 DIST mpv-0.30.0.tar.gz 3085141 BLAKE2B 314f6830f91e7dc11d3627688415c7535ef0ae462378d2c29cf036d5b851c55025ea5e9d5b0aa3f07ac6ec8c87350be65c882932bd908eab7c4f40b3840bf1a3 SHA512 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66
+DIST mpv-0.31.0.tar.gz 3142672 BLAKE2B 62a24a2bde2929047e061522147a6e823dfea9b5e7f1f739ad65bc0c82742e98743fb9ff7f0c3f74218cf50a32d0dc37c5e786fdcc951d649499f74efc3a641c SHA512 5199183d35bc2d7fffde1af250edf829fe768cedd7aa00f424d2a11a11d82cdb451c62886159ba3e1efc407b242c25e2485f4ebffd13b1da9c70defbd1f4c309
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.29.1-r1.ebuild 10367 BLAKE2B f470542d7c202e72438e0394b76e40c1bafc20865cd3c5196afad26940619d35b8d121c997dfba8fa9a442b583b7e7a56f791df6b50232dc203019ad47e09864 SHA512 92c16e81be4a2376d16134edac4ed4a7cf98b7fa88f5122f776e7e225e80ed27ccac4bc8bc32330db25ad970584906c716770f13c324d7826dc1b6b02962b38d
-EBUILD mpv-0.30.0.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a
-EBUILD mpv-9999.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a
+EBUILD mpv-0.30.0.ebuild 10024 BLAKE2B b6e0daffd7daa55250357159a4c8b01784a5c467abc5f5314d1e57a645b27a858099a33cb2b36985b2b12064148741b7387e03448eb4405d7a8b855bbe976890 SHA512 6a9a424fb35590a338d5717a361d8e44c9674b240a209816bdc741ff88b2864fc6d7bab83680023f8ba18d553ab3e9182cb98a63910065cef13f1f20c723d99b
+EBUILD mpv-0.31.0.ebuild 10034 BLAKE2B 7677e8389016a0c2b781ac71a543bfcde5108854b2a105db6904d65f0f573499ff57e24876527cd74a88f317629850b2e0e82d061df83be782107acf8f3ad1b1 SHA512 a8c59c76cc5c3862ec4be9a35e3a4a7fc736b483972ef596a24b86762e8a2a3dd9cc4a5494c6b3954a4e3411504976fc3a6983338d89e1c0f3c6de0c5db3f4c4
+EBUILD mpv-9999.ebuild 10034 BLAKE2B 7677e8389016a0c2b781ac71a543bfcde5108854b2a105db6904d65f0f573499ff57e24876527cd74a88f317629850b2e0e82d061df83be782107acf8f3ad1b1 SHA512 a8c59c76cc5c3862ec4be9a35e3a4a7fc736b483972ef596a24b86762e8a2a3dd9cc4a5494c6b3954a4e3411504976fc3a6983338d89e1c0f3c6de0c5db3f4c4
 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7
diff --git a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
deleted file mode 100644
index 1a4975a4e305..000000000000
--- a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-player: make ffmpeg/libav version check non-fatal
-
-We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
-
-diff --git a/player/main.c b/player/main.c
-index f56191a297..4e51aebd66 100644
---- a/player/main.c
-+++ b/player/main.c
-@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
-         // Distro maintainers who patch this out should be aware that mpv
-         // intentionally ignores ABI in some places where it's not possible to
-         // get by without violating it.
--        print_libav_versions(mpctx->log, MSGL_FATAL);
--        MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
--                 "FFmpeg/Libav than the shared\nlibrary it is linked against. "
--                 "This is most likely a broken build and could\nresult in "
--                 "misbehavior and crashes.\n\nmpv does not support this "
--                 "configuration and will not run - rebuild mpv instead.\n");
--        return -1;
-+        print_libav_versions(mpctx->log, MSGL_WARN);
-+        MP_WARN(mpctx, "\nmpv was compiled against a different version of "
-+                "FFmpeg/Libav than the shared\nlibrary it is linked against. "
-+                "This could result in misbehavior and crashes.\n\n"
-+                "Upstream does not support this configuration.\n"
-+                "Please rebuild mpv in case of any problems.\n");
-     }
-
-     if (!mpctx->playlist->first && !opts->player_idle_mode) {
diff --git a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch
deleted file mode 100644
index 5a9be073fbfa..000000000000
--- a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Wed, 18 Sep 2019 17:07:29 +0200
-Subject: [PATCH] build: lower version requirement for EGL
-
-`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't
-follow the same version scheme as mesa but instead uses the API version
-that the library exposes, which is 1.5 for EGL[1]
-
-[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8
----
- wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 3569dbf060..97a4d9196b 100644
---- a/wscript
-+++ b/wscript
-@@ -636,7 +636,7 @@ video_output_features = [
-         'deps': 'wayland',
-         'groups': [ 'gl' ],
-         'func': check_pkg_config('wayland-egl', '>= 9.0.0',
--                                 'egl',         '>= 9.0.0')
-+                                 'egl',         '>= 1.5')
-     } , {
-         'name': '--gl-win32',
-         'desc': 'OpenGL Win32 Backend',
diff --git a/media-video/mpv/mpv-0.30.0.ebuild b/media-video/mpv/mpv-0.30.0.ebuild
index d4a50dfa75a3..4e65a16aeb95 100644
--- a/media-video/mpv/mpv-0.30.0.ebuild
+++ b/media-video/mpv/mpv-0.30.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=2.0.9
@@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
@@ -97,7 +97,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		media-libs/libplacebo[vulkan]
+		media-libs/libplacebo:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -123,9 +123,9 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
-	doc? (  dev-python/docutils
-			dev-python/rst2pdf )
+	dev-python/docutils
+	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+	doc? (  dev-python/rst2pdf )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )
 "
@@ -166,7 +166,7 @@ src_configure() {
 
 		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
-		$(use_enable doc manpage-build)
+		--enable-manpage-build
 		$(use_enable cplugins)
 		$(use_enable test)
 
diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.31.0.ebuild
index 2df0619aa036..61db0d2cd470 100644
--- a/media-video/mpv/mpv-0.29.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.31.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=2.0.9
@@ -11,11 +11,11 @@ WAF_PV=2.0.9
 inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
 
 DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
+HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 	DOCS=( RELEASE_NOTES )
 else
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
@@ -28,19 +28,17 @@ DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
 SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
-	dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb
+	dvd +egl gamepad gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
 	luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
-	selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
-	zsh-completion"
-
-RESTRICT="!test? ( test )"
+	selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
 	cuda? ( opengl )
 	egl? ( || ( gbm X wayland ) )
+	gamepad? ( sdl )
 	gbm? ( drm egl opengl )
 	lcms? ( opengl )
 	luajit? ( lua )
@@ -49,17 +47,17 @@ REQUIRED_USE="
 	test? ( opengl )
 	tools? ( cli )
 	uchardet? ( iconv )
-	v4l? ( || ( alsa oss ) )
 	vaapi? ( || ( gbm X wayland ) )
 	vdpau? ( X )
 	vulkan? ( || ( X wayland ) )
 	wayland? ( egl )
 	X? ( egl? ( opengl ) )
 	xv? ( X )
-	zsh-completion? ( cli )
 	${PYTHON_REQUIRED_USE}
 "
 
+RESTRICT="!test? ( test )"
+
 COMMON_DEPEND="
 	>=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
 	alsa? ( >=media-libs/alsa-lib-1.0.18 )
@@ -72,6 +70,7 @@ COMMON_DEPEND="
 		>=media-libs/libdvdread-4.1.0:=
 	)
 	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	gamepad? ( media-libs/libsdl2 )
 	iconv? (
 		virtual/libiconv
 		uchardet? ( app-i18n/uchardet )
@@ -95,12 +94,11 @@ COMMON_DEPEND="
 	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba )
 	sdl? ( media-libs/libsdl2[sound,threads,video] )
-	v4l? ( media-libs/libv4l )
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
+		media-libs/libplacebo:=[vulkan]
 		media-libs/shaderc
-		media-libs/vulkan-loader[X?,wayland?]
 	)
 	wayland? (
 		>=dev-libs/wayland-1.6.0
@@ -120,17 +118,16 @@ COMMON_DEPEND="
 		xv? ( x11-libs/libXv )
 	)
 	zlib? ( sys-libs/zlib )
+	zimg? ( >=media-libs/zimg-2.9.2 )
 "
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
-	dev-python/docutils
 	virtual/pkgconfig
-	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
+	dev-python/docutils
+	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
 	doc? ( dev-python/rst2pdf )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )
-	v4l? ( virtual/os-headers )
-	zsh-completion? ( dev-lang/perl )
 "
 RDEPEND="${COMMON_DEPEND}
 	cuda? ( x11-drivers/nvidia-drivers[X] )
@@ -138,15 +135,10 @@ RDEPEND="${COMMON_DEPEND}
 	tools? ( ${PYTHON_DEPS} )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
-	"${FILESDIR}/${PN}-0.29.1-egl-bound.patch"
-)
-
 src_prepare() {
 	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
 	chmod +x "${S}"/waf || die
-	default_src_prepare
+	default
 }
 
 src_configure() {
@@ -158,10 +150,6 @@ src_configure() {
 		append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
 	fi
 
-	# Prevent access violations from zsh completion generation.
-	# See Gentoo bug 656086.
-	use zsh-completion && addpredict /dev/dri
-
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
@@ -174,15 +162,14 @@ src_configure() {
 		--disable-static-build
 		# See deep down below for build-date.
 		--disable-optimize # Don't add '-O2' to CFLAGS.
-		--disable-debug-build # Don't add '-g' to CFLAGS.
-		--enable-html-build
+		$(use_enable debug debug-build)
 
+		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
+		--enable-manpage-build
 		$(use_enable cplugins)
-		$(use_enable zsh-completion zsh-comp)
 		$(use_enable test)
 
-		--disable-android
 		$(use_enable iconv)
 		$(use_enable samba libsmbclient)
 		$(use_enable lua)
@@ -192,14 +179,12 @@ src_configure() {
 		$(use_enable libass libass-osd)
 		$(use_enable zlib)
 		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
 		$(use_enable dvd dvdnav)
 		$(use_enable cdda)
 		$(use_enable uchardet)
 		$(use_enable rubberband)
 		$(use_enable lcms lcms2)
 		--disable-vapoursynth # Only available in overlays.
-		--disable-vapoursynth-lazy
 		$(use_enable archive libarchive)
 
 		--enable-libavdevice
@@ -241,32 +226,42 @@ src_configure() {
 		$(use_enable vulkan shaderc)
 		$(use_enable raspberry-pi rpi)
 		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
-		--disable-mali-fbdev # Only available in overlays.
 		$(usex opengl '' '--disable-gl')
 		$(use_enable vulkan)
+		$(use_enable gamepad sdl2-gamepad)
 
 		# HWaccels:
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
 		$(use_enable cuda cuda-hwaccel)
 
 		# TV features:
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable v4l audio-input)
 		$(use_enable dvb dvbin)
 
 		# Miscellaneous features:
-		--disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+		$(use_enable zimg)
 	)
 
 	if use vaapi && use X; then
 		mywafargs+=(
-			$(use_enable opengl vaapi-glx)
 			$(use_enable egl vaapi-x-egl)
 		)
 	fi
 
+	# Not for us
+	mywafargs+=(
+		--disable-android
+		--disable-egl-android
+		--disable-uwp
+		--disable-audiounit
+		--disable-macos-media-player
+		--disable-wasapi
+		--disable-ios-gl
+		--disable-macos-touchbar
+		--disable-macos-cocoa-cb
+		--disable-tvos
+		--disable-egl-angle-win32
+	)
+
 	# Create reproducible non-live builds.
 	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
 
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index d4a50dfa75a3..61db0d2cd470 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 WAF_PV=2.0.9
@@ -97,7 +97,7 @@ COMMON_DEPEND="
 	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
 	vdpau? ( x11-libs/libvdpau )
 	vulkan? (
-		media-libs/libplacebo[vulkan]
+		media-libs/libplacebo:=[vulkan]
 		media-libs/shaderc
 	)
 	wayland? (
@@ -123,9 +123,9 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
-	doc? (  dev-python/docutils
-			dev-python/rst2pdf )
+	dev-python/docutils
+	cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 )
+	doc? ( dev-python/rst2pdf )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )
 "
@@ -166,7 +166,7 @@ src_configure() {
 
 		$(use_enable doc html-build)
 		$(use_enable doc pdf-build)
-		$(use_enable doc manpage-build)
+		--enable-manpage-build
 		$(use_enable cplugins)
 		$(use_enable test)
 
@@ -253,9 +253,9 @@ src_configure() {
 		--disable-egl-android
 		--disable-uwp
 		--disable-audiounit
+		--disable-macos-media-player
 		--disable-wasapi
 		--disable-ios-gl
-		--disable-apple-remote
 		--disable-macos-touchbar
 		--disable-macos-cocoa-cb
 		--disable-tvos
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 9fe367f38e31..2faf79e46693 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,7 +1,6 @@
-AUX obs-studio-23.2.1-use-correct-libdir.patch 1776 BLAKE2B 4b3bcc6a0b1c128b3b2e90ce65d8515847413fb7b879943cd42789b8597dd7cb7036916cc5c796fb860237235cfba464c2a51c7aa43fb607f21dd9b823e9b2ce SHA512 33396fdb59d0588b8cae14539742f65d4f257ad1b9fb85fefae68c636de31099d8878e4b5ffde2ca16575c4ebe642164a2a8a4b8e87ca7101cf5bb3474bcd367
-DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123 SHA512 aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169
 DIST obs-studio-24.0.3.tar.gz 6285359 BLAKE2B f799e93e9c35c22e5d7f6e4da04e30b06a3a1ad1b3bfd0a75acdbb5d1f28a717d84809a1f35a858252ff30094fa80521d752a35b5285b0a606d0d77ff88fb3cf SHA512 57cef700076457da1eee344042261e1ada6d6744fcb3033a1d4eaffb9e84dd350aa198984fba3de82d4e727706f562c7c3568d95de6859a4942d9fa6368a02ab
-EBUILD obs-studio-23.2.1.ebuild 3076 BLAKE2B 537845e1bb605bef3fb624912c2433dd52c350119a4ae6bb6a620b3bfa0de6a5170074b3b5c99521e7d54d255e27b32f4e8c117e545e06c9302e2560ab1d9fa6 SHA512 02fb36afdee9f05b98df9b21ae9c6fb449e8acb8be03aaf6b7e8533c3546fc3a72376fac4a2279a9eb96c73203c6cceb9658904e8226df1bd274acbb80c97c12
-EBUILD obs-studio-24.0.3.ebuild 3113 BLAKE2B fc0e8d1ece5c80eba87e73be0ab1c39504a7f58ebd6a5ee484e8061b6a03200e27e0770e95e524456f2d95de0f9a3a3d151a925bb3158fd48ada693fe68f320c SHA512 e87680d42f2a0ca5329b6a0c0dfd2614efcfbb59f15a3b03946ae853726181206f089b847165640b9e293a1e11430a594b458eba1778c0ef043f59a29f88f441
-EBUILD obs-studio-9999.ebuild 3082 BLAKE2B e17e770fca7a25e2eeab49230a7feb72d4c0ffd76f9b6f22bbecddb0e12c07b63a5bbf3a2b71262af1e1e9c8fcbbba61c43527238e2e46bfe861cdb5fe8a1173 SHA512 5a01e927ae74a8b65fa88b6ad90ebb16b4b04c1846b979546612c791606f567659d813f10e9e274efb95684ac2e697fc7739fac14b96db6a2f50bc19cf64f8f4
+DIST obs-studio-24.0.5.tar.gz 7901198 BLAKE2B 79c9712f3523114a70e0df3e0631c19067fd7ead5fd9031123dd4c82d9b92dee69473fb51a495f938430540505a5cf45258eeee01d61a7aaa6654255fee14aca SHA512 99be46046b70597474f25a85036ebe5a2f704eef47c77bc27e2ba8890b877da346ff6008c5922d7a83a4cead9df7214c6a3be885430693e609a42d9d06fedfaf
+EBUILD obs-studio-24.0.3.ebuild 3111 BLAKE2B e884db933172b8fdda667ac8b1f206c65074b74a130feb709233795c8aee37461d29580242424f58fa61763d802122fddbc7e9e3fa79fd08477945a7b389fb94 SHA512 1cb3890980ded6994ae723427e1b34407055172cddac7c0013bcbf3049baf3dc00b7309339c28bdb6628730819af74190a418ed54801520722617a784926e298
+EBUILD obs-studio-24.0.5.ebuild 3111 BLAKE2B e884db933172b8fdda667ac8b1f206c65074b74a130feb709233795c8aee37461d29580242424f58fa61763d802122fddbc7e9e3fa79fd08477945a7b389fb94 SHA512 1cb3890980ded6994ae723427e1b34407055172cddac7c0013bcbf3049baf3dc00b7309339c28bdb6628730819af74190a418ed54801520722617a784926e298
+EBUILD obs-studio-9999.ebuild 3080 BLAKE2B 6928b8bb308958bddd83498b6fd2db03a907e120a78982360a1deafb757a56a0a5f3e8ce4c56a35522b7a6aab2a52b89a051b02193bcf1caeff50fc89fa2ceee SHA512 50a09407949e25548207e5957bad2e2a4d0fc0af171ce951a5a34a7dbc595c55644e57b7f6f803a64e40726081742be153dab1574ca3cc2416d69ca9037b4252
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
deleted file mode 100644
index 619c414d6b8a..000000000000
--- a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Fri, 21 Jun 2019 17:48:32 +0300
-Subject: [PATCH] cmake: Install 'libobs.pc' under the correct 'libdir'
-
-In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of
-'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc'
-being installed under '/lib' when '/lib64' would be more appropriate.
-
-In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for
-'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir',
-and '@CMAKE_INSTALL_PREFIX@' for 'prefix'.
-
-Gentoo-Bug: https://bugs.gentoo.org/644538
----
- libobs/CMakeLists.txt | 2 +-
- libobs/libobs.pc.in   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
-index fed3e694..86811481 100644
---- a/libobs/CMakeLists.txt
-+++ b/libobs/CMakeLists.txt
-@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE)
- 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
- 	endforeach()
- 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
--	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
- 
- set_target_properties(libobs PROPERTIES
-diff --git a/libobs/libobs.pc.in b/libobs/libobs.pc.in
-index 03fe4cdd..f6c471ba 100644
---- a/libobs/libobs.pc.in
-+++ b/libobs/libobs.pc.in
-@@ -1,7 +1,7 @@
--prefix=@DEST_DIR@
-+prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@OBS_LIBRARY_DESTINATION@
--includedir=${prefix}/include
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: libobs
- Description: OBS Studio Library
--- 
-2.22.0
-
diff --git a/media-video/obs-studio/obs-studio-24.0.3.ebuild b/media-video/obs-studio/obs-studio-24.0.3.ebuild
index 58691bbb1db1..041e31be8073 100644
--- a/media-video/obs-studio/obs-studio-24.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-24.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/obs-studio/obs-studio-23.2.1.ebuild b/media-video/obs-studio/obs-studio-24.0.5.ebuild
index 2b14f6e82721..041e31be8073 100644
--- a/media-video/obs-studio/obs-studio-23.2.1.ebuild
+++ b/media-video/obs-studio/obs-studio-24.0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -38,7 +39,6 @@ DEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
-	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-video/ffmpeg:=[x264]
@@ -60,18 +60,16 @@ DEPEND="
 	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}"
 
-PATCHES="${FILESDIR}/${PN}-23.2.1-use-correct-libdir.patch"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -86,10 +84,12 @@ src_configure() {
 		-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
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 1629603a1fa5..01b6cd617a29 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index f47e463af9c5..de68763705e3 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,5 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
-EBUILD openshot-2.4.0-r1.ebuild 1275 BLAKE2B 04d16ebe05301d91fd4692410662618f4d7d1304e719f4ef3c3b3dabb85285c3dc64044fe80920dfae5d52c2f9789c60a7ce535e25d5fce196fe3888f0d89776 SHA512 40495955fe86cb522f12fc78a73e216093a21f08a899667197bc4943e929c858bfd9d807261df0179b4d1079fea9551db3e76c81bc3e1cefb83828432a712751
-EBUILD openshot-2.4.4.ebuild 1208 BLAKE2B 0a266ec566dd0194e804857e2496426c21f7f7a0f82afeaf9ce74e90e06ba00b28dc783040363bb1620129606fe15462a5ae8547d1c382b1b305f7c40d2ff8a6 SHA512 18b0b8b0d6a0348b99a50a5e58ce9b6b8825e52c0805491a5cfad66550d0bb1ab0cbe158db7a8c1db349663908eccd1e9d4f308522b96cb0a322389b63402983
+EBUILD openshot-2.4.0-r1.ebuild 1271 BLAKE2B 7cdf661ce20add5534d4b56dc3f0480c49a8867c87f435dabe2cf2a4250c6bfc205c6212d40aef0e896ce2d53d3e99906ff20dc1c05ed902bc0b5f2c736b6a5d SHA512 44debba712fb7d542989ee48262f73684f899dc8a92a67563c27754b197c3bbd51e49e5d95d85ee031db5d6b165120bbaf9c1fe581774155deb3266f45b3f097
+EBUILD openshot-2.4.4.ebuild 1206 BLAKE2B 2b56cc68d695cc6e7b3bb482e2b13d5bfe7abcfc8c7091fce0712881f2136b847b43010980bdd38d8b355bbf7183216c44c8dabea480e97d965ce67173cd5d01 SHA512 37bfc6c50c940fb2f8cc75d34074242478bfa6f5ab5dc4ac3b23772499923bdc93e04dd5682c7a5122d89f244a1bac2f9446db74c17df4a6c5629baa9e138164
 MISC metadata.xml 636 BLAKE2B 08e8c695bf15de910bb90ebe5fef7b6883ce1fac03eb6c7de660d280cb402c5a70befd6e99dc281aa76098322439e2c4bff48e63ade946fa390dfe5f1ccbe156 SHA512 1b736005e9564431798291c83f1ccba5de2b03ba18b41a0fe400e2b2b58020fb0863e6aad2c348191f5903f288ed4fef1cef1e7615bbc3e97f2deb35633b5bd4
diff --git a/media-video/openshot/openshot-2.4.0-r1.ebuild b/media-video/openshot/openshot-2.4.0-r1.ebuild
index 09f5de3b4b43..cbde49448910 100644
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ b/media-video/openshot/openshot-2.4.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 gnome2-utils versionator xdg-utils
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4.ebuild
index d1d143bbbd74..954d0061c562 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest
index 797db63b6aea..65df289102f2 100644
--- a/media-video/parole/Manifest
+++ b/media-video/parole/Manifest
@@ -1,5 +1,3 @@
-DIST parole-1.0.4.tar.bz2 921020 BLAKE2B c81b5d8773a933e7f3b2d3816401e5e833db58964623b1c40747b47632f594e9aaabde87d89de3c6e87b01b43ef9aef01194ab5a40ce2e36fe8909acceac5c3e SHA512 5f67830e36b6ac41c85dbbb7d6b4e2dfbd037c9e8fe4f5ab5ef8c52ebe4c69b5a9bfdee298b174a85334a4ae9414ed3492994853896f745c489116359cc14969
 DIST parole-1.0.5.tar.bz2 929983 BLAKE2B 542cee0e45b0f2219235211daf161984a50849cb864f00351c3f1c112b4a6cd11fdda4dd8b2fd6ebc0bf5984542135453bbf9180b458c6cfa76b740419806bfd SHA512 458b042752919d4dd1bfdaceda2b281b07a3094d986a99ec2ff51c12b7ca32adba6ce67ecb67e9ab70bdf83cfa22f8b5027054e2c3a3cf71d50ec8b98eeb24df
-EBUILD parole-1.0.4.ebuild 1418 BLAKE2B a1abef8e6c6ba9e38e2cda7e5ea376778266cd7018e6ac7f92290412294281e56e05f2f9591aac3f5224cf8aed6464e3aae9fdb29959ebe0ab49eadf41f7ab73 SHA512 e6783e3eae9679c806a3626451cde9f1ad9d34ee387e70838e47c2f78d6dbcd87602e743a0903652c69137a9bebcb253913a6e02297f4bf817ca509d6f014183
-EBUILD parole-1.0.5.ebuild 1407 BLAKE2B d25365b9f99bcc1e9e6a1c4b99795d9852d0788f39ab890244100a047e805784f0b7fd37729c964e70e151046bdc2e54fd0de6a8f01c46fb1f2d3a5329eab179 SHA512 70bcb12a548b8f7f02c755260e94da54cad71231a05bc01a6f22333dbd97d70e1f00875f9690919bc522ea333babb587c3d2b12ab6e4900f9c79d6ee91745998
+EBUILD parole-1.0.5.ebuild 1405 BLAKE2B 2b1c4e3ad1da732d2ad5ee175d276135b226b5ccca8fd3dd02ae10ebbf24d47ef08ff9e266f4ce43525f4783f5507eb5e5753933edda397ab19145084e76e60f SHA512 df44c6a2f10bae2f6b91c5ad03afe72b09ff75e6f0253ea132c2974799b21d8b9ff47e6d1bf62bdd52b5a5a323d94ea1c510b3749b2733845531c43e3472d93b
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/media-video/parole/parole-1.0.4.ebuild b/media-video/parole/parole-1.0.4.ebuild
deleted file mode 100644
index dbb13e8a3220..000000000000
--- a/media-video/parole/parole-1.0.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A simple Xfce4 media player using GStreamer"
-HOMEPAGE="https://docs.xfce.org/apps/parole/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="libnotify taglib"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.32:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	sys-apps/dbus
-	>=x11-libs/gtk+-3.20:3
-	x11-libs/libX11
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.11:=
-	>=xfce-base/xfconf-4.10:=
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	taglib? ( >=media-libs/taglib-1.6:0= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/glib-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO )
-
-src_configure() {
-	local myconf=(
-		# clutter backend does not work with new GTK+3 versions
-		--disable-clutter
-		$(use_enable taglib)
-		$(use_enable libnotify notify-plugin)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-video/parole/parole-1.0.5.ebuild b/media-video/parole/parole-1.0.5.ebuild
index 9086cdac2e2d..390b7e2c5327 100644
--- a/media-video/parole/parole-1.0.5.ebuild
+++ b/media-video/parole/parole-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="libnotify taglib"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 54709b0e6e41..18c13196ebda 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1,4 +1,4 @@
 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.ebuild 2055 BLAKE2B bd3f762857a28ab28be20d1070539f6cc3fe6e63f111e4d4992a82d9b733a1df08bbd327387b6a5bc3381695d881394ab462644fe3510c0c5fa80f3bfe43941e SHA512 39cc395df0c5dc2de391e1d54d4e77656839502c4e9109e63f2d582b11b80cea54d3e0d6b2b74e1b3be6117d6f7f55627f7dfa13ffbb49938e5b5de72488b247
+EBUILD photofilmstrip-3.7.1.ebuild 2051 BLAKE2B 39fef7729c1c511e73a5277bb43b50f24c3d266c889288c43f5731e584fb3b2abd155fec2b220ac9226fcb800590fb09d97221661a156d67449360a7b659ba43 SHA512 95e925c4e701916effd7b078de5145c6e8ae10f5f71a653f9aeb7bfc043c41ed936d5437ea75781aec98c2d35d07b6d0f8fea73f0c38a4ca6e338147b5860826
 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
index a8f65086077e..bd308e4f0daa 100644
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 82d8abb0eaf8..b53dbc63c253 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,4 @@
 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.ebuild 2365 BLAKE2B 81eb8da38e0c2632ee68056c065476b02f59104763a9d77b7ffd76dcc026f72146d37de6c32d83207015a6dfa857a91c5c170a7bde88817f3ed01d690e06a397 SHA512 d5b8a9ba87abf770f90edf146a378cb257e81f9c4f05b2cb8237fc76604249e43a10f1de92ae70136274038c150646c48df1e09ba88dc9c00a638ceb6c622f3d
+EBUILD pitivi-0.999.ebuild 2359 BLAKE2B 838f7e07298b0a4ef28062f2f8fcd0eb8e7adb3de88c793024a3aa7edad26c2bab690162cdc44d5427d649bf4c39518ead94de84bd43055d89a6b400f5c51635 SHA512 cec1fc77970885bdeed0fe049f5d80d318c9519b01c5d4fd676887bce84b33bf7744d37d6cceee437f08964d7ba9bf74a5591cd97a535e47b4a471ece48d6ad9
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999.ebuild
index c7703da70ced..0478303d98c0 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit gnome.org meson python-single-r1 virtualx xdg
diff --git a/media-video/plasma-mediacenter/Manifest b/media-video/plasma-mediacenter/Manifest
index a1c259108926..265cae2577ff 100644
--- a/media-video/plasma-mediacenter/Manifest
+++ b/media-video/plasma-mediacenter/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-mediacenter-5.7.5.tar.xz 162076 BLAKE2B 6001c11ee96e989e9b9366e74637816e3f7d778a225d89c6414ae7b9cc0f3649b460d0e39ed3eb3f9daa6b3cee4d96e42fb71102d500cf2546e4c4af757d8990 SHA512 47a5b015364a1ffd1fd1b1dd3720e5ae8ebc38e4aee03e55d042c6b9aeea2579e1b7a31f1b0fcef74c4c19c470c7a380694d9c93624a75337eb58080f5b8d09b
-EBUILD plasma-mediacenter-5.7.5.ebuild 1135 BLAKE2B 7d614f343c0381fd8e136c06dbae6f862ce20f0cab700fd83c13a339a004cf2d79d2d9549db3f1faf40edc5a5563634fa74d6590b2e23a351ae692e40b29a7c2 SHA512 a9e786f23bdaeff0e624b211609c934a066f86c716468865722b32b12e95f5995d380756f6b7deb575beaf66ced5ecb02fe9ccef09f0973d041d6a254f80df3a
+EBUILD plasma-mediacenter-5.7.5.ebuild 1370 BLAKE2B 78db35e59fe2ef108253053afd393b483aaea010e36a863c465d501da7e118531eb54a985f6c06eb98f904bce5926a026186e37a178565faf19a9a9ddbbed85d SHA512 b304542a9ee868d941eecdf015edd320370f1c6b168ce7f4c018a08b3f8e5ebd6c0f6f804e13772e03cca748b039d84dcb3cfa2a89e2af07866b4da12ab4ab90
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
index ad1eb0048ef8..08802ebedeae 100644
--- a/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
+++ b/media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
@@ -1,47 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Unified media experience for any device capable of running KDE Plasma"
+HOMEPAGE="https://community.kde.org/Plasma/Plasma_Media_Center"
 SRC_URI="mirror://kde/stable/plasma-mediacenter/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="amd64 ~arm x86"
 IUSE="semantic-desktop"
 
 DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
 	media-libs/taglib
 	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtmultimedia 'qml')
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=kde-plasma/plasma-workspace-5.15.5:5
 	!media-video/plasma-mediacenter:0
 "
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
new file mode 100644
index 000000000000..0a72a1754f82
--- /dev/null
+++ b/media-video/qmplay2/Manifest
@@ -0,0 +1,4 @@
+DIST qmplay2-19.12.19.tar.gz 1285009 BLAKE2B e4f644513ac0e7d33574e4b1b157dfe775222df74ba5041099e9bcaa87f8b052880dfd2c19005380783d9ca7b2bdbf7aedb233e12e2af839d40af224981d593e SHA512 a03d70c5bd3b2644810b9ec5fd39bd0340ddcc460646228a2799053a27117a54ead09f046b58ff7e0ae2cd959a92980cf8336a12d49ef297e1de30dd32f604a0
+EBUILD qmplay2-19.12.19.ebuild 3464 BLAKE2B ef9de5595eefd3292a03c13b6d9cd42cedd05bc1b35f6a56525d0214cd36aca5fc0a32d29d7f040008d725740e1ab11cfa89c8a51da61b027baf083c99e12e20 SHA512 68e3183a925f1334159c865846a838f37a8458917740029302205f625d86769404defa3ed2ebe60d7070c006049c1d631da2c9b4683ceb4bec12280e47ed9ce3
+EBUILD qmplay2-9999.ebuild 3464 BLAKE2B ef9de5595eefd3292a03c13b6d9cd42cedd05bc1b35f6a56525d0214cd36aca5fc0a32d29d7f040008d725740e1ab11cfa89c8a51da61b027baf083c99e12e20 SHA512 68e3183a925f1334159c865846a838f37a8458917740029302205f625d86769404defa3ed2ebe60d7070c006049c1d631da2c9b4683ceb4bec12280e47ed9ce3
+MISC metadata.xml 1577 BLAKE2B ebb3b018d3a1ed0c8591e6379448a327c1a09ccf2582660536074fae02c16df7cebbef551edc58c54a288d6c57853302acc5ef15f632d7633e5c4323ab6e7956 SHA512 af7dac9bfc6f0f26c00ca1b6ab40bcfece84b4028924f6881469ef1a1f96bd23bdd2e23d66d6785df5b7bf0a01a6cbd5ba06b7fb35fe5cd95774523aeb95af6d
diff --git a/media-video/qmplay2/metadata.xml b/media-video/qmplay2/metadata.xml
new file mode 100644
index 000000000000..9d4d0d19d765
--- /dev/null
+++ b/media-video/qmplay2/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reagentoo@gmail.com</email>
+		<name>Dmitry Baranov</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zaps166/QMPlay2</remote-id>
+	</upstream>
+	<use>
+		<flag name="audiofilters">Build with AudioFilters module</flag>
+		<flag name="avdevice">Build FFmpeg module with libavdevice suport</flag>
+		<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="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="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="videofilters">Build with VideoFilters module</flag>
+		<flag name="visualizations">Build with Visualizations module</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-video/qmplay2/qmplay2-19.12.19.ebuild b/media-video/qmplay2/qmplay2-19.12.19.ebuild
new file mode 100644
index 000000000000..d77ba82ead27
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-19.12.19.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 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/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/QMPlay2-${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"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa portaudio pulseaudio ) )
+	avdevice? ( ffmpeg )
+	avresample? ( ffmpeg )
+	lastfm? ( extensions )
+	lyrics? ( extensions )
+	mediabrowser? ( extensions )
+	mpris2? ( extensions dbus )
+	vaapi? ( ffmpeg opengl )
+	vdpau? ( ffmpeg )"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	dev-libs/jansson
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dbus? ( dev-qt/qtdbus:5 )
+	ffmpeg? ( media-video/ffmpeg )
+	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 )
+	vaapi? (
+		>=media-video/ffmpeg-4.1.0[vaapi]
+		x11-libs/libva[drm,opengl] )
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	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_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_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# 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)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-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)
+	)
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( USE_GIT_VERSION=ON )
+	else
+		mycmakeargs+=( USE_GIT_VERSION=OFF )
+	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
new file mode 100644
index 000000000000..d77ba82ead27
--- /dev/null
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 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/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/QMPlay2-${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"
+
+REQUIRED_USE="
+	audiofilters? ( || ( alsa portaudio pulseaudio ) )
+	avdevice? ( ffmpeg )
+	avresample? ( ffmpeg )
+	lastfm? ( extensions )
+	lyrics? ( extensions )
+	mediabrowser? ( extensions )
+	mpris2? ( extensions dbus )
+	vaapi? ( ffmpeg opengl )
+	vdpau? ( ffmpeg )"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	cdio? ( dev-libs/libcdio[cddb] )
+	dev-libs/jansson
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dbus? ( dev-qt/qtdbus:5 )
+	ffmpeg? ( media-video/ffmpeg )
+	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 )
+	vaapi? (
+		>=media-video/ffmpeg-4.1.0[vaapi]
+		x11-libs/libva[drm,opengl] )
+	vdpau? ( media-video/ffmpeg[vdpau] )
+	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_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_XVIDEO=$(usex xv)
+
+		# ffmpeg
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
+		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
+		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
+
+		# 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)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-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)
+	)
+
+	if [[ ${PV} == *9999 ]]; then
+		mycmakeargs+=( USE_GIT_VERSION=ON )
+	else
+		mycmakeargs+=( USE_GIT_VERSION=OFF )
+	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/rav1e/Manifest b/media-video/rav1e/Manifest
index 4fa5a330b003..d983647fb5a6 100644
--- a/media-video/rav1e/Manifest
+++ b/media-video/rav1e/Manifest
@@ -1,2 +1,2 @@
-EBUILD rav1e-9999.ebuild 686 BLAKE2B dc4e33c45ab8796ddd6c46e82e694e591e2b5c1c0533da1ea25fc9c108b5c3d846db4251812d7b82593a8db2c65425fa56a256b6ecad0b21b67ced2a82a92ce1 SHA512 b946f5d1d4eafba8725a5e180ba8fb730b1141dce771fd4707927b1e39e652cf3d104549d57648149f363a951bf7e6d9f3af474ff21cdbbc8cdf9a0502f8a2f5
+EBUILD rav1e-9999.ebuild 639 BLAKE2B 5fab52058ecc7456d4696cccc2db1bedc97f088e5cb27b7db755f358aabdc2f17932cdb70f3e3231e872261ad54c0d5f90c92b12809c4f803ecd959e97c15506 SHA512 367e4f8025b9472097d81fa3435ad616dfd72aa2fe099559013f5fcb858f827ef2754e82fa6c16813f43a901f14d480ba40af1a1d5990ef86118d53e2af69377
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/media-video/rav1e/rav1e-9999.ebuild b/media-video/rav1e/rav1e-9999.ebuild
index 0136a727b3a0..131796f9e62c 100644
--- a/media-video/rav1e/rav1e-9999.ebuild
+++ b/media-video/rav1e/rav1e-9999.ebuild
@@ -32,7 +32,3 @@ src_unpack() {
 		cargo_live_src_unpack
 	fi
 }
-
-src_install() {
-	cargo_src_install --path .
-}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index f0b80bab9a0b..d02afc6b7dab 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,4 +1,4 @@
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
-EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3084 BLAKE2B 32382d742514ba7a5865ae9549010ae04189d01656b52c88a7ddd7956c497c3d67673735c962fafcd190ddcb8d44d3fca0a0193da0b932c69bace3c8119024de SHA512 8dbb6a0b4b200a6d840221b67b474e5b2f84093ea105ca655bafb0aac2988dbb211ccb17e07df907ccee1483f690b0cf9f5f46e86b70530600d25f238631fc16
-EBUILD simplescreenrecorder-9999.ebuild 3084 BLAKE2B 32382d742514ba7a5865ae9549010ae04189d01656b52c88a7ddd7956c497c3d67673735c962fafcd190ddcb8d44d3fca0a0193da0b932c69bace3c8119024de SHA512 8dbb6a0b4b200a6d840221b67b474e5b2f84093ea105ca655bafb0aac2988dbb211ccb17e07df907ccee1483f690b0cf9f5f46e86b70530600d25f238631fc16
+EBUILD simplescreenrecorder-0.3.11-r2.ebuild 3085 BLAKE2B 457b037bd45f41207985b9df2de80de39e022097a58ca81864a8c31c919c8b9005a08c6ae359a307df1814c74912df2e4b4848b4912544227a2351331ce61f19 SHA512 fc94fc80c7a11afaa4df84e5f7f3d052c14df33c05ec0c41ef8ce0ff6cc6d8dfe3da931131a6ba153fa3b0e86a4d9e88d71f4007a7ee1b56660b19e6c209e4ba
+EBUILD simplescreenrecorder-9999.ebuild 3085 BLAKE2B 457b037bd45f41207985b9df2de80de39e022097a58ca81864a8c31c919c8b9005a08c6ae359a307df1814c74912df2e4b4848b4912544227a2351331ce61f19 SHA512 fc94fc80c7a11afaa4df84e5f7f3d052c14df33c05ec0c41ef8ce0ff6cc6d8dfe3da931131a6ba153fa3b0e86a4d9e88d71f4007a7ee1b56660b19e6c209e4ba
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
index ebea68fc269a..54eeceee53ad 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
@@ -73,8 +74,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# required because xdg.eclass overrides default cmake-utils_src_prepare
-	cmake-utils_src_prepare
+	# required because xdg.eclass overrides default cmake_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -105,7 +106,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index ebea68fc269a..54eeceee53ad 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
@@ -73,8 +74,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# required because xdg.eclass overrides default cmake-utils_src_prepare
-	cmake-utils_src_prepare
+	# required because xdg.eclass overrides default cmake_src_prepare
+	cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -105,7 +106,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index cc100a3ff3b7..a3ad39e0914b 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,7 +1,7 @@
 AUX subliminal-2.0.5-add-missing-comma.patch 1196 BLAKE2B 1042b22bf4c6f488ada97c628d98c79e6733816ffe094af9ae45be632edfd0547086911fd3e2154cc13c5ca609bb436a3d73f6825bd8242074be323cee969192 SHA512 82cabee6a7bdc701f73e7115edc975fbde8f0008dff2e4dcf7fcb27b9203dc9efd42b54aa31a632501e3e3ed405638fcb3fb273eff4bf19cbc8085d710d3763b
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
-EBUILD subliminal-2.0.5-r2.ebuild 2387 BLAKE2B 3166277c1cd80023b54103b8ba9cbf2075e16874f8834c973395403b0da0dd42b3ca015dfd192bfcc14822b3eae7244f50688203e3d97c20b757aba51ae0443f SHA512 66e0facc888f2c58351accd0ca1a792278027dc71327307989ba00afca932270b938477acc133ff7c323a928f051b6bd9010661af99f44ce21ecfd9f4b1c08ef
-EBUILD subliminal-2.0.5-r3.ebuild 2475 BLAKE2B d708951ee24309e97054423de7e2b7061b22f4e33f8ffc9838f2615c64e506221dca712c6d7b5ef25314e2397a357d4fd2e4e5767482dce36299e15742601426 SHA512 fc99a04ea7c6d697e6bc8e77f7f2bf42cd7e5ac8a71dcb984b4ce4496959bef2d6b52f67ba74f54b756d16f69cbcf2ae6a363ecdb7f915670f1f7342bb60f105
-EBUILD subliminal-9999.ebuild 2265 BLAKE2B 05d67974a86f14dd1e1f06a6f538b7a1bc8502807f5bf416927d2af7654d4c4e0ab424697c9a5e1f2848cb7479f23de848917fe827cff6484107f7854a9e4e14 SHA512 6a42eba33e91b887161c6a1388616181c1d8d18128a138cc616662748c5cbaf5e4bbdeca27ee388a5197b821937af0fca68b4f57df9d635f83f3de9756d8f00b
+EBUILD subliminal-2.0.5-r2.ebuild 2377 BLAKE2B df06d4184287eb33dec78e54d39d812e1b3643b3a3221f3af4c40204ba8f4bc4cc8eaa83a8a10999bba375462c35065ecfabea1b76d3927b3c917ffbc0359661 SHA512 93636aebf88dfc90dee0b9fe517ecb6a6d0ebdc9dcae02c65dc2707311c550574760e279537c91207291536938b70d24fce42293010b20b436d29b4cd8cedeba
+EBUILD subliminal-2.0.5-r3.ebuild 2465 BLAKE2B 62df580689873ff71a88cf886818361eb0fc951e923bfe816faaad5826bbb3ef90dbffa0126df824608b1006abb59443416a0e56204838a4833cafa23b4883a5 SHA512 60e64f835da948a54043f92444b0b20d1fe5751824d42ceb9a54cd2ec0db2be01b62c2bb88ed44a728cf5974f64762d93068795a59193c73abcae8727370dff1
+EBUILD subliminal-9999.ebuild 2255 BLAKE2B e932656aaddc9fa283ba4f03d985c5d7376016283b53147cf58c69639905268195dd6f8839136c7dbd923c7836c8c7ce113caa71e636972225e2abbbd1a9842d SHA512 2729b29a80e468eac381e4c339def7814e744198d6412246ebea9ea37f47c007680a4f280ba7fec57297b44aa9513511260fa3fb0814be66e4d9c950487b56e8
 MISC metadata.xml 350 BLAKE2B 64054ae243f37db216c26428801347c2ef0b61b4f557b01e1e84213ca4d405e0ef44d2a121c97a507cb155c053e190c7b875e7e9e325ecd1d4ee6006fdf8f975 SHA512 573c536a3e3d2859085a60fdeb224475bc457b07c6b3d0ff4554bb7e8f49a7839d1f44489fd10261b404c33e2f6729a25ac8ea09701287c13f968ef2cff0aaad
diff --git a/media-video/subliminal/subliminal-2.0.5-r2.ebuild b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
index c5b8d509e688..dbc7dd6e79f9 100644
--- a/media-video/subliminal/subliminal-2.0.5-r2.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml(+)'
 COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
 
diff --git a/media-video/subliminal/subliminal-2.0.5-r3.ebuild b/media-video/subliminal/subliminal-2.0.5-r3.ebuild
index 88a4d3d9653b..bfde2b82c963 100644
--- a/media-video/subliminal/subliminal-2.0.5-r3.ebuild
+++ b/media-video/subliminal/subliminal-2.0.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml(+)'
 COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
 
diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild
index 730716b31468..2576dc081f5a 100644
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 5e654d9c9fa9..7c1a1729f85c 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 1871 BLAKE2B 532c4673682a9eebe1323d196ee070a34db258de6d8968b1ad8303e29c18af4671adcbb448648c4e5f3af48a9028884afb79fe08eefb0f0a8212a69ddc21ca97 SHA512 b3e86b4226a167eb90ae2e8ed3e633f88ee2e8e5c3bd4a570383cd6c511d3a1d66f00f32c0e318bec46acd5bd1be29dbe19ad9055cd0a5680633c734f98d8a1c
+EBUILD subtitlecomposer-0.7.0.ebuild 1957 BLAKE2B 33c736ff86796225fa475e5c454fb0a19e8c0aa64e8f7b5b9011cc006337699a55360f24b37c6439454d6d65f43aa6bef5720b1a8e547c7cf51cfa62640a9c22 SHA512 c5f5884eb4e6a975cc78efc0e3e4fbbf7f1d019f74e58a151b65a42227c7a150d0879420efbf0dbb9fb0ac1e0eaaf0678578425f026b84500b05a5b6227adf5d
 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 58043f6d38ea..f974a2076cba 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm
 
 DESCRIPTION="Text-based subtitles editor"
 HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
 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"
 
@@ -20,20 +23,20 @@ BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
 	media-libs/phonon[qt5(+)]
 	gstreamer? (
 		dev-libs/glib:2
@@ -59,18 +62,18 @@ S="${WORKDIR}/SubtitleComposer-${PV}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-		$(cmake-utils_use_find_package gstreamer GStreamer)
-		$(cmake-utils_use_find_package mpv MPV)
-		$(cmake-utils_use_find_package unicode ICU)
-		$(cmake-utils_use_find_package xine Xine)
-		$(cmake-utils_use_find_package xine X11)
+		$(cmake_use_find_package gstreamer GStreamer)
+		$(cmake_use_find_package mpv MPV)
+		$(cmake_use_find_package unicode ICU)
+		$(cmake_use_find_package xine Xine)
+		$(cmake_use_find_package xine X11)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	elog "Some example scripts provided by ${PN} require dev-lang/ruby"
 	elog "or dev-lang/python to be installed."
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 2d272fa6d211..558dc9d96dee 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,9 +1,5 @@
 AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b
-AUX 3.30.0-control-plugins.patch 7048 BLAKE2B 6c40cfaa9b831ffd054ddf09482036d6b7c66693814fc798ec9e0f41a95163e3cad6474c346e55349172f6189d257c7630e6b51bf4c58c42212cc6f888ba6754 SHA512 410d78444b2f27b61e5a242ba9c4d93ab9eff02f7923129c286b2c482a36c8b799c53655a4e7bcf6ec89252537c7a62269296917378efcc015aa60bf7930705b
-AUX 3.30.0-vala-errormsg.patch 820 BLAKE2B 6b896371078f59b5e46efb28ccca56ef710cbba583ec4c9bc7c7b05b18866e6b30f6ba140461dbaab4b9a56fd50e37a940a61c4d62b7b5132f97b1969e7a723f SHA512 f19bc0bc9e592f0e32cfb776d631acc9aef54d107ae22acf9ce29036dec0abf9b153c5a1a2e3c99e3f0d27d9ee504e4bf9dd91567318be1966f4f3fc157c16ce
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
-DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.30.0.ebuild 3759 BLAKE2B 0889c571bb3129c65529e99fed4d8366b46751a0e815ad26d71e6f4ed3c272140c1c9ecded6a7f5fc881353d17de10722c56975413b2c05098686fea04fdb2e3 SHA512 9e1e598f00e5a33c0a51d5246f9a6dc38e4a47a8239021546c1bff0049970a5cf5e3c2ec9bf59cc217b9f13630ad40694b749fb84339b6cbbf58495e318bf59c
-EBUILD totem-3.32.1-r1.ebuild 3103 BLAKE2B 200bd4012fa7d3563aad00a3907860b9fcc2427f075c4750f6e37553d550919c267587bb422b58ca955fbcb04650e12064e3dbe250caa2629c8f40ba61599b0a SHA512 5d1ce68941374b0f3de8a531dc05b3334a4d0c47b6d356316886b74f9bd0d9721c429a280fb473505218200f9f4ff9966c2fd9de53578fbf193eee07e62fa179
-MISC metadata.xml 1323 BLAKE2B 50a31cc1ea80714ce43b7434888c275acfea44b2231c500b20422ead6f248b3ccb0765909df4dd2c74c05aee333e294c599982037f91364efe77b1dad639c63e SHA512 95686fb2c0a601026587bc759548bc7b3798f7ed1347d34d2deb42a35ed5f424da7412ccb4b6d6fb50ca078855c32f1eb0485ffa4eec919baad7e19b899058be
+EBUILD totem-3.32.1-r1.ebuild 3101 BLAKE2B 23892d3bc99c6de484934f5282f123774b99bffcbac1fdb0e0676af8c6565bd4189b6b3e6a52a7792965fd9e15d1b3e9c26875f8159efc3436e6057211c4ea66 SHA512 778619ac4ca20f3eb9197c0af9120dbbdf3225bfd9dec605a015d771cc19400f756eff9df2713c24dd0b3ce8fa5e5088bcf37063bafb00ccc0d00f85ac1dee0c
+MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b
diff --git a/media-video/totem/files/3.30.0-control-plugins.patch b/media-video/totem/files/3.30.0-control-plugins.patch
deleted file mode 100644
index 4d57ad0971c0..000000000000
--- a/media-video/totem/files/3.30.0-control-plugins.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-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.build             |  2 +-
- meson_options.txt       | 28 ++++++++++++++++++++-
- src/plugins/meson.build | 56 ++++++++++++++++++++++++++++++-----------
- 3 files changed, 69 insertions(+), 17 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 9c4797dd..aa91ae10 100644
---- a/meson.build
-+++ b/meson.build
-@@ -3,7 +3,7 @@ project(
-   version: '3.30.0',
-   license: 'GPL2+ with exception',
-   default_options: 'buildtype=debugoptimized',
--  meson_version: '>= 0.43.0'
-+  meson_version: '>= 0.44.0'
- )
- 
- totem_version = meson.project_version()
-diff --git a/meson_options.txt b/meson_options.txt
-index 3b6ff67b..6e056952 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,7 +1,33 @@
- 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('enable-vala', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'whether Vala plugin support is requested')
--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',
-+  'gromit',
-+  'im-status',
-+  'lirc',
-+  'media-player-keys',
-+  'ontop',
-+  'opensubtitles',
-+  'properties',
-+  'pythonconsole',
-+  'recent',
-+  'rotation',
-+  'sample-vala',
-+  'samplepython',
-+  'save-file',
-+  'screensaver',
-+  'screenshot',
-+  'skipto',
-+  'variable-rate',
-+  'vimeo',
-+  'zeitgeist-dp'
-+], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
- option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'compile the nautilus plugin')
- 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')
-diff --git a/src/plugins/meson.build b/src/plugins/meson.build
-index 95af6485..289ba811 100644
---- a/src/plugins/meson.build
-+++ b/src/plugins/meson.build
-@@ -41,8 +41,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',
-@@ -56,26 +56,38 @@ 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
- 
--  plugin_error = (plugins_option == 'all')
-+  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('gromit')
-+    gdk_targets = gtk_dep.get_pkgconfig_variable('targets')
-+  else
-+    gdk_targets = []
-+  endif
- 
--  gdk_targets = gtk_dep.get_pkgconfig_variable('targets')
-   if gdk_targets.contains('x11')
-     plugins += 'gromit'
-   else
-     str = 'the gromit plugin is not supported on non-X11 targets'
--    if plugin_error
-+    if plugins_option.contains('all') or plugins_option.contains('gromit')
-       error(str)
-     endif
-     message(str)
-   endif
- 
--  lirc_dep = dependency('lirc', required: false)
-+  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
-+
-   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)
-@@ -84,33 +96,38 @@ 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_nautilus
-+  if have_nautilus and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('save-file'))
-     plugins += 'save-file'
-   else
-     str = 'you need libnautilus-extension to use the save-file plugin'
--    if plugin_error
-+    if plugins_option.contains('all') or plugins_option.contains('save-file')
-       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
- 
-   if have_vala
-@@ -129,17 +146,26 @@ if plugins_option != 'none'
-       '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version)
-     ]
- 
--    plugins += [
-+    foreach plugin: [
-       'rotation',
-       'sample-vala'
-     ]
-+      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('zeitgeist-dp')
-+      zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false)
-+    else
-+      zeitgeist_dep = disabler()
-+    endif
- 
--    zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false)
-     if zeitgeist_dep.found()
-       plugins += 'zeitgeist-dp'
-     else
-       str = 'you need zeitgeist-2.0 >= 0.9.12 to use the zeitgeist-dp plugin'
--      if plugin_error
-+      if plugins_option.contains('all') or plugins_option.contains('zeitgeist-dp')
-         error(str)
-       endif
-       message(str)
--- 
-2.17.1
-
diff --git a/media-video/totem/files/3.30.0-vala-errormsg.patch b/media-video/totem/files/3.30.0-vala-errormsg.patch
deleted file mode 100644
index 37816784ded8..000000000000
--- a/media-video/totem/files/3.30.0-vala-errormsg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4fba51c82d855426ad73f8215d0ed7bfdfa4fae2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 15 Dec 2018 20:50:34 +0200
-Subject: [PATCH] build: Fix error message with -Denable-vala without vala
- found
-
-Fixes
-ERROR:  Unknown variable "vala_options"
-to
-ERROR:  Problem encountered: you need vala >= 0.14.1 installed to use vala plugins
-by correcting a typo.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c0679d25..5647376f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -230,7 +230,7 @@ if vala_option != 'no'
-   endif
- 
-   if not have_vala
--    if vala_options == 'yes' or introspection_option == 'yes'
-+    if vala_option == 'yes' or introspection_option == 'yes'
-       error(str)
-     endif
-     message(str)
--- 
-2.17.0
-
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 1daea3f76b23..39dcd3765107 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -19,8 +19,6 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 	<use>
 		<flag name="lirc">Enable support for controlling Totem with a remote control
 			using <pkg>app-misc/lirc</pkg></flag>
-		<flag name="nautilus">Enable the nautilus extension</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>
-		<flag name="vala">Build the rotation plugin, which allows videos to be rotated if they are in the wrong orientation</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/totem/totem-3.30.0.ebuild b/media-video/totem/totem-3.30.0.ebuild
deleted file mode 100644
index 9506455784d7..000000000000
--- a/media-video/totem/totem-3.30.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome.org gnome2-utils meson vala 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 nautilus +python test vala"
-RESTRICT="!test? ( test )"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	vala? ( introspection )
-"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-COMMON_DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[X,introspection?]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[X,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/libX11
-	>=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 )
-	nautilus? ( >=gnome-base/nautilus-2.91.3 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_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_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	app-text/docbook-xml-dtd:4.5
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=dev-util/intltool-0.50.1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	vala? ( $(vala_depend) )
-"
-# perl for pod2man
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-vala-errormsg.patch
-	"${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_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Disabled: sample-python, sample-vala, zeitgeist-dp
-	# brasero-disc-recorder and gromit require gtk+[X], but totem itself does
-	# for now still too, so no point in optionality based on that yet.
-	local plugins="apple-trailers,autoload-subtitles"
-	plugins+=",im-status,gromit,media-player-keys,ontop"
-	plugins+=",properties,recent,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo"
-	use cdr && plugins+=",brasero-disc-recorder"
-	use lirc && plugins+=",lirc"
-	use nautilus && plugins+=",save-file"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins+=",rotation"
-
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Denable-vala=$(usex vala yes no)
-		-Dwith-plugins=${plugins}
-		-Denable-nautilus=$(usex nautilus yes no)
-		$(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_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
index e3a3030b0181..0a1b3d38e9a1 100644
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ b/media-video/totem/totem-3.32.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 2e191fb98331..70d1e8465a5d 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -3,5 +3,5 @@ AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601b
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 EBUILD vcdimager-0.7.24.ebuild 1492 BLAKE2B 69b176284b7c915f72785cb02fd4c340644b82519318a749086fd8850707214d5429c2f9d19b35a4d95c395c0e0fb4677775cf05707a34da0cc2a69840318442 SHA512 5e5cf2a27d353be4c23e34565cc0ffdccdac97b261de89d255086655d76deaaaafabafe4e06a994bc76cdea485511f17a2fa63f593ca369c6c3c877b0e98b134
-EBUILD vcdimager-2.0.1.ebuild 1376 BLAKE2B 2559bef9b946d90e061bcbe31c71843973d7936165bab70b1b94620044d2076395b2ff4052f870058a51fda8769894bf15eff0ec49e09d5abea36f9fb0d20a1a SHA512 5e4d25aeca4b15b8f64c58c2ccb81b2f51e2f0e0a73888e44fa083e94b99ee9d05941c923dab073c210e571359e8f9759261a9619a0af0bc7188bde6fa47b2ce
+EBUILD vcdimager-2.0.1.ebuild 1375 BLAKE2B 3e617ca2a82d4e5ba8f99665f8adee63dfef72d7e65a2fcd0578b1cecefe0525739a6ebbee2f5d6165b22ecb9270aa335e4cf51fcb0e69f70ba54fb3ee79b79e SHA512 6840ed28f8591ae3da10375a5fb26e957a274db7d4183c7ecd15100bf66ad1f8e99995a600c3f6569dea2614f17dfe74a905d21a5928026be78354dd6004148e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild
index 4923e365621c..15f180963d3d 100644
--- a/media-video/vcdimager/vcdimager-2.0.1.ebuild
+++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sh sparc x86"
 IUSE="static-libs +xml"
 
 RDEPEND="
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 3a99760de3f4..abf0cf139360 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 ea59d61c032ca1ef77423f8afb3a9174b858d433901ca5fb488f302b3ce520c138913bc07dad21d66dbbf2a860ff68a027bb484115d6029211d94e1f8ce5b847 SHA512 42c0591691ed77bd6da94576f46d9ef0aea8bb0afa508c4b5e384614f948d6b291c6467a8d4494c06d2be4f87dcdd6ce5249e798a6cb8cfb06ba5d0b2b894c18
+EBUILD vcsi-7.ebuild 863 BLAKE2B 917d7785b47e026fa4ddfff75d36b724a3a09d7026a46d0c98645b26dde661e39346c35acb3f22e138749930bc098035191416bf0b32f3d8ea87e442ce3755d0 SHA512 dead935223a5a0ad2907b04592c276d6bbaf99b687f098c85cbee355bd582b691f3f6445d1be6da55763d1450dc1cedb39dc9a864fbfb660b4c96615cb768899
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/vcsi/vcsi-7.ebuild b/media-video/vcsi/vcsi-7.ebuild
index 3ef53f47136d..15d9f32e1f64 100644
--- a/media-video/vcsi/vcsi-7.ebuild
+++ b/media-video/vcsi/vcsi-7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8a047a817bd5..3401663eba1d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,11 +1,20 @@
 AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d
-AUX vdr-2.2.0-jpeg-9c.patch 811 BLAKE2B fcfef4fca2e2e412f5f4fda858c98978abca85198cf0b88808059d52e9ef260b66b3bc64c1c6eb6498c11923f6d51ea3b29e4b650d1426dc8457a293db025a5a SHA512 91a90e04fa6790a5efa58c1f55b427f8c4fae9266a7998857508d7c9470ab0b7513de49cf2be28e35dc361fbedb492d092ed6cabf7dce1551646a48e8aa4a544
+AUX vdr-2.2.0-jpeg-9c.patch 917 BLAKE2B 8d5e55585daccbbc94cc57b602bba6df2d364e8841fe4bdc6adff3d10ce5c9ca10edaf14146f43fb35b5d954afcd4e8137b7f003e2349752fe209a9205ca4762 SHA512 162ff2b6aa5cd7df29265de2889ba354140ce2ae2ec1877559db2e9164faed8944bbb8d680963fa3212b9d8916aed34a63d2d4f69e1d742e860a57be58f252c9
 AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b
 AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da3b47ec009a5126f38bcfe5adec8657f9ca69dced3202c12f0751e88ce1fec0231feeb9b4e8e019556df3b61b SHA512 64c299db8e2fa0545ba9379330ecc365ec0dda9991ef5e85af3fd3a842bdef196aa811b083b50edca5db757e437e181248b5825e32dd463bd916167b4ddda5c7
 AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a
 AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45
+AUX vdr-2.4.1_gentoo.patch 2128 BLAKE2B dd10816931a5801f0ecef5025d750a8a0f16795fd70234792b6721ef31909350682a8f5ddae091d3c39a383b9715a281f178059798b9c5cd37b9e4c22f36dd6e SHA512 4ed95f894fa37a1a2fea6c568e5e3878b16afa172ebdde8181203a88bcbef4b3691449a1e07b0912675a67200ae8137f0ae0a78b8f1ebe2e5fe17a729c418284
+AUX vdr-2.4.1_makefile-variables.patch 1076 BLAKE2B 674b9a57fa8504e88cbaa21016766a0da3fc4ec8b6d9891050c7aa026c01414d18f57895885f8f0466243474ba02937397b571819cea3e1c38e5b35b5e5a9cbe SHA512 47bfbb7929e15ff98ff4bd0b466cbfa37c7f90efb1ef3a5c75e6c67fb0719a5979d2bfa2cb2e19805b15f22931dd1c911efab2e31fe8bd6953a1850196785d77
+AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-EBUILD vdr-2.2.0-r4.ebuild 8100 BLAKE2B 108a7185466fb38efe0f2644e493b7e874dced3963825a4cf78a96e8afaa7b3aabae17ef10f45e5c3f972a18e921520b772f502f3bccd83362695a61fd6d6aef SHA512 c56c79a147230f0e4dc33c2f5722f35ba97803e7388c41bb498495c3cb644a65b65957269a482218317856d536a14b47ffb7e08aca269fe945168039c238e89a
-EBUILD vdr-2.2.0-r5.ebuild 8111 BLAKE2B 8422450ce89242b7a434a3e413c2a211b417c6eda7b415952dd59774c81b38c8e2b7c348a44d1911b97e159d357c38ceff15c5a5f50d141c0b6d3b8d66b8a655 SHA512 ede37811fa9be88ab1e7732a6dc9949d0258ab62b30205d16e98e3a9d721a45752e5582dbd3d531fd6547473d64b8ccb0a35000ce1d783d2915d38042c459993
-MISC metadata.xml 1665 BLAKE2B a94302446f9bdda540fa5e03f61670325c6a23702dc38f67e876025d60f421d1a54f532c33d02e6938de0d756e91810ca1259f9a8b06ceb425e33dcd3babcc1d SHA512 9482d1a2528354978c7c013816c2672959b109794b8c2a020604ef1e9df28f893a4c1e01ac34b707b7e8f60bad93f44be770daeea4b6f2950a7fb2d276de3223
+DIST vdr-2.4.0-ttxtsubs.patch.bz2 16721 BLAKE2B d5c3da713cd82ed8c3baccd1336d283404ebf1099116e76776c26a41ac193aa88bcb5bc2aaa8409a6d40e61c122bbc8ac0d67cb6ff8f83b0dbaea392101643b9 SHA512 99f2cab268d3f6af11607333a35583e5802f90636712e0429eb89eb66ccea7b1fb16a0d3ed2ff266e6f87c338bf77f97028a372eef5e6116b27220a5670a6d31
+DIST vdr-2.4.1.tar.bz2 940623 BLAKE2B 6fa7858e1c0fc25d3332d20347b30515276fc2b54905f32109dfa7f59e4e0c8a83687be405fac063a673c89d77e191f62162b1bd0ed6ee179d32a27f73076fb3 SHA512 b851ebf626de1a6aea11ee9c0cd87d78ebebdc34128925d2027a7030db1262064edb8818566a87ce22d37a9bd2b4f0b4ff1aad8dd251061d9ff972ffe0cf022d
+DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
+DIST vdr-2.4.1_pinplugin.patch.bz2 8641 BLAKE2B 339bb23ed0f505087bdbbefb192824d5def37bb00c4d5dc300f545c7951f11504115d058c157d1964f5f32e483e668675e13254465b5acce76cfdcf07faae216 SHA512 f402fa51314ad6c34439f71b7cb81e1ca51e0fa3b120a1fdaee119c2dd1b13174db2e666bf5e6204aa28e4acef8f6bd6e3ab8324793c3484eafb16dc8cf808d5
+DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
+EBUILD vdr-2.2.0-r5.ebuild 8110 BLAKE2B 8f71caafb129020c9c431db012061f3f3dad3f60a2b28439f793a39c0336e049b94cfe21f8011741a8db16777efe0b8fb6bdd2bc3dd61845a32c595a296f7b61 SHA512 f3e10562f35f19ae808215a86b5a807af4aeec327e39e42ed89eb2a729836afe1ab4253cd95a379be8d2a693719066093c765be4118e483bbcd1c007767399be
+EBUILD vdr-2.4.1.ebuild 5733 BLAKE2B 0bdc7d0a4654b2a19997c5d15dad9bd4a0b6edd38dc5000ad935e9233ef4de0d047f29d3b4aef639ffc1e8e2ea839143e77fc63f8fdc8e33f63ef9fb233bf5ec SHA512 1c76e2d0c0de09e703d7bc554f1c6cf327b9f7ce2db11806d77774a762e7cd2ce1c2ee280c6e0aa35cbdfdc6dacc77f131aa068001b3c2969351c2a424ee7274
+MISC metadata.xml 1862 BLAKE2B 7dc6b96c3e05f9e4b34e6c2eb755e7326b5398e16ebee51768676003127becae8cd744de9a749b529452ca262caf4ccda9889d169297a0cf2134bdc2e22ca439 SHA512 3272e780bac7ae35449902621e7ff7ed7da099b9633d7cb47e6a2f6708cf069c220b5d67f6be3092459cbb254931f52b2e4d9b08f983c6b8841b74ae7239b1b2
diff --git a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
index b67c94d7c579..8ae498a28fd8 100644
--- a/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
+++ b/media-video/vdr/files/vdr-2.2.0-jpeg-9c.patch
@@ -1,5 +1,7 @@
 https://bugs.gentoo.org/667934
 
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org>
 --- a/tools.c
 +++ b/tools.c
 @@ -1221,15 +1221,15 @@
diff --git a/media-video/vdr/files/vdr-2.4.1_gentoo.patch b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
new file mode 100644
index 000000000000..71aca7f5f96b
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_gentoo.patch
@@ -0,0 +1,66 @@
+this patch will disable some handling in the core Makefile
+as we use for Linux FHS a different handling in gentoo
+demoplugins from core vdr install disabled
+support from Linguas variable
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -182,7 +182,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -209,7 +209,7 @@
+ 
+ install-i18n: i18n
+ 	@mkdir -p $(DESTDIR)$(LOCDIR)
+-	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -283,12 +283,11 @@
+ 
+ install-dirs:
+ 	@mkdir -p $(DESTDIR)$(VIDEODIR)
+-	@mkdir -p $(DESTDIR)$(CONFDIR)
+ 	@mkdir -p $(DESTDIR)$(ARGSDIR)
+-	@mkdir -p $(DESTDIR)$(CACHEDIR)
+ 	@mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf: install-dirs
++	@mkdir -p $(DESTDIR)$(CONFDIR)
+ 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -296,9 +295,9 @@
+ install-doc:
+ 	@mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	@mkdir -p $(DESTDIR)$(MANDIR)/man5
+-	@gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+-	@gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
+-	@gzip -c svdrpsend.1 > $(DESTDIR)$(MANDIR)/man1/svdrpsend.1.gz
++	@cp vdr.1 $(DESTDIR)$(MANDIR)/man1/
++	@cp vdr.5 $(DESTDIR)$(MANDIR)/man5/
++	@cp svdrpsend.1 $(DESTDIR)$(MANDIR)/man1/
+ 
+ # Plugins:
+ 
+@@ -315,8 +314,9 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-	@mkdir -p $(DESTDIR)$(INCDIR)
+-	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 
diff --git a/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
new file mode 100644
index 000000000000..30cd39528f9b
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4.1_makefile-variables.patch
@@ -0,0 +1,40 @@
+we change some variables in the Makefile
+for a better handling in gentoo ebuild
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 22 Dec 2019 )
+diff -Naur vdr-2.4.1.orig/Makefile vdr-2.4.1/Makefile
+--- vdr-2.4.1.orig/Makefile	2019-12-22 00:51:31.000000000 +0100
++++ vdr-2.4.1/Makefile	2019-12-22 00:53:34.000000000 +0100
+@@ -54,7 +54,7 @@
+ 
+ # Output control
+ 
+-ifdef VERBOSE
++ifeq ($(VERBOSE),1)
+ Q =
+ else
+ Q = @
+@@ -89,7 +89,7 @@
+ ifdef HDRDIR
+ HDRDIR   := -I$(HDRDIR)
+ endif
+-ifndef NO_KBD
++ifeq ($(USE_KBD),1)
+ DEFINES += -DREMOTE_KBD
+ endif
+ ifdef REMOTE
+@@ -98,12 +98,12 @@
+ ifdef VDR_USER
+ DEFINES += -DVDR_USER=\"$(VDR_USER)\"
+ endif
+-ifdef BIDI
++ifeq ($(BIDI),1)
+ INCLUDES += $(shell pkg-config --cflags fribidi)
+ DEFINES += -DBIDI
+ LIBS += $(shell pkg-config --libs fribidi)
+ endif
+-ifdef SDNOTIFY
++ifeq ($(SDNOTIFY),1)
+ INCLUDES += $(shell pkg-config --silence-errors --cflags libsystemd-daemon || pkg-config --cflags libsystemd)
+ DEFINES += -DSDNOTIFY
+ LIBS += $(shell pkg-config --silence-errors --libs libsystemd-daemon || pkg-config --libs libsystemd)
diff --git a/media-video/vdr/files/vdr-2.4_remove_plugins.patch b/media-video/vdr/files/vdr-2.4_remove_plugins.patch
new file mode 100644
index 000000000000..56997968d60f
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.4_remove_plugins.patch
@@ -0,0 +1,25 @@
+we do not install any plugins from core vdr
+
+Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
+Reviewed-by: Joerg Bornkessel <hd_brummy@gentoo.org>
+diff -Naur vdr-2.4.0.orig/Makefile vdr-2.4.0/Makefile
+--- vdr-2.4.0.orig/Makefile	2017-05-29 10:48:42.000000000 +0200
++++ vdr-2.4.0/Makefile	2019-03-14 12:08:56.857495048 +0100
+@@ -125,7 +125,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -271,7 +271,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-conf install-doc install-i18n install-includes
+ 
+ # VDR binary:
+ 
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index d0e7ffcbce82..eea6df4fdb23 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
 	</maintainer>
@@ -16,9 +20,9 @@
 	<use>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
 		<flag name="bidi">fribidi support, for languages, written from right to left</flag>
+		<flag name="demoplugins">Install demo and example plugins coming with vanilla vdr</flag>
 		<flag name="graphtft">support for vdr-graphtft plugin up from version 0.1.7</flag>
 		<flag name="html">Install HTML documentation</flag>
-		<flag name="kbd">enable keyboard support as remote device</flag>
 		<flag name="keyboard">enable keyboard support as remote device</flag>
 		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
 		<flag name="menuorg">Enables support for the <pkg>media-plugins/vdr-menuorg</pkg></flag>
@@ -28,5 +32,6 @@
 		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
 		<flag name="resumereset">rreset resume of EOF</flag>
 		<flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
+		<flag name="verbose">enable full output on compile</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-video/vdr/vdr-2.2.0-r4.ebuild b/media-video/vdr/vdr-2.2.0-r4.ebuild
deleted file mode 100644
index 41a6e54da799..000000000000
--- a/media-video/vdr/vdr-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-				mainmenuhooks menuorg menuselection resumereset ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.7
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-CONF_DIR="/etc/vdr"
-CAP_FILE="${S}/capabilities.sh"
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-add_cap() {
-	local arg
-	for arg; do
-		CAPS="${CAPS}\n${arg}=1"
-	done
-}
-
-enable_patch() {
-	local arg ARG_UPPER
-	for arg; do
-		ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]')
-		echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to Make.config"
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/d' \
-		Make.config.template >> Make.config || die "cannot write to Make.config"
-}
-
-extensions_all_defines() {
-	# extract all possible settings for extensions-patch
-	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
-		Make.config.template \
-		| sort \
-		| tr '[:upper:]' '[:lower:]' || die "error in function extensions_all_defines"
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex kbd 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-patches
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR="/usr/include"
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR="${i}"
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	cat > Make.config <<-EOT || die "cannot write to Make.config"
-		#
-		# Generated by ebuild ${PF}
-		#
-		PREFIX			= /usr
-		DVBDIR			= ${DVBDIR}
-		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
-		CONFDIR			= ${CONF_DIR}
-		VIDEODIR		= /var/vdr/video
-		LOCDIR			= \$(PREFIX)/share/locale
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-
-	EOT
-	eend 0
-
-	# wrt bug 586070
-	if has_version ">=sys-apps/systemd-230"; then
-		sed -e "s:libsystemd-daemon:libsystemd:g" -i Makefile || die "sed libsystemd failed"
-	fi
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		eapply "${WORKDIR}/${EXT_P}.patch"
-		sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing"
-
-			extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE"
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE"
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS are up to date."
-			else
-				ewarn "IUSE differences!"
-				local diff
-				for diff in $DIFFS; do
-					ewarn "$diff"
-				done
-			fi
-		fi
-
-		ebegin "Enabling selected patches"
-		local flag
-		for flag in $EXT_PATCH_FLAGS; do
-			use $flag && enable_patch ${flag}
-		done
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile || die "sed fails on Makefile"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		eapply "${FILESDIR}/${P}_gcc7extpng.patch"
-	fi
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.24.patch"
-	eapply "${FILESDIR}/${P}-jpeg-9c.patch"
-
-	# fix some makefile issues
-	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
-		-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
-		-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
-		-i "${S}"/Makefile || die "sed fails on Makefile"
-
-	eapply_user
-
-	add_cap CAP_UTF8
-
-	add_cap CAP_IRCTRL_RUNTIME_PARAM \
-			CAP_VFAT_RUNTIME_PARAM \
-			CAP_CHUID \
-			CAP_SHUTDOWN_AUTO_RETRY
-
-	echo -e ${CAPS} > "${CAP_FILE}"
-
-	# LINGUAS support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	emake install \
-	VIDEODIR="/" \
-	DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}"/plugins
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS )
-
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
-}
-
-pkg_postinst() {
-
-	elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-	elog "\tA lot of thanks to Klaus Schmidinger"
-	elog "\tfor this nice piece of Software...\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	elog "To get nice symbols in OSD we recommend to install"
-	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
-	elog "\t2. select font VDRSymbolsSans in Setup"
-	elog ""
-	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
-	elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.2.0-r5.ebuild b/media-video/vdr/vdr-2.2.0-r5.ebuild
index 740d4182bd84..38a44d4e8183 100644
--- a/media-video/vdr/vdr-2.2.0-r5.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,9 +26,9 @@ HOMEPAGE="http://www.tvdr.de/"
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 	mirror://gentoo/${EXT_P}.patch.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
 
 COMMON_DEPEND="
diff --git a/media-video/vdr/vdr-2.4.1.ebuild b/media-video/vdr/vdr-2.4.1.ebuild
new file mode 100644
index 000000000000..d2f923913af4
--- /dev/null
+++ b/media-video/vdr/vdr-2.4.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${P}.tar.bz2
+	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_mainmenuhook-1.0.1.patch.bz2 )
+	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
+	naludump? ( http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
+	pinplugin? ( http://vdr.websitec.de/download/${PN}/${P}/${P}_pinplugin.patch.bz2 )
+	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/${P}/${PN}-2.4.0-ttxtsubs.patch.bz2 )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump pinplugin systemd ttxtsubs verbose"
+
+COMMON_DEPEND="
+	virtual/jpeg:*
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	media-tv/gentoo-vdr-scripts
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+BDEPEND="sys-devel/gettext"
+
+REQUIRED_USE="pinplugin? ( !mainmenuhooks )"
+
+CONF_DIR="/etc/vdr"
+CAP_FILE="${S}/capabilities.sh"
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_configure() {
+	# support languages, written from right to left
+	export "BIDI=$(usex bidi 1 0)"
+	# systemd notification support
+	export "SDNOTIFY=$(usex systemd 1 0)"
+	# with/without keyboard
+	export "USE_KBD=$(usex keyboard 1 0)"
+	# detailed compile output for debug
+	export "VERBOSE=$(usex verbose 1 0)"
+}
+
+src_prepare() {
+	# apply maintenance-patches
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT || die "cannot write to Make.config"
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		ARGSDIR			= \$(CONFDIR)/conf.d
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+
+	EOT
+	eend 0
+
+	eapply "${FILESDIR}/${P}_gentoo.patch"
+	eapply "${FILESDIR}/vdr-2.2.0-jpeg-9c.patch"
+	use demoplugins || eapply "${FILESDIR}/vdr-2.4_remove_plugins.patch"
+	eapply "${FILESDIR}/${P}_makefile-variables.patch"
+
+	# works
+	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
+#	# request to upstream for new patch
+#	use permashift && eapply "${DISTDIR}/vdr-2.3-patch-for-permashift.diff"
+	#pinplugin works
+	use pinplugin && eapply "${WORKDIR}/${P}_pinplugin.patch"
+	# ttxtsubs works
+	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.0-ttxtsubs.patch"
+	# menuorg works
+	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
+	# mainmenuhooks, works
+	use mainmenuhooks && eapply "${WORKDIR}/${P}_mainmenuhook-1.0.1.patch"
+
+	add_cap CAP_UTF8 \
+		CAP_IRCTRL_RUNTIME_PARAM \
+		CAP_VFAT_RUNTIME_PARAM \
+		CAP_CHUID \
+		CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}" || die "cannot write to CAP_FILE"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+
+	default
+}
+
+src_install() {
+	# trick the makefile to not create a VIDEODIR by supplying it with an
+	# existing directory
+	emake VIDEODIR="/" DESTDIR="${ED}" install
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	# backup for plugins they don't be able to create this dir
+	keepdir "${CONF_DIR}/plugins"
+
+	if use html; then
+		local HTML_DOCS=( *.html )
+	fi
+	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS UPDATE-2* )
+	einstalldocs
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	fowners vdr:vdr "${CONF_DIR}" -R
+}
+
+pkg_postinst() {
+	elog "Please read the /usr/share/doc/${PF}/UPDATE-2.4"
+	elog "for major changes in this version\n"
+
+	elog "It is a good idea to run vdrplugin-rebuild now.\n"
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup\n"
+
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/vdrsync/Manifest b/media-video/vdrsync/Manifest
index 264ccd929d7a..4813da6e9146 100644
--- a/media-video/vdrsync/Manifest
+++ b/media-video/vdrsync/Manifest
@@ -1,4 +1,5 @@
 AUX vdrsync-0.1.3_pre050322-path.diff 1377 BLAKE2B 8587333a17dc6a31a67e05f4904c11562ec311cc1c63a88769d7467e0260316e376ca414e951119a63471b6c7a7a22b5840d925ee799ec05a354051ebc178e2b SHA512 0d7d1dad8b2cae5ed04259bf55dd921a583c47d5788eb17596706fa83487eab2026bfcf3c4fe42234ef4ee231746d0f42ec916cacc99262f5850de1f428d4d57
 DIST vdrsync-050322.tgz 295498 BLAKE2B 8f40605c8f035829aa7881de8a4435de9fa8b40af737d38b5452a2338b216acb454634eb14d79767c23de13520a2499420d8aa9908cc1b6a4f557222ea5ec3a0 SHA512 112dc3cb84511fcd8c61144378931dfb6af5a1650b728dd3dbd9004dc783c24fc26125d31fe02ba5b3c26174c82ac7fb2f74fd444b8c390640fcbc45e30c7a21
 EBUILD vdrsync-0.1.3_pre050322-r1.ebuild 912 BLAKE2B 78bd741ea687d22c59c4a4bb144fce90ee42bffd9c4e03a8613dbabeefbc82881d3261ebda8b281703e7763646ef6cdb99740db4d1bd2529d4f6306a14eed3d4 SHA512 2828c40a1509291a8fe80596661817d4714800d19215db7e6fde9d3da7c7214c2333617fc404a9a227bd830e05f0440d8b6e60d85304f93481abba7b8f5ff9b4
+EBUILD vdrsync-0.1.3_pre050322-r2.ebuild 916 BLAKE2B f722291b86dda6f901f2a96a96ada68e53d572df5d72805e55193a6e87b49522457807db56dd64771c595ebcc96e62dc3de7b6f9d406e220e08594cbe76b7ed0 SHA512 9aaa0892f6f8184a7545fe8eee7fb31c08ec15e9626443cfc1536ba04f21692d1d7bca26c28ca5d41ff447e43fae5231517891ae199f93da365c0bd511cac172
 MISC metadata.xml 357 BLAKE2B 2969a06704f541160af828c0e4bb2607cc86a22090e867607fd2951b08a22f45070e6c4fcf84ce22d6ec074b288ea4d8e04d42bd77dac69e3ec16600a311d1d0 SHA512 c301a1bb051eefde7856ef1462d13343fba21acfabde35a2fd9feba5c00f3aaf697b9e358132cc56114f59af0b785ffb07998d8a6d084369275cbf1b616a7fa4
diff --git a/media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild
new file mode 100644
index 000000000000..0ebbc2700aea
--- /dev/null
+++ b/media-video/vdrsync/vdrsync-0.1.3_pre050322-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-${PV#*_pre}"
+
+DESCRIPTION="converting vdr-recordings to mpeg2, dvd or other similar formats"
+HOMEPAGE="http://vdrsync.vdr-portal.de/"
+SRC_URI="http://vdrsync.vdr-portal.de/releases/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvdr"
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.8.0
+	media-fonts/corefonts
+	media-video/mjpegtools
+	dvdr? (
+		>=media-libs/gd-2.0.15
+		>=dev-perl/GD-2.0.7
+		>=dev-perl/GDTextUtil-0.86
+		>=media-video/dvdauthor-0.6.8
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	sed -e "s:/usr/X11R6/lib/X11/fonts/truetype/arial.ttf:/usr/share/fonts/corefonts/arial.ttf:g" \
+		-i dvd-menu.pl || die
+	eapply "${FILESDIR}/${P}-path.diff"
+}
+
+src_install() {
+	dobin check-vdrsync.pl vdrsync.pl vdrsync_buffer.pl
+	use dvdr && dobin dvd-menu.pl
+	dodoc CHANGES
+}
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index 1655eb38b942..d78413d02f96 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,3 +1,5 @@
 DIST yle-dl-20191022.tar.gz 84694 BLAKE2B bfeab9c5220931b8af5eae94b0f5377d21f6b6fb7b21c5f7bc5360a69e7185b8f1e052a584460187cfdd04d68295a20cb895e749af43c1de4ffd7fcd7bfc3875 SHA512 2d7c6d7f8e60cb8fd54fc04dcf73caf5022e3c65ab78f002c280950184fb2458f88f6934b62c0afaeaf30864b5cc47b1ef9c2a58d2855c5111a563cd195095be
-EBUILD yle-dl-20191022-r1.ebuild 1747 BLAKE2B 0221a2a84a8dc3489b1ebffbb3e49b26d0cb8825f05897c152daf62af521edc5f705aba2410424b30e5c83299bfd0b23b1ba4bacfed3d77a066541f7e18e3181 SHA512 b8e1ba894da186d7c1579c3df953d177e18183ee5a237709d0de0b94141b7520bcd50ed2ede8e26cc782bc92975378558e1a018ee85abafb168137ecb5099284
+DIST yle-dl-20191231.tar.gz 86479 BLAKE2B 5b39a3e68478fe71ec604f3217a4115ad1ff09fc8913c81acc7108e433349a0c524eebadeb892e01d3ed43ab163421ea59bc4ec486af710f0680107d15d13f35 SHA512 60d7aeab72e3a6c9346a9e569c9de6af154a65b326c7528ceebe3ee33dc1df62764d6f768da160524bf74ab6ad7c238658a58184726cec6b6b46e70b5701437c
+EBUILD yle-dl-20191022-r1.ebuild 1747 BLAKE2B 033026b4047e1630bb323989660ef72817e24c8c9a62d119c7995d8e9a82f45989619b8f693b7f0d4cff837114442a46bf6e13db9168aaaba8ae784169320cb5 SHA512 761d1c5ea9d110a157f1fc663dae8c7be3d84f6bb90ffe8fe62523da81d82c080049f87b18dc7aa08ffb554851e9863681b32c3bbf17d970f266bcfad9adfca5
+EBUILD yle-dl-20191231.ebuild 1687 BLAKE2B 26fa2119458c0eef2cac9cfb65a29cf61428d86d924e4a749bac13a477c04d1f593038054d784c22e4dc638c16822f4bf1892ba3d50fb7dfeb99265e4841226a SHA512 c8e74be2fc5235095462dbf3c7359b4d90cd65f29ffe72019afb85d0ff90411059db93fc99bb76aeb4548995f0ac99648d0f14d7d2311d52285b536fa741bdfe
 MISC metadata.xml 415 BLAKE2B 3961cdbc02847f65011c6987b811207c31c49ae40c3bea44b481f35ac04e75dabfa8ceae74f6adc816f211129efb8faaa0ba63700d95eec569b3f51cfe64bd42 SHA512 96f1afba4a47f7b5dca75ba1d5300baf9815bdcf3eda12f5b6044aea7cfc09683c76db210a0b4965626aac050016fc39f44c4e5c63597894e0ae6457dc2aeb90
diff --git a/media-video/yle-dl/yle-dl-20191022-r1.ebuild b/media-video/yle-dl/yle-dl-20191022-r1.ebuild
index 2684deeba928..82b8f3eced6b 100644
--- a/media-video/yle-dl/yle-dl-20191022-r1.ebuild
+++ b/media-video/yle-dl/yle-dl-20191022-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/media-video/yle-dl/yle-dl-20191231.ebuild b/media-video/yle-dl/yle-dl-20191231.ebuild
new file mode 100644
index 000000000000..6cbb34932369
--- /dev/null
+++ b/media-video/yle-dl/yle-dl-20191231.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Download media files from Yle Areena"
+HOMEPAGE="http://aajanki.github.io/yle-dl/"
+SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libav 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}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mini-amf[${PYTHON_USEDEP}]
+	dev-python/progress[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	net-misc/wget
+	php? (
+		dev-lang/php:*[bcmath,cli,curl,simplexml]
+		>=dev-libs/openssl-1.0.2:0=
+		media-video/rtmpdump
+	)
+	youtube-dl? ( net-misc/youtube-dl[${PYTHON_USEDEP}] )
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
+
+src_prepare() {
+	default
+
+	# Gentoo doesn't ship pycryptodomex with pycryptodome
+	sed -i 's/pycryptodomex/pycryptodome/g' setup.py || die
+}
+
+python_test() {
+	# For tests to run succesfully, you need to disable network stricting
+	# feature first.
+	#  FEATURES="-network-sandbox test" emerge -a yle-dl
+	esetup.py test
+}
+
+pkg_postinst() {
+	elog "Sample configuration file has been installed in "
+	elog " /usr/share/doc/yle-dl-${PV}/yledl.conf.sample.bz2"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /media-video
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)