gentoo resync : 10.02.2020

22 files changed, 139 insertions, 58 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4d7b6bc6e24a..04cec9d33219 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index c58e0d9dd087..c3cb5b420682 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -2,5 +2,5 @@ AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df
 AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b
 DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r2.ebuild 2113 BLAKE2B d671255ec142676227d68dde7fb87cdb995fbb621bdfbfa447c11f169e067499bc8ac5ba16ed6520fe738dbc3ab12da55cb0c39f049233a9b57b247f1c6fc884 SHA512 91eb875d5b85a34f78e6d1fb3e5a3b84f508a2f3c35001877ac0aa91c1ea6d876e17f41a2ffe5a066e79e9e0912c331d62f4b701dc41b6466343886d64c673a9
+EBUILD griffith-0.13-r3.ebuild 2184 BLAKE2B 4ae2ac0dd60cdb9cc1d2c53006317534360f826c7593fecb9442f307635cd4958ef46ffb628cd6874614cb310083a13d0edef76f1ecf54a4a491c869adc4da0a SHA512 1c0b70e5dd0517c319ea5d1ac76d4b98fb79dd213fc404294445c22f6fcc28f4e992d282456f6ec4a60f52db230f1e8cbd04157f344f7bed18646f33059b3e0d
 MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r3.ebuild
index aa9efbb2fc61..d606fd887aac 100644
--- a/media-video/griffith/griffith-0.13-r2.ebuild
+++ b/media-video/griffith/griffith-0.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,12 +22,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	gnome-base/libglade[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/reportlab-1.19[${PYTHON_USEDEP}]"
+	gnome-base/libglade[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.6.1:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-0.5.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/reportlab-1.19[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}
 	doc? ( app-text/docbook2X )"
 
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 0dcfceeddeb6..c55fc9b07cf9 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 4275 BLAKE2B 43fddc9f49b339b9e6257c9e02131334a373f52c503a99be228ce9a5b87b2fd5d8c9abd0a68f119f180911979020c8d9e78efe6d351590e11a4d3412727e9663 SHA512 0a8d3c598653c32da03d568e0a2d5b441cc2b276788d139359bad8388293576f87a389f461650ad59bb3b13d8061abf1e967e4f69be3ef0a6a8374d64edfdd93
-EBUILD handbrake-9999.ebuild 4213 BLAKE2B 4bb317de8260b88f39ddc997c7c2fc60a1901c7105d04f2624d9f324b5851c4d6744d029b0387accc23b3609859c8a334a8c6c9eff7517581683b3b01d7a2e68 SHA512 c035fe2e012f3e2aae938f75628a3f503f5cf76648e46b3ba8deabfde0ce99a8a3e13bfc764b824b0e6182f877881ca42ef1e06752d7e6341da7498e957d2a49
+EBUILD handbrake-1.3.0-r2.ebuild 4265 BLAKE2B e563616a46b2b818201ba7a80860b2cc3f2112b84b42263aa0614a59ae4e857784e891d05dfc93897022f47c86f39466394f3d2b1cd936b05c6678644ee469d7 SHA512 9f577f7040689ecbe5c6e7562f7bf6f2e05bd8740bb2bd4642e5d83b612be37db427de3161190872a903864e5ce0933d5c28f3f2b8f1f164fdf50dd5f2983044
+EBUILD handbrake-9999.ebuild 4203 BLAKE2B f4502d19371e87031eb4ece62144e3bb1eb68d467072dbf54350ff59fd766300d9a0a05753bfb897c61b09a2e6f50773961f18e9d59e5e36592b48fdd990dd04 SHA512 9b7219856c3f100e6560050eb1c84f6bdbdd50a08bb83ec41d431f7f01463c118b0179a82a61aa442290876a0bbca914e36c951453fd30a1235d26a27bc85766
 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 e5f8e2714182..6c8e01b4f37e 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,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 59a9c3a97a83..753a5a361561 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index de68763705e3..798444f57b50 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
+DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
-EBUILD openshot-2.4.0-r1.ebuild 1271 BLAKE2B 7cdf661ce20add5534d4b56dc3f0480c49a8867c87f435dabe2cf2a4250c6bfc205c6212d40aef0e896ce2d53d3e99906ff20dc1c05ed902bc0b5f2c736b6a5d SHA512 44debba712fb7d542989ee48262f73684f899dc8a92a67563c27754b197c3bbd51e49e5d95d85ee031db5d6b165120bbaf9c1fe581774155deb3266f45b3f097
-EBUILD openshot-2.4.4.ebuild 1206 BLAKE2B 2b56cc68d695cc6e7b3bb482e2b13d5bfe7abcfc8c7091fce0712881f2136b847b43010980bdd38d8b355bbf7183216c44c8dabea480e97d965ce67173cd5d01 SHA512 37bfc6c50c940fb2f8cc75d34074242478bfa6f5ab5dc4ac3b23772499923bdc93e04dd5682c7a5122d89f244a1bac2f9446db74c17df4a6c5629baa9e138164
+EBUILD openshot-2.4.0-r1.ebuild 1283 BLAKE2B 1ca81c34d0d99593719c65c38ec59df75df5ba937ab6f62482a885068f36c5cdebde2bc351d97ab873cdcd87cb7eef6fb5303868ce687ee81526c4030da47f40 SHA512 5a86460edd21308837e2172cbbaa4cc2a02f567982de61b287a294db1d22457598a77113e4ce5f284900c8788703b643075d82885bfefdcad1ead65016fbe1e0
+EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
+EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 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 cbde49448910..e426ccbfaa58 100644
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ b/media-video/openshot/openshot-2.4.0-r1.ebuild
@@ -21,14 +21,13 @@ SLOT="1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},svg,webkit]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.1.8[python,${PYTHON_SINGLE_USEDEP}]
 "
 
 S="${WORKDIR}"
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4-r1.ebuild
index 954d0061c562..cf2c948c325c 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4-r1.ebuild
@@ -21,15 +21,18 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit,widgets]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/libopenshot-0.2.3[python,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.3[python,${PYTHON_SINGLE_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-video/openshot/openshot-2.5.0.ebuild b/media-video/openshot/openshot-2.5.0.ebuild
new file mode 100644
index 000000000000..3d62b7ccd98f
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+MY_PN="${PN}-qt"
+
+DESCRIPTION="An award-winning free and open-source video editor"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.4[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 18c13196ebda..1b2a5430b1ef 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 2051 BLAKE2B 39fef7729c1c511e73a5277bb43b50f24c3d266c889288c43f5731e584fb3b2abd155fec2b220ac9226fcb800590fb09d97221661a156d67449360a7b659ba43 SHA512 95e925c4e701916effd7b078de5145c6e8ae10f5f71a653f9aeb7bfc043c41ed936d5437ea75781aec98c2d35d07b6d0f8fea73f0c38a4ca6e338147b5860826
+EBUILD photofilmstrip-3.7.1-r1.ebuild 2141 BLAKE2B 5018c0076339c9571ac84a955b232c3ccbc1b816e3c62cb7cbb57ad1d8c7dee671939ec721ca19dfebcfcf0158e8b15905a8513c077ad4500be9fe63f6a45b48 SHA512 15b71ba2c85dfbf838475a972b274ba51d10a8c6bef9436a2088f3fc16447624c0b4b4034455f8efda556f709244aa4c931bf6fe0f1d30ca3ebe4830daabf011
 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-r1.ebuild
index bd308e4f0daa..642f93edc0e6 100644
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
@@ -18,12 +18,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="dev-python/gst-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+	')
 	media-plugins/gst-plugins-jpeg:1.0
 	x11-libs/wxGTK:*[X]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+DEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
 
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index b53dbc63c253..282c92e35e5c 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 2359 BLAKE2B 838f7e07298b0a4ef28062f2f8fcd0eb8e7adb3de88c793024a3aa7edad26c2bab690162cdc44d5427d649bf4c39518ead94de84bd43055d89a6b400f5c51635 SHA512 cec1fc77970885bdeed0fe049f5d80d318c9519b01c5d4fd676887bce84b33bf7744d37d6cceee437f08964d7ba9bf74a5591cd97a535e47b4a471ece48d6ad9
+EBUILD pitivi-0.999-r1.ebuild 2500 BLAKE2B a588b27acf90e8adc38585e091e5c20f8e975b87a3ecc84b994c6f50549c4a80b19fd5e7e97bb8027c70a4c5d934a23bfe72930bfdf2b00bfb63fd2f6a4355ab SHA512 26119b42f0a1a7ab0099e092e6de114afa88fd508ede595f0061d63035ba56f326062ce60c89184427d146f11f7077d6833bd6a9177d1c318936972addddee5f
 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-r1.ebuild
index 0478303d98c0..aa8949946c6b 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999-r1.ebuild
@@ -26,7 +26,9 @@ GST_VER="1.14.2"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+	')
 	>=x11-libs/cairo-1.10
 
 	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
@@ -36,11 +38,13 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-libs/glib-2.30.0:2
 
 	>=dev-libs/gobject-introspection-1.34:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+	')
 
 	gnome-base/librsvg:=
 	>=media-libs/gsound-1.0
@@ -66,7 +70,11 @@ BDEPEND="
 	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( dev-python/nose2[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=(
diff --git a/media-video/pymp/Manifest b/media-video/pymp/Manifest
index 98908057572a..a7c5d6dec776 100644
--- a/media-video/pymp/Manifest
+++ b/media-video/pymp/Manifest
@@ -1,3 +1,3 @@
 DIST pymp-1.1.tar.bz2 132710 BLAKE2B 4c834ed96a6436daf6c29fea3e6eeab4e93c03b39897e904650640e4b27b856674f584caa1ef658069cc71c3f83dbab917319290d974641053e848682a7da3dd SHA512 10647af1233c5a030cc32f5efb7790fb93568832547f8c886d49597cff36f5d5606b7b06c00c0206e9eacd6331dbb40bc2331dc30230052b4510be1ffec34500
-EBUILD pymp-1.1-r1.ebuild 1002 BLAKE2B 3f4de8bf37c80393bda131c14dbd0c7f8f93a99c37573a77a3e8010ec6fc442f73a76f7973f23520369efa357e5f77694730245e8bfaff85452563065aa8d1be SHA512 019e9254b4ffea10124599cadf0220d7234ba692ba4fa973b446d2eda04cede65ad59738b4ebc7a7c465ee13245e21162d95e734daa766892779d37c85077859
+EBUILD pymp-1.1-r2.ebuild 1035 BLAKE2B 9b2fcf6f91e958270e93878a4e2d55a6702522f9ee512a1770ede6664da1cc73feca24bfa6cb696c7b626f858a56450398ae87c5d96ef454056147d1897189c1 SHA512 c547be7911917902a18d5a7efe6b92ee3aecb532bcfd517f35588c76b368bc3d9c9664ad63bae21a1589a4507729f012665b8d6c6f30c8512fcac9211b840095
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/pymp/pymp-1.1-r1.ebuild b/media-video/pymp/pymp-1.1-r2.ebuild
index b9fb82683b78..2ce35400dcf3 100644
--- a/media-video/pymp/pymp-1.1-r1.ebuild
+++ b/media-video/pymp/pymp-1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,9 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="media-video/mplayer
-	dev-python/pygtk[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="sys-apps/sed"
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 558dc9d96dee..c5e500f1d3f5 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,5 @@
 AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.32.1-r1.ebuild 3101 BLAKE2B 23892d3bc99c6de484934f5282f123774b99bffcbac1fdb0e0676af8c6565bd4189b6b3e6a52a7792965fd9e15d1b3e9c26875f8159efc3436e6057211c4ea66 SHA512 778619ac4ca20f3eb9197c0af9120dbbdf3225bfd9dec605a015d771cc19400f756eff9df2713c24dd0b3ce8fa5e5088bcf37063bafb00ccc0d00f85ac1dee0c
+EBUILD totem-3.32.1-r2.ebuild 3186 BLAKE2B d75f3aa485c4a540306121e78410880135f3e62fe72197840a12a7b54d4558c0d762bb5eabeee1b50db748807fbd450247e71733ad461e8ba50410f29563a0ae SHA512 6663251bb8990af94e942ce6da26e7e10b4100fcf0392bea09e7c97e3e37f4ddf36858379110bef8df239054cef4ea4adb06fb42be641b729df8098824419e75
 MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r2.ebuild
index 0a1b3d38e9a1..dc7f5d912604 100644
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ b/media-video/totem/totem-3.32.1-r2.ebuild
@@ -45,7 +45,10 @@ DEPEND="
 	lirc? ( app-misc/lirc )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${DEPEND}
 	media-plugins/grilo-plugins:0.3
@@ -53,8 +56,11 @@ RDEPEND="${DEPEND}
 	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}] )
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 BDEPEND="
 	dev-lang/perl
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 60f91e472148..0cd69ad67c19 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13113 BLAKE2B 74c803645380d5ebdd9a38368e1ea12c6ef30999efcb53303d92e2acdd73ae92b1df473369a5adc3ea465d6c96169bdf87d60104f769ff4a6570fc34667c36ce SHA512 b82d345e198838297d5001ea80191adf694abe151b4bfa6c58d31b0b9cf2794458d341efbe5bf3e97d6a710df65eb05fb22ef79a6b084ec01699eacb6affe95f
-EBUILD vlc-3.0.9999.ebuild 13118 BLAKE2B 3c6f37e7bf28f15ba51a461270657900b11689bf42b2360cc62b13e8d16eccafb1cb02b3cf7f21fc443f9e6d7a9e24af494c5f10a509230fc56b85b9044c35c3 SHA512 ce64b488341416225f9dc3c24b7dcfb2a6e60d734e517a839c2807be10471c06dabc9841e55fb2f9a1b423798805969818d1ed21b14ff5a0c5e764c7638ce1f9
-EBUILD vlc-9999.ebuild 13057 BLAKE2B 357665845d812917c6e6833839a96aca5fb837041fa9b21d8d32293bf7185072a234c8e831cce3150a8d07edda3c25186856da200661d7731a2249d2fa55839d SHA512 6f13e5f234dc210281b411df857dcdab56806ab8613fa07857276354f1552506329379f02a38e7f98ef074ad5811740180beefb5e3d860a7b866b89c033df530
+EBUILD vlc-3.0.8.ebuild 13116 BLAKE2B bae61a9cfc2da25c4865451413718db7bf0ee19ab33f54e267ad6ba8e6397b04f0f095a8373cd42a8b6f172d79a9dc6de9d29be23d9ab19c61fd109a92d7db59 SHA512 cb22519b6872790fff32b3461b4240f7da539953215f2dc2f61f716913a11d3f7f2c3201f08bab7a79b477b43d5fbb691f50f243ec516657596bf109090cecb4
+EBUILD vlc-3.0.9999.ebuild 13121 BLAKE2B 65ba26a978b35ccb8f8c81d0d7d7af138ad2a4f74edac8da093449f85acbe84995cdd9c18f57060b12085d657c748e68d4371e4dbe7ea5c51ce5873fa806b99f SHA512 fa7c99805959f3dca296d4d3d4af9e0de379e3eca3566fc6d6e30e20f6df94c6899b26de38c456c860e9406a1236ac5ceb9e94b2225e8ee69626b27602ee6124
+EBUILD vlc-9999.ebuild 13060 BLAKE2B 0838c7fb13d400f997870b0781823163d399a7e834d85f2e686b4887a14c2cc6ea84d1c3a3a638bc23bf8bc37abfaf1d843820c914df747836939321fb4abdb8 SHA512 f82bba1e42ff0b0804fcc12e3d6e451671782adb08fdd85c076bfcffbadf3ba9aceef172fb798c1c25dfc629771018c33d9e6d885b818dcb6adffb77817516b0
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 91eb7fe2f527..1365a0718a5e 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8fad44625193..9e019812fe14 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6f1c27b496de..116dc942964c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )