gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /media-libs
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
105 files changed, 724 insertions, 336 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 304faf127fe7..7ec809498164 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 0a6fde33d954..857ba82288f5 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -9,5 +9,5 @@ EBUILD alsa-lib-1.1.2.ebuild 2124 BLAKE2B 8f964d67aa073c906087ae5d2376378a93b29f
 EBUILD alsa-lib-1.1.8.ebuild 2069 BLAKE2B dfa9c16f9ae9520ac0cd558c0bc53e124c0b59140d104e2c76b25da8cb051a862d6607901ae481d4f786c6cc117618e33dbd6a2a656bb582fbb55c99192e53ac SHA512 55976162d5fef66fea1e2e44edf97953ad8001ba6e3c05cae7affa5d0607f20ffde47c93702a3d5f3ff7fa80071d816a9060afe21f028ed121b88cfad9308469
 EBUILD alsa-lib-1.1.9.ebuild 2076 BLAKE2B a5b993db209ad0fc59d2846c083a0906622a86911fcaa023fdb90de823d95ec33f67b61d710ec5e164e78ad323c774bc524f844f7dbcd3b8e5f0b102b30192b0 SHA512 a13d43dc7efb41f4a47ce06a66e07b8f7846350988fbfd64c01ce9b6c14da35b24a8b02f59383ba339230bb8efaf938c09a8c225e923c00cd207cbc47b646aef
 EBUILD alsa-lib-1.2.1.1-r1.ebuild 2147 BLAKE2B d2bb59384252242313a6bc20197bad9dd8979bf0bec59ea8409793b4516b169caf3279ab88c941404580267dabf604071ac8893889097c63403be2d11c329b12 SHA512 abab7f9e9c1b896afb1f7236f349315acbe71ca32316488148c5ee47e35b0ed67007c2cc645adb89f0fa94f3c297f344ddf962744cdb4071a840b781fba1505f
-EBUILD alsa-lib-1.2.1.2.ebuild 2088 BLAKE2B aea23d684ea4c3828104d3d283eb4923efd160989b75d83144530341122c02b321f662d76c41a2371b0b7c5f95593cc4021bc16df71d4630c4770b7c79fc2143 SHA512 069855fe23236a263bb0110092db1be616e4049e864748b1ed2b96f90c92a4493b17496f64692f5e92e4026672d02d87eeb1ea9b45d14bcfc5931989a865c1b2
+EBUILD alsa-lib-1.2.1.2.ebuild 2087 BLAKE2B 855b04b0753926e2a1be60925a38db1a42a4f2cb0783b2b96f2086ec33293727638a1af167f547704dd86a72706de67b3478df530ffd58d2f464c81a9a3fd1a7 SHA512 42c6f8c252cdd24da9745f7ddf6afe4863655e32ac4352e98594afd849fc4522f6a90e1a2898fa7292dda464ea2f619e2c6516629e8d4239ddb41d2bc81bb9c6
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index 5576b0b97835..1a6d20546cc3 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index dcf9af6c27d7..c3a765771db6 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,4 +1,4 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B 319cb97fdb88c2c48624f23c9d10353976643491ee5897c792997e554d953e0391975c60175a7ee20e35c0b0565967e6df8f3c44beb20d0954df58c818efd5f4 SHA512 3872ce722d521ffa04f74599bbdc788035c34315e3bf135bd6d64d49515c2748d70616ae4aa6f1dae0b3e59d70f707303b20b1f4d33cd930b714412db01c62e8
+EBUILD alsa-oss-1.1.8.ebuild 1032 BLAKE2B 4725690afd7d58b5e577bc8f0504c545ec200027d1d690f3646549c71e10dce8c16349c54f5b1e84ef21f4625d80047473a6d3f06c036e987db907ece3afe6fe SHA512 81599618c180f720234b18577d4008995d399ede255dde1d36086723d2d82708191ab8ff7323db080a1036d22375aa7f8be2ff4c2b4aa3230088f0005d404d65
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index 3f9aa7693e13..527a9794d7f5 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -41,5 +41,5 @@ multilib_src_install_all() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 	find "${ED}" -name '*.la' -delete || die
-	sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED%/}/usr/bin/aoss" || die
+	sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED}/usr/bin/aoss" || die
 }
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 0cb97bb6e00a..1846de40ecaa 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 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-plugins-2.7.3.ebuild 4315 BLAKE2B f99b4475f1da295309a43fefb329d2905df5fd1fb77664f6222170eaa7031a2b94ee99df739f10ef6c4b82504614ad1299aee56b01bdbe9b22bd5101f18af08c SHA512 d5c5b70242f63b267c137573388ece2876bbc59dd8024083542b60684c16175feeac6aedb831f2d6abe2d763cd784f6225c75c3f4bc22f29617d5687ab926271
-EBUILD avidemux-plugins-2.7.4.ebuild 4231 BLAKE2B b320b836d0cd9ff80cb622e3f03363a92e8ece3b4cfbdb33fd164b2f04d4c9741729ce6e1d9a1865e84f0152aaed81d6e31e1a6d332f57c8795f5ac5c4faea6d SHA512 ac2b70f9970b557c7d155cb016dc32756d1112575fe6d4b8714e11c9ed38d82f5a1bb7a4fe4ad98f3b9ff3a567746a1895162e9ecb4425a6063d6a4180fcf465
+EBUILD avidemux-plugins-2.7.3.ebuild 4309 BLAKE2B a8acc0e4f2ec6864da9fda8921ec607ee42480254b329a92b58b9cd5d84aa01dd9e10cfb3272d438c75d7baf408684fb15b031e639f7e7d08189a2ed2813f87f SHA512 116bc8f4e952cde04b247cd32b63f56da0405e50d2798ee7ed0fda6c4ef9809bbc9e93909d47232eeb8fbd54bdf67797fa06f2b6001488ab7fdd32a21d9d5396
+EBUILD avidemux-plugins-2.7.4.ebuild 4225 BLAKE2B 2c30a228035a7448650ac617e1588ee34f0d29b94d7be680cf457d7a0231db53bc2014c1043d7d6f2fbf1e607fbba9795a45da8f8adac751b5d98e3a1282da64 SHA512 f08e4813618ced792236243a41450f3f2b7664753dc34029221c2a86826df66a7e578bd1a7fbe57a529a00d3934512743a00be36d304e520bd0daeb30eb21afb
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
index 0650e3a9f4d8..2886869b6456 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake python-single-r1
 
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
index cad08c9330b6..b88e94f5c0ee 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake python-single-r1
 
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index ff9684147428..12848749c12a 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,5 @@
-DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22 SHA512 ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
 DIST cimg-2.8.1.tar.gz 11208148 BLAKE2B 1d53c11f76c63c453b9090d01c9b970a5d38f9accc13ed5f03d3107d218ff1b69a9e3d469cd9a5a51f90a0d0565efeb2523a2f0f7964752ca8ea8f2e2115f45e SHA512 df7bf86e5957c998180494eba70218a86f6e33c85d3f5d441a695a35725bb811956a945f40cc73573d6507dd4bcb25589ec05083ac99539365f73e6bd1247dd9
-EBUILD cimg-2.7.2.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+DIST cimg-2.8.3.tar.gz 11208996 BLAKE2B 1e76f99d20a99955647228cffe5fcd2c26596f4045c2a79cff45b089283146199054628d207c0dda5204d9aeb4c1269dc01639fb8bb1ad95ec61ee68186b9d53 SHA512 3404224446a76cba2295a70ef742cf337675b33481e10d79c94a3994c099bcde1e398b27bf5926395f99ef46fff790668a0ebd24dc894c47982ac1ceaa6d1d1c
 EBUILD cimg-2.8.1.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
+EBUILD cimg-2.8.3.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.7.2.ebuild b/media-libs/cimg/cimg-2.8.3.ebuild
index a3f01bc9ba22..3205e035da6e 100644
--- a/media-libs/cimg/cimg-2.7.2.ebuild
+++ b/media-libs/cimg/cimg-2.8.3.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
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 2758ff67a649..b6c26f34fbdb 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,4 @@
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
+EBUILD clutter-gst-3.0.27-r1.ebuild 1412 BLAKE2B e827be76b95d68de1d4a8425eb89ea88cd72aba092168ca12c9a69b009bcfc13a4375db4cd37ea00f3cfaf6d0016a3f8dd60646da10aa6e48ea715efef170efc SHA512 ebacfd6f4ebeb564272061a6a83271aab5d27be28d69686a1b246f0677fa8514b60ec89aa4662934f535e84c4820db0e573405662302629c74203451c5a76a90
 EBUILD clutter-gst-3.0.27.ebuild 1468 BLAKE2B f210609ab87331fadc2aa9140ed4075716b4a137003dfaf212ac35f7da3320d29a74f7f673496844dfdabd4d2f74d8ee3edff2a278e366d4e8d09125ceef8773 SHA512 60a1e06663a54bf046a028aa52312b7d27cd0591da399616659759e29ad19a822737782a44c97227adf0c999c8acb193a2bd151a047cc588eab243bddc2995d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
new file mode 100644
index 000000000000..42615b32a54f
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X debug examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( dev-libs/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index ae22f1ef6ff4..8b612852bef5 100644
--- a/media-libs/fontconfig-ultimate/Manifest
+++ b/media-libs/fontconfig-ultimate/Manifest
@@ -1,5 +1,5 @@
 DIST fontconfig-ultimate-2015.04.tar.gz 455899 BLAKE2B 5b9395da2c9091965ddbd65d536932a925c81d2a872f790bf946b2dbb7eea0ebae3a258f88b3628a67b26022cb489aa4a4cdc98cfb4d67b3f1d83907c9f21e5b SHA512 cdf11c298c9746c720dd6a4e1d361aa16244fdd46630fa00fea03d6d57956b6cee41b3ea439c84d81756a11d63768e4672851c9692a87944b6688a9763a06096
 DIST fontconfig-ultimate-2015.08.01.tar.gz 1241997 BLAKE2B 291a2cefb793dda5b5d5c826dd720cb9eee311d67a8268554911a4581b6e2bd3389079f4383eb32d350c57f9eb854af04734adaac40e3da134a819c77456c03e SHA512 2c1e8c522c94f6db45c63cde610bd2abf95ae913241ebda275d40cda0c0b62a489047749eaefa78fcf25d802ebad442f32f2bbf5629d4fa8ee0c6dbc9f105de9
-EBUILD fontconfig-ultimate-2015.04.ebuild 3127 BLAKE2B cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
-EBUILD fontconfig-ultimate-2015.08.01.ebuild 3127 BLAKE2B cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
+EBUILD fontconfig-ultimate-2015.04.ebuild 3144 BLAKE2B abc3861527b4e3b0d72e77a4f80ef33d3c75018a3ed0441a278b4d60147c09ea6686c831e17bc4b16eff60aa0d15e764dcf3d6c800f525176cf2d267d2f44021 SHA512 361749b39ddb8f1953f892a3c39f8f5cc221871bdda4721eb0531d28f79ae08a149694916f65667d417f847b0ec5af0623146654a333f12e4fda37fd4480fa39
+EBUILD fontconfig-ultimate-2015.08.01.ebuild 3144 BLAKE2B abc3861527b4e3b0d72e77a4f80ef33d3c75018a3ed0441a278b4d60147c09ea6686c831e17bc4b16eff60aa0d15e764dcf3d6c800f525176cf2d267d2f44021 SHA512 361749b39ddb8f1953f892a3c39f8f5cc221871bdda4721eb0531d28f79ae08a149694916f65667d417f847b0ec5af0623146654a333f12e4fda37fd4480fa39
 MISC metadata.xml 341 BLAKE2B 609469836f44b2b1afcd253057bb9a2ce0a1cae6a28177d71864b50e7ce8cf320278d3b6c393fac59af62d513018ff587bf8cc8a5d251ab1ec3dfccbcd5b34da SHA512 55d47d4699c323ee47f874f74fd765211068a361b83aaa0016c7dd0b838d2d1902ed0c14b8ae264184e1501c31b10d84c87cd9e27989076b999049177b134272
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
index fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
index fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo versionator
 
 MY_PV=$(replace_all_version_separators "-")
 DESCRIPTION="A set of font rendering and replacement rules for fontconfig-infinality"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 73c69cb1fa5b..6dc5b9424e52 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -6,5 +6,5 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
 AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
-EBUILD freeimage-3.18.0-r1.ebuild 2974 BLAKE2B 2dc58bd65dfaf7742fa79f30e3f21ad04cacd113640aa366ee6aa952daee2600a5fb4241ba5a45d9b90a71e745ffe169775765c114eaa1eac698a68aca399c78 SHA512 66bc093e1baa9fd8e4ee95131ad0b1a4d09bb4e1045c636ac384d350be9fe271c2410dfe02e30d5c4ff248f7a3923cebbb577310da53fa5ffa70a361d2fb7a2d
+EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B 0f4f3b62a4db9fc5d5adaa419f2e92c68d988af0dedf523bb04ea8719e0a1df2cf829d520e0f17d8ecec72c92ec187e47bb67996cb071b0715651cca1a6d906d SHA512 e9ca41ba0394505946e3c1a53b7974d27aa8aea06128befb8123fa8cf25ed8a36a8c2b6b49721304dafb194705d6284ebfcee5b6b8ca6ff0603111ef7a7ecd48
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 60e82af73945..677a23328f84 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -113,6 +113,6 @@ src_compile() {
 }
 
 src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
 	einstalldocs
 }
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index acf8ec8ac95f..07d33a7cc43c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -23,7 +23,7 @@ DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01a
 EBUILD gegl-0.2.0-r6.ebuild 4966 BLAKE2B 90aa2bd833a192cb3f29e3575679af54c44a3476b9c6c1cab0a33d1be9e6d814b4b36fe213bf3c3b09b2dd8ec98bb26837516b7a0eebf4c4a6c89709620c1581 SHA512 80165722f20fa6834b5756f4a20f1fc4bfeed22b4748dd76336ca5f1fad837c25096254e9cb073078f537ff5db79999d622c92a5c052ef0ea7c2a668e4177862
 EBUILD gegl-0.3.34.ebuild 5323 BLAKE2B dc0f672e62994020b85c6f2e9affefaac7d4dca6ab0da46d4f6ef9e14ecae08495bb849024ce77d9e7c7f52eb982ea11d7755e8730136d33ab4576e737d3d4a6 SHA512 9de42db2c3fe569b9524b513408751fa8ffcf2845db5f001b9f914c9549e6b48393c9a4927aea74d9bbbce8c06fa3b257b10b895197af38849ea6b685819aa43
 EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
-EBUILD gegl-0.4.18.ebuild 4884 BLAKE2B a87f35e02d29f55b1c6ec473466aad8092dd897455b6164d3ac484a1cabdb24b650798a9e0e4d324bb4f7ab5f5e3f1b4d4096be7f009581a3c2bb1c14d38e5ce SHA512 ecf8d3ff39b8f1d668405ef58b81ab8efdd8de4d62a55765cd4a572ba4e0bd1e65181cca9208d2a4f0600eaf5a84822585b903edc0c1d62038c1b1a4ee9ea774
-EBUILD gegl-0.4.20.ebuild 4863 BLAKE2B 83245542db2dbf9e2b63d9fe909996777de6bf8bb718298a21de6a7ede5e09941a5bb6ecb26b0a1320fae11146a556b37bfd38723b4d667fd15fdf2bc379a550 SHA512 8a5bc3f806ad80b7a3bc83163af7aecd5fba7a2b8e5253644b0112ebf8a6039f4906044ade1339859eb791625bd7be7a6ddc2b165d54608f923060c66a300d33
-EBUILD gegl-9999.ebuild 4471 BLAKE2B aa1aa47a315427f9c374f6ae60c90d320102e0ebf96023324a86885f13af9917c482f3369b0e4777829fa0546b5b013106784a22efb2e2bd5466772fe15fef9c SHA512 2156e13dfc325de26e5624ed563fad372f0c674e33308d60f62fd6eaabbd003b5dc0c9c8f650979d0443a4c2bfbdb0e23f584714d388339d79c62954f99b4cd6
+EBUILD gegl-0.4.18.ebuild 4878 BLAKE2B be26ff0bb228295832b675317423413b400f277034eebba4214115398ae281254d784be6f6d1f1a314dd9ff3c58ecd3d6397143c8331c0668245a1675c982737 SHA512 dbf8429b00f79ed230dac38b9e5c8ea63a32dab638ad3af173359bd25a332b2210195583254dd4e0588910c860a2007dde21ebd9bf39d15be8acbbe3d408f3f3
+EBUILD gegl-0.4.20.ebuild 4857 BLAKE2B cf94e6f7a15e4824f5f97bc9dfc0ad3898a92fa6f7bfced65966621b9a515cea29b89c371d051f75e98b4b9e51568327ccdeb933ea8e81899e93166da10b34c5 SHA512 e3ab09d1214fd189bebf8fc052961a99e31be19848621da3ae03955800ce9deee0a02ee0b6b47485eed786da653ec1527bc87e6e9c5532db94f2b39de1a519ce
+EBUILD gegl-9999.ebuild 4465 BLAKE2B efcc8cfd2a932d910f2a82ab444bc6eb996077fa5ed0b9f9838c16fab29bddbba3eecdddfdcbe90f176a3c55c46360f0fdf67d2daa5195b4e4e62b42066cbee7 SHA512 e73cce2fb1b7d5cb0b1a4af2efe1656e3b48a71e3f97cf573f51691a70073a4c9c1a17f35c8365549e7bd2651ffb573429f5eef0edab298850134ca840df11c1
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index df5feb8b8690..68dae56ba0d4 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild
index 5623528869a2..35677f76c85d 100644
--- a/media-libs/gegl/gegl-0.4.20.ebuild
+++ b/media-libs/gegl/gegl-0.4.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 25f257ba42c8..a12ca086b180 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 0b7405f0d2a9..5126f12f03c3 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,3 @@
 DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
-EBUILD grilo-0.3.11.ebuild 2184 BLAKE2B 2ae4cbc2756227872ec52d9386b7166b89f5e173e08de916027ddf141180715400a031e7f4fd0b9b14c6555d7b541464e54b963adb3da31139c9634e0d5e195e SHA512 d6ba2acd1ccbc8d7b1e8ee70893804922c3a69cb69d01c1fbf165698949a2d427558a6e08beb3de39cd342ef90417dcbfa6ace2d6559cf1d99eae0d5d6532536
+EBUILD grilo-0.3.11.ebuild 2180 BLAKE2B 61b553437971cc50a0e7dc2fd6422285a883c3cbcdd35c10a1c5a7247727c6dd3c7b03c51f3cda9a23e73a4e4da680f685788133b5e190c5c2014470dc8e9450 SHA512 c6089603299430d6da1a6f6635a72914816b0cff07852e86652f6c440cc440c9c26f41bc8fa4e84eea2ef730cbe62444d9281e2daf2d3f1c8f67a884f39dfd0c
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.11.ebuild b/media-libs/grilo/grilo-0.3.11.ebuild
index 28f8fec8b7a3..e4711be72aa5 100644
--- a/media-libs/grilo/grilo-0.3.11.ebuild
+++ b/media-libs/grilo/grilo-0.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 93265682ab17..a688e88eeb52 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,6 +2,6 @@ AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 EBUILD harfbuzz-2.6.1.ebuild 3073 BLAKE2B 519f2c37e7b4bd6a6d41254ed054395f3fbbaecac20be9c2b4a5eec242276020738574a4096695c4362c5fd6e73c1dae8e2f4b6945c917b5f699a3ef121ae89c SHA512 52f4ae285b02ef732852ca31f25bc645e542b50dce262031a8535400ece661399b3a1ad4690017f2effbc7242b20373b125144f00cf0ca648e2b1a5436508991
-EBUILD harfbuzz-2.6.4.ebuild 3041 BLAKE2B 90579c7e11d8fefd2e5202884e6a72a398cc23aa14fb1bcc014621cfc09e6e20ec9f52bea3727f44e11ee00e693485e7967f90a1575bee6fd8adc69332a40542 SHA512 c129b8a31ac54c631475d14a43da140d91c7a2a94e0d28c1b198328ca83b45d8f7fd0f9f79ab62173998e5aadbd76a07bd925b1408cd2f6b3cbf67f9e7d4d6af
-EBUILD harfbuzz-9999.ebuild 3058 BLAKE2B d2336819bc96892978b4243bb6771b4a788f85e04f369f12c05f41ab05e6d0bbf1b3fa575016264451171a5bfdd093aa364d405db843c55021e735197dbcc9de SHA512 69baa034155020602c120fc70617fd1f0f086faf40d64dee494bf56ea4313236aaae43f8941fe5af1da0eba15a1bce5bb769479ef2696e31c9ad6cbb23b7a7a4
+EBUILD harfbuzz-2.6.4.ebuild 3035 BLAKE2B 2105b34d683bae161837dc85a30ef86d2c4acfdad35fbfeefa771f77266410bafaa366e9cda6a7259468d917a758a99d33d7e88e22bc2954d75fecb563d1c473 SHA512 201394159bda2791a93e5d6bce7ad0d06a17e3203c6e3726628e9e7bbf1eab668a4d3e5b10f07733bbbbf63b67a3f01c03a835eb11b0c2bed9820a6cbcfa6f3a
+EBUILD harfbuzz-9999.ebuild 3052 BLAKE2B 7bddf0786714c39b3217051fec34c62a18c02b2f10e260e58bd2835691749697b8d0668a261f32049c7a2e07e74be50cfe59fe82ca0a35d99a381f166d246e3b SHA512 215d36533252522c727712da8c7182ac01938a28a40d51b2befaf02bf2b6a9ad1fa7981c95fd855b14d8ddccd9007d143cee880aa7e245d7c86a8dea8b83e1e9
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 5e7efcc0bd61..99e5ac1e9122 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 356659abc38a..aee517e2a1ce 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 509243b976c7..feb2f7926c17 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,3 @@
-DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
-EBUILD imlib2-1.5.1-r1.ebuild 2149 BLAKE2B bc74642e7aab58ab589461e82884a7c08e97f59e6e0683d6a4fbb7198a0778b8a4fea82d53350d6c4c0f9d2519625b47dbd3baf3429f5b98fa718af0167ff2d5 SHA512 16507fd770a73fe0d5429f9d7c69159adeb32f04634be9700ee81d3ccc0550cf658b30fe012bcd76087867a94fd2ddd4df8948077aa3380036e5fa78d63d9edd
 EBUILD imlib2-1.6.1.ebuild 2280 BLAKE2B 5ca1c33f001a6cce19c9f84069eb0db510d4c5f1ccb7b70fb8c4373c06cbe0f6f05bad4705ec80dcde79265fd7bc36d8d14e26a9391892df4f0e540213008a79 SHA512 5788af3bad428b6a6e07b46cf3b53909579d61dfc4e9ec50feeaeb402a86910fcaa153bd1841b3a283b3ee1348f6b422e44bff140e8653de18b16f039be99711
 MISC metadata.xml 3005 BLAKE2B 1b67eed4da7c73ed10d37bc2d5706c09e6457d1c8be4420758afe8906771f0cbba1f8ccb21a2bb5988d5271e794c0460019cba7c1241572443c8f6219db4f003 SHA512 dee85662dd1ef54784c0af882ff76581e3ce6f7d67ae6015801fcaa57e6e05b6ce2e67b408e1f66177a19e0519efc9ddc84b01c208e6f397129768d470a0c424
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
deleted file mode 100644
index a30f232f48d9..000000000000
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
-
-REQUIRED_USE="shm? ( X )"
-
-RDEPEND="
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
-	jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
-	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	local myconf_imlib2=(
-		$(use_with bzip2)
-		$(use_with gif)
-		$(use_with jpeg)
-		$(use_with mp3 id3)
-		$(use_with png)
-		$(use_with shm x-shm-fd)
-		$(use_enable static-libs static)
-		$(use_with tiff)
-		$(use_with X x)
-		$(use_with zlib)
-	)
-
-	# imlib2 has different configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf_imlib2[@]}"
-}
-
-multilib_src_install() {
-	V=1 emake install DESTDIR="${D}"
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( "${S}"/doc/. )
-		rm "${S}"/doc/Makefile.{am,in} || die
-	fi
-	einstalldocs
-}
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 456766ad5215..35e37d4066b2 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
 EBUILD jbig2dec-0.14.ebuild 1144 BLAKE2B 7a91e03a74cf156cd8a785d31a0601598774afd260884c73a6c20deb3d125afe9fba52d9b03b5dc1146e206d3cf24da23cac775f7b7d0167d641e23a39a1a028 SHA512 fa18e71040784802416b2ead1f3908e5083fc8488921b8fd112ba96982ba3882ca0145b17c7a86700c6b506ef020f6005c5af23021c2d313da111c168fc20a4c
-EBUILD jbig2dec-0.17-r1.ebuild 1628 BLAKE2B ec351eccd7459bbcad944f94809b2fab5d62ba98e8aac87ee1ce0ee748f7e50b365c08c4c21ff52b1e9bc978d4047e0ea531bdc1a6481fa2564fb6321241890e SHA512 d46c2dc1499dda43e92cb70370b60ed1d62573ca1bb2ea363822b708719ba3e1632538c3ef03ec0a5b5ee9d3104a9bfcf2ddb221174b8dcd815556a05809780e
+EBUILD jbig2dec-0.17-r1.ebuild 1618 BLAKE2B fa67815f5b437d0c1715af5c14e662e5ff33e8548056889cba2d39dfa3f880ada543e7911dcf31f6756f60672318ddad47796f2c7d927335fbd07b8b39079563 SHA512 f0d557bdbab3876e018260c5c7356978101772092443eee8897c8225f3c58fd8e65f4235d69908ff663cfe4c2f6e46a0e175339531b233b9eaf75e71194b2bfc
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
index d6865051761e..81ec6ea19bdb 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 30e2d43f9312..7dbdb515bf54 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
-EBUILD libepoxy-1.5.4.ebuild 1282 BLAKE2B 7fbd18b374d253dc0576d283c9414a5f2379c3bc29b7b4649e59cb2ecc8f745fa25a20e8c64157c2724eafad1e86b353b6f67cdd3e6d4a93344b95f32cc1f3ad SHA512 8c8602880ff0c5538e5db77e68e09a400f25f54d7353e117b395ff1a44e118be40fd82658f170a5901be7bf40879eff78e780f7d1a8d371ff3e2d6bddf45b2ec
-EBUILD libepoxy-9999.ebuild 1291 BLAKE2B bf973caab3794cbb049bced0b544f84a2a34615c216a9ccb4aeac89e6e5d025bba05547164fa8e38053632df467b047c65b634872a4dd04f8902044e124c7a99 SHA512 9d5865264292a985cda4f83e6e6d22c64cbb36a5462ac3b4c5233300940f09f0c24956d17fbd94b6e544c2527529c2a8c6566f756b82f8c32b0a97a0cd6089ee
+EBUILD libepoxy-1.5.4.ebuild 1278 BLAKE2B f944e2ccefd7116c34ea11ad2a786ef9bdff0dfc0487f318dcdee25b18003bb92779de553cfd947222b10e7ada6675c94929051a2276ff6e0910c1aee4e9a620 SHA512 f8df8b09fac21241907439f4a42aefa68d5c2ad0601afcbc399288d40aab238d80b116afc14c25c4763cd898aa912769216d16340abab3ac283a2ad2f1dddb96
+EBUILD libepoxy-9999.ebuild 1287 BLAKE2B ad166aa96a6d735e378eac8e8d74bc432f9892c442095b7cd225e5d899193c17fb72434a6c29e93ac0e9b972bbf606331e59c5f066df3a94bbddff34b5f93f7d SHA512 f64395059f40960a111aa3ba622cbb1847586bc3f8ad22aaaba5da31d2c8ae6770a78c888fbdf2838f2504856a2f83d2ba1850278030d98e8cb6f151fd4ed41f
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index d3f97708c15c..f68358117f44 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 247ffa088bf2..7d68a7cdbcf2 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index ce9c5e6eea61..49b9b6c4e516 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,4 @@
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
-EBUILD libffado-2.4.1.ebuild 2799 BLAKE2B b88e34d36d8c708f568103cc1ba3995cf90919d5e459329fdb6fa3ffe39eb3ad344156f049e8a4836d3c408f321ec46583ff1ba63c7fbb5b3a8ab6a6cca2e7a3 SHA512 eba45eda82247f03f8b2033ee1eb2f63ab15f09566adbf65ecfe534d2f798ac53b0d2ae3bec1900825f4560d24d6a17a402153023556b9733c4babd590f4a049
+EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild
index 571be2962fef..4d945041ea53 100644
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ b/media-libs/libffado/libffado-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
 
@@ -33,8 +33,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-libs/libavc1394[${MULTILIB_USEDEP}]
 	sys-libs/libraw1394[${MULTILIB_USEDEP}]
 	qt5? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
+		')
 		x11-misc/xdg-utils
 	)"
 DEPEND="${COMMON_DEPEND}
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 6d3cbf390738..006b40bf8c6d 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -3,5 +3,5 @@ AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r2.ebuild 1924 BLAKE2B 8219d141863c8dcc718902e998f03934fde4fe54d7f5800321c7a163881f0ab838fd02bafac89fdf44859956e74df3e61b64469350adcdd879ce94afc7df2fc6 SHA512 73ef0af171d6edddad09b5efd7834f1de38f23d79214c9538de4a8bf53338f75b9bc72bb534257ecdeab7c210b91714e8bf69220a724ccb518b75532bc74c060
+EBUILD libgpod-0.8.3-r2.ebuild 1966 BLAKE2B af392fa7b565e6bbeb8774a5302df860c272d4463cb0511fcb4d33a4f42d9af92bf864bf4ec7a065cfc8c4091d3f5b42b765dac13b0a911314ac4b24d94d5d45 SHA512 09130974ccddfa2f17b96197fdc0df626d9fa45606d286fe4440aee64333288b6e8a4e8caf61be9bdd0907302be4872d4b46bee04fbbe1808a450950bc2bf2d0
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild b/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
index bbaec2d1a295..dbff81c64076 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-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
@@ -27,8 +27,10 @@ RDEPEND="
 	ios? ( app-pda/libimobiledevice:= )
 	python? (
 		${PYTHON_DEPS}
-		>=media-libs/mutagen-1.8[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=media-libs/mutagen-1.8[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-2.8:2[${PYTHON_MULTI_USEDEP}]
+		')
 		)
 	udev? ( virtual/udev )
 	mono? (
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 4394b7baae41..0d4813447e68 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r3.ebuild 1280 BLAKE2B beda61664ecd87e1828c29522aacc5d671ac33eb15d20c8e56bffe124864b97995b8a2b1be8190b8c69a2925be1045e424fd27a671e723c5acb7fda9c935178b SHA512 bdba2e0f60a22133f716aa8d8b62345415410228634e56466561119aead00340b2ac7d48750a32f06919fdf07c1b67ee57128b625b6552724387921a46f82c04
+EBUILD libkate-0.4.1-r4.ebuild 1318 BLAKE2B d03ca39e171f034a0e41d64f45cedea2db4a91ee2cb8fd05036ad3599db97f9149dcab28965ec7daf65046c0943e7cd00955e89fe1413274f861bcebd60a8740 SHA512 d5ca6143880d49b527535a27b4a8b1a734fa16b29c970e866000f630dd4e72f57a576b16d28bdf0773e3bbb2b2ac91f11a382de61af0740e037b07da43677288
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
index 6745423f91c8..3711f2d95de4 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -30,7 +30,9 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	wxwidgets? (
 		${PYTHON_DEPS}
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+		')
 		media-libs/liboggz )
 "
 
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 874c1aa40574..000d66c06203 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,6 +1,8 @@
 AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3bc3bf4a626f1f9186ae6e5ac65dd0da517dde4461353f594a8b1d54ad4ea8974be289833984c77a49b351e1b9e0a49288ed993f9f175b097e SHA512 6fdfc0e8d4a2325389a530d166c5bb504ab71a5274d037a07b579d2855c425197bf0e88349204aadcbdfc9e8efd246f10ca3d20378055f739e1d4d8fba97d7c2
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
+DIST libopenshot-audio-0.1.9.tar.gz 1710939 BLAKE2B b9b117fe033c00219e9f6babd1d82dccd2f7a3754e916e5411047deca545bbda8c18ea71a1c7ef0952458ffd40b9f109a918c7c226bace569a8be1927c050bd6 SHA512 8113bf6f5747b0f72391a30560f49c97b13c68994097170797cdfeb44813791b90b073a6caffc91ba1a2153a41b86e8c1b188de0daaec3f5c785013c049c1b4d
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
+EBUILD libopenshot-audio-0.1.9.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild
new file mode 100644
index 000000000000..ed11d8638bf2
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 7af3df08b809..d580bae02584 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,6 +1,8 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
+DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 EBUILD libopenshot-0.2.2.ebuild 2203 BLAKE2B 5df8e0074314e938d24c187b1caa311571e7941db450556363550a42f858eb994e2fcc259f98dbcda49360aa6a244b4e3963a5ae5fad1ee206efb6b727dac6bc SHA512 aa0645ebedd9d4d7e1b81300c9ad39cfcf39277cd7ff9a215204ab0c95e6acd6c9469a4531a3dbb461407e1579941a39248a32c47f3fca01c95ede448494c4ab
+EBUILD libopenshot-0.2.4.ebuild 2342 BLAKE2B 1ef25538ab2cf6d26f591a69e0200404c338001cd2f177fdceef8734c559a7baf0bf752a1b118566569b8e277c1c09549bc6e8ec82973e2cd1dd6320106e192a SHA512 24a0fd2b1dc0a764e8b2ccc88cb6a77a69494cf8354ad2fa84290d8539f01818e9cfd02abe68e4c0c9d55a291d847139952dcf0805ad258554b054bba1c887d6
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2499 BLAKE2B 197e14dd027fe8b98ed18824e6fdc7b3684327c39a4e9275566e3c569e99415313bd87af1662653f6e7b3394f40846e1a6c04175c1121dec56cfeb4dfa370d19 SHA512 2edc3a1df921921f434aefb3edebc355eb1d54433acef15d8605a77cdd257a5c6977cc565b2137fe944947f5c4044f35ab13717d77ec9d437d912188ad22f296
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.4.ebuild b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
new file mode 100644
index 000000000000..39d166e92c80
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/18"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick libav +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/jsoncpp
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.1.9:0=
+	net-libs/cppzmq
+	net-libs/zeromq
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+	test? ( dev-libs/unittest++ )
+"
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		-DUSE_SYSTEM_JSONCPP=ON
+		$(cmake_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
+
+src_test() {
+	cmake_build os_test
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+	use examples && DOCS+=( src/examples/ )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	cmake_src_install
+	use python && python_optimize
+}
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 09b32dc9fe20..6cb88ddfae29 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 963 BLAKE2B bd7058b441a96b4888dbc446cfcb08b978903132f8177830cc0d782dd28df273918a41c72c55aa9d8205806a04d23b9db7b0072ff18600fb006e8e6cad983bf4 SHA512 0d292c6474ac837be80f508ab584956b66a573d5d1f0cb281c70a485d4491a6e9b801a380f35926f5990587484c941eb796af0cdd4237f39f73d3da43efff2d7
-EBUILD libpagemaker-9999.ebuild 994 BLAKE2B 3bd85ea89d3df0520d91b4116152a339c88e45f04aaace7f868d0c9dca9d9d618b3a1b94b365da73797c51bce3014e18cd8be952a270ba4e0b84e91c24b05f45 SHA512 474a672aaf43ab3cf144d465b58f934f0a21f56553501d1fb1a7c971d6e2168c7af7acea842b2a238928d2fdc3cde0c3f581c6099fec92459327b10400872874
+EBUILD libpagemaker-0.0.4.ebuild 970 BLAKE2B 3c68c8559412da3f05756617fca8a4d205b9b8c38918cb4341d7a1ac5107aa437ab575cccad6fb4ebb8c4990506cc836250fcbb1b9d6509495c6336965f66ccd SHA512 faaac0b6bf091b24fc362a6e120a303ab024f415243904ce45c2d84dbc2fb64967ef9ad8c4999a96eb50e062694a136dc68db20cb4ee74ad9c94d1fad47e217b
+EBUILD libpagemaker-9999.ebuild 1001 BLAKE2B 4b6101beedeff57e5a72f589952d996e94f90237acf4f1f51ed32319729bc95655aa01718c785f56c213f58d385050022a0f8ae927953439513eb4a0f33ebf14 SHA512 5e5b8b7cd1905ef101bf17a03a0d464a1e2c03c0e5cc1a9b6fe1088082a0eb338325ee488d611bd8909e9820a5d2f5ed74d54965c94d2a4150a2475181805acf
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 52f9c783e3ea..dedef265f14f 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 [[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 35b64943085a..e06afc69f315 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 46e02a2601d6..46949b5ef409 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,8 +3,10 @@ AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd046
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
+DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1475 BLAKE2B e5e37491cb53dc2dbf3977b7b3590e5a717ccef46369525faaf48b882043ecfc03b1430e52562dc65ac3b78d39a1d43cf1aad374f7eac42c7d1549ab45987e3c SHA512 80a29679f901daf04261de929e32c8f26233b3fabd8dbb999284040319f16b322071f42d5a8f1f659f6a5a05ceccf4b799a319aef88f370b95137f21baa76169
 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
+EBUILD libprojectm-3.1.2.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 EBUILD libprojectm-9999.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.2.ebuild b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
new file mode 100644
index 000000000000..ec8f42efd454
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable qt5 qt)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 161ea9dc81fb..23753337dee0 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -4,7 +4,7 @@ AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f07
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
-EBUILD libshout-2.4.1-r2.ebuild 1400 BLAKE2B c422923fd1e22b1a192eb179fe39c8e1828e05205a81efdd03ab58ecdd01172aed50a5d623257d18aa00661389f2a02cd04c5eccc1d017c19a16e9ebbaa56d6f SHA512 bebfddbb54a1141b1ea9f9d0f062c56f7a3a2eb47d2d0a7da27561a330e278331cf2ba83a364d7dcd9a192f5bc1e69328ef5538286e9b852757ea9659d03a8c4
+EBUILD libshout-2.4.1-r2.ebuild 1398 BLAKE2B 1462f1a57236d0c5435e7879a0d47d9038cc0d1b2950c83acc3348ffd635aa81e3a709a2205c1d4cd7c8cd23022fd4f6340b7266f5a22d04c20ffebe52658fe0 SHA512 f8270e181ec3973af5752667899c704d07bb473cec6451f96ded12ec15dc7a7bc4d56dc41694118f35d2073f6462bd7456cd2ed99f95c7ad10f7e5a5b7a9f943
 EBUILD libshout-2.4.2.ebuild 1386 BLAKE2B 61d51d9de79455f9dda811fbb8529d8a7e89c69653174151b6e8a68a38ed98a08766c94abfe3d69e752dcc77b04978ae9d68cb50b8d30d1950426becf4e3a2b9 SHA512 5690b80f51ce03929d80c0e40994ce426b8f69e96cfaf012a3b6a411f745f1f6af10d9544f3d0c76cc9215052ad8e34a10a9df3f986d39c6a3c26ccaab311173
 EBUILD libshout-2.4.3.ebuild 1322 BLAKE2B 6e654babaf39a4de2e46cc471d886f817a1180cb538404883e930e8049588dcc49b6c800ed88a70ce2fa56c2546acf136f21917bc09cd949151b9bcd386bc7db SHA512 3a75537a6f711564abe78c50716158df9b35623a33b4ccc5a47a2efb9bd4feea59507bcc5d7ecf96eb6dc6a2a95a5bc6cb89427e31e1d8acfa23f7acc7a90612
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 1bbb41cef00e..18b33dc28a21 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -54,6 +54,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	rm -rf "${ED%/}"/usr/share/doc/${PN} || die
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 2ad507bfa498..c5fb44ef787a 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,7 +8,7 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
-EBUILD libsndfile-1.0.28-r4.ebuild 1878 BLAKE2B 920b6105f8d4b281718f670ece41e84a4475a1bb1f390445d54a71bffb6950917c8a5c3bec9c0aa15130ae3682ba920459769a6356df7bd4f844f6da81c1923d SHA512 dcaf60fa2d04ce76145f0c73e067fa7f415dd41837ab42e5af3af76d6588cd407efbe3350c1f885adcad89401c6680b2a003382218359b7e40bdd32010398544
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1680 BLAKE2B f9b2e314166905dd9bf06fed23dddf8ada32db1a5cf5cd400c7010fe2b1734b5d260ff4579526a7825c6d6ef3523178e8f957b2d4fa1d02dac6363131b923b52 SHA512 abd08750bf6b02dab4ec12241bc3a5afc697405ee10107260deb828d9303b50bf5c38fea7457d1dba57ea0a5c1c17b35cc3152a7e375b30d59aaebc41a045dab
-EBUILD libsndfile-9999.ebuild 1825 BLAKE2B fdb4c8b69bc59fe5e5d90da4e8820c3ff1f48a78588d3014abf1b2fb174c70d30e0a4c67ccd52437aa3c96c779fe65c2464bd79e1dae4960dbaf9c828934563f SHA512 0469a8114758a3f9a14bdbbb8dcd15572edb381e5fc33bc9c18495a49bae472abfaf7dc24e46595840c5c7def73254c0a19c206095b64f2c1da287fd3a39f2f3
+EBUILD libsndfile-1.0.28-r4.ebuild 1872 BLAKE2B 320ddb0422e2b4fb1484905e1b760527e84ad892181ab0636e81c4832b068e821768eecc4856417f820607cec92fe9f172562c10a70bf5c4c83b5a76c950ff4a SHA512 ef8131a1b8e51e42b97d968eff9349fa2c7da59b8425f6be03060d55772cd849a494cf38664e1669de17d770a34f4d29d1b5a3ac84535762c68dd2c0a58f5595
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1676 BLAKE2B 4d6361118b00579e9b01f9dbe53cbdbb30dc88cf5c19ade98bff1c9cc526828b433765356521dbb7560a68afef2634efcf33175a32248043e437846b0d4e6f0b SHA512 06b8ff76cba7ca0b1d6f0a8ac48150e61a2846749ccb2009d2ef0b64ffaf6540b15bcdfe4157b21cddc3fd6927669b4dbe60ba6dc663ffe2ef1909a19a0094ff
+EBUILD libsndfile-9999.ebuild 1821 BLAKE2B dfe0d566f1b33bb655e0d7f111e6c3d2a9d7801147cd8158271f731f9c095f77f26f857f2002d5b4a996277fce93e16ab1c94a3ff26ac713ed6fa8b1b622c441 SHA512 7f3461610476f41665d369e74a9ca33622cd9e262183b92ca570429faf18e4cb7efc1de633ad1dd8729730274796f209d4c3930729d1dfb2af8d11d394fa65c6
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index fb19c93a3548..9d70049aeac8 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index 435eb04300a8..1a1ff9ab655f 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit autotools python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 1409be979875..d8aeacbde190 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
new file mode 100644
index 000000000000..9c0d944eb88d
--- /dev/null
+++ b/media-libs/libtgvoip/Manifest
@@ -0,0 +1,4 @@
+AUX 2.4.4-pulseaudio.patch 1143 BLAKE2B abbfdccd75bebc71a8e8b5d089db8d7e43efaf57deaff5279057dd200ce1b756021f9c0b5445432f0f7621e28dbf56178ee2265cad3ba6a84aad5ec8f4490b6f SHA512 959ea6e3e26c135e486517ef1390e0b47f12ddfe4779f8faa9f2340f7dca547f51e53945f374372e05ab915c11c2f8af7c8b72c6beb055dfbdbcb7aae50abfc0
+DIST libtgvoip-2.4.4_p20200123.tar.gz 1481831 BLAKE2B 5c6b4ecee4d8daf31f52db1070431cb6caee324d58a20207405ebcd2b275a07c57fa524f3f29e8aaa05e50451730d34ad47bb94a180e3ac8a169dac9979582be SHA512 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3
+EBUILD libtgvoip-2.4.4_p20200123.ebuild 1070 BLAKE2B 39eafc007c1968ba7383885d5435dad691b89fed24ea3ecc3251e49f65abbda852bd53258193573a1c2022a9a2074a9be0fd703d77da5d72ae34a8d952a08c78 SHA512 0776fad15d09433c541a88b0033e63bd9d7b727bb9ca747bf4e38bfa022c91f1493060867395feab3d74f41a985fbd83810190490c1ece5800c4ff96a569ebb6
+MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch
new file mode 100644
index 000000000000..ecb0d88a07a4
--- /dev/null
+++ b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch
@@ -0,0 +1,36 @@
+From 1b029a0eb8b65057a31001e812b28f4685298ea4 Mon Sep 17 00:00:00 2001
+From: Seven Du <dujinfang@gmail.com>
+Date: Fri, 17 May 2019 22:19:08 +0800
+Subject: [PATCH] fix build with pulse audio
+
+---
+ audio/AudioInput.cpp  | 2 +-
+ audio/AudioOutput.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/audio/AudioInput.cpp b/audio/AudioInput.cpp
+index dae647a..7b0c4da 100644
+--- a/audio/AudioInput.cpp
++++ b/audio/AudioInput.cpp
+@@ -79,7 +79,7 @@ void AudioInput::EnumerateDevices(std::vector<AudioInputDevice>& devs){
+ #elif defined(WITHOUT_PULSE)
+ 	AudioInputALSA::EnumerateDevices(devs);
+ #else
+-	AudioInputPulse::EnumerateDevices(devs)
++	AudioInputPulse::EnumerateDevices(devs);
+ #endif
+ #endif
+ }
+diff --git a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp
+index 458e8a5..07a3e31 100644
+--- a/audio/AudioOutput.cpp
++++ b/audio/AudioOutput.cpp
+@@ -90,7 +90,7 @@ void AudioOutput::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
+ #elif defined(WITHOUT_PULSE)
+ 	AudioOutputALSA::EnumerateDevices(devs);
+ #else
+-	AudioOutputPulse::EnumerateDevices(devs)
++	AudioOutputPulse::EnumerateDevices(devs);
+ #endif
+ #endif
+ }
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild
new file mode 100644
index 000000000000..06ad597854cc
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="c5651ffc728336e56d8567f5c6c179e8a5d4fe55"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="alsa +dsp libressl pulseaudio"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/opus
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}/2.4.4-pulseaudio.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable dsp)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libtgvoip/metadata.xml b/media-libs/libtgvoip/metadata.xml
new file mode 100644
index 000000000000..c5af453673d4
--- /dev/null
+++ b/media-libs/libtgvoip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="dsp">Enable signal processing (echo cancellation, noise suppression, and automatic gain control)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 3c79a18333ad..1e0f53a339f5 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r7.ebuild 2549 BLAKE2B adc035b3661cd2d2e6a4c580898bfc134066d2f21084758560c8ecf853416da1a8fc08e4ff72c9a2b14d87705075d14ca4191d8aa1117380041e379553d7d4d2 SHA512 e8df8965b53e551dc3496fb3754b670df6893102d39dd72b6d546f2ef99da5f36af8979a38e11ffe124a5438e1343305de0ee22fa5bb8bf2651f983afa5ff0bf
+EBUILD libwmf-0.2.8.4-r7.ebuild 2541 BLAKE2B 317803ec16e86476b4a6f5afd5543116d263c3407934a5e13c9f7ae3d30f1212ea12ffb4d9f495d8e7562a74f0ac341964366c0ad0148c0c22769524fe2625ad SHA512 4c030b16ac032d4e5aaead6c9b4bd3e865f0900ea4c1598c32837b0897cc9f032270d09cbae066f065941a79a0741cf3c50640116053d8fef9d166f91b6be683
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 3c130ff28f52..c4467c021691 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -69,11 +69,11 @@ src_configure() {
 		$(use_with expat)
 		$(use_with !expat libxml2)
 		$(use_with X x)
-		--with-docdir="${EPREFIX%/}"/usr/share/doc/${PF}
-		--with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
 		--with-freetype
-		--with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
-		--with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+		--with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
 		--with-jpeg
 		--with-layers
 		--with-png
diff --git a/media-libs/libxmlbird/Manifest b/media-libs/libxmlbird/Manifest
index 001ceda63308..1160456d4c76 100644
--- a/media-libs/libxmlbird/Manifest
+++ b/media-libs/libxmlbird/Manifest
@@ -1,5 +1,5 @@
 AUX libxmlbird-1.2.0-configure-valac.patch 1789 BLAKE2B 3c073ca4e985e2037f8b7775a0276ff32a1bad71550b4d4ab78ee508492e06e6f040c2cc4ab7507d157c44ae67b17a7a46c066347a1894520d567de8b92a4f5c SHA512 b3b3642b3b0a9c3c18ccdeddd67b08078473ccf4db6de6e33b41c84ef119b13e25034e2c77e958df5e9ca93eb189b89c3b542a58f2e63d039438a21ef6c19d66
 AUX libxmlbird-1.2.0-libdir.patch 7266 BLAKE2B dbed29bdfae04523e0872433f7cff41e56e7478fccb58effa3ba386a04ba853c637bbc10e904994a0f420103c5dc2371712aa33cf891ff935b9af6ccb07b6a24 SHA512 a879ca5fc70be9a9a3baa7311032b166bc88e6f655e195b57447c665fbe3241dc48235a0f849d9fed4542e09937b150cb7e93f75906668d11fead010318e42a9
 DIST libxmlbird-1.2.0.tar.xz 20004 BLAKE2B da712a82b85188b76943c105cf99f1d366d2dec24c67ce515666a1341dbeef512df62fe5c1407f8b125dd28b662877ca474d422336d789852e822066b5449e3f SHA512 0677004a79194dde87f27387ae1faeb19aa2ecd985664ad4f3f7576d39f71e0d05215c92bb15f3e3f1a4053e27025fd1a4151f1ba12774cfa789d47648097e5b
-EBUILD libxmlbird-1.2.0.ebuild 1240 BLAKE2B f5ba74dd5408395ed4c688ca040224710a9bbf01027b958033a8fc732b6e169264d6bddea95bac0e839ec5a5fbe8c0ee7361c4a6d5048dbf743bc81c90ee9af4 SHA512 d05c30a724ca589eb413132a10cc3608f4077c965eef046e07171fefb0febe64d9c166ecfc574176fd2182e4980348c385d6ead228ccf2ce7861103246f384dd
+EBUILD libxmlbird-1.2.0.ebuild 1234 BLAKE2B 1f496007b880311e5bc06f037e583ad8acba61c7d05185e27e90b81d7267143bca1ad6155a3cd8bece7c173a2882170c491ea2e461e238cb1bbc41426f8c72d6 SHA512 cea7cb7fd0615040ef6386959913e4fe9634f6dcb8eee4b0fe98514ca7bb220bd9b14acc4bef3ec044e9639cbdeeab85862100d9f2f8b89779e0dd33be39c5e6
 MISC metadata.xml 351 BLAKE2B bf15ddb7c39336982fa14d3de2aa0043bda64382be7a2b0ba6154839fcef9569c2b6c41d92fdff90abb87c0d7c9b0383e35d5aa402f760ed4feeff0601575bd9 SHA512 9538a6f758475b5381770ba633843b88a4d1b5e780d6822faca6e1c0f576c0e49d1eb44f152b08a89eb092adbc29541b6736362d1ac8c804a8e7f66dc4b69496
diff --git a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
index 8ad6be3e7fe5..67129e1dcdb1 100644
--- a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
+++ b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 vala toolchain-funcs multilib eutils multiprocessing
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index c9062047675d..0f147b2b301f 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,6 +1,6 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.4-r1.ebuild 1629 BLAKE2B 75a588823b55fd5cb9921325b64a8d623edee627313bfb07efc9b13d95e9ec4d1a9f84188a28f9a60d8b35d4a9ddbb522a28455788f449c6b6707b29b17549ba SHA512 cac828ae14c566ebe9f5987aba2767cc80da5c047dac47dbe4044e976b280bdc6c68e6341f97ad56057d55ef4c3fd571d0ef6853a0f7a105621d5bf473dc0de2
+EBUILD lilv-0.24.4-r1.ebuild 1625 BLAKE2B 38caa30a0a2765df83d9e2f3f008770a9c8ed7d06f4fd66890a1598faa2b705dce46f38bb16867d816bbd1a697028b4edcc28b7fe93fe468c72c9fee02bf631f SHA512 87777ee80c8d0f97100c6206f20de8e0683f941d5c4396d025c6704492589fa33e7282c4105fda4f8e5221669d5d1c587ed8a59ed3b74539b887c6e86417209c
 EBUILD lilv-0.24.6.ebuild 1764 BLAKE2B 27a24f74badb4b2ceaeb0582ba9c787559e57be6c2c6bd47e1dc09f9093e39a2decf872f4fecce4ecdace1b477bb73d5fa5f34a215f47c7bdd4f3363570daa1b SHA512 558fcca32b27a9a86f2e6521af68f6fbe5da732b1c7e6905db2d8fc6eaf0556f8b2dc54b2e090995aa93e797de875063fb5adbedd8e688ca2facda42b0addea1
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index cbfb7ae97985..0d2ef8f6bd16 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 1c9f8639a34a..122f765247a1 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,6 @@
 AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
-EBUILD lv2-1.14.0-r1.ebuild 1324 BLAKE2B e413332fbc2df6aa027095fa693fc3ea8d8144e0d05a2f9331c5c257db1737660408563131a1700ce5462e2cca3968f68f1816024910893add10c1ab2ca100d8 SHA512 cb618fd52f319c74929da171202ed571a3c747f28fa79f259361a114a819212349fe6c0f7b6d04f95d99d23f50c17d42328973b81369c7d3c8448ff42ae6bc44
-EBUILD lv2-1.16.0.ebuild 1323 BLAKE2B 2c37360f5a663b64d7fd4e869a0c8756dff5a0e364462cb05868fc3daca6e3552a97e210bb316fd96404cfdb3caca9df80f58697685ec2789b3e3975b263ba5b SHA512 834e5065ecef64f45f1e195846770bf652780c2fd6021533eb790386e0164920446712b763bcbdb21e39620ceb56f8b1d356e1bd290a0e1a321a587f128a2bfb
+EBUILD lv2-1.14.0-r2.ebuild 1368 BLAKE2B d948dc014d98469b58e27f8e640b1f1ecea95c6ea3d359ec870af27c86c55316c84dff55a8369bfb70c38de973ff2c83e171b1d140fde46acd6287d29cd3c500 SHA512 c8fbf1c9937e2020c7820108479ee963eba9b2f3f08c91c86d9880288b29c39df68c35919465590c20cecc6a28ef8fc6d10142ad8402ef37ba820808e098f948
+EBUILD lv2-1.16.0-r1.ebuild 1373 BLAKE2B 9a8ff5fe5ad4a202cef148f8d7d64fc610aa292664088480a0f34d763f67047dbe8b96420c732526509c3d69765391e4175cffaaefb5ca1f81be7ed4c5a57c8c SHA512 8ca3f0b1a45719e13498da01c4d60fb135eee214c55a3186b46621c0bf59d04f0456418f3c2a103b49ed0df84b8651bd909b79a259c76d1910bab6a2bb2af988
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r2.ebuild
index 9c33a5afd098..d44fb841aaa0 100644
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.14.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-single-r1 waf-utils multilib-build multilib-minimal
@@ -22,9 +22,11 @@ DEPEND="
 	${PYTHON_DEPS}
 	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
 RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+	')
 	!<media-libs/slv2-0.4.2
 	!media-libs/lv2core
 	!media-libs/lv2-ui"
diff --git a/media-libs/lv2/lv2-1.16.0.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild
index ea755948b201..135b11725f72 100644
--- a/media-libs/lv2/lv2-1.16.0.ebuild
+++ b/media-libs/lv2/lv2-1.16.0-r1.ebuild
@@ -29,9 +29,11 @@ CDEPEND="
 DEPEND="${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DOCS=( "README.md" "NEWS" )
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 97c276df001e..96bbee8f5dac 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,10 @@
 DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155 SHA512 9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43
 DIST mesa-19.3.2.tar.xz 11834324 BLAKE2B 114912816a08424da1d55c65d8ff4fb97d58022f5968d37938055e0b0fcdfeeebdbdca3c28d187fd85aaf6385d3a1bfbfe3f011f410e9a991519d34cb81697b5 SHA512 fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28
 DIST mesa-19.3.3.tar.xz 11938700 BLAKE2B a2fd88e8c2d8b189ddf4fcebe324d2f6c00e0c101a565eeb783f50ecc7b2b85f3fe698822788807ab9aaf0403a4d27b7c469bd73c891f535e220b9a0204059f9 SHA512 1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9
-DIST mesa-20.0.0-rc1.tar.xz 12085464 BLAKE2B 5d9831eafe9f2e1e3e0c4bc4cb9b76f3b0fca0b6f0c2e6aa4cc72a5f79308eae392f47627f3372400f832bee14dd76914c398c21f2e93d3c42c7ebc5b8c2bda6 SHA512 1b1d5408768b7eec313083ec12218dfaef1f6bb0e209ee7e49b8974af0cdbfdf71860516e459c6933647ec8895ed61f54db64a26662e3e6500e27560f7d98746
+DIST mesa-20.0.0-rc2.tar.xz 12100548 BLAKE2B 6bc2130dd7920d2a6eee845d4f53633e609ec2f8a740e39df23a732db842dbe5e0da6374dd0a8b2dfbd938ef1d0de55281a80c061d568dd609f8ac78da528aee SHA512 27e23925ce7e3a38954088db47d564776c4ac7e028d30ef5c58229b3182b461ece37863a69bc42ea4ff0a4817c46c0b0ca8d70f6fafddb5c3fe60bd9c429563b
 EBUILD mesa-19.2.8.ebuild 14496 BLAKE2B 1135c0e5ac0a205e7e8fa5ad581b2d4d5b08447c71c76be0d97281de65b58ef7531442d61ad8ae248e4488d1664defba56831beb994473488a9ca0ce35d2b4b0 SHA512 0428f593206f9582a8f083fca0148dcd82b1d77776fb0f766f80157f35f7756c075f0dba18e474e94f11ee28ba750eff8890d78ee0d5abf861e0722090329f7e
 EBUILD mesa-19.3.2.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
 EBUILD mesa-19.3.3.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
-EBUILD mesa-20.0.0_rc1.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
+EBUILD mesa-20.0.0_rc2.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
 EBUILD mesa-9999.ebuild 14367 BLAKE2B f943f71814589c1298bb2fa36e20fb440185f0b1ad56126268fe25ac2ba364723a1f09e29af71cbc1b54b903dad90d6f86141cc2ce95f0a4009279ae5ab4dc81 SHA512 44fedc245b2088bc41fe5c88fd8bf33a02378ed18fd33f43f04b0cf6dbd5af51f7445718c0239745677b268153f5b68e803a3c6e6374c9640320021fcbf0de4b
 MISC metadata.xml 1917 BLAKE2B 795c4e550486eeb2f1fca9f43ad653c1ea45ba836677a3e68863d38faf5ccbcb140699f10366b2e1449718ffc4104830f378560e8b4646d5892b70a5bbe46262 SHA512 1133638886b3c039f15f7a8fa4ce55684db65f84e9d8c6b50ad8e2de4370d4303c6852c7d22239681923b5eb7fe6ebd77ee2caa41bb1210507268d3c1a69353d
diff --git a/media-libs/mesa/mesa-20.0.0_rc1.ebuild b/media-libs/mesa/mesa-20.0.0_rc2.ebuild
index 39da329b5dd5..39da329b5dd5 100644
--- a/media-libs/mesa/mesa-20.0.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-20.0.0_rc2.ebuild
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9941a0e8c054..406e410eebef 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -9,5 +9,5 @@ DIST mlt-6.18.0.tar.gz 1430398 BLAKE2B 43d33756ace75dd38c7a223ff297323d3f47d8b7c
 EBUILD mlt-6.16.0-r1.ebuild 5776 BLAKE2B 87676544fa092cee5ea8b39d710f2ee62fe22f3d7cea6ccb07d8d64aab6ba5d032ad709ef05fd5d981dcee66e7297b7367398bda118e4ce6c1c48d0f1f86c009 SHA512 d608429a2c3c62d5e2507e28789f57ee394aa04362bae8e7b2a22a15aecba221effffb065a9e1031a5d11302ede425b03f7f3b04bace9eb766b507b726e197a1
 EBUILD mlt-6.16.0-r2.ebuild 5776 BLAKE2B f7a30d589351353030d89799d8fe719fbdf434c2ab16648f024297f3f24d4d8e3436acc633ccdfb15f7d0a5a27bacea42a372fd445353dc4f6d59f8912455ea7 SHA512 c34b90ff7bcb17f3673f43312ee088154d0a9845f168afc74b7c3e07af52ba18d955e949a2db1ab48b32d1585d58c0f2af3ee7bca33f0df9d223f7e719c55a49
 EBUILD mlt-6.18.0-r1.ebuild 5374 BLAKE2B bc9fbbaed6447ec2dbd1be10de77fb607728ed4c85ce61a8431c6cfd06817285035dbdfe2983bd04fe5df8095b1ed2a34079598f5d1dc85e6404131b438576fd SHA512 7838b7c247abda99c51b3b8dafe3cae6ea6630a7783f8d3efbf59e06809684415d6d1bdcaccdd29d60852690cbe81666113741cbba8fe5029a0e5d17ee993dd2
-EBUILD mlt-6.18.0.ebuild 5367 BLAKE2B 0eb03e758bd30a27616d715589d17f33b3ac1d07cad905513e25b5eb3acad8512a86ddc52f810ebb577c8e3ef8ccdfb6b44262889e9d472914e7bb2648a18de9 SHA512 dce80d749ac175cf49d435c81d938181ac6c91e4d76c96bc26d9b2ef3a2ec5e6c29d4ce7fe0e772084cb3b0d197efbbb6f761510d1c7ffa92ea825c45eb2e0ab
+EBUILD mlt-6.18.0.ebuild 5374 BLAKE2B 2b1702e9bb100178d620a68e5cbc444fced88662cc187e3c03167a456e913a8b99ded0a9417c0207c38b4070d2afacbce09241d587d4b615c8434b7c387189f5 SHA512 267861c33a99b38c26e291af7fdd893bc5ba607ac2fd74f78189b3be032f077d367db17d41ebd031f42b3537c1ead6285f236b9b7eec71531a78b87f3d969cb0
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.18.0.ebuild b/media-libs/mlt/mlt-6.18.0.ebuild
index a2df7a96441f..c835916cd8cb 100644
--- a/media-libs/mlt/mlt-6.18.0.ebuild
+++ b/media-libs/mlt/mlt-6.18.0.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
 fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
@@ -100,7 +100,7 @@ src_prepare() {
 
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
 	done
 
 	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index d90eae9018c0..4ee5c39a2714 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -4,6 +4,6 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r1.ebuild 2373 BLAKE2B f9bc666f50135262c76c541003bd356ddad7076108deb2e14d268387ad7ef019d8ec6c2b2aa743ebfd6dd8872857df819bbb278ac1e0f55a6ed8d7afbfc5b914 SHA512 22f051766ef13a15910146f20c7935d8c6e97875c7669e8144f67fb0a1573c69121f9bd60cbfd253e513d2a6402809b40443304c0068deafe02cd76298e0e97c
-EBUILD opencolorio-1.1.0-r2.ebuild 2270 BLAKE2B b2b77f56808cb04d6d9087f7aed1cbdbc6f4cfdcd7edd20f4f22007e31a175660c0cc018a137efe074db06436d4ab0142a45f89f0cad3f9e04a950714ce64ebd SHA512 60003203e8b0c54d575e869caae52f07859c5bf0c4db62547873ba59397963e0f741d2e94085cbee33c54ab470866089283449e67b7aad42ac4b58ed57d3df9e
+EBUILD opencolorio-1.1.0-r3.ebuild 2414 BLAKE2B 95c52266c77793fbec05be57c7ee1c2e5a1fff579ef4b0520a20f08ae0fc433b3c6bfc45299bcb2fe47419ef274bd20eee5472e9611199076d6a5c48162d339b SHA512 6cb2ab8f7b5f60249100d5fb1ef15234632d901851a9946fc3a66a1691b64d646a2dc265e7b60baadc52fdea0531a4b0be43377e04532a81025e2f2868ae1c9e
+EBUILD opencolorio-1.1.0-r4.ebuild 2311 BLAKE2B 351293de329dc85cf4ea3b95f38136dfa43ac565ad1103df94665c22bcd55579e166a66c4183eaa3eeb4f354d232c2e92437942ecde5334b62da95d8064a893e SHA512 51325d2ce2cc344485a6314999151ff350bcdd57accb49a2da3e98b02bd3ee6d5cb375097bd95ddb3d10771f2019c389669471348665996815d34c074d086586
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r3.ebuild
index e324b83533c8..a6978ea8c3e2 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r3.ebuild
@@ -35,7 +35,11 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 # Restricting tests, bugs #439790 and #447908
 RESTRICT="test"
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
index a4e109ff8155..5e3887be717e 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
@@ -36,7 +36,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 # Restricting tests, bugs #439790 and #447908
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 28a8fad17acd..18f3994454bb 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -27,7 +27,7 @@ DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r3.ebuild 5981 BLAKE2B 82922ac811bc4a27fabbd4ee329b6646066211707496be14c86dc044395daaceb5fa3d0683d5e5eeb73d4ba765d2e8a62dd3323b257612e32d0afef2326ca83f SHA512 c62c40a50aadd992142ffaf389c5ea895f55a87d693928f74cf6b4ac9bc2363dd5e6729cb3cab06ba8141eafd8853d194f252de532322fa625a3d8de852aafac
+EBUILD opencv-2.4.13-r4.ebuild 6028 BLAKE2B 49e634cf091fdbaf69e518f2fde2f3916bdaf39b0fed413d253c22f3c823ef132d49c2c7891b2c6d73e3a7c9b1e3b8efe999940d4d5aff50844b4ad9a5728eb6 SHA512 464e49cf782cabe002d3d5c499932c31cde6ec69658330a8040eb7cbd8a56e94f94ca3cf073780665066e34ee06c338dadbddc18602c6f900a9922ae1edcba74
 EBUILD opencv-3.4.1-r7.ebuild 18644 BLAKE2B 636275f9a39e3fef49f59d2d93e4fe288e73de35e210aec8ec7982058e1f0c98d25a7e7e9ffd85aeccf088225058357c2d7e23330d4a912e3f345a501735a030 SHA512 eba05037ccbdf8858aa799dddad2ddbc031677a69ed808d324e4aa2ae10a29f7f6c0424f92892ea8cdbcf3915da4b47f2a97227bfa35fe390e43c3f5d0439cb5
 EBUILD opencv-4.1.2-r1.ebuild 18329 BLAKE2B f917c45b9d91c362c1470f41ef6f4ad72b5c45d4c3c2c2901a714ebe5898cc3a742ae8a7d15646399d3568bff70b32e63d5d5f82cb6da12864aab88ca98e8cfb SHA512 4ee76673c4284546aa9018cdde1e2b2278e64650695fac63d1677c79beae28dd18b696c19dea7e30d661a9a2dcca22b11bd272c736a582a5b2049029497c4269
 EBUILD opencv-4.1.2-r2.ebuild 18370 BLAKE2B 347aad52543221205f22bf1672b540bb67eb917065b9cb2c9f1dc113ecb4ba967851912ba7abeb48c00a2d3ae076e0a46d51c8a8e682ef8e12401b88627fa8e3 SHA512 c9b204281dee9ca4ba73ee2bca2dfe54d837944a05f8f4f890ec8b82a4177e5d2095c31adbd9a64cf58679f23ebe68cbcb728d3cd8aa0cfe0d0484f8bff29c5a
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
index caceec0fd66e..e678316f625b 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild
@@ -53,10 +53,12 @@ RDEPEND="
 	png? ( media-libs/libpng:0= )
 	python? (
 		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		')
 	)
 	qt5? (
 		dev-qt/qtconcurrent:5
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index dc90623da02f..0724c1fc101c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,4 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.8.17-r1.ebuild 3109 BLAKE2B 99bfcca70f60ad50cf63cea34d8a7e12d5b7940949284b57f7c5c9113905986704798fc33800c9ee7fbb046a9b011007455e9e47df94f3cab564e63578a19d6a SHA512 c40c8f0f68b9dd27e18da5abd15025c4a628fceb28a4170d67eef37c463164d3c597670ec688d39db6526e58d5921e531941241a0e4ec8b58e599e4f3a3b5f92
+EBUILD openimageio-1.8.17-r2.ebuild 3147 BLAKE2B 8fc27aefbc85f11a22f4decefc0ea55f805992cfdc6f2013af3d5e9b6a91b938d6f23d17c5c43455b41bc56721c7593cd3f440a1adb31c707d0c05c276f42425 SHA512 358ddbda5f037708bef1f81751258fc3a72fd0b3fc71fdac1dda1be1d020339ed99bf18476873420df16fa0535f05936aac3b7b6c0e2f03343ade6cbe3848a07
 MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd
diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
index 8384bd61702d..c6365e2983cb 100644
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
@@ -53,7 +53,9 @@ RDEPEND="
 	ptex? ( media-libs/ptex:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	qt5? (
 		dev-qt/qtcore:5
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index ca49fa994338..454e7f8e32f1 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,6 +1,3 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
-EBUILD opus-1.3.1-r1.ebuild 1064 BLAKE2B 2e2ec38a2a20ad4037e8d473abd2e5594e5e87ef3fca7a698932dc023be1666aa143ad7569d4fc5bd87fa0a0c43140dc023436d5899442c3ca8ac8089978c14a SHA512 8d874857b52b72f22d63c6875e9e43a5cd2ed32e8d67f5c68e01b3f1a14c6fa8cfd4d0cb302ad20f6fb82e56d9769d5ef43946228bbd22b84a4890c44ae0f5e5
-EBUILD opus-1.3.1.ebuild 952 BLAKE2B 67ae11d184681007655fc1270938cf1e41a6cc172f8f57d1459dae30ec0da9d0f41bcc5e9cad21464de723c25ae7ab9ef559cd5cec4ae3a7d34bfbca872ad284 SHA512 7d60bbf645bc0b6d0558ba7b36363fd1ea7f463edf0c7cf51953fc1b8e8dfd9a0e2b0ec265aac31587e945efdb788f65c4bd13e73ac06b80552488ebfabb46a3
-EBUILD opus-1.3.ebuild 1169 BLAKE2B 153d7f0868bfb71aea06d0396dc1d6862762b068448191a36ddf507d08bda251cde5a2b7b5b7e732be77c5029bf64b367fdbeae7e706d40c12125901ca77bef4 SHA512 7a6e60aeb7105b593369acf0a6fd62db92a8de6b7ddff14fe47d639d987e0f1d923a680b7b9266315d7372f33ffcdad998965251f24192a5bce8a204154aeb1b
+EBUILD opus-1.3.1-r1.ebuild 1055 BLAKE2B cb250cc2c4650c97a712ea1dae761579e23c1d827b204ee84d699d93e2b711b1809c7a59c4215fa33368aab10f718d06156b69186cb1016748c362d0d85820e8 SHA512 8f9f014ca7f6bdd050505ca6bef177e346a134b014219052775f22561feee09e5f7a83b1b80f23fb27297c47de32b9f16cecf575c4bf7eb888ef7897703de84e
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index ae3328a25fd9..aba9e62e775d 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
deleted file mode 100644
index eeda2865a899..000000000000
--- a/media-libs/opus/opus-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
-HOMEPAGE="https://opus-codec.org/"
-SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
deleted file mode 100644
index 758b0ac2e0ba..000000000000
--- a/media-libs/opus/opus-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus.git"
-else
-	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
-	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-	fi
-fi
-
-DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio"
-HOMEPAGE="https://opus-codec.org/"
-
-LICENSE="BSD"
-SLOT="0"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index db4ca0da669f..6db24c6c687d 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -2,6 +2,6 @@ AUX oyranos-0.9.6-mesa-18.3.1.patch 834 BLAKE2B f8cae2cdb21c4588cc1f89c9989ea95c
 AUX oyranos-0.9.6-underlinking.patch 1064 BLAKE2B e05060b0bd88b8ca3edb36f2e9d86b5d2296e16f13420a14473a7b0273bf9b53fdea57cbd6ae4828c3b63d4ec8025757e5b9a4858378861d42f83f537155b2fc SHA512 19b22636294c74a44cad38ff4e795a110154349e89715104afd014a219e254a3749a1e9e59b37ce14f01fe22653c6ae062e11e587456b19c8012cc1315699b09
 DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493
 DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111
-EBUILD oyranos-0.9.6-r1.ebuild 2818 BLAKE2B 1306b22453dfa535ee4713ceb7435eb069f79c077b7b8ce426b9b67d829e3adba811808e2bb25227d555162567588aa7ac8dbecc6501699033e083cf0ebca582 SHA512 b8081efd598425c490831cc4ea93ce2d8edfde46df4d54b67cdb131c1ec8ff4a7f526a78edb0ba943b3c87ecf79cc23e0e6cb9917a02ca681a03f5944eedfe96
+EBUILD oyranos-0.9.6-r1.ebuild 2669 BLAKE2B e57cb65d4286ec733bf8c01e67d4b438aaf567c7b2abba5303672359254ba4c20ace18c4c08e2396c66be16f9939a401499b3a1c60d388ebca5cfa4df9e9a020 SHA512 696bcde3a1e8b34016119e0429ec446ea3fcdc99e5b42fc0458e304266a6dc862e1ac124af0fa7a268ff7fa6a36f30bb4370aa09c6c940228263dc41f2be49d1
 EBUILD oyranos-9999.ebuild 2635 BLAKE2B ef6ebe70c54e5b9cc7bf0e289ae594f1f9c106c1494f6f74c83efd62d3231f9b38ef23c49fa4bb06d6bc5d316c632d59d5f8fd643dd40300b8dd6376c49ac495 SHA512 00f825173d253661d76da2901a48681a0572abc68b7c147ba6343e813347f0e8c1e98dd5e981a3e7a21042c378c14cf28e030850ac74310aade5a43d83d6c709
 MISC metadata.xml 251 BLAKE2B 0999a9b822622949e7ddd1e5d5b77cd32cf1f689c715a8e9d4c2a4a312d8f59bf2efd06c84f52d71b05149e51514c4f4cecaf30a2c8ab391dcb3a5f7957d7b7e SHA512 bd232a6e37c4b956d15fd9fb66e3b7698c41747b9d3a1b474e8f41a1d7a0d841308526f9ba6a5b250f0140c1af47353bb0adc2e08d09bf8ef52c7b09e66ab891
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
index 4eee55d10f7d..26ac4c259163 100644
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,9 @@ HOMEPAGE="https://www.oyranos.org/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X"
+IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X"
 
-REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
+REQUIRED_USE="test? ( static-libs )"
 
 COMMON_DEPEND="
 	app-admin/elektra
@@ -36,14 +36,6 @@ COMMON_DEPEND="
 	exif? ( media-gfx/exiv2:= )
 	fltk? ( x11-libs/fltk:1 )
 	jpeg? ( virtual/jpeg:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-	)
 	raw? ( media-libs/libraw )
 	scanner? ( media-gfx/sane-backends )
 	tiff? ( media-libs/tiff:0 )
@@ -96,7 +88,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif)
 		-DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk)
 		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
 		-DENABLE_STATIC_LIBS=$(usex static-libs)
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 982e007ced68..1d5691f6fd66 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,7 +1,7 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1049 BLAKE2B 59be45fbfe12dd538ccac9af82587f956dff90bed589d4a8d065a04aff7c240eddf56e32d3f7ec04208b3e31a8d05390c005cbedcaf40a9f2897adae0a3e08ab SHA512 2c9c46ccd43dfb00eb12039e446f8354e22b0be240f9897a8aa016a59dad5388bce12eb4612c9f6f0e80dcdff33bc2b6d6318c49d6f89aeb893737c9c0b7f95f
-EBUILD partio-1.5.4.ebuild 845 BLAKE2B ba0da04deba2306dfe4a59ed7442549e1ce06dc959157ec1e96169638209280ae54837fa60e3a5e0c08e5cb2e33966125bc2bb3c194b9aef2190ef058dfbf97d SHA512 2905032ff5f5d7f287a84a9f82a27109a667c5fe0e6077ab2d22ef54bccaee8908d0a8df8efab56cdcff37f68ab575f09042e262ce00757d4740026954c5cc8c
-EBUILD partio-9999.ebuild 847 BLAKE2B a2fcce51d829c0af80ebf23ceb8b6e35fc0de12700539b07c770a0c751f70d6f88493c7d7b27b4ebf41b99e372d23f8f38c4021ef0354081e2970d97ce6da80c SHA512 7abd0bcdee18c4704a2a75f62207ee56c822c334f7b9d5b74e1a0110c6f9fe29c9d9f5165ea3ca200d0fc8bcefaa635fb7f7338008526320099629dd4f2b3f8a
+EBUILD partio-1.1.0_p20170829.ebuild 1043 BLAKE2B f1662f643564c16117f72ceae975eaea83579b49ad5759ee121ec42aeb421e55b7fd6965f1b26159458a474663a8dcbe9bb64d6fcf863135582498ae29854954 SHA512 05910b9b2201f9c542429cbf653b29dbcf5b016d565678f40bf699d2c187cf0caf479ad286b5c8d71f59de276475b5cb5418ea14e90c90ec82910bb79e01afee
+EBUILD partio-1.5.4.ebuild 839 BLAKE2B dc586d4cf182949bf72700242671b150eb9c3480db61b0a9e1acb906309eb86bb1fa331d69ac3bc0cbee8112f3427effc8e0711590acb45c80958282a9cb09d4 SHA512 494c1edd504aad12506f61e7822b019efec660a2f9f7e29cfce7edbc3ba4c472ff9369a822a1c1440a7557fa8a0072561d74a01687b7cc4664f6b622b5901fc2
+EBUILD partio-9999.ebuild 841 BLAKE2B 95491a2224a0834ce4e20cf6d0ff45e26815eda71c0f583200df08f95b0a40bf6e5877a436183fc542c095fc2e18ea81d0d3bbe68a34753783dfd6dd6ed18ec5 SHA512 c0fa26e76dc9b92b3cb291fc402e8f443052ca077599b93cc010f8f45b2e1c0ebbd25d0248a498c1d8e1c6f5731c44cf926dbaac7d25733766bb639ec2f1c7e7
 MISC metadata.xml 528 BLAKE2B 76f098570ed5ad0be85fb87b6696903e3b111e6d2d157679a835faa6dea65633c75d18560c486750063703a9b5899747df90fdfadebab38af3688d625b5df2ad SHA512 c9f2d206bc6921c783d1d72134c3a9acd7350c80f2ecb26f45d7617dc2d352f7d84134858956569f084dd444f2a01d186c97b3a83c07b45a468d48579fa01658
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index 51dabc8a8473..9227c54e1723 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 3fea34e9cdae..dd11e5974703 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index e081be1b58f9..fb1771b479c3 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 1c34c9546314..7d663fdd7154 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,6 +1,6 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
-AUX portmidi-217-r3-python.patch 1568 BLAKE2B 039c2bde15d5aaef1f255a0166c3563fcbfe3439dc2dced93b5228e5f5b747c47b70b7a25574d3116652aa3ae7177fbdd95aa03e29f65a05cddbe056b7b7e9e9 SHA512 210db5901f5d31c2e686aaca850f972ae2083834b3599e5e71acbb21374f8136306e087f62d2307767c8f0eb2fddf5a6115486258aaa16aefd4199b6d21f42e2
+AUX portmidi-217-r3-python.patch 1630 BLAKE2B df68b3d216004f6f94fcf9b321deebc76f2891499ba58cf60376695fd02f7de33933274836ca8357996c0fd07006ee545ef7208ac58caaf83e74188327a4362c SHA512 eae1cfd3e3b9d98f5575f93f33f2d88d0b7f674ec059548bd972e58127715bf76131fdc24a9cb9fb4bbd446ef32b1b3ed79d3923332b967e2599446c636ba36c
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
 EBUILD portmidi-217-r2.ebuild 3050 BLAKE2B ea034c6366908edeab906b8cd5ee58f1bf75aa1f2a29d7766db7ae94d3576c587a409a96d54704cd8b84e34d4430b0c1e557e2f93be5607bec40803d40afe1eb SHA512 a69e6ca91231cbce5efa1cff3c305ff34ec029c1a113fcf1090dd3ea232f2050dc0e8dd60bae225e20e5c93d1aefd2c568dab897a020485f92b61b0c0ab5dabe
 EBUILD portmidi-217-r3.ebuild 3157 BLAKE2B b61c1d362aacaea932666f97e9cea5554db4c67fc81395eafb6b6ed8c03834a5b9f9bdc3b913c6448a12fbc21d29b4939c4aa559239920659226f1cf2378a968 SHA512 517a5528d1fe9f8451b4d9e60664d7f3414d0d0f1febc838cd1bc3dd9229cfe8c4cc0cb0052a10c78bd8f057e1bc7e0d61e7b737dd2dbbb45fcd797124b3c105
diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r3-python.patch
index cfc6b24e9487..d4024710fa39 100644
--- a/media-libs/portmidi/files/portmidi-217-r3-python.patch
+++ b/media-libs/portmidi/files/portmidi-217-r3-python.patch
@@ -43,7 +43,8 @@ index 14ab1c7..5b1e7c0 100644
      EXTENSION = dict(
          ext_modules=[ 
              Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-                       library_dirs=["./linux"],
+-                      library_dirs=["./linux"],
++                      library_dirs=["../../portmidi*build"],
 +                      include_dirs=["../pm_common", "../porttime"],
                        libraries = ["portmidi", "asound", "pthread"]
                        )
diff --git a/media-libs/pymemphis/Manifest b/media-libs/pymemphis/Manifest
index b37cbe58a2ca..aa4e7bc11efa 100644
--- a/media-libs/pymemphis/Manifest
+++ b/media-libs/pymemphis/Manifest
@@ -1,3 +1,3 @@
 DIST pymemphis-0.2.1.tar.gz 128848 BLAKE2B fe48cb4e33a7402e02fea007667401b77c38f0fc4f47d5ed61e8fa074a21700db008afd7a6d7ad8bdb34dd9ce3d42f416ceb8f41edb9e551b971077b87969a12 SHA512 0eb2d5112956673e115575b7d6601dd56708f02da2a67a67a0d54dd2fe53654d07e99265092c67834a07eaf8f353a643e7d2a6aa50efd38d5761ac349de1813a
-EBUILD pymemphis-0.2.1-r2.ebuild 777 BLAKE2B 36eab40b9d8996efa2c059c9d379d53158b6ab982ea19dc59576df0355ba49651c2323892b32ab24939684993edd06b625d34b05859fb472aa080d1da3213006 SHA512 f4a6e0e08e9ab6e790b9e7dca21907a25c184c774c0c58617998e92de0291098ec9fda9b1782cadf09ac3cf888235e7a4c93406c9354c6d2b2fad2a21ad77fb9
+EBUILD pymemphis-0.2.1-r3.ebuild 817 BLAKE2B 49e6d8eee752db39b39fa55cbbf4d368398f607c81c163ad9ac1632594400841e50957f558e0e151dd9473210bd57f138f794a2ef1b94e23b1ec621efc3bc777 SHA512 2c8eaad6832eaccb91b7ab9751b802768c8f5c04cb75834e8dd86c6ce4bf1ffc6c42409fa17d7d69c1ad1d2c22ddaf9b6dd81e01ec2da274bfe3aa21cd62ca4d
 MISC metadata.xml 265 BLAKE2B 65aa3f55bbf6646be50460d7fa19c2336d7ab4a88906ef67da5051ef514d3fd7123b17123620457ce87ebac3cdd3f7060c2931905cffd3025a9704824ca879d7 SHA512 c08402155a91423d29d281e4adcb3bcb057a61def37efc13bbaf8ea03c147e258352fcc9d6ef12c935ed65078743d79a5191d72d7838429a80cadee42b32cb8f
diff --git a/media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild b/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild
index a9f890cbaea1..5239a296f165 100644
--- a/media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild
+++ b/media-libs/pymemphis/pymemphis-0.2.1-r3.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
@@ -20,8 +20,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/memphis"
 DEPEND="${RDEPEND}"
 
diff --git a/media-libs/sg/Manifest b/media-libs/sg/Manifest
index 3cedd2d418dc..e61b55fd05b0 100644
--- a/media-libs/sg/Manifest
+++ b/media-libs/sg/Manifest
@@ -1,5 +1,6 @@
+AUX 1.4-AC_CONFIG_HEADERS.patch 316 BLAKE2B ebb73f3d30357cc0ab97c0e79dfa05c2de2d39d0814458191485855962780fc6b81db115f914f20e3aa55922dee76f932dd04c59eb42b83baaeaf1fcf678afa6 SHA512 84e6309e50300b514d64ac0f0f4a47900b7497f208c617d515fbba6344dc286b74bad145beb6779a2b5c78ea7e96c3a283ba443492d485a632e889fda834e496
 AUX 1.4-doc.patch 526 BLAKE2B 907c7a978d1906e4e647440b2dfc3602aa46ff8ba87010c215845070f5f221a6ae505dc428cd408ba80890db383f726f6762d01b5312609397a67cb5b4883c89 SHA512 9e9d48b51264c5d91ef3536630dee112001dd7b2e55a7a3024165f3249efe187b0a77a5fd5b12858c33c3c1171c5f2fe72c4eaf76ddc2d9a7d17b593396cb63d
 AUX 1.4-opengl.patch 2304 BLAKE2B e604cded6b4e1f3fcd0f4bc5e05d5dc1ec1870c6c70ea54f142cb2148610eba6863e1be8507bffcf38cae373b8cdfb6243f873325a00a5a38d7f5af895daad5f SHA512 9ef41aff50c7676ef1f2cd9ab6ffe966ee0761cfc748078d76f46d5f2f40107fac9717ebbe93713a8a7196cc23179b3bf4ec9904be80434d2958e133aea990c6
 DIST sg-1.5.tar.gz 2859299 BLAKE2B f1c2f1a10f73e719a531f80971114a3175e20863aea1d864a142cfbea8d6212801719ca4f727825aa1e54d3c26f202edde61b1ec126e61fad0ed260900320116 SHA512 0e1f931b51e7bdecedc1bb17275d87e7549abf3d4d9eff6daf74cbc97ad1bea94b256fe4accfe27bd0a67f0637bb0d3b363d748f57edd73e07e922d2ea6e24c0
-EBUILD sg-1.5.ebuild 1688 BLAKE2B b7beb7d1ea84c9d0c3abada01807dc4b860b1da49875f0103fc76c80aa7c22dab6dc5ee1d413fac3282fb4ec4011facecb4ac2ce09c25081f5bd25250b42432b SHA512 9bbca854f7d7a078c2bc02fefd8647568445b4b4a1b5859a8aff4e95360f26c5c36410182b552e1b991ec8e20751525d9544d72fbc4995a0ec09f2b2e9135863
+EBUILD sg-1.5.ebuild 1603 BLAKE2B ef185b090e675d826e58de24b8ab04ab56f731113e6cb5985b60229d45216115d90dcc97f5c1cb9d05c1749f709e26ab830383e16333d0c06ef748dc410d55c8 SHA512 27d40f7429a973d5d41a53e0861f0a7c46113aff28d9ceb30f55e279dbe6d2f8e0d3e52c125f1f8c06a259ebf2d3476bfa36bd2a85b3b682e890e94344ef6ecc
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
new file mode 100644
index 000000000000..f57b6110593f
--- /dev/null
+++ b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@
+ dnl 0. autoconf initialization
+ AC_INIT(sg, 1.0, mholst@math.ucsd.edu)
+ AC_CONFIG_SRCDIR(src/ogl/sg/ogl.h)
+-AM_CONFIG_HEADER(src/aaa_inc/sgcf.h)
++AC_CONFIG_HEADERS(src/aaa_inc/sgcf.h)
+ AC_CONFIG_AUX_DIR(config)
+ AC_PREFIX_DEFAULT(${HOME})
+ AC_CANONICAL_BUILD
diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
index ba5e44642aa6..a172a6b00e68 100644
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@@ -1,57 +1,52 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Socket Graphics tool for displaying polygons"
 HOMEPAGE="http://fetk.org/codes/sg/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-libs/maloc
+	media-libs/mesa[X(+)]
 	virtual/glu
+	x11-libs/libGLw
 	x11-libs/libXaw
-	x11-libs/motif
-	|| (
-		( media-libs/mesa[X(+)] x11-libs/libGLw )
-		media-libs/opengl-apple
-		)"
-DEPEND="
-	${RDEPEND}
+	x11-libs/motif"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
-		media-gfx/graphviz
 		app-doc/doxygen
-		)"
+		media-gfx/graphviz
+	)"
 
 S="${WORKDIR}"/${PN}
 
 PATCHES=(
 	"${FILESDIR}"/1.4-opengl.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+	"${FILESDIR}"/1.4-AC_CONFIG_HEADERS.patch
+)
 
 src_prepare() {
-	rm src/{gl,glu,glw} -rf || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
+	default
+	rm -r src/{gl,glu,glw} || die
+
+	eautoreconf
 }
 
 src_configure() {
-	local sg_include
-	local sg_lib
-	local myeconfargs
+	local sg_include="${EPREFIX}"/usr/include
+	local sg_lib="${EPREFIX}"/usr/$(get_libdir)
 
-	sg_include="${EPREFIX}"/usr/include
-	sg_lib="${EPREFIX}"/usr/$(get_libdir)
 	export FETK_LIBRARY="${sg_lib}"
 	export FETK_MOTIF_LIBRARY="${sg_lib}"
 	export FETK_GL_LIBRARY="${sg_lib}"
@@ -63,13 +58,19 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"
 
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--enable-glforce \
+		--enable-gluforce \
+		--enable-glwforce \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen "") \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot "")
+}
 
-	myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce )
+src_install() {
+	default
 
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-	)
-	autotools-utils_src_configure
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 8ee38b32466a..24f37a18f853 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -3,6 +3,6 @@ AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067c
 AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-EBUILD shaderc-2018.0.ebuild 1978 BLAKE2B f85b80ca81fa6ef8206a75525063c2e574498290b607e40f4bf98ac9c6dd09f6ca770ec56d83ac86f43c02ad9ff4411569b36f6c2ee2fab4d52a29f2885dbe0f SHA512 994a1b17f26fca6767f4ce3fe1779895955a8e8a4d48c51c78eec352314c238fa98a5145746e31e787618831551caf7d7145f40f6bb941493207c0fdcc87fc5a
+EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
 EBUILD shaderc-2019.0-r1.ebuild 2085 BLAKE2B 92c60e5103ec3bb8eb3a40be7b8de11b7ae1045dec1f1d10f762d503ddb4913852538e43746dc9e9376f76f1795e4d93d3508779a4462b39df1604212af67d82 SHA512 8387bbfc8e76865bc19de3c926f33f5005c50e24bfd9e09bee0801970fe63d349e37c4c4821128a7730037424c470185d21bcd16ab31b446202f4e6b8f1f7469
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index 93d43a06d61e..991a67e2d50b 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 76797e728faa..53661b45d52c 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,5 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
 DIST sratom-0.6.4.tar.bz2 339707 BLAKE2B acf29c7dd3c4e23bf20ef2811706abdd3543d0fc380183f7f419932c3178ff5e2f6d95c57bad2ef991dbc1e32c6e8a3645238c7b42dfd204942dbc4c05270652 SHA512 6462d8d33ed7ddaa2aea267fab14c9a15bfc077a4f8d26eb493be4c48c95d8dcec614f540bd82fe22aecca641771326a44d175c3991cd473ae371062c78aaac3
-EBUILD sratom-0.6.0-r1.ebuild 1235 BLAKE2B c5ee8d18a0807d2a834642e2b299adadfe4592f2a4ff46e1b6b1607b8ede839c1a51ca6d0fd2c1e914909d7aae18aa30b27f9d815a57ae4ba97f8c9b759a6c2c SHA512 c857efc7c30ae8a6743531af26cc58f6c27a9b205722e5e5fcf253c64cf8389ee6d45fec3e4e09ac65f708f65131224a5ff43daa87162d3ef456900886b82025
+EBUILD sratom-0.6.0-r1.ebuild 1229 BLAKE2B 0cad234a27e8f85563694ce027e73c21825e756d2f1271616826e1b40a56812c101fb3cb753a2502e1e57715858105d5603726fc537fcb1e01b3fa2973469d92 SHA512 17e73a301c2a4de39002470101d1ea96869eed8d063d120c6df24c369abdb5d943f3750868aa65c1596a4f05ce814515914f4b267453497645bb4bc9ddf76e13
 EBUILD sratom-0.6.4.ebuild 1231 BLAKE2B 02fac949c96cae12f35a8ebb8ec4e8b47b6799a9670d6c873ce851110f558503c9827fdecae0e4188c1db65f131baa464b712fe8b12bdc47c6070aefd614c239 SHA512 dae3c0d80f46ab812eecc2ecd0801d2625bc9b8eb32e49b19f23a689b1b7838acad04f4962354364662f2e3d024500e2a3be10a60044eae6956366da68b2dbd4
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index 4160b0476a5b..d9a4052de6c5 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 9e8c0c4cb815..1b46be9e2cf1 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,6 +1,6 @@
 AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a096a6a4068b03139ec8b1d1c13097a1309265d53545109ae3a74f81e9b9bb32fefd73b69157037f76f470839b657bfdce10fea3c22 SHA512 7584c52c5e61c1bc8770bd776abe78a43d6a8f6ffcba1f4411c7674766d36220a38051eebd12515fe8d7db2b958d05c38f6940f676ca3aa0041321e81afdd5f4
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
-DIST stk-4.5.1.tar.gz 2413113 BLAKE2B 5eedf936f26acd3e2f377a198b252ee36bcdbb642f0649c0db6c453beb670a1fc725c94af78ff3e075f50068ae6927b628de0174dba598191ed9f9d2f074c17c SHA512 c4c05edfb49b269d5d2518c06abad8e636c4f67a8598f5a03d406bbef04b8b3315d2592d35c8742ce9163b52215ac87b6349c0012e271a43707d109175b6d336
-EBUILD stk-4.5.1-r1.ebuild 1286 BLAKE2B 68b49ce06ced817767f6565c3c1f2be47ae32967576280943787f75ffd5778feb8160d79c408a550bf691cae88f8ec4c0998254ef053be4cbb65681d3844cf26 SHA512 357e91ef7db68ba8b9a27eb28581aa15c3341633bad1ed3a4769daa8a5a8cb23b401a7b8edabfeebca225ba58ce52beadfdb3305694de846aaf8d8032032ab90
+DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
+EBUILD stk-4.6.1.ebuild 1364 BLAKE2B b998c93647a5f0b2d257cfb25def730c496ef0492fa374247160d4f5b5119e63f2feb225aa5c08894e0feefa950851ea23603dadc465f726dfeff3e083867eed SHA512 066d65a7f2cca336977b68d0f1d36caafc0d95284e08e2c01a404f4c944178a6310b0544f25f011b496d933d4871c98ee514a89f2b670485108774e94369f646
 MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012
diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
index d1f5900803f5..12eb50caa5f9 100644
--- a/media-libs/stk/stk-4.5.1-r1.ebuild
+++ b/media-libs/stk/stk-4.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,14 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug doc jack oss static-libs"
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	dev-lang/perl"
 
 PATCHES=(
-	"${FILESDIR}/${P}"
+	"${FILESDIR}/${PN}-4.5.1"
+)
+
+HTML_DOCS=(
+	doc/html/.
 )
 
 src_prepare() {
@@ -55,7 +61,8 @@ src_install() {
 	dodoc README.md
 
 	# install the lib
-	dolib src/libstk*
+	dolib.so src/libstk*
+	use static-libs && dolib.a src/libstk*
 
 	# install headers
 	insinto /usr/include/stk
@@ -67,6 +74,6 @@ src_install() {
 
 	# install docs
 	if use doc; then
-		dohtml -r doc/html/*
+		einstalldocs
 	fi
 }
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 445efa9bd829..9c3252f21850 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,6 @@
+AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
+EBUILD waffle-1.6.0-r1.ebuild 1796 BLAKE2B 3d6601f814a0c71838a2733769800b6ebfe490896f4c5331364890dea90451200c8b952699015128e54595c6c1703dcca5cda97d0fd38a066dbf486d8eb2ccd5 SHA512 370c761329baef7d8d8f40717debcec65f354aedf61706e69d0597918a4793e18a884008fb6fc1bfa91186715c519f4acc0de4c53e679f4f3c2cd2425c56f5ce
 EBUILD waffle-1.6.0.ebuild 1644 BLAKE2B df24a6ba36c9cde52116a594f6eda58dde0b04dd7e631ce9b289047fe1ec0e8ee5e25be3386006b8fc6add1bc46fa7eaf0d9d84fab7dee2ed774cf89e0b86b6d SHA512 b85123a6a8cc4fdeb19ccc96b783c4f4828b4f51ccc02177f06db67b1489168c5d2bf19f1dd7816e82ac917a2e3a8dae0a6565a491dd177b43ccb6adce16ff28
-EBUILD waffle-9999.ebuild 1647 BLAKE2B bd565769059852f4a15c9f3362177c6307d8231a45abac074bfbbd2a2909c4a24db5935691303bfe32edd2d556391ebcae913ad19fe29fbb184067a54a1868ae SHA512 45fc09985650274ab570a65c5a221760435ce1007ad911fced36f3cd13aba650c7c9fef2525606e57ce275af9aeb0744a0a349fcde77c536e1c34f419e197a64
+EBUILD waffle-9999.ebuild 1704 BLAKE2B 3228a268c601d962eefcf2763e058faba1941e5892884d0add3c3eac68931671a30c3ad4d002e114d28b2377cdc4ffba05fd7c6d6c41a14335e10981ca66bdaf SHA512 b772a268634d57a47a6859bfb2603df98a09dfe883e41b02d3946968a0fc623d95741188135b7965c047c2448b32ea3ee7fad8cb4e6c61b522ad69e44533ad9f
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
new file mode 100644
index 000000000000..ef31275de08e
--- /dev/null
+++ b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
@@ -0,0 +1,87 @@
+From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
+From: Dylan Baker <dylan@pnwbakers.com>
+Date: Fri, 7 Jun 2019 15:36:09 -0700
+Subject: [PATCH] meson: Generate cmake config and version files if meson is
+ new enough
+
+Meson 0.50.0 added a module similar to the pkg-config module for
+generating cmake config files. Since the CMake build system provides
+these the meson build system should as well.
+
+v2: - Bump version to 0.50 instead of incorrect 0.49
+v3: - remove TODO comment that this fixes
+    - Add a definition of set_and_check for meson-generated Config
+      files.
+
+Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
+---
+ cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++
+ meson.build                         |  2 --
+ src/waffle/meson.build              | 20 ++++++++++++++++++++
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in
+index b60b470..4e19755 100644
+--- a/cmake/Modules/WaffleConfig.cmake.in
++++ b/cmake/Modules/WaffleConfig.cmake.in
+@@ -7,6 +7,16 @@
+ 
+ @PACKAGE_INIT@
+ 
++# This should only be used for meson
++if (NOT DEFINED set_and_check)
++    macro(set_and_check _var _file)
++        set(${_var} "${_file}")
++        if(NOT EXISTS "${_file}")
++            message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
++        endif()
++    endmacro()
++endif()
++
+ set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
+ set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(Waffle_LIBRARIES "@waffle_libname@")
+diff --git a/meson.build b/meson.build
+index 29fda22..22b7f59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -231,5 +231,3 @@ endif
+ if get_option('build-examples')
+   subdir('examples')
+ endif
+-
+-# TODO:  CMake config file
+diff --git a/src/waffle/meson.build b/src/waffle/meson.build
+index 322df40..cd68ddf 100644
+--- a/src/waffle/meson.build
++++ b/src/waffle/meson.build
+@@ -211,6 +211,26 @@ pkg.generate(
+   description : 'A library for selecting an OpenGL API and windows system at runtime.',
+ )
+ 
++if meson.version().version_compare('>= 0.50')
++  cmake = import('cmake')
++  cmake.write_basic_package_version_file(
++    name : 'Waffle',
++    version : meson.project_version(),
++    compatibility : 'SameMajorVersion',
++  )
++
++  cmake_conf = configuration_data()
++  cmake_conf.set('waffle_libname', waffle_name)
++  cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
++  cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
++
++  cmake.configure_package_config_file(
++    name : 'Waffle',
++    input : '../../cmake/Modules/WaffleConfig.cmake.in',
++    configuration : cmake_conf,
++  )
++endif
++
+ if get_option('build-tests')
+   if get_option('default_library') == 'shared'
+     # The unit tests need to poke at internals of the library, but with a
+-- 
+2.24.1
+
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild b/media-libs/waffle/waffle-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2f9c6de8b559
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd:4.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		$(meson_use test build-tests)
+		$(meson_use doc build-manpages)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	rm -rf "${D}"/usr/share/doc/waffle1
+}
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 56a48b843787..f088ab0aa6d5 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
 src_unpack() {
 	default
 	[[ $PV = 9999* ]] && git-r3_src_unpack
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /media-libs
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)