gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-libs
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
128 files changed, 2578 insertions, 3861 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index d3e127c08efc..5f5addf1fba3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alure/Manifest b/media-libs/alure/Manifest
index e63bae398dbc..70e57d4052d0 100644
--- a/media-libs/alure/Manifest
+++ b/media-libs/alure/Manifest
@@ -1,4 +1,4 @@
 AUX alure-1.2-include-unistd.patch 192 BLAKE2B 61cfebb2c2f8d2ea0e228d81f37d25b6b59445711658a04e7e85c20624099aeb86c065e6d7ab4f3cdc65b5ba35248cde4c93104c971fd008c1aba19de259bd9f SHA512 ebb1f841ea28f7e7690f1cdf6991af6bd97486473b63ffd11d79b05d66faf44b8ee590e45b0b1ede69af99a3f817103e8e444885834defd4ccbc76e2104649e8
 DIST alure-1.2.tar.bz2 65210 BLAKE2B 6e99e5bb56c96db27b2ab5ff67c98406636e5b1fc9e446356234c332edf0a4c167707068edf380f99a3744cf0f26a76c1c0325401977d1b3fe8bc989c4a1129c SHA512 f1a2dbbe6870c9d34da724e49cad993cabdca393482bf6476adc925ba5da2a34dc26d86e612e6ed829183c6df595d46921766f46063d0d478ddb18deeb8878a6
-EBUILD alure-1.2-r1.ebuild 1254 BLAKE2B bf1a4035126449eeb8390509048ae23ada7f73cf8436abcb3a2837f4cf11fc17feb5779880472cc331c230af85bd343974ffc87770660e3d86b5e3f066e9f525 SHA512 1c90e9f3954c9b22ad076bfc513dd8a94930f92f047ac281a91b1a554ec55c4623623aa5b10564ff42085d867848d24f48b7137d961efbdc93817a95700bd745
+EBUILD alure-1.2-r1.ebuild 1251 BLAKE2B a1d6f681ddd0e4edda102ebfe432e4f1accf9bb412a3b1ccdc5eebf4f1ffb306181701c12d36c4564aa0862c627c21271ad4de135c86010e1f8fc4185f351309 SHA512 98deededfc7f498775cdac04d0aef32254a14431f1b0e1b6b58251d19826a922ade85cd502b8f119a71222721a45207076a618a03bf9a7bb9cceb6b4e1f32d9f
 MISC metadata.xml 440 BLAKE2B dbe7f0e580e3b0c1b28237654dc06f8c3945ddc42ec690a254add4f5d2855fd1e60d0cfc91cf9ed62c6edd39bfdf9d2d75e3fc7fb6cbdfae3bac1e7e07026f3f SHA512 5b6106088e98c6676d01e02b99a93dc661eb24909ee8aa235e9506c18175fbac7d765c05ce95dbe085c8aa772d45a4f8f717657f281694f40ddc10dd83f1e58e
diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
index 2aefcc7885f3..24092bba44b6 100644
--- a/media-libs/alure/alure-1.2-r1.ebuild
+++ b/media-libs/alure/alure-1.2-r1.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils eutils
+EAPI=7
+
+inherit cmake-utils
 
 DESCRIPTION="The OpenAL Utility Toolkit"
-HOMEPAGE="http://kcat.strangesoft.net/alure.html"
-SRC_URI="http://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
+HOMEPAGE="https://kcat.strangesoft.net/alure.html"
+SRC_URI="https://kcat.strangesoft.net/alure-releases/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="dumb examples flac fluidsynth mp3 sndfile static-libs vorbis"
 
-RDEPEND=">=media-libs/openal-1.1
+RDEPEND="
+	>=media-libs/openal-1.1
 	dumb? ( media-libs/dumb )
 	flac? ( media-libs/flac )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.1 )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.1:= )
 	mp3? ( media-sound/mpg123 )
 	sndfile? ( media-libs/libsndfile )
 	vorbis? ( media-libs/libvorbis )"
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 2117f247e5f1..c267440651c0 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,15 +1,16 @@
-AUX babl-0.1.48-configure-cflags.patch 672 BLAKE2B 42cc735f6191ae71da8f8c884a0d218deaedd5fddf3c3d91d17c85bb77bf2dc847f2998e27bf1aa9e55b33a6b0ab80e0870586ae0c57b419c8b56e8489a40c12 SHA512 5a17a4322b7a8526e8a1b3e48dfb16eef8a5af05540960859b9463efeba29e63b40c0de5e62ed79d420cad1810867aaba1798c9afecab738086be7ee7ad0caad
 DIST babl-0.1.12.tar.bz2 642234 BLAKE2B 2e60f7bc5edd55d78e3e588c1c777e3aff6953ffb0ecb5ac91b2a1bf7019329a1ddedb8de53b77fd1c37342b607f2f9603bedfb45ceb9943051d63bb0bd364ba SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a
 DIST babl-0.1.18.tar.bz2 734225 BLAKE2B 8fc7f0c25adbde4c88fef6ef104de232f5dd074c6262a6e47f177be9362d62dc8cf30e098f3f341fe57f164383eb2fc5054d7796214464482c1ef684f09d1cbd SHA512 70cf2db7294d5744e30519ccc9bfd795c9ef4bae4425bdf8719ce0028c6bb81deca7b2c0550e98877beddc7f5d5ce71b9ba5318416dc32c3087a13d8eee42304
 DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6797a6e077de16d47239a67cc8fcb93253f54de31012cfb1622cafed2c220cba5cb3cdd9eb1599e5d11b4000f SHA512 4b55b666170322adad4b4624c98110d7a34c496f7aadb22a53c09d1ce5ae518122c2105fd2cb2a057e752fe1540beb703f8192e48e7c43601342a75db2bfdca0
 DIST babl-0.1.56.tar.bz2 673080 BLAKE2B a172819342e6982249734d2e5a0014bc9feaf882788c50c72494adac7160e9cca4b8d45411c110217b8bd8642fe46689295801f1207e54de1219be5e13a475b0 SHA512 e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
 DIST babl-0.1.58.tar.bz2 686407 BLAKE2B 89e93f9152adddd5761728e0234e0139b8e7a4611fd0b082998f34bfca6cfc155d35e3d9b66d777022948d6b46e8d6e12af739d43138139b361c63879f39f1da SHA512 4747e9432072ab786f096f18fabe307587f307369ca89ec7ece2ae8db59ea8f618a67c6c9ed93a8f21533bd91e00db05653b37b923dfee074d7c4381452324ce
 DIST babl-0.1.60.tar.bz2 685707 BLAKE2B dccbbb6974160377eb70fa32dad998ceeed6d065ba87a34c11d38e4bd2ea6a4c359f107bfe4afc0ab637fea99377d83c4669519a61fbc9e221a842d1d5375870 SHA512 a65533b4527c4334c7ab14fb16be41e3e2e93f51bbeb24dd427fa9263e25fa8ad83337b73a805bebc2414fb57bccceaa681f89ce5c5187bd0a03703bf07cccc2
+DIST babl-0.1.62.tar.bz2 698161 BLAKE2B 21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3 SHA512 4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
 EBUILD babl-0.1.12.ebuild 1340 BLAKE2B 5134dd30060cb44092b6915c3f88da469c319d760e8aff3960c36c991b1b15cb4f696fe05966cbbeaa09910a824067893fe19b853494aae34e09562101ec7161 SHA512 809652f63a16bcc6fee76a7f4d9d2f4460f9b5e79f3e3325ec368694004c1702e5bd57efc5ec5dd91bc66494080268b89d7cecc116943311bd347a32a18b9e8b
 EBUILD babl-0.1.18.ebuild 1470 BLAKE2B 5e45d86ec4e9c274c66ce2bf2829a286a08c81048c36d74e96bb5c7eb4442991a75a224747b1e4e509ff08f758a0794c95d7e8968351f190076d865c49b62828 SHA512 b07a5b88eaae36f039b3f11f729b01464075bbe383c037609784b7644799adc9f1a9a3e156c1207856b2d78f4c85d7a0e39cccb26597c6f238a2712416645634
 EBUILD babl-0.1.38.ebuild 1463 BLAKE2B 8aeb5ec689a4595cafe28fe9c7678d154f2f892b306edbe483db2c26cce220ccc24d5b8c8435aa1f687642a3f3c88180f5d7bde43f6ffcb9ca5a71c2ac5fffe6 SHA512 d79e7597bb0d5fc2670d0991964051d08dc69c090838fa36ec6b188f5062190943ebe27d01bc46fc1aedd7da24e91d7e88c976dd67e85c36887494ba0d2d677a
 EBUILD babl-0.1.56.ebuild 1537 BLAKE2B 1858b7fd4b0dd6eff9031c92150a4870b3edac208819e905ceb7635dd2ce603c0387cefb989fccca639adaa147d9d866040e437d7e70dfc11399181e8f499dda SHA512 add502c131a3691698aa68d7a2e00628675abc0e086c16ac97a1211017f18290470ba0c9044cb6266113aef45671a6bf6a474026393c8fd3eff4d87ff29d034d
 EBUILD babl-0.1.58.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
 EBUILD babl-0.1.60.ebuild 1534 BLAKE2B b02f952cde0678f29087c7356252681e5a71d2be900689e9a07fa6dd8308ee4c75d43e15dee24266805d22b0844ddb2e61e86cbc6b14347b403fa5fcb31be374 SHA512 1cca3329bcb2441790e843ce0c5864e020b1bce31b09083d53d793aeda78e9f6604abd0d35cf434a69d7d01427bd9a575e4cf59a41c0646c882225e6331fde6f
-EBUILD babl-9999.ebuild 1543 BLAKE2B 0a8626bd9b4ce836b0d8787d05000ed037d71d8923617d444f66fd88a63b7fd8ff7d9ad256ab4197793bc68e7fd66df60d6c420e246dc940bf7ab3ca5fa9317c SHA512 ba4adc9f84430a58edc165f8bfae1685324d709dc801bffbe2c321cdeff6f2d889e5af915409adc7ee242d82dc68f2b2518afb64d967a271fbf18d27917c020f
+EBUILD babl-0.1.62.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
+EBUILD babl-9999.ebuild 1545 BLAKE2B ffa68e0a1d0994f176767e2a5d4ffd30f4632685199a6a29de1aee57fec7cb16266805fadd190f2fe9f27c84bd96890b1be18cc7d9914ce6ba736c1e18cf2db8 SHA512 b3c6cb1abdfe65e7d86f1505c5d00ad0b2aef84dbbe5156a63913951452af30be13c8b339edefe831cdbd6eddd4ecb766c17cae2af75f1067d8f49bebe3ba506
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.62.ebuild b/media-libs/babl/babl-0.1.62.ebuild
new file mode 100644
index 000000000000..c6f18423b435
--- /dev/null
+++ b/media-libs/babl/babl-0.1.62.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	# Automagic rsvg support is just for website generation we do not call,
+	#     so we don't need to fix it
+	# w3m is used for dist target thus no issue for us that it is automagically
+	#     detected
+	econf \
+		--disable-docs \
+		--disable-static \
+		--disable-maintainer-mode \
+		$(use_enable altivec) \
+		$(use_enable cpu_flags_x86_f16c f16c) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable cpu_flags_x86_sse3 sse3) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index 20dfb53dae7a..c6f18423b435 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit ltprune
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -52,5 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/babl/files/babl-0.1.48-configure-cflags.patch b/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
deleted file mode 100644
index 089a82f0e00e..000000000000
--- a/media-libs/babl/files/babl-0.1.48-configure-cflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17d85b43750bc4cdfde71ab6b1d5f41acc89f2ed Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Thu, 17 May 2018 20:50:29 +0200
-Subject: [PATCH] configure.ac: No longer enforce -Ofast
-
----
- configure.ac | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 924b0df..7933ead 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -161,9 +161,6 @@ CFLAGS="$CFLAGS $extra_warnings"
- BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition')
- CFLAGS="$CFLAGS $extra_warnings"
- 
--BABL_DETECT_CFLAGS(extra_warnings, '-Ofast' )
--CFLAGS="$CFLAGS $extra_warnings"
--
- fi
- 
- AC_PATH_PROG(RSVG, rsvg-convert, no)
--- 
-2.17.0
-
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 2edc8a7d5ee2..250686393f77 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,4 +1,6 @@
 DIST dav1d-0.1.0.tar.bz2 351745 BLAKE2B 302680ddfdc8d5a3eff90541ed156e820c3322bfb93316da1b2deabeac40062103af19e99dfa810678e62ad668c4aed944ac9bf8160afb301b100063919ed2a1 SHA512 5893ad40af7c4f5c3678ecc604ad360b5d1cd3fadaa16f7183d638745097fed091aeb3456540db61a2f4f0fc8bb93f2a20f428c76a7976d3fd186cc8b8baed53
+DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a70e884c5116d8d1a56b81c1f852c93666bd0bb3f4d5105f2220bbc6c92f893848f0cf1bfc0bce1ee1f551287c SHA512 378060ed6762f9f6baf7addfa7382cb0873bbc606f0389eee4ed7537dcfc851f5b159a34af0f15d9f8d345a9b2a950f38078a419144b0458aa3464e54ea5d490
 EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
+EBUILD dav1d-0.2.0.ebuild 1128 BLAKE2B 9c2e43bdd88b165cff20d6e233ea7424c0443b5e581e12c863d1754a40dff78acfd561ce8e69622f407e5e7a24a6188fd07c0b88a287f9a361be6872faf3ccf7 SHA512 547f249b39a8d679d41b74a37d81fb6765c016e38642004d65d405689bf1f4646d9401378dc549ec6e2d872072d373e16029c43c186cf90d1e83fed6fe688286
 EBUILD dav1d-9999.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
 MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.2.0.ebuild b/media-libs/dav1d/dav1d-0.2.0.ebuild
new file mode 100644
index 000000000000..ddb669829bc1
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	asm? (
+		abi_x86_32? ( ${ASM_DEPEND} )
+		abi_x86_64? ( ${ASM_DEPEND} )
+	)"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+	local -a bits=()
+	use 8bit  && bits+=( 8 )
+	use 10bit && bits+=( 16 )
+
+	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+		build_asm=false
+	else
+		build_asm=$(usex asm true false)
+	fi
+
+	local emesonargs=(
+		-D bitdepths=$(IFS=,; echo "${bits[*]}")
+		-D build_asm=$build_asm
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8d2f7f8ff53b..c3ff24a0bff3 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,8 +2,10 @@ DIST Image-ExifTool-11.03.tar.gz 4414017 BLAKE2B 3f5abe1b6c5c43d216aa7d1774516d9
 DIST Image-ExifTool-11.10.tar.gz 4428194 BLAKE2B b1085b2b4b0054026369849aec38403a4722c61f5e703d7635c9a07d1480c651398777a6113f84fe2b59a4fd5dee5a8c0fd193afd59a5dcc8f7f5b7f9f904e5d SHA512 f8aa9a7c5ef2da0958a9f48b2238d89687b6fab9c8acd8a119fec50361e86ff09940127a6593d8a1618a7554d9adad985af6806bc44ccbf117c8854713678450
 DIST Image-ExifTool-11.23.tar.gz 4492460 BLAKE2B 64032e295f510020e340f0f230c27130230809f69aa1ea6190445b8adcd27717742a33b11d5066bfe077f1746f114c08884ccae03ccc26295ef45f0fc821890e SHA512 b2ba35c903b8108123b03faa15571bfd60ee565a894c6debfb238c6c5ed04a29366d52ec9e59d0d925f599f58ca623efec22db5b894491756901295bb2ea80f7
 DIST Image-ExifTool-11.26.tar.gz 4496603 BLAKE2B 2f6b64e99941e12ffdad48d6f8812d7a012b0ac988f3bfc94d8d262f32c423b5c2db16a9a30089bf9896be669681f6bebcf325183eadd617c3f5e806e48344fc SHA512 c924e32f3cf31e9590b61f229a426c67d2dc30d032af45d95a4f1fb6202fbc0016f988317dc839ab3c1b043d8843e89656b310dac30c2163607745429e155729
+DIST Image-ExifTool-11.29.tar.gz 4503877 BLAKE2B 9afbb695edebb1be2c673abbdf32626482c81c847610840e82ca0cb1fa83d697aeb2635ad4b62a692f09ae1effb8f2261aa3968adc35d72e82f1261db393b48a SHA512 fa9a7d28ef09dcbc52e43e1f5b938fa857d4d2b949b47b36ea259bf010637852b3aa7fe8d51bbf5ab22adc6fb67f7858f38a08c2be143f0b0139960347688a3f
 EBUILD exiftool-11.03.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
 EBUILD exiftool-11.10.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-11.23.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
 EBUILD exiftool-11.26.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
+EBUILD exiftool-11.29.ebuild 603 BLAKE2B 4e9579af5da38b82ac5a7082c56cc2db3ea1428ec732bcb31ae21cb4f11dcacaf9122674e47b27490faf5d3e5937ea8c125248b0db8ee7ee0de2e0fdd7dfa03c SHA512 3657350157c2455e887da46f72ba92e5b052195794f8bf083230b0f45d4caba7bc1dd5ef0ab2f99a8e21774a3aefdce7276973b709606559b4ec2f4a63642d30
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.29.ebuild b/media-libs/exiftool/exiftool-11.29.ebuild
new file mode 100644
index 000000000000..91d088b681d2
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.29.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+
+	insinto /usr/share/${PN}
+	doins -r fmt_files config_files arg_files
+}
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index d7061b3609f3..b763b372dec5 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,4 +1,4 @@
 AUX faad2-2.8.5-libmp4ff-shared-lib.patch 539 BLAKE2B 3ee6b86534612e6c96bc884e71559521c0ed464a66a07217caef0959eca0e2a0bdc5ef28367340d07d5ca1ab1686408b4c98c7ef718d4bcb0fa3d827c11074d3 SHA512 b5889dec7850ffcffa707a8594ef74f1e33848c22d2eb5e1a397ca57884b984633610f37f111b534724f2d8f0331e40ed90b01c9acf22c34053f740703e33fa4
 DIST faad2-2.8.8.tar.gz 1069044 BLAKE2B 3e22e695d89cce0ecb673caec73dd3115b2249d18daf6d0c8cf2b5cc90086889c9da733e037bc8b58c0bdc145c66bd4218b9b5e237adb7ad1c6f0caf0d97d304 SHA512 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
-EBUILD faad2-2.8.8.ebuild 1245 BLAKE2B a4a188d6a9a80efc7c4565477079a0249d8c8e84fe68454969a684b71a26ebb1134f1473192c8df3c8c854ff2f136ce25b6b29fd2a2120614028f53da517d98d SHA512 99aec1c0d40ba306e2780a5b96e4408db1dd0e0676fea4572639cf26157f3972082dd40b19778d8173ae317fea74ac8bcd9a06912ec80d2b135291e87d5df7e5
+EBUILD faad2-2.8.8.ebuild 1243 BLAKE2B 79a5ace3014765e525f86e969c789aff38620e9257b1da650cc7fbf2c9fd99cb71111fe44cee5628df49dfc4193f46e5d53f2163237d8df22d96a1ba5fc3395c SHA512 70d321880b872c1bdfe98f9aafe519116cb8a1f09f118a230607df36758d4813b7f33b9e5c565594bf3dd826136dfc9ef4e957de343802574c155ed02879d832
 MISC metadata.xml 619 BLAKE2B 3eb4a78c845f019f564e15c8aecc41bac00aa7a814f761a6f6b4b5810e245c4645149defb09c998a615c8e3ba551e569373475e7dd8ebb5f8656e6ac6b2992dc SHA512 b62370a9ce905bb0e96001422baee1b75af853080d9ef795148e56ed8c2b8dca9c7eae3a3ff29869dac4e9af5835327649eafa20bc7831b14bec07cb901960fd
diff --git a/media-libs/faad2/faad2-2.8.8.ebuild b/media-libs/faad2/faad2-2.8.8.ebuild
index 6c2bf827e555..71287ad16ea8 100644
--- a/media-libs/faad2/faad2-2.8.8.ebuild
+++ b/media-libs/faad2/faad2-2.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools multilib-minimal
 
 DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="http://www.audiocoding.com/faad2.html"
+HOMEPAGE="https://www.audiocoding.com/faad2.html"
 SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 6e2a86b67c25..811898798b73 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,9 +1,13 @@
 AUX freetype-2.4.11-sizeof-types.patch 1041 BLAKE2B dce55cf1b31d426bb5a59aee20681e1e15ec24ee4468627e3e4f19f3a8fcd2ea89402292db24efffae3a3a0293c929f5e06bac3c87e6762d380b74d68a7ef71a SHA512 0774b7b769d332cbd0e674fad545d1c2b816947188725a7528d749c6311b84bbdc7f8c1a1f2cc947c405f16e8a92e394d77094aad98a6468f154fdedacec0ecc
 AUX freetype-2.7-enable-valid.patch 533 BLAKE2B 64449eceea9c394ee4a0e2dfb1722c95950561003d3d5ae894b4a571614d8ac6b89a895f883e90ed7d4bdbd225d26bb4a09e49e2b93c4354b8acf1358bb1b067 SHA512 bb8caa36cbd941a24347c761e0110f21aad3f783aab7507de831cdde1d2e83032cbca58ccedac94ce2f5233921a63436fc799f0dd615f21009f7f309d15c6863
+DIST freetype-2.10.0.tar.bz2 2743740 BLAKE2B def3e6393a4a26cd063df1cdfa676677547a9f68a95b8f246c79a7ff88d3da842b214770cd60e359d42692d6c002ba4effab03905034aa67a841af4c5d7a7157 SHA512 dfad66f419ea9577f09932e0730c0c887bdcbdbc8152fa7477a0c39d69a5b68476761deed6864ddcc5cf18d100a7a3f728049768e24afcb04b1a74b25b6acf7e
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
+DIST freetype-doc-2.10.0.tar.bz2 2130601 BLAKE2B 7814b8ad53343dc72f0b11b29224f9755686e504d099c53b76faefd9b38d207222c092ea549b25c7842956f13067a09cce460d33cfff1aace537f0044df627ac SHA512 e0902983030b7b67443ca88f29a8bb72662de706ddff81309c66b6738b26c5d11dbd00eb75795851ddcd9f93ce05981623884afad096c0defd08bd544f5266d6
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
+DIST ft2demos-2.10.0.tar.bz2 237599 BLAKE2B 722e586f412059b8b29a26c832037a860dc1b26afed85b8b0aa5fc71245293f45d19b379c54993f64ba4b8de329799834656d00fc4b6f6610ddd0b08cfd05449 SHA512 d48cbabd5cc673e0af2e0c4056dba95cee8e08092f881958c6908ea2d4da7104ca81b701d47a17640ac36cbdfd8aa274cc26353bb43f026f55c00d565f2ad641
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
+EBUILD freetype-2.10.0.ebuild 6744 BLAKE2B 196ffa36d501ddc9e39d767520dd9737b5ee735c838922e89a1fb1940175f1d7a95637c0cd88a641e59f21908c1ee8656c829c70b0223f67bda74eabc976425f SHA512 426bbf8dce36e13dbfa441f3869945e3a6ce6b5a6ba53ef1b1f78420e4c626e1d10a8dd1c8d37a400799e9fec05aacb8a3a45dfdc734a15609b17cdfd61d3f90
 EBUILD freetype-2.9.1-r3.ebuild 6690 BLAKE2B bf817875d28b6361d8916bf998e7e05e26301a858319a49b1c6c1f1bc2de723c138d897d6819d13377893cabcb0d3a0731ed305937cb655f6e0da49566f705cf SHA512 3583bc9bca21c740741b4a6e7d7d28402505f655482c0e0c8b14d55410a8f80f3f2781dfc1d0a95567c9d4f40a70846bfe58e994a3fcb44250385bb8124252a9
 EBUILD freetype-2.9.1-r4.ebuild 6702 BLAKE2B af94a4761e7915ac7fe330cfb8af45f9b162943675436af49ef22791b5da6519c344dc29784b5a0dde548de845b04c55328d21410ce05488f6a02d8133fa5983 SHA512 b4168030a91cd30cb9490268c28123b15e803847e35bb1abf7a728e7b90c02e800d6b2a2c176d31383700dc6dd829cc517eafe74cd6d5c4f53d008bf73c58709
-EBUILD freetype-9999.ebuild 6726 BLAKE2B c24d216a00ba8c3a6826254d9f58b31aba7b9f21a4dd01aadb5f7059d9656e64d8f66d7159b0b774161b6d4022a9d21acd5731e84d82ab1cb8336896caa1ba36 SHA512 daa0fdd6ac35dd6f34b84079f34525a48716ba6c2c860cd557e98ecb00274a5f90158a18dac3ed93c807d282c9a8e81b1087837c89dddea2cad1eeab67bfeb18
+EBUILD freetype-9999.ebuild 6744 BLAKE2B 196ffa36d501ddc9e39d767520dd9737b5ee735c838922e89a1fb1940175f1d7a95637c0cd88a641e59f21908c1ee8656c829c70b0223f67bda74eabc976425f SHA512 426bbf8dce36e13dbfa441f3869945e3a6ce6b5a6ba53ef1b1f78420e4c626e1d10a8dd1c8d37a400799e9fec05aacb8a3a45dfdc734a15609b17cdfd61d3f90
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.10.0.ebuild b/media-libs/freetype/freetype-2.10.0.ebuild
new file mode 100644
index 000000000000..2563974f72bf
--- /dev/null
+++ b/media-libs/freetype/freetype-2.10.0.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+		mirror://nongnu/freetype/${P/_/}.tar.bz2
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_unpack() {
+	_egit_repo_handler ${EBUILD_PHASE}
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# inspired by shipped autogen.sh script
+		eval $(sed -nf version.sed include/freetype/freetype.h)
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		eautoheader() { return 0 ; }
+		AT_M4DIR="." eautoreconf
+		unset freetype_major freetype_minor freetype_patch
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	# This is the same as the 01 patch from infinality
+	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		dodir /usr/bin #654780
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index e9f895c9ce0b..2563974f72bf 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
@@ -26,7 +26,8 @@ LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -37,8 +38,10 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
@@ -71,11 +74,11 @@ _egit_repo_handler() {
 }
 
 src_fetch() {
-	_egit_repo_handler fetch
+	_egit_repo_handler ${EBUILD_PHASE}
 }
 
 src_unpack() {
-	_egit_repo_handler unpack
+	_egit_repo_handler ${EBUILD_PHASE}
 }
 
 src_prepare() {
@@ -207,7 +210,7 @@ multilib_src_install() {
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
 			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${ED%/}"/usr/bin || die
+				"${ED}"/usr/bin || die
 		done
 	fi
 }
@@ -219,8 +222,8 @@ multilib_src_install_all() {
 		local header
 		find src/truetype include/freetype/internal -name '*.h' | \
 		while read header; do
-			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 		done
 	fi
 
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 2b22cbe34be8..eab197b4d7cb 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,4 +1,11 @@
 AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
+AUX gd-2.2.5-CVE-2018-5711.patch 3225 BLAKE2B f3e22fa172bb6d07a7bc1da59e25efed81afca5c65cf9dd20b1df286f11eee95be2e61fd094c2c568ec2c940372677553f4c3161e149c1ec294f90f35c3d3832 SHA512 4c8d756079cf4a5c856516ad3ad76c3913c26c3762064e564fd159a0f0b7c2d510f9e83353f89227238dbdb674e82e33ee6121a39a54222c6d67f1b8111a9d14
+AUX gd-2.2.5-CVE-2019-6977.patch 1167 BLAKE2B 7ec6fbd6c7a4841915d968558e8f8c647b873ece655e884661af1afe5732df66520de7b0c096c0faac5af57764fd0a8c6e9e83af155d93c3db74636944ff15d7 SHA512 5214ac4148c618f3fef3bb3b6675e41a76e31465cd8dac326ee99dc1ae4cfe760749997d2941743efa48e79b8dbdb536d6b6d79d9bc4e5363f2c50da52ab5cac
+AUX gd-2.2.5-CVE-2019-6978.patch 7852 BLAKE2B 2d9ced220950994fe3977c0ddbb3bf234fbc0912515ee1eb7e6f98510aabd4163b33ac4f0ccd4336538b20c27dea4f625a3e56ec865fe4bce610f7382415db42 SHA512 2a890d8b0c923e59b3d1b054f92999a48d7fa7065f64fdecc7bf80f719e5e10150a34549059a8edf13fba45c76c68be3ca698f38be0411cb2b9978daa2db3899
+AUX gd-2.2.5-ossfuzz5700.patch 2680 BLAKE2B 55beecdf63e280ab54b83b214d704bccc83a6779b650b4b6f31b3d6989deadaa179d4e733f0b07a4ee8aac5be043879619924ed21c0b6ede300b804783aded31 SHA512 cfac2479729105a9ed0200191b9e9a47e3e1962d4d9b0f811bc94006a79e9ac08ddb6ed424f60e8626c44e7316f0c1747de49e26890d5b454c8206fa22a65530
+DIST libgd-2.2.5-ossfuzz5700.dat 30 BLAKE2B 5ddd3d2be2adf05e1e2eb1852cc689be57d4d77c57b471e8b6021877f2fb137d15b4c73445fbb23a9ed585974a96dd154759a48712c1e7b5bdc5750d534aee4a SHA512 2394e92ff7a42c818e13a1ac9ad15bc81aa401adc917366ec8c440bb7f27a63777ab059aa03c501dafef0ac16b462dd23c7fb9f8086ce558203384a98a235fff
+DIST libgd-2.2.5-php_bug_75571.dat 1731 BLAKE2B 4b5d3f258b73e8089ede1b2c9f538855f410965a9e01e1f3f151ae52f072036172b184bd1a4d07b8355bb974bf088bebb0e812175a277bb67926274272bd80a0 SHA512 b3048640ce7828cca7901fadc989e867cfc6d31b44c0f5a1bda54d7428f317c8c8fc6403fef301e193869a95eb46eb7195d47710ec7f8c507ba049cb6cdcb281
 DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
 EBUILD gd-2.2.5-r1.ebuild 2098 BLAKE2B 618b894c17512da414cafcb7c483519d115567f64069e0aef6773eee7cdeedc488f328956f7ef58dec5a366d43a6fee969a882a013bb8debd7c8cf9da34279e6 SHA512 a26a8fc9d231d5d2acf7093f415e3b2431e79739f7b96be0067fe36610754357f6ca997c6cf05648ec47919dd7a01e620c77b1d985e1694b2360e1ab89e74671
+EBUILD gd-2.2.5-r2.ebuild 3145 BLAKE2B eadfeeb142f10d6f9abaf02fe6cd8cd14c3540733256277e051d5b4c1922b99a2a4a22521f902211667bf8d1ad47153c82915c3772fa5d747696b39f44ea8ea4 SHA512 e784f73fb4af49dd9c50b35e178cd7e43cf4d2524e97d8a3b173a268ecec6f7c5c63c4a7e734a1aa07a176a3490f2bad147667b211e39a7bdd5e01d8db019402
 MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch b/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch
new file mode 100644
index 000000000000..6d9de06998a4
--- /dev/null
+++ b/media-libs/gd/files/gd-2.2.5-CVE-2018-5711.patch
@@ -0,0 +1,124 @@
+From a11f47475e6443b7f32d21f2271f28f417e2ac04 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Wed, 29 Nov 2017 19:37:38 +0100
+Subject: [PATCH] Fix #420: Potential infinite loop in gdImageCreateFromGifCtx
+
+Due to a signedness confusion in `GetCode_` a corrupt GIF file can
+trigger an infinite loop.  Furthermore we make sure that a GIF without
+any palette entries is treated as invalid *after* open palette entries
+have been removed.
+
+CVE-2018-5711
+
+See also https://bugs.php.net/bug.php?id=75571.
+---
+ src/gd_gif_in.c             |  12 ++++++------
+ tests/gif/CMakeLists.txt    |   1 +
+ tests/gif/Makemodule.am     |   2 ++
+ tests/gif/php_bug_75571.c   |  28 ++++++++++++++++++++++++++++
+ tests/gif/php_bug_75571.gif | Bin 0 -> 1731 bytes
+ 6 files changed, 38 insertions(+), 6 deletions(-)
+ create mode 100644 tests/gif/php_bug_75571.c
+
+diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
+index daf26e79..0a8bd717 100644
+--- a/src/gd_gif_in.c
++++ b/src/gd_gif_in.c
+@@ -335,11 +335,6 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
+ 		return 0;
+ 	}
+ 
+-	if(!im->colorsTotal) {
+-		gdImageDestroy(im);
+-		return 0;
+-	}
+-
+ 	/* Check for open colors at the end, so
+ 	 * we can reduce colorsTotal and ultimately
+ 	 * BitsPerPixel */
+@@ -351,6 +346,11 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGifCtx(gdIOCtxPtr fd)
+ 		}
+ 	}
+ 
++	if(!im->colorsTotal) {
++		gdImageDestroy(im);
++		return 0;
++	}
++
+ 	return im;
+ }
+ 
+@@ -447,7 +447,7 @@ static int
+ GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
+ {
+ 	int i, j, ret;
+-	unsigned char count;
++	int count;
+ 
+ 	if(flag) {
+ 		scd->curbit = 0;
+diff --git a/tests/gif/CMakeLists.txt b/tests/gif/CMakeLists.txt
+index 2b73749e..e58e6b09 100644
+--- a/tests/gif/CMakeLists.txt
++++ b/tests/gif/CMakeLists.txt
+@@ -4,6 +4,7 @@ LIST(APPEND TESTS_FILES
+ 	bug00227
+ 	gif_null
+ 	ossfuzz5700
++	php_bug_75571
+ 	uninitialized_memory_read
+ )
+ 
+diff --git a/tests/gif/Makemodule.am b/tests/gif/Makemodule.am
+index 3199438f..5dbeac53 100644
+--- a/tests/gif/Makemodule.am
++++ b/tests/gif/Makemodule.am
+@@ -4,6 +4,7 @@ libgd_test_programs += \
+ 	gif/bug00227 \
+ 	gif/gif_null \
+ 	gif/ossfuzz5700 \
++	gif/php_bug_75571 \
+ 	gif/uninitialized_memory_read
+ 
+ if HAVE_LIBPNG
+@@ -26,4 +27,5 @@ EXTRA_DIST += \
+ 	gif/bug00066.gif \
+ 	gif/bug00066_exp.png \
+ 	gif/ossfuzz5700.gif \
++	gif/php_bug_75571.gif \
+ 	gif/unitialized_memory_read.gif
+diff --git a/tests/gif/php_bug_75571.c b/tests/gif/php_bug_75571.c
+new file mode 100644
+index 00000000..d4fae3ae
+--- /dev/null
++++ b/tests/gif/php_bug_75571.c
+@@ -0,0 +1,28 @@
++/**
++ * Test that GIF reading does not loop infinitely
++ * 
++ * We are reading a crafted GIF image which has been truncated.  This would
++ * trigger an infinite loop formerly, but know bails out early, returning
++ * NULL from gdImageCreateFromGif().
++ *
++ * See also https://bugs.php.net/bug.php?id=75571.
++ */
++
++
++#include "gd.h"
++#include "gdtest.h"
++
++
++int main()
++{
++    gdImagePtr im;
++    FILE *fp;
++
++    fp = gdTestFileOpen2("gif", "php_bug_75571.gif");
++    gdTestAssert(fp != NULL);
++    im = gdImageCreateFromGif(fp);
++    gdTestAssert(im == NULL);
++    fclose(fp);
++
++    return gdNumFailures();
++}
+
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch b/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch
new file mode 100644
index 000000000000..0b67a596c6bc
--- /dev/null
+++ b/media-libs/gd/files/gd-2.2.5-CVE-2019-6977.patch
@@ -0,0 +1,28 @@
+Description: Heap-based buffer overflow in gdImageColorMatch
+Origin: other, https://gist.github.com/cmb69/1f36d285eb297ed326f5c821d7aafced
+Bug-PHP: https://bugs.php.net/bug.php?id=77270
+Bug-Debian: https://bugs.debian.org/920645
+Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-6977
+Forwarded: no
+Author: "Christoph M. Becker" <cmbecker69@gmx.de>
+Last-Update: 2019-02-01
+
+At least some of the image reading functions may return images which
+use color indexes greater than or equal to im->colorsTotal.  We cater
+to this by always using a buffer size which is sufficient for
+`gdMaxColors` in `gdImageColorMatch()`.
+---
+
+--- a/src/gd_color_match.c
++++ b/src/gd_color_match.c
+@@ -31,8 +31,8 @@ BGD_DECLARE(int) gdImageColorMatch (gdIm
+ 		return -4; /* At least 1 color must be allocated */
+ 	}
+ 
+-	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * im2->colorsTotal);
+-	memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
++	buf = (unsigned long *)gdMalloc(sizeof(unsigned long) * 5 * gdMaxColors);
++	memset (buf, 0, sizeof(unsigned long) * 5 * gdMaxColors );
+ 
+ 	for (x=0; x < im1->sx; x++) {
+ 		for( y=0; y<im1->sy; y++ ) {
diff --git a/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch b/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch
new file mode 100644
index 000000000000..2eb9369a0bad
--- /dev/null
+++ b/media-libs/gd/files/gd-2.2.5-CVE-2019-6978.patch
@@ -0,0 +1,278 @@
+From 553702980ae89c83f2d6e254d62cf82e204956d0 Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" <cmbecker69@gmx.de>
+Date: Thu, 17 Jan 2019 11:54:55 +0100
+Subject: [PATCH] Fix #492: Potential double-free in gdImage*Ptr()
+
+Whenever `gdImage*Ptr()` calls `gdImage*Ctx()` and the latter fails, we
+must not call `gdDPExtractData()`; otherwise a double-free would
+happen.  Since `gdImage*Ctx()` are void functions, and we can't change
+that for BC reasons, we're introducing static helpers which are used
+internally.
+
+We're adding a regression test for `gdImageJpegPtr()`, but not for
+`gdImageGifPtr()` and `gdImageWbmpPtr()` since we don't know how to
+trigger failure of the respective `gdImage*Ctx()` calls.
+
+This potential security issue has been reported by Solmaz Salimi (aka.
+Rooney).
+---
+ src/gd_gif_out.c                  | 18 +++++++++++++++---
+ src/gd_jpeg.c                     | 20 ++++++++++++++++----
+ src/gd_wbmp.c                     | 21 ++++++++++++++++++---
+ tests/jpeg/CMakeLists.txt         |  1 +
+ tests/jpeg/Makemodule.am          |  3 ++-
+ tests/jpeg/jpeg_ptr_double_free.c | 31 +++++++++++++++++++++++++++++++
+ 7 files changed, 84 insertions(+), 11 deletions(-)
+ create mode 100644 tests/jpeg/jpeg_ptr_double_free.c
+
+diff --git a/src/gd_gif_out.c b/src/gd_gif_out.c
+index 298a5812..d5a95346 100644
+--- a/src/gd_gif_out.c
++++ b/src/gd_gif_out.c
+@@ -99,6 +99,7 @@ static void char_init(GifCtx *ctx);
+ static void char_out(int c, GifCtx *ctx);
+ static void flush_char(GifCtx *ctx);
+ 
++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out);
+ 
+ 
+ 
+@@ -131,8 +132,11 @@ BGD_DECLARE(void *) gdImageGifPtr(gdImagePtr im, int *size)
+ 	void *rv;
+ 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
+ 	if (out == NULL) return NULL;
+-	gdImageGifCtx(im, out);
+-	rv = gdDPExtractData(out, size);
++	if (!_gdImageGifCtx(im, out)) {
++		rv = gdDPExtractData(out, size);
++	} else {
++		rv = NULL;
++	}
+ 	out->gd_free(out);
+ 	return rv;
+ }
+@@ -220,6 +224,12 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile)
+ 
+ */
+ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
++{
++	_gdImageGifCtx(im, out);
++}
++
++/* returns 0 on success, 1 on failure */
++static int _gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
+ {
+ 	gdImagePtr pim = 0, tim = im;
+ 	int interlace, BitsPerPixel;
+@@ -231,7 +241,7 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
+ 		based temporary image. */
+ 		pim = gdImageCreatePaletteFromTrueColor(im, 1, 256);
+ 		if(!pim) {
+-			return;
++			return 1;
+ 		}
+ 		tim = pim;
+ 	}
+@@ -247,6 +257,8 @@ BGD_DECLARE(void) gdImageGifCtx(gdImagePtr im, gdIOCtxPtr out)
+ 		/* Destroy palette based temporary image. */
+ 		gdImageDestroy(	pim);
+ 	}
++
++	return 0;
+ }
+ 
+ 
+diff --git a/src/gd_jpeg.c b/src/gd_jpeg.c
+index fc058420..96ef4302 100644
+--- a/src/gd_jpeg.c
++++ b/src/gd_jpeg.c
+@@ -117,6 +117,8 @@ static void fatal_jpeg_error(j_common_ptr cinfo)
+ 	exit(99);
+ }
+ 
++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality);
++
+ /*
+  * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality
+  * QUALITY.  If QUALITY is in the range 0-100, increasing values
+@@ -231,8 +233,11 @@ BGD_DECLARE(void *) gdImageJpegPtr(gdImagePtr im, int *size, int quality)
+ 	void *rv;
+ 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
+ 	if (out == NULL) return NULL;
+-	gdImageJpegCtx(im, out, quality);
+-	rv = gdDPExtractData(out, size);
++	if (!_gdImageJpegCtx(im, out, quality)) {
++		rv = gdDPExtractData(out, size);
++	} else {
++		rv = NULL;
++	}
+ 	out->gd_free(out);
+ 	return rv;
+ }
+@@ -253,6 +258,12 @@ void jpeg_gdIOCtx_dest(j_compress_ptr cinfo, gdIOCtx *outfile);
+ 
+ */
+ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
++{
++	_gdImageJpegCtx(im, outfile, quality);
++}
++
++/* returns 0 on success, 1 on failure */
++static int _gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
+ {
+ 	struct jpeg_compress_struct cinfo;
+ 	struct jpeg_error_mgr jerr;
+@@ -287,7 +298,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
+ 		if(row) {
+ 			gdFree(row);
+ 		}
+-		return;
++		return 1;
+ 	}
+ 
+ 	cinfo.err->emit_message = jpeg_emit_message;
+@@ -328,7 +339,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
+ 	if(row == 0) {
+ 		gd_error("gd-jpeg: error: unable to allocate JPEG row structure: gdCalloc returns NULL\n");
+ 		jpeg_destroy_compress(&cinfo);
+-		return;
++		return 1;
+ 	}
+ 
+ 	rowptr[0] = row;
+@@ -405,6 +416,7 @@ BGD_DECLARE(void) gdImageJpegCtx(gdImagePtr im, gdIOCtx *outfile, int quality)
+ 	jpeg_finish_compress(&cinfo);
+ 	jpeg_destroy_compress(&cinfo);
+ 	gdFree(row);
++	return 0;
+ }
+ 
+ 
+diff --git a/src/gd_wbmp.c b/src/gd_wbmp.c
+index f19a1c96..a49bdbec 100644
+--- a/src/gd_wbmp.c
++++ b/src/gd_wbmp.c
+@@ -88,6 +88,8 @@ int gd_getin(void *in)
+ 	return (gdGetC((gdIOCtx *)in));
+ }
+ 
++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out);
++
+ /*
+ 	Function: gdImageWBMPCtx
+ 
+@@ -100,6 +102,12 @@ int gd_getin(void *in)
+ 		out   - the stream where to write
+ */
+ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
++{
++	_gdImageWBMPCtx(image, fg, out);
++}
++
++/* returns 0 on success, 1 on failure */
++static int _gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
+ {
+ 	int x, y, pos;
+ 	Wbmp *wbmp;
+@@ -107,7 +115,7 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
+ 	/* create the WBMP */
+ 	if((wbmp = createwbmp(gdImageSX(image), gdImageSY(image), WBMP_WHITE)) == NULL) {
+ 		gd_error("Could not create WBMP\n");
+-		return;
++		return 1;
+ 	}
+ 
+ 	/* fill up the WBMP structure */
+@@ -123,11 +131,15 @@ BGD_DECLARE(void) gdImageWBMPCtx(gdImagePtr image, int fg, gdIOCtx *out)
+ 
+ 	/* write the WBMP to a gd file descriptor */
+ 	if(writewbmp(wbmp, &gd_putout, out)) {
++		freewbmp(wbmp);
+ 		gd_error("Could not save WBMP\n");
++		return 1;
+ 	}
+ 
+ 	/* des submitted this bugfix: gdFree the memory. */
+ 	freewbmp(wbmp);
++
++	return 0;
+ }
+ 
+ /*
+@@ -271,8 +283,11 @@ BGD_DECLARE(void *) gdImageWBMPPtr(gdImagePtr im, int *size, int fg)
+ 	void *rv;
+ 	gdIOCtx *out = gdNewDynamicCtx(2048, NULL);
+ 	if (out == NULL) return NULL;
+-	gdImageWBMPCtx(im, fg, out);
+-	rv = gdDPExtractData(out, size);
++	if (!_gdImageWBMPCtx(im, fg, out)) {
++		rv = gdDPExtractData(out, size);
++	} else {
++		rv = NULL;
++	}
+ 	out->gd_free(out);
+ 	return rv;
+ }
+diff --git a/tests/jpeg/CMakeLists.txt b/tests/jpeg/CMakeLists.txt
+index 19964b0c..a8d8162f 100644
+--- a/tests/jpeg/CMakeLists.txt
++++ b/tests/jpeg/CMakeLists.txt
+@@ -2,6 +2,7 @@ IF(JPEG_FOUND)
+ LIST(APPEND TESTS_FILES
+ 	jpeg_empty_file
+ 	jpeg_im2im
++	jpeg_ptr_double_free
+ 	jpeg_null
+ )
+ 
+diff --git a/tests/jpeg/Makemodule.am b/tests/jpeg/Makemodule.am
+index 7e5d317b..b89e1695 100644
+--- a/tests/jpeg/Makemodule.am
++++ b/tests/jpeg/Makemodule.am
+@@ -2,7 +2,8 @@ if HAVE_LIBJPEG
+ libgd_test_programs += \
+ 	jpeg/jpeg_empty_file \
+ 	jpeg/jpeg_im2im \
+-	jpeg/jpeg_null
++	jpeg/jpeg_null \
++	jpeg/jpeg_ptr_double_free
+ 
+ if HAVE_LIBPNG
+ libgd_test_programs += \
+diff --git a/tests/jpeg/jpeg_ptr_double_free.c b/tests/jpeg/jpeg_ptr_double_free.c
+new file mode 100644
+index 00000000..df5a510b
+--- /dev/null
++++ b/tests/jpeg/jpeg_ptr_double_free.c
+@@ -0,0 +1,31 @@
++/**
++ * Test that failure to convert to JPEG returns NULL
++ *
++ * We are creating an image, set its width to zero, and pass this image to
++ * `gdImageJpegPtr()` which is supposed to fail, and as such should return NULL.
++ *
++ * See also <https://github.com/libgd/libgd/issues/381>
++ */
++
++
++#include "gd.h"
++#include "gdtest.h"
++
++
++int main()
++{
++    gdImagePtr src, dst;
++    int size;
++
++    src = gdImageCreateTrueColor(1, 10);
++    gdTestAssert(src != NULL);
++
++    src->sx = 0; /* this hack forces gdImageJpegPtr() to fail */
++
++    dst = gdImageJpegPtr(src, &size, 0);
++    gdTestAssert(dst == NULL);
++
++    gdImageDestroy(src);
++
++    return gdNumFailures();
++}
diff --git a/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch b/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch
new file mode 100644
index 000000000000..891c232115ec
--- /dev/null
+++ b/media-libs/gd/files/gd-2.2.5-ossfuzz5700.patch
@@ -0,0 +1,103 @@
+From 9fa3abd2e61da18ed2b889704e4e252f0f5a95fe Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 26 Jan 2018 01:57:52 -0500
+Subject: [PATCH] gif: fix out-of-bounds read w/corrupted lzw data
+
+oss-fuzz pointed out:
+gd_gif_in.c:605:16: runtime error: index 5595 out of bounds for type 'int [4096]'
+
+Add some bounds checking on each code that we read from the file.
+---
+ src/gd_gif_in.c           |   8 ++++++++
+ tests/gif/CMakeLists.txt  |   3 ++-
+ tests/gif/Makemodule.am   |   2 ++
+ tests/gif/ossfuzz5700.c   |  13 +++++++++++++
+ tests/gif/ossfuzz5700.gif | Bin 0 -> 30 bytes
+ 6 files changed, 26 insertions(+), 1 deletion(-)
+ create mode 100644 tests/gif/ossfuzz5700.c
+
+diff --git a/src/gd_gif_in.c b/src/gd_gif_in.c
+index afc08bf7..daf26e79 100644
+--- a/src/gd_gif_in.c
++++ b/src/gd_gif_in.c
+@@ -601,6 +601,10 @@ LWZReadByte_(gdIOCtx *fd, LZW_STATIC_DATA *sd, char flag, int input_code_size, i
+ 				/* Bad compressed data stream */
+ 				return -1;
+ 			}
++			if(code >= (1 << MAX_LWZ_BITS)) {
++				/* Corrupted code */
++				return -1;
++			}
+ 
+ 			*sd->sp++ = sd->table[1][code];
+ 
+@@ -610,6 +614,10 @@ LWZReadByte_(gdIOCtx *fd, LZW_STATIC_DATA *sd, char flag, int input_code_size, i
+ 
+ 			code = sd->table[0][code];
+ 		}
++		if(code >= (1 << MAX_LWZ_BITS)) {
++			/* Corrupted code */
++			return -1;
++		}
+ 
+ 		*sd->sp++ = sd->firstcode = sd->table[1][code];
+ 
+diff --git a/tests/gif/CMakeLists.txt b/tests/gif/CMakeLists.txt
+index 7d40cddc..2b73749e 100644
+--- a/tests/gif/CMakeLists.txt
++++ b/tests/gif/CMakeLists.txt
+@@ -3,6 +3,8 @@ LIST(APPEND TESTS_FILES
+ 	bug00181
+ 	bug00227
+ 	gif_null
++	ossfuzz5700
++	uninitialized_memory_read
+ )
+ 
+ IF(PNG_FOUND)
+@@ -12,7 +14,6 @@ LIST(APPEND TESTS_FILES
+ 	bug00060
+ 	bug00066
+ 	gif_im2im
+-	uninitialized_memory_read
+ )
+ ENDIF(PNG_FOUND)
+ 
+diff --git a/tests/gif/Makemodule.am b/tests/gif/Makemodule.am
+index 0bdeab7e..3199438f 100644
+--- a/tests/gif/Makemodule.am
++++ b/tests/gif/Makemodule.am
+@@ -3,6 +3,7 @@ libgd_test_programs += \
+ 	gif/bug00181 \
+ 	gif/bug00227 \
+ 	gif/gif_null \
++	gif/ossfuzz5700 \
+ 	gif/uninitialized_memory_read
+ 
+ if HAVE_LIBPNG
+@@ -24,4 +25,5 @@ EXTRA_DIST += \
+ 	gif/bug00060.gif \
+ 	gif/bug00066.gif \
+ 	gif/bug00066_exp.png \
++	gif/ossfuzz5700.gif \
+ 	gif/unitialized_memory_read.gif
+diff --git a/tests/gif/ossfuzz5700.c b/tests/gif/ossfuzz5700.c
+new file mode 100644
+index 00000000..8fc9f88c
+--- /dev/null
++++ b/tests/gif/ossfuzz5700.c
+@@ -0,0 +1,13 @@
++#include <stdio.h>
++#include "gd.h"
++#include "gdtest.h"
++
++int main()
++{
++	gdImagePtr im;
++	FILE *fp = gdTestFileOpen("gif/ossfuzz5700.gif");
++	im = gdImageCreateFromGif(fp);
++	fclose(fp);
++	gdImageDestroy(im);
++	return 0;
++}
+
diff --git a/media-libs/gd/gd-2.2.5-r2.ebuild b/media-libs/gd/gd-2.2.5-r2.ebuild
new file mode 100644
index 000000000000..00f3a5a6cf9c
--- /dev/null
+++ b/media-libs/gd/gd-2.2.5-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="Graphics library for fast image creation"
+HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/"
+SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz
+	test? (
+		https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/ossfuzz5700.gif -> lib${P}-ossfuzz5700.dat
+		https://github.com/libgd/libgd/raw/e0cb1b76c305db68b251fe782faa12da5d357593/tests/gif/php_bug_75571.gif -> lib${P}-php_bug_75571.dat
+	)"
+
+LICENSE="gd IJG HPND BSD"
+SLOT="2/3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib"
+
+# fontconfig has prefixed font paths, details see bug #518970
+REQUIRED_USE="prefix? ( fontconfig )"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}/lib${P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ossfuzz5700.patch"
+	"${FILESDIR}/${P}-CVE-2018-5711.patch"
+	"${FILESDIR}/${P}-CVE-2018-1000222.patch"
+	"${FILESDIR}/${P}-CVE-2019-6977.patch"
+	"${FILESDIR}/${P}-CVE-2019-6978.patch"
+)
+
+src_unpack() {
+	default
+
+	if use test ; then
+		cp "${DISTDIR}"/lib${P}-ossfuzz5700.dat \
+			"${S}"/tests/gif/ossfuzz5700.gif || die
+		cp "${DISTDIR}"/lib${P}-php_bug_75571.dat \
+			"${S}"/tests/gif/php_bug_75571.gif || die
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug 603360, https://github.com/libgd/libgd/blob/fd06f7f83c5e78bf5b7f5397746b4e5ee4366250/docs/README.TESTING#L65
+	if use cpu_flags_x86_sse ; then
+		append-cflags -msse -mfpmath=sse
+	else
+		append-cflags -ffloat-store
+	fi
+
+	# bug 632076, https://github.com/libgd/libgd/issues/278
+	if use arm64 || use ppc64 || use s390 ; then
+		append-cflags -ffp-contract=off
+	fi
+
+	# we aren't actually {en,dis}abling X here ... the configure
+	# script uses it just to add explicit -I/-L paths which we
+	# don't care about on Gentoo systems.
+	local myeconfargs=(
+		--disable-werror
+		--without-x
+		--without-liq
+		$(use_enable static-libs static)
+		$(use_with fontconfig)
+		$(use_with png)
+		$(use_with tiff)
+		$(use_with truetype freetype)
+		$(use_with jpeg)
+		$(use_with webp)
+		$(use_with xpm)
+		$(use_with zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index f0e0efdc4419..fefc875a11c6 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,7 @@
 AUX gegl-0.2.0-cve-2012-4433-1e92e523.patch 2365 BLAKE2B 64361413f30f81e881c51b050d644f7c83a5d44359568c93fc1139b89b98607f6005a3aba33c3c86fb9bc292415116d71653c84255ee3f8cc28adcd13e554b37 SHA512 f27c89ac3b7742da348f75190cb1d5ad2569ab71a188b42a64e23a6254489770c701714e8de49602fdb8e8f063c3c9130abac330dceacee15603098bc1b70348
 AUX gegl-0.2.0-cve-2012-4433-4757cdf7.patch 1952 BLAKE2B bd601e99324c3861ef3da7685518891ba7e55f316120da8660b8afc85179c9ce7e9ef54c0c73d99754ed3ca0cd05f4e3803613db438909fb6983958cfcbb5221 SHA512 c48ed73b4a042263464819981e5f9fb0c0fc7abe8291840da9e839833a8cd548077fa99fed4b523a5bbac120d4336d2007a243baa359b40a0f0e3ff633bffa57
 AUX gegl-0.2.0-ffmpeg-0.11.diff 2022 BLAKE2B 11fb013522cdeaa06bef97c421763d3b4d0900181667b7dd5688c0fc0a666a68ab50cccdce7105f20802df5e7ce58f67bc48e16f9447fe0fbe27efb60ed52f0b SHA512 b2d56e4abaae76d7995e8e454b023a5f1e4e74e3bf1f3cbe9663040031762941c3947db5de312ee516733f23e03d72d779794ab7f206e7334b14e298c0ceb493
+AUX gegl-0.2.0-ffmpeg-4-0-compat.patch 507 BLAKE2B 348cd79471d63192b65a52d8ab91c9e227d9364876db04da707bf7fb36a9211b27781061a85442a7d1cd178f9ba5a459e806e451c9eee5c5c4e841b96abef05f SHA512 e80364dcbd47eb49f0a10d3104ef2927e2eeda27a0a9016e2157401ebd17aa99b8707a42c1ae12e4118d7fc3d8fa15f49f4a3230e00177a5158511618c4a2339
 AUX gegl-0.2.0-ffmpeg-av_frame_alloc.patch 1340 BLAKE2B 485bca4ea457dd135535058ce3cd62fcff8f237ab94c98243c8ac17a1b137d67bc4d8750e30372345798b1c197e21158694d79ffccba9a076b32e4b9e1fad7ce SHA512 142d35b2c75b0f3512c3ba3a1f4e5597c282401a13c688069caed4f868b6ce0dbf16764a7b87cecd8d7e48f98ed5cd1c5cccec833f40bbb3816b898fea3939ac
 AUX gegl-0.2.0-fix-without-exiv2.patch 823 BLAKE2B f2f0f8ff2d12ae0586518d4bfdbeea55ace61dc63171ed14a4196d8672f6009e26766553b882732801e6e56a28fca640a5a33dd8335682353f096ff77c149db7 SHA512 19b8299e82bbfb0d6879ffd4d75e149c4ea3c6ae474bf9e2f4b975d87240985fe136731e388d0c63b3baadebc30871a5b54241d683107aa19bc7bcdbd710d118
 AUX gegl-0.2.0-g_log_domain.patch 1079 BLAKE2B 7d0ba02291aa33b4a8077d56de01c5b0e10b46740c64565bf8b6a9867a6d76fe6fa07a752d0698f0674236e0be06c41135af114847096cfec642572fba315c06 SHA512 a538d42164dbefbd5044461fe8fdac5d3b2de2d7df5013a5206b0230fe48ea7cf537972b8aab2a40081a15ece1dd818bef70cef95cd0a04bc7179764070a1e45
@@ -16,16 +17,19 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6c
 DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
 DIST gegl-0.4.12.tar.bz2 7065555 BLAKE2B f0801739e67e6d6ecc88abaed8638c900edd7229d240f63af7cc0bf503cd29b33b84d7e3018c757b0bdb6ee5245f6af595b96decc3916b57debfb46712213577 SHA512 cacf9f5c34357b3939162d0d4712ee2b47298a3e806b55e275cdf5e23f186d436ea1a840b91b1b72b76d450d94674cca217b7c253cd6b52a7d9505b4ad73fde2
+DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
 DIST gegl-0.4.6.tar.bz2 6931774 BLAKE2B c8fabc8efbcc21a3663c8a3a698e6bc072506a66a21b81e6696c37c81aec1458c695f773c554b6d98c2fd21a3d3ab7fcca4b2f6567ec9d4f94b1e925b9bc9ce5 SHA512 6df34b6e76318a375820bccac6efeb2792c737e47154902fcc08ef93cb45b978992ee263260c99f8e865964d80cd1fac6dc2d6c8e4453174df64a9044b57325e
 DIST gegl-0.4.8.tar.bz2 7017022 BLAKE2B ec934fe6faa0c9328ae8c6476e19e175a8e8082e3d1f59052fb83fad766030ede9dd3464a215d332238277492151d988b17c6d3ac87f3d9cec01797acd259fae SHA512 20d2700cc74bce02e3e1b477f5e4dbd6546bb74625de235baaaa31e24f506930927af53de3d0880c0b16f93a10cec993c58a12adba59dec7dda0e389261799aa
 EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
 EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
+EBUILD gegl-0.2.0-r6.ebuild 5031 BLAKE2B f2a0afc2e46268561dd0e887c1fb05c56c69488177eaec0420cc4fa68441b1eac6f358dc78bd46d8eb35e69a3e2721ac53088de883586014fcd466b91edcb55e SHA512 a50ac55bcb8cddc08916d61da67174e4d24a927f685a8db87b2ab1f33b7190ea32d2ba52d9f2a263a0c0e055279b0609560626d1350635e86aa2f6a59e3d6272
 EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
 EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
 EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
 EBUILD gegl-0.3.34.ebuild 5377 BLAKE2B ac84c85d0ab0a6fab5e2176639f30cefda1081acab0bcc155915cdeb702cd681efe0d332d6ccfe29055b7e16d6b4406893f525574d702d7f2609e952c440b6bc SHA512 a7991520a562539a9f975fb7b7199b8c3129fee1415ddd1211b2b513fec29db7e4740f20109081981dbf656edc5cafac2c3cec339dc3a22e98c8bb272eb6e564
 EBUILD gegl-0.4.12.ebuild 4918 BLAKE2B 38df7754c5b30c18d6d2858a8cafb701f008b5c33ce9c45f9136f64746bacb9e22089ccb4758f844604dbf547834be23ab2d5c0947db6d0cdd4d97647bd0b162 SHA512 d2b0a08f7713683c2f62d1b29a94b23e37fc948a287c537f5d4cda60d1713e61815a78cdf629dbb3bacd41edc774c0ab59952846fe9761a894669c15b25b31ff
+EBUILD gegl-0.4.14.ebuild 5037 BLAKE2B 9e1610c90c4324b542562cbe39b533d263c4d58444c01731b6271070962b6bc8e9172949dcff3175e51d8f6cf7dd4612c2fb92242b878620d5f038e43e16097f SHA512 b9e03224de06edd921e8e5882a365772f059c13eaf36543cb970fbb7de4c6d3e533a6e8d84e4a7d4ac817dd5c990f2385c8b00af2710a39d20663b0d5157b36e
 EBUILD gegl-0.4.6-r1.ebuild 5389 BLAKE2B 4eba81cf6624d66ceb3d3e27b9bff465f9b5702e53d12abccc6ccf8bf17e1ccbe439dbb5b9842564da374510ac3c01ffaac28be89aa3cc1b6c3b8493744c358a SHA512 4e010197d78a08ecc574975d3069a1fcfd2cb15b0cbc40f28b28494213369fc926c1e7bd082314213f823381a52b687facfc122ed000c3078b409bd406f79ff9
 EBUILD gegl-0.4.8-r1.ebuild 4968 BLAKE2B 3cdb9f610500db2fd90fbb55e64c22bac6fe13cc153d5b42b5f16509e09efba77e50e5cc803b33d0e0845f61f65bc201f4e2bfec5fcdcbfb6d6eeaf4966f8204 SHA512 5cef00dcb12ce6153a0831a129dedf0051c29abb683b06b5f5e4d85467f293c93de28149ed73946fc63bedaaac22150f6ade4b21c679a6a4cd422ea702ec307d
-EBUILD gegl-9999.ebuild 4860 BLAKE2B d4751dbc4c4534a727169c1179eee781aa52b21f3032bc5d10598fc8f81c4b73d9848fd9cb79e7483f91f75120eef17042b6d19937045713fdbda508ec50bf4d SHA512 770bc8c33a5451a69cf561b438dde1fb69bb1297122a1874146b9bbf270fda790405e645ed66ea5605b5b55911332f0ad3efb8758408cf590654df9f5c170ddc
+EBUILD gegl-9999.ebuild 4976 BLAKE2B 8510368b9fa38dfb28782ba7076af4eb8d6ea8e912b4aa7f5029ba733a33eaf3827c48a0fd4853801672d583e5e004143d346f64ee245475b6bd40618f3230ff SHA512 5181b917e6db0170348f7b698bf55bf48914eccb678619d8515d16fd8073d63a03299c6ce7918bddb0877907f2d3653e2f0b48197e9d659735b59b08c668272a
 MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
new file mode 100644
index 000000000000..6b8e9792c026
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
@@ -0,0 +1,13 @@
+--- ./operations/external/ff-load.c.org	2018-12-18 09:22:34.467409854 +0100
++++ ./operations/external/ff-load.c	2018-12-18 09:22:50.921379092 +0100
+@@ -309,8 +309,8 @@
+           g_warning ("codec not found");
+         }
+ 
+-      if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+-        p->enc->flags |= CODEC_FLAG_TRUNCATED;
++      if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++        p->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+ 
+       if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+         {
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
new file mode 100644
index 000000000000..63cc626cb6a9
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11  # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+	>=media-libs/babl-0.1.10
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gdk-pixbuf-2.18:2
+	x11-libs/pango
+	sys-libs/zlib
+	cairo? ( x11-libs/cairo )
+	ffmpeg? (
+		libav? ( >=media-video/libav-12:0= )
+		!libav? ( >=media-video/ffmpeg-4:0= )
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	openexr? ( media-libs/openexr )
+	png? ( media-libs/libpng:0= )
+	raw? ( >=media-libs/libopenraw-0.1:0= )
+	sdl? ( media-libs/libsdl )
+	svg? ( >=gnome-base/librsvg-2.14:2 )
+	umfpack? ( sci-libs/umfpack )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+#	>=media-libs/babl-0.1.10[introspection?]
+#	introspection? ( >=dev-libs/gobject-introspection-0.10
+#			>=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40.1
+	dev-lang/perl
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+"
+#	vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=636780
+	"${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=442016
+	"${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+	"${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=416587
+	"${FILESDIR}/${P}-introspection-version.patch"
+
+	"${FILESDIR}/${P}-ffmpeg-0.11.diff"
+	"${FILESDIR}"/${P}-g_log_domain.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=605216
+	# https://bugs.gentoo.org/show_bug.cgi?id=617430
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libopenraw-0.1.patch  # bug 639834
+	"${FILESDIR}"/${P}-fix-without-exiv2.patch  # bug 641872
+
+	"${FILESDIR}"/${P}-ffmpeg-4-0-compat.patch  # bug 673378
+)
+
+src_prepare() {
+	default
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	eautoreconf
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=468248
+	local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+	[[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+#	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# never enable altering of CFLAGS via profile option
+	# libspiro: not in portage main tree
+	# disable documentation as the generating is bit automagic
+	#    if anyone wants to work on it just create bug with patch
+
+	# Also please note that:
+	#
+	#  - Some auto-detections are not patched away since the docs are
+	#    not built (--disable-docs, lack of --enable-gtk-doc) and these
+	#    tools affect re-generation of docs, only
+	#    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+	#
+	#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+	#
+	#  - Parameter --disable-workshop disables any use of Lua, effectivly
+	#
+	#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+	#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+	#
+	#  - There are two checks for dot, one controllable by --with(out)-graphviz
+	#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+	#
+	# So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+	# https://bugs.gentoo.org/show_bug.cgi?id=451136
+	#
+	econf \
+		--disable-silent-rules \
+		--disable-profile \
+		--without-libspiro \
+		--disable-docs --disable-workshop \
+		--with-pango --with-gdk-pixbuf \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		--without-exiv2 \
+		$(use_with ffmpeg libavformat) \
+		--without-graphviz \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k jasper) \
+		--without-lua \
+		$(use_with openexr) \
+		$(use_with png libpng) \
+		$(use_with raw libopenraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_with umfpack) \
+		--without-libv4l \
+		$(use_with lensfun) \
+		--disable-introspection \
+		--without-vala
+#		$(use_enable introspection) \
+#		$(use_with vala)
+}
+
+src_test() {
+	gnome2_environment_reset  # sandbox issues
+	default
+}
+
+src_compile() {
+	gnome2_environment_reset  # sandbox issues (bug #396687)
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
new file mode 100644
index 000000000000..58165e607836
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+	SRC_URI=""
+else
+	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+REQUIRED_USE="
+	svg? ( cairo )
+	vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+#       so there is no chance to support libav right now (Gentoo bug #567638)
+#       If it returns, please check prior GEGL ebuilds for how libav was integrated.  Thanks!
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=media-libs/babl-0.1.62
+	>=media-libs/libpng-1.6.0:0=
+	virtual/jpeg:0=
+	>=x11-libs/gdk-pixbuf-2.32:2
+	x11-libs/pango
+	cairo? ( >=x11-libs/cairo-1.12.2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+	lcms? ( >=media-libs/lcms-2.8:2 )
+	lensfun? ( >=media-libs/lensfun-0.2.5 )
+	openexr? ( >=media-libs/openexr-2.2.0:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
+	raw? ( >=media-libs/libraw-0.15.4:0= )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svg? ( >=gnome-base/librsvg-2.40.6:2 )
+	tiff? ( >=media-libs/tiff-4:0 )
+	umfpack? ( sci-libs/umfpack )
+	v4l? ( >=media-libs/libv4l-1.0.1 )
+	webp? ( >=media-libs/libwebp-0.5.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2
+	test? ( ffmpeg? ( media-libs/gexiv2 )
+		introspection? (
+			$(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]')
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+)
+
+pkg_setup() {
+	use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# FIXME: the following should be proper patch sent to upstream
+	# fix OSX loadable module filename extension
+	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+	# don't require Apple's OpenCL on versions of OSX that don't have it
+	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+		sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+	fi
+
+	# commit 7c78497b : tests that use gegl.png are broken on non-amd64
+	sed -e '/clones.xml/d' \
+		-e '/composite-transform.xml/d' \
+		-i tests/compositions/Makefile.am || die
+
+	eautoreconf
+
+	gnome2_environment_reset
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		# disable documentation as the generating is bit automagic
+		#    if anyone wants to work on it just create bug with patch
+		--disable-docs
+		# never enable altering of CFLAGS via profile option
+		--disable-profile
+		--disable-silent-rules
+		#  - Parameter --disable-workshop disables any use of Lua, effectivly
+		--disable-workshop
+		--program-suffix=-${SLOT}
+		--with-gdk-pixbuf
+		--with-pango
+		#  - Parameter --with-exiv2 compiles a noinst-app only, no use
+		#    but needed during testing
+		--without-exiv2
+		#  - There are two checks for dot, one controllable by --with(out)-graphviz
+		#    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+		--without-graphviz
+		# libspiro: not in portage main tree
+		--without-libspiro
+		--without-lua
+		--without-mrg
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_with cairo)
+		$(use_with cairo pangocairo)
+		$(use_with ffmpeg libavformat)
+		$(use_with jpeg2k jasper)
+		$(use_with lcms)
+		$(use_with lensfun)
+		$(use_with openexr)
+		$(use_with pdf popplerglib)
+		$(use_with raw libraw)
+		$(use_with sdl)
+		$(use_with svg librsvg)
+		$(use_with tiff libtiff)
+		$(use_with umfpack)
+		#  - v4l support does not work with our media-libs/libv4l-0.8.9,
+		#    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+		$(use_with v4l libv4l)
+		$(use_with v4l libv4l2)
+		$(use_with vala)
+		$(use_with webp)
+		$(use_with zlib)
+	)
+
+	if use test; then
+		myeconfargs+=( $(use_with ffmpeg gexiv2) )
+	else
+		myeconfargs+=( --without-gexiv2 )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	[[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 1d5e515f803a..377cbb02f89d 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 # vala and introspection support is broken, bug #468208
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3+ LGPL-3 )"
 SLOT="0.4"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
 REQUIRED_USE="
 	svg? ( cairo )
 	vala? ( introspection )
@@ -36,9 +36,8 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	dev-libs/json-glib
-	>=media-libs/babl-0.1.56
+	>=media-libs/babl-0.1.62
 	>=media-libs/libpng-1.6.0:0=
-	sys-libs/zlib
 	virtual/jpeg:0=
 	>=x11-libs/gdk-pixbuf-2.32:2
 	x11-libs/pango
@@ -52,6 +51,7 @@ RDEPEND="
 	lcms? ( >=media-libs/lcms-2.8:2 )
 	lensfun? ( >=media-libs/lensfun-0.2.5 )
 	openexr? ( >=media-libs/openexr-2.2.0:= )
+	pdf? ( >=app-text/poppler-0.71.0[cairo] )
 	raw? ( >=media-libs/libraw-0.15.4:0= )
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	svg? ( >=gnome-base/librsvg-2.40.6:2 )
@@ -59,6 +59,7 @@ RDEPEND="
 	umfpack? ( sci-libs/umfpack )
 	v4l? ( >=media-libs/libv4l-1.0.1 )
 	webp? ( >=media-libs/libwebp-0.5.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0 )
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
@@ -135,6 +136,7 @@ src_configure() {
 		$(use_with lcms)
 		$(use_with lensfun)
 		$(use_with openexr)
+		$(use_with pdf popplerglib)
 		$(use_with raw libraw)
 		$(use_with sdl)
 		$(use_with svg librsvg)
@@ -146,6 +148,7 @@ src_configure() {
 		$(use_with v4l libv4l2)
 		$(use_with vala)
 		$(use_with webp)
+		$(use_with zlib)
 	)
 
 	if use test; then
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 1d4a02f1f0eb..fff612727ecd 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,7 +2,7 @@ AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5df
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10-r1.ebuild 1847 BLAKE2B e39bb69b45313779400ca781efe5cf82e596d48372fa472a21bae8d98996f6347c03f824b3b2530886e2394ab8eae0690d12d5d9c20b93f275e80adcb4aad2e9 SHA512 32fdee226501f3448a63d8bf557df4f9fb21d19ceab532b70e23ce7044753aed8c94730ef8372280c9e8710cc2773090f197f9dc664529eb0ae1f589d1de70c9
+EBUILD gexiv2-0.10.10-r1.ebuild 1848 BLAKE2B e272960da779d7b40ae25db6456dc9a1eb45c324a4ae7bb8c60d279c1faa9631eec29290f63c77bb6000c530415823a3879eb74c22e49dceb6ca3a4c538ae702 SHA512 a4c6326c2cce1ac74d632f09701d516826582073c493d8cef9530a7fb71fc870def1170c4ef1d8e07d8d063a618766a76dc767a6d8ffbce921abcc61de9e72e7
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
 EBUILD gexiv2-9999.ebuild 1652 BLAKE2B 5a00ff2ccdd58025bdc614384e70975f871ea4c861ad7ec91ccdc5b942dc621ca4fcdbcefcf40e2016c548bd0874b168609dc1939ec54d4a13be163872f70bcd SHA512 b5d591aa541ec76e8aff3372b28815500815ca686ddca872ebbb3c6a082077e285a69b37794f676cb7b83dae5fe3a24531e35141b2f166ffd5702be2c0151a73
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index 5474bf14e183..b7fa5ece19cb 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test vala"
+IUSE="gtk-doc +introspection python static-libs test +vala"
 
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest
index 3e8516945204..2317ff8c4858 100644
--- a/media-libs/giflib/Manifest
+++ b/media-libs/giflib/Manifest
@@ -1,15 +1,16 @@
 AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f
 AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f
-AUX giflib-5.1.4-reallocarray-export.patch 5668 BLAKE2B c2dc8b1f9ffa5ba5e3f50bd71ecb098331a97737e20f71ae88fa2b3a0aa27c9d3a83d72654692ad71edb7eb03aac00f7af21088eded85c3a0126e6893a4f583c SHA512 3635efc2b10adc01bb0ac70a99e8ac7dbe3dc1b2f03060ea449777078da2a1eb731f17299a9e239afb55e25777cae54de6ca12d9d069e513b03a9eb6402a6658
 AUX giflib-5.1.6-gentoo.patch 424 BLAKE2B 2d244e7e5311506a03dde36d83f14c9ff75533b60ac8be470c73786acf652d07774d7756bb342bb5373a515db090c3a3bab3abb10a87be09e97eb81cfe59e38a SHA512 88f133e4fabcbbca9151812f9a6e1676c41301175b6637502c5c2a2b888ad31975ebf4d28d77c0adaf7a854860f9979b7a45479542ed91fa72e97c3f705f2da4
+AUX giflib-5.1.8-gentoo.patch 469 BLAKE2B f0bbb86b2fc3288860ccad7a06f4217f29dbd60bf5871e0a701e7744e37002d484046ec85109db6e9e60d72c4a227bb1d206f2a3590ab526c88fa8f82e567beb SHA512 feede4296a111d063dd2a81b9eb0552f6b4e38e5bf340e57cd6a12e83ff577b3d78be2dc2296ade57901ef8d11760dd54c721525fe157fe57e8fcac3d2baf970
 DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491
 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-DIST giflib-5.1.6.tar.gz 391894 BLAKE2B e961236459d7312b41668f19cfb26006af0f0dc1a9741abee3f00d8eeba0dceebe5b03709dfc8170c1b73a6687dd926c5ef92ac2817fe78ab65160e8012d9044 SHA512 a148e3ebee6ad00ac24eb2241e5d7f51c0a22e6e931ebd751ca57b921a2a3d1a17a6d1e0e949ca0401589b539ec1458a57a9e306fadaf03dcd2ec40c11ca28be
+DIST giflib-5.1.7.tar.gz 391525 BLAKE2B d994941f4da324f62a16af973b443660b6cf3ee764e9b7f8c165656037f11d482ccd141e9ac8a81ae1096faa4e264602191ebd039cbf5dd2f55e435aef0ab546 SHA512 b30c3707839a6d66a3e54d92607c303e5ca3d04d6a02d2037fdc8b80386f9a7fa4148727705014481c3c167bdfac2e99d7e4db1ff7f277b64bd2d9193a89f8b0
+DIST giflib-5.1.8.tar.gz 419065 BLAKE2B 4a42120758be15e765dae249d98d25164b40e64f933415412420163c0ed7fd6967d3958fff70478d5635a5bb9a6ed397f06ad6de510f2e97de5574b7c68d84d2 SHA512 d390917837a64de1912720ab8968e6b077c6be9f9a2f835faced44420f54d6d55d4e3543b9779ec65d399858856188fea93c170b253d0b83928f15548a14aba3
 EBUILD giflib-4.1.6-r2.ebuild 1383 BLAKE2B 564dfc8776afe92c076aa5bec6c8f58b985bd8b8c3b14621c9946aa8984047a6cf4ffe776a803199ac0417615dc2df270ec8b4b35683f3a657d92f4ccbd415a2 SHA512 71a6621273dd6341e25de0150aa7b194a1143b6e344ba2a77317fd72394f585fe232d9eee5dbd28242773ebaf26072119d5ebe93ae540d4054d7e1d64410059c
 EBUILD giflib-4.1.6-r3.ebuild 1482 BLAKE2B 98f35d4ceb7bafcc67b9d66d273ca0362a49e0be0e804c4665c9c723d7e04689429362611b35cf37bd2c9d5df29f422be541ef796f4cda58ec0e6877aa23f5c3 SHA512 752ba45f1c9650a9268c5c9e555f239ec8302549573f508d5c9ce0ba9a1461b8497cde8dfabf180cc6ad8aaca420931b9025188d4743c526c3bdceaa93c1c1ae
 EBUILD giflib-5.0.6.ebuild 1060 BLAKE2B 9ee4bc54795eeef8850a5a94129dfb8c73b979d8b1e2f827fe434bf5c9966b5580e4ff0d7946fab757bfcfc18bce87368c2f8ca903e4dfe6c927281c3535041f SHA512 7c0abe0f1450dbdb2b72239e7876f3d2b3e13292c0883c92af6f85a764dd4a14f3391d55b2a21313041f07eebcb086f3fb28141093794b9fbb501c650a59f5a0
-EBUILD giflib-5.1.4-r2.ebuild 1473 BLAKE2B d2b40ef189f9edad3003bbb734b056bdf50bfa626386efee79a7181c578dae4c3080739a8bf012e3a72d779fbc454f2609b46b6273b791fe6b844d2fc1128efa SHA512 d9a4bc42cdb3f8c5ddd47dae36eebbcbb488f4df2bf364c332dd8b576952c26c1fd241d2fd40df5af7938d15afeba4b5b73a41447f0c10795c80afcf4f0fe763
 EBUILD giflib-5.1.4.ebuild 1390 BLAKE2B 5e1719539fb2ee35bfc86c64c651534bf72057080c2f7d38e15df4ed4f6d5b7c91cea3ba55a47054455f9953a25c110733bb05e5b75da793c005d779a5dd3373 SHA512 f86b46958b2e977c56dfbd8df548d540a4b1873254abf4c6e1a69c24e696b4928a8f3d56145a545be3528497965e3e4898ab56fbdaf6b9d1c88d8066c170774d
-EBUILD giflib-5.1.6-r1.ebuild 1918 BLAKE2B 7a0219fd96c2862eb8b4087e25a03983c0f1abbfeb8321871ebc487c106b9d88a338c69231efd4561030f58c82dc65fed31b6a5204e48c86094d41f027e6c133 SHA512 b926b6da59cdbd55e3e741d808b11ac5ddc62b2756596349a1a800463e0c772baa7b36a1234591ba75b9d760abc16b1663fb70eaa5b32d57024dd8651c853d20
+EBUILD giflib-5.1.7.ebuild 1918 BLAKE2B 7a0219fd96c2862eb8b4087e25a03983c0f1abbfeb8321871ebc487c106b9d88a338c69231efd4561030f58c82dc65fed31b6a5204e48c86094d41f027e6c133 SHA512 b926b6da59cdbd55e3e741d808b11ac5ddc62b2756596349a1a800463e0c772baa7b36a1234591ba75b9d760abc16b1663fb70eaa5b32d57024dd8651c853d20
+EBUILD giflib-5.1.8-r1.ebuild 1875 BLAKE2B 6b12c444b885ae0a0aa321c76a47281847c92ce4a01363515d8bc3933cc474eb146cc3007221a8c9fe94a3faf7d5b5c25535b5a756a2479eecc8f8e00eec94b8 SHA512 12d8a59b6940a27ff7c0d688f8f71bb808189ad668c50392bc4842b0b119de11792bd56ec5a0b01951d5cb1f369da14cf543b7824c56ab995f525bc6f8db0572
 MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf
diff --git a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch b/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
deleted file mode 100644
index 1c2a433c29c2..000000000000
--- a/media-libs/giflib/files/giflib-5.1.4-reallocarray-export.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From dfba2b34d35ddfd47233293f2f28978e8acfc87c Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 14 Mar 2018 21:18:14 +0100
-Subject: [PATCH] Address clash of export reallocarray with glibc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-.. by renaming the exported symbol and the related
-function in code and where it's used.
-
-Bug: https://bugs.gentoo.org/637438
-
-Compile error was:
-
-/usr/include/gif_lib.h:248:51: error: declaration of ‘void* reallocarray(void*, size_t, size_t)’ has a different exception specifier
- reallocarray(void *optr, size_t nmemb, size_t size);
-                                                   ^
-[..]
-/usr/include/stdlib.h:443:14: error: from previous declaration ‘void* reallocarray(void*, size_t, size_t) throw ()’
- extern void *reallocarray (void *__ptr, size_t __nmemb, size_t __size)
----
- lib/dgif_lib.c             |  4 ++--
- lib/gif_lib.h              |  2 +-
- lib/gifalloc.c             | 10 +++++-----
- lib/openbsd-reallocarray.c |  2 +-
- 4 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c
-index 66a1d6a..f0e0385 100644
---- a/lib/dgif_lib.c
-+++ b/lib/dgif_lib.c
-@@ -396,7 +396,7 @@ DGifGetImageDesc(GifFileType *GifFile)
- 
-     if (GifFile->SavedImages) {
-         SavedImage* new_saved_images =
--            (SavedImage *)reallocarray(GifFile->SavedImages,
-+            (SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
-                             (GifFile->ImageCount + 1), sizeof(SavedImage));
-         if (new_saved_images == NULL) {
-             GifFile->Error = D_GIF_ERR_NOT_ENOUGH_MEM;
-@@ -1108,7 +1108,7 @@ DGifSlurp(GifFileType *GifFile)
-               if (ImageSize > (SIZE_MAX / sizeof(GifPixelType))) {
-                   return GIF_ERROR;
-               }
--              sp->RasterBits = (unsigned char *)reallocarray(NULL, ImageSize,
-+              sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL, ImageSize,
-                       sizeof(GifPixelType));
- 
-               if (sp->RasterBits == NULL) {
-diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index 078930c..cefc3bb 100644
---- a/lib/gif_lib.h
-+++ b/lib/gif_lib.h
-@@ -245,7 +245,7 @@ extern ColorMapObject *GifUnionColorMap(const ColorMapObject *ColorIn1,
- extern int GifBitSize(int n);
- 
- extern void *
--reallocarray(void *optr, size_t nmemb, size_t size);
-+openbsd_reallocarray(void *optr, size_t nmemb, size_t size);
- 
- /******************************************************************************
-  Support for the in-core structures allocation (slurp mode).              
-diff --git a/lib/gifalloc.c b/lib/gifalloc.c
-index 3b51868..1394cfa 100644
---- a/lib/gifalloc.c
-+++ b/lib/gifalloc.c
-@@ -188,7 +188,7 @@ GifUnionColorMap(const ColorMapObject *ColorIn1,
- 
-         /* perhaps we can shrink the map? */
-         if (RoundUpTo < ColorUnion->ColorCount) {
--            GifColorType *new_map = (GifColorType *)reallocarray(Map,
-+            GifColorType *new_map = (GifColorType *)openbsd_reallocarray(Map,
-                                  RoundUpTo, sizeof(GifColorType));
-             if( new_map == NULL ) {
-                 GifFreeMapObject(ColorUnion);
-@@ -232,7 +232,7 @@ GifAddExtensionBlock(int *ExtensionBlockCount,
-     if (*ExtensionBlocks == NULL)
-         *ExtensionBlocks=(ExtensionBlock *)malloc(sizeof(ExtensionBlock));
-     else {
--        ExtensionBlock* ep_new = (ExtensionBlock *)reallocarray
-+        ExtensionBlock* ep_new = (ExtensionBlock *)openbsd_reallocarray
- 				 (*ExtensionBlocks, (*ExtensionBlockCount + 1),
-                                       sizeof(ExtensionBlock));
-         if( ep_new == NULL )
-@@ -325,7 +325,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
-     if (GifFile->SavedImages == NULL)
-         GifFile->SavedImages = (SavedImage *)malloc(sizeof(SavedImage));
-     else
--        GifFile->SavedImages = (SavedImage *)reallocarray(GifFile->SavedImages,
-+        GifFile->SavedImages = (SavedImage *)openbsd_reallocarray(GifFile->SavedImages,
-                                (GifFile->ImageCount + 1), sizeof(SavedImage));
- 
-     if (GifFile->SavedImages == NULL)
-@@ -355,7 +355,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
-             }
- 
-             /* next, the raster */
--            sp->RasterBits = (unsigned char *)reallocarray(NULL,
-+            sp->RasterBits = (unsigned char *)openbsd_reallocarray(NULL,
-                                                   (CopyFrom->ImageDesc.Height *
-                                                   CopyFrom->ImageDesc.Width),
- 						  sizeof(GifPixelType));
-@@ -369,7 +369,7 @@ GifMakeSavedImage(GifFileType *GifFile, const SavedImage *CopyFrom)
- 
-             /* finally, the extension blocks */
-             if (sp->ExtensionBlocks != NULL) {
--                sp->ExtensionBlocks = (ExtensionBlock *)reallocarray(NULL,
-+                sp->ExtensionBlocks = (ExtensionBlock *)openbsd_reallocarray(NULL,
-                                       CopyFrom->ExtensionBlockCount,
- 				      sizeof(ExtensionBlock));
-                 if (sp->ExtensionBlocks == NULL) {
-diff --git a/lib/openbsd-reallocarray.c b/lib/openbsd-reallocarray.c
-index aa70686..b922b01 100644
---- a/lib/openbsd-reallocarray.c
-+++ b/lib/openbsd-reallocarray.c
-@@ -27,7 +27,7 @@
- #define MUL_NO_OVERFLOW	((size_t)1 << (sizeof(size_t) * 4))
- 
- void *
--reallocarray(void *optr, size_t nmemb, size_t size)
-+openbsd_reallocarray(void *optr, size_t nmemb, size_t size)
- {
- 	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
- 	    nmemb > 0 && SIZE_MAX / nmemb < size) {
--- 
-2.17.0.rc2
-
diff --git a/media-libs/giflib/files/giflib-5.1.8-gentoo.patch b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
new file mode 100644
index 000000000000..90a72685d343
--- /dev/null
+++ b/media-libs/giflib/files/giflib-5.1.8-gentoo.patch
@@ -0,0 +1,16 @@
+--- giflib-5.1.8/Makefile
++++ giflib-5.1.8/Makefile
+@@ -61,12 +61,11 @@
+ LDLIBS=libgif.a -lm
+ 
+ all: libgif.so libgif.a $(UTILS)
+-	$(MAKE) -C doc
+ 
+ $(UTILS):: libgif.a
+ 
+ libgif.so: $(OBJECTS) $(HEADERS)
+-	$(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
++	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS)
+ 
+ libgif.a: $(OBJECTS) $(HEADERS)
+ 	$(AR) rcs libgif.a $(OBJECTS)
diff --git a/media-libs/giflib/giflib-5.1.4-r2.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
deleted file mode 100644
index 940bfb803e3e..000000000000
--- a/media-libs/giflib/giflib-5.1.4-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool multilib-minimal
-
-DESCRIPTION="Library to handle, display and manipulate GIF images"
-HOMEPAGE="https://sourceforge.net/projects/giflib/"
-SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="doc? ( app-text/xmlto )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-reallocarray-export.patch
-)
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		# No need for xmlto as they ship generated files.
-		ac_cv_prog_have_xmlto=no
-
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if use doc && multilib_is_native_abi; then
-		emake -C doc
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	# for static libs the .la file is required if built with +X
-	use static-libs || prune_libtool_files --all
-
-	if use doc && multilib_is_native_abi; then
-		docinto html
-		dodoc doc/*.html
-	fi
-}
-
-multilib_src_install_all() {
-	doman doc/*.1
-	docinto
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	if use doc; then
-		dodoc doc/*.txt
-		docinto html
-		dodoc -r doc/whatsinagif
-	fi
-}
diff --git a/media-libs/giflib/giflib-5.1.6-r1.ebuild b/media-libs/giflib/giflib-5.1.7.ebuild
index 9f1609ae182b..9f1609ae182b 100644
--- a/media-libs/giflib/giflib-5.1.6-r1.ebuild
+++ b/media-libs/giflib/giflib-5.1.7.ebuild
diff --git a/media-libs/giflib/giflib-5.1.8-r1.ebuild b/media-libs/giflib/giflib-5.1.8-r1.ebuild
new file mode 100644
index 000000000000..e16390f179c9
--- /dev/null
+++ b/media-libs/giflib/giflib-5.1.8-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="https://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="doc? ( app-text/xmlto )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.8-gentoo.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	# Use reallocarray() from libc if available.
+	if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_GNU_SOURCE -o "${T}/reallocarray_test" -x c - <<< $'#include <stdlib.h>\nint main() {void *p = reallocarray(NULL, 0, 0);}' 2> /dev/null; then
+		local -x CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE -DHAVE_REALLOCARRAY"
+		sed -e "s/ openbsd-reallocarray\.c//" -i Makefile || die
+		rm openbsd-reallocarray.c || die
+	fi
+
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -std=gnu99 -fPIC -Wno-format-truncation" \
+		LDFLAGS="${LDFLAGS}" \
+		OFLAGS="" \
+		all
+
+	if use doc && multilib_is_native_abi; then
+		emake -C doc
+	fi
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+
+	if use doc && multilib_is_native_abi; then
+		docinto html
+		dodoc doc/*.html
+	fi
+}
+
+multilib_src_install_all() {
+	docinto
+	dodoc ChangeLog NEWS README TODO
+	if use doc ; then
+		dodoc doc/*.txt
+		docinto html
+		dodoc -r doc/whatsinagif
+	fi
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 6bbddf502eee..aa82e80031ac 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,9 +1,10 @@
 AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
+AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.3.tar.gz 4577239 BLAKE2B 167312e95a43417dba59481b1d45976d9249af9fda9ebb6d0ec598e706bc2469b8c0928877683d47335e0c55ee881a20c1c7f648dd77e183880f7c2792bd5277 SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
 EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.2.ebuild 865 BLAKE2B 69b9fb6daadd63ba3b5691b6c8cfaa3b2afc072a0894f81ac95908d968f5060e24129497db2ea11f93604bf38f7d700ee769472918f05a55df17b7484f5b3001 SHA512 bffa26d68e2d034fd7802c9ad4b174f843c1fe773f40e3e36a56237e4605d63c50c6bcbf6e8145a6ce29fc53ebbd8852fe1157e2ae33c60e0fd11ba9b2e2d127
+EBUILD glm-0.9.9.2.ebuild 903 BLAKE2B 0a3a6d5761f7c2a8c497c59d03094c306eeaba1d5d6d5d97b07bd67d05d92389279ffa6302a57ba86bfdeeb3bcf75d5a1daf949d677298648d43df371b01540c SHA512 fd05cc52d409c68d807193e366f01c8e44b1bd168a559c3a9548e71c634b82a0c076b974fb1c230da4bfafbdc3b4e0ea1f4483346a0bc54a897510406a57815a
 EBUILD glm-0.9.9.3.ebuild 862 BLAKE2B 9b34afe8021029980017534376e5fb49faeb7e5ec1ebf17859424cfcacdfc4cd10a3943df9bfae3888cd5317e024ceaaafbbdc6590c75ae908b3cec6c030f017 SHA512 7f004b7285c6304a2e268b7cf6f14f7bb8e79a5ca23bf181446797afe8c57731cf19995448f8cc88c967006418d03f6799ef23ee3471b4a8a13a2e3b60d6a71a
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.9.2-avx.patch b/media-libs/glm/files/glm-0.9.9.2-avx.patch
new file mode 100644
index 000000000000..3549af416fc4
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.2-avx.patch
@@ -0,0 +1,30 @@
+--- a/glm/simd/platform.h	2019-03-06 18:57:53.309630574 +0100
++++ b/glm/simd/platform.h	2019-03-06 18:58:30.796988006 +0100
+@@ -233,7 +233,7 @@
+ #define GLM_ARCH_SSSE3_BIT	(0x00000010)
+ #define GLM_ARCH_SSE41_BIT	(0x00000020)
+ #define GLM_ARCH_SSE42_BIT	(0x00000040)
+-#define GLM_ARCH_AVX_BIT	(0x00000080)
++#define GLM_ARCH_AVX_BIT	(0x00000000)
+ #define GLM_ARCH_AVX2_BIT	(0x00000100)
+ 
+ #define GLM_ARCH_UNKNOWN	(0)
+--- a/CMakeLists.txt	2019-03-06 19:27:14.052353176 +0100
++++ b/CMakeLists.txt	2019-03-06 19:27:05.161503895 +0100
+@@ -203,7 +203,6 @@
+ 		message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(-O2)
+ 	add_compile_options(-Wno-long-long)
+ 
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+--- a/test/perf/CMakeLists.txt.old	2019-03-18 20:18:58.397352048 +0100
++++ b/test/perf/CMakeLists.txt	2019-03-18 20:19:08.466182370 +0100
+@@ -1,6 +1,3 @@
+-glmCreateTestGTC(perf_matrix_div)
+ glmCreateTestGTC(perf_matrix_inverse)
+-glmCreateTestGTC(perf_matrix_mul)
+-glmCreateTestGTC(perf_matrix_mul_vector)
+ glmCreateTestGTC(perf_matrix_transpose)
+ glmCreateTestGTC(perf_vector_mul_matrix)
diff --git a/media-libs/glm/glm-0.9.9.2.ebuild b/media-libs/glm/glm-0.9.9.2.ebuild
index 8f93505e3279..5dd83d7c5081 100644
--- a/media-libs/glm/glm-0.9.9.2.ebuild
+++ b/media-libs/glm/glm-0.9.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
 
+PATCHES=( "${FILESDIR}"/${P}-avx.patch )
+
 src_configure() {
 	if use test; then
 		local mycmakeargs=(
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 7c03324d56fb..c8205a4d31a2 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,4 +1,3 @@
-AUX 1.14.1-fix-32bit-rtpstorage-test.patch 4957 BLAKE2B 2bdd056803ebb1d7f66e7d3e585f0c5d91c52a89992a284c67f8689407f8e5980dc02fc18674fd9215e5ed6e6df0b5ed10dab412f9ea03b1ecd4031cc8231761 SHA512 c97bcece7e14d38f47f75fe78462bee9a580013221e0ad4840bf0d28fe978e1421d1464bef4a2633622dd73faaf4b6aeb605260c8e7c48506e0432c5e5e541e5
 AUX gst-plugins-good-0.10-clang.patch 662 BLAKE2B 19fd6e7bb5bd66e4414360a4b71b1b7594d91d0d4a0665c0b926dcace76cfe75115849b3b6130a4fde6237bc1b07dd87521919fb8be0af35b1158eb22325864b SHA512 773dee80e639e982e71048bb7cbe1b8be2bc94ad6f95403d5cab2e7df97234ccb7be17f9bdfaadcd61f35a47efc8ef616e219a704ec1abcac07c3b989819ac2a
 DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
 DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
diff --git a/media-libs/gst-plugins-good/files/1.14.1-fix-32bit-rtpstorage-test.patch b/media-libs/gst-plugins-good/files/1.14.1-fix-32bit-rtpstorage-test.patch
deleted file mode 100644
index 3bca4f6cd6ed..000000000000
--- a/media-libs/gst-plugins-good/files/1.14.1-fix-32bit-rtpstorage-test.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 48dd93662d6c16fc5967ef4386a63db41683142d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?=
-Date: Sun, 27 May 2018 20:29:47 +0100
-Subject: tests: rtpstorage: fix potential crashes / test failures on 32-bit
-
-Pass 64 bits to g_object_set() for 64-bit integer properties like
-rtpstorage's "size-time" property.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=796429
----
- tests/check/elements/rtpstorage.c | 21 +++++++++++----------
- tests/check/elements/rtpulpfec.c  |  3 ++-
- 2 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/tests/check/elements/rtpstorage.c b/tests/check/elements/rtpstorage.c
-index 4a1d60f..e80b212 100644
---- a/tests/check/elements/rtpstorage.c
-+++ b/tests/check/elements/rtpstorage.c
-@@ -98,16 +98,17 @@ GST_START_TEST (rtpstorage_resize)
-   guint i, j;
-   GstBuffer *bufin, *bufout, *bufs[10];
-   GstHarness *h = gst_harness_new ("rtpstorage");
-+
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
--  g_object_set (h->element, "size-time", 0, NULL);
-+  g_object_set (h->element, "size-time", (guint64) 0, NULL);
-   bufin = create_rtp_packet (96, 0xabe2b0b, 0x111111, 0);
-   bufout = gst_harness_push_and_pull (h, bufin);
-   fail_unless (bufin == bufout);
-   fail_unless (gst_buffer_is_writable (bufout));
- 
--  g_object_set (h->element, "size-time",
--      (G_N_ELEMENTS (bufs) - 1) * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element,
-+      "size-time", (guint64) (G_N_ELEMENTS (bufs) - 1) * RTP_PACKET_DUR, NULL);
- 
-   // Pushing 10 buffers all of them should have ref. count =2
-   for (i = 0; i < G_N_ELEMENTS (bufs); ++i) {
-@@ -139,7 +140,7 @@ GST_START_TEST (rtpstorage_stop_redundant_packets)
-   GstHarness *h = gst_harness_new ("rtpstorage");
-   GstBuffer *bufinp;
- 
--  g_object_set (h->element, "size-time", 2 * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element, "size-time", (guint64) 2 * RTP_PACKET_DUR, NULL);
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
-   bufinp = create_rtp_packet (96, 0xabe2b0b, 0x111111, 0);
-@@ -159,7 +160,7 @@ GST_START_TEST (rtpstorage_unknown_ssrc)
- {
-   GstBufferList *bufs_out;
-   GstHarness *h = gst_harness_new ("rtpstorage");
--  g_object_set (h->element, "size-time", RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element, "size-time", (guint64) RTP_PACKET_DUR, NULL);
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
-   /* No packets has been pushed through yet */
-@@ -182,7 +183,7 @@ GST_START_TEST (rtpstorage_packet_not_lost)
-   GstBuffer *buf;
-   GstBufferList *bufs_out;
-   GstHarness *h = gst_harness_new ("rtpstorage");
--  g_object_set (h->element, "size-time", 10 * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element, "size-time", (guint64) 10 * RTP_PACKET_DUR, NULL);
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
-   /* Pushing through 2 frames + 2 FEC */
-@@ -212,7 +213,7 @@ GST_START_TEST (test_rtpstorage_put_recovered_packet)
-   GstBuffer *bufs_in[4];
-   GstBufferList *bufs_out;
-   GstHarness *h = gst_harness_new ("rtpstorage");
--  g_object_set (h->element, "size-time", 10 * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element, "size-time", (guint64) 10 * RTP_PACKET_DUR, NULL);
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
-   /* Pushing through 2 frames + 2 FEC
-@@ -331,7 +332,7 @@ _multiple_ssrcs_test (guint16 nth_to_loose,
-   guint16 stream0_seq_start = 200;
-   guint16 stream1_seq_start = 65529;
-   GstHarness *h = gst_harness_new ("rtpstorage");
--  g_object_set (h->element, "size-time", 12 * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element, "size-time", (guint64) 12 * RTP_PACKET_DUR, NULL);
-   gst_harness_set_src_caps_str (h, "application/x-rtp");
- 
-   _single_ssrc_test (h, 0x0abe2b0b, stream0_seq_start,
-@@ -453,8 +454,8 @@ GST_START_TEST (rtpstorage_stress)
-   StressTestData test_data;
-   guint seed, i, total, requested;
-   GstHarness *h = gst_harness_new ("rtpstorage");
--  g_object_set (h->element, "size-time",
--      STRESS_TEST_STORAGE_DEPTH * RTP_PACKET_DUR, NULL);
-+  g_object_set (h->element,
-+      "size-time", (guint64) STRESS_TEST_STORAGE_DEPTH * RTP_PACKET_DUR, NULL);
- 
-   /* The stress test pushes buffers with STRESS_TEST_SSRCS different
-    * ssrcs from one thread and requests packets for FEC recovery from
-diff --git a/tests/check/elements/rtpulpfec.c b/tests/check/elements/rtpulpfec.c
-index e0fa972..57de5cd 100644
---- a/tests/check/elements/rtpulpfec.c
-+++ b/tests/check/elements/rtpulpfec.c
-@@ -154,7 +154,8 @@ harness_rtpulpfecdec (guint32 ssrc, guint8 lost_pt, guint8 fec_pt)
-       g_strdup_printf ("application/x-rtp,ssrc=(uint)%u,payload=(int)%u",
-       ssrc, lost_pt);
- 
--  gst_harness_set (h, "rtpstorage", "size-time", 200 * RTP_PACKET_DUR, NULL);
-+  gst_harness_set (h, "rtpstorage", "size-time", (guint64) 200 * RTP_PACKET_DUR,
-+      NULL);
-   gst_harness_get (h, "rtpstorage", "internal-storage", &internal_storage,
-       NULL);
-   gst_harness_set (h, "rtpulpfecdec", "storage", internal_storage, "pt", fec_pt,
--- 
-cgit v1.1
-
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 234f572f933e..a8be6c048aab 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -3,10 +3,10 @@ DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f8817
 DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
 DIST harfbuzz-2.3.0.tar.bz2 17909479 BLAKE2B 32ea08ac60ca3c6b91a41b17d857bcabfd6f13785b674ceaf7006cd0616e1799d1d5f390f5b8d37e2bb22ac5506f00a6fc5c9a6a5263c23760ffe0e0677fe44e SHA512 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
 DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
-EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B a4521347729a2533a10ef6e28c54d91c93a93198db6f1199fc3534503780a74e6888fb370b59f85df07c057dc4d51983c54fc3cac86e1f18031ad3302fbdf2ea SHA512 6f824127087d1e5dfbc3f13dc23b06292feae1ade55715e5318ce6329ff15f087ac7cb0d69606f77408a3616df5f35ed08f9d2f8faa0beb0a58974519a9ce807
-EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
-EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
-EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 83bf6f358e3799d0cdff7e5c7becbdd00c3fb34466552d427c42b9129c379990064b917d0ffa9d7b40d3e68a1730b5b2059052dadc2f1af2607cf841adc03f3c SHA512 158d7bbb98b60a8ce9a860538671a4fa64e1c9620b91da68126b0db0ab19658a668de4f2d436c22056b193e0b2256cba9ae66dfc14f7a71f4e19913b4bfc6063
-EBUILD harfbuzz-2.3.1.ebuild 3034 BLAKE2B 83bf6f358e3799d0cdff7e5c7becbdd00c3fb34466552d427c42b9129c379990064b917d0ffa9d7b40d3e68a1730b5b2059052dadc2f1af2607cf841adc03f3c SHA512 158d7bbb98b60a8ce9a860538671a4fa64e1c9620b91da68126b0db0ab19658a668de4f2d436c22056b193e0b2256cba9ae66dfc14f7a71f4e19913b4bfc6063
-EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
+EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B 0a57e126a32b29bc80e1e9c21b7f41f65e7b802674254ac7873d3ff74a6f76afa1133d4a13db2d909a25175d6e8978f1701e4d9811e13da2845f9a991e05cd0d SHA512 087a6d939fdbba2a3c57c6a0ded302a2ebb27b8776a3a16431c624ffda8a8742a71d4d8e105f87f9354eb7c13c82badd4b50841475324d33855692ffef106f6b
+EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
+EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 62ef17e0a44743eb46f8fa181a1e94334a3b0cbe5c6ecf8ff2b2ad0ad8393dfea288cb2d4b9aa6193028f2a7cf995d38e01d25a710586d373e62377552304d83 SHA512 d52af0ac8aea38e71d09ae0e360acb4fff16394e1759bd88cb67b522afe4ab0db1ac70b7464e311274a08c0e27b623c41175e75f14f097bafaf39af71beeb788
+EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 7d620a2005df18eced9e5288632a102730b5531f4373289b9c584cfd2b7096ef1264f3778001a5c47f4d455f19c5dbf7f2e8ef27a1939956befe188b779ee487 SHA512 4ea2f1c1f1c4b166c5c69e735c99badf1eb88d25eb78bc9632426cb1639bd121c80016c72798087b167526a13c2748829f93134d59564a1c3e50d40974887f58
+EBUILD harfbuzz-2.3.1.ebuild 3031 BLAKE2B 9661cb45752c88e610c780ad9ec8ed27e4a639915a71c283981f9ed04cdeeb69619fd2453e95518ad2f20f064443ce997a67ec8c3a58ee6966dc40cf5dd530d4 SHA512 813d6f4e5b532681eed47e4963af490ee33982b6c3ed7f53a466496c77aab045c673c467bd2b84102dcb909f5cc7ff7faedc70be1f2bdfe325e5e700c5ca5d92
+EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B afca3dbe2f59a7bf02bab5f81f00589f05080ef91ec346372a44aa7f47982a3efa70e26c61180de0517763ffde83aca10fc125997f8a1c8942520c26fcfdb511 SHA512 7b1c896402721aa66521165db457a254114d7c544fd1b67b42fc1667239d82b855f71bc04b4aa0693af26066a340bc67a196413e512defbff619ed97cc31bbe0
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
index 2cfc66808b22..40e27ba44322 100644
--- a/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
index 9223739ba804..da5f35a6a967 100644
--- a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
index 9223739ba804..da5f35a6a967 100644
--- a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
index 08348f2ec48e..072663ae41e8 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
@@ -33,10 +33,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
index 08348f2ec48e..74fbb4200e84 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
@@ -33,10 +33,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 85491d783cd9..cb8c95a6e525 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,10 +34,10 @@ RDEPEND="
 	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
 	test? ( ${PYTHON_DEPS} )
 "
 BDEPEND="
+	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
 # eautoreconf requires gobject-introspection-common
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 27ba13a83367..631ab6d30c91 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,5 +1,5 @@
 DIST libchamplain-0.12.16.tar.xz 623912 BLAKE2B fcdf351e5b264cc31e2ce2954e05abd9f9aaaa9ad622eb015e2267b24a8c281cd9fc79d0e5081f80b8805e0b9329b6c463d04e18d5704d75ab45139d86896e62 SHA512 78db380d87bd6437cab84b546af7f6505a8aaed7e8d9e8a06f3fdab1896b06a3bf1d11201384e4daedd2c78e528221e1d7e40665557e78251efec5fa036f4137
-DIST libchamplain-0.12.18.tar.xz 233108 BLAKE2B b244d0008af922e11f7e812972f1557e05a8ec5921a455db102ad102c64f0062a1d74f1650e6255e49e395d860b51f44f4e9e744e33daf6c9f07bf3e866e402d SHA512 204bed27a92ab0531d0d639a94deb55dbb5318de89d17b9ea44877d66034ae62948b0ec5380a9b756b61655a095817a2ad19a0c2b50342429af7af8750ac5ddf
+DIST libchamplain-0.12.19.tar.xz 233084 BLAKE2B b46ef4b1ceaef3d3b7d52652e825de30a11d7b8f5a68b5a08abcec7111c58443ba76b9aea6b350007ccd91bfc86a4062079c51416fc4e63795318269045ce509 SHA512 3fc03c123859b078f1c4f5062706c95446146a7ed2352306cea3f72f3fbf95099afd2a99f61182e3cb7c47e546de6501ff3ed6ff17614f23dc2e4139ba5e4902
 EBUILD libchamplain-0.12.16.ebuild 1627 BLAKE2B 5b27437597ad463e41c731ad01aca90a9280bdcd8164bc500fc8870cef5770a391c8cd66d4467d2e7f1a784d2a854378be6d0b5976cf585c4c3ecef7366451dc SHA512 121df5c8fa295c833f5ea2b66df4a70944ab4fb0c1e1eb9e44eafc872c97860580546ef839696bf91fd5bc12add81d419130d02d707e2576b9d72b6b8c1947aa
-EBUILD libchamplain-0.12.18.ebuild 1360 BLAKE2B 9464a1ec51b9b0e21b4b8c995c6c901054bfabc7569ef94dab9cc721f508200cc0a170d28cf337c93a4410c8dcb4e4679419f2165b93bf2bdc00eb385f779adf SHA512 32a5e626d395b73d8624d9e89d98078baaf9da3c5a8c40a13b97f547952a1980a14a3c54ccacaaa0e69d7594a6b0eeba1fd86f5d5302d5815752d57121806c62
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
+EBUILD libchamplain-0.12.19-r1.ebuild 1656 BLAKE2B ba6110dbf4d34c105e31921eb6e007dadb9d3bd11367824ee0c6baaa30eb5b2e05bcbd453f689177cf66c9eaa3d22cc83114a73a77f4b2496d4382bcac4bb075 SHA512 ad0a999e320cb11e4cd7845365afd1cfef09c20ccfaec421b6e6ec3687cece4b6b26b958108f14d5944c92bf6c8eb57ec608fb2124c208e64214db5a75cf7284
+MISC metadata.xml 621 BLAKE2B ff31085e2b6cee6e64d64161505ae026d3d6896964a0e5aa055b6052b6bc242396db2bc1bb603cfdd3b66300d65e39fa57a8556ac3cea2454ac52048eedea61e SHA512 6d2214f5f62f6deace80db56fee500efed4713be2087b6a9159594a36c503b534b8f50e728ceccfe13f17ce79614ec97baf5b56342680b9283e03096df644a64
diff --git a/media-libs/libchamplain/libchamplain-0.12.18.ebuild b/media-libs/libchamplain/libchamplain-0.12.18.ebuild
deleted file mode 100644
index 5bf54c2495e1..000000000000
--- a/media-libs/libchamplain/libchamplain-0.12.18.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clutter based world map renderer"
-HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
-
-SLOT="0.12"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="debug +gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.38:2
-	>=media-libs/clutter-1.24:1.0[introspection?]
-	media-libs/cogl:=
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/cairo-1.4
-	x11-libs/gtk+:3
-	gtk? (
-		x11-libs/gtk+:3[introspection?]
-		media-libs/clutter-gtk:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Fix documentation slotability
-	sed \
-		-e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
-		-i docs/reference/Makefile.am || die "sed (1) failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Vala demos are only built, so just disable them
-	gnome2_src_configure \
-		--disable-memphis \
-		--disable-static \
-		--disable-vala-demos \
-		$(use_enable debug) \
-		$(use_enable gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
new file mode 100644
index 000000000000..1240a3e7c15c
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.19-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
+
+SLOT="0.12"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+gtk gtk-doc +introspection vala"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( gtk )
+" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore)
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.0:3
+	>=media-libs/clutter-1.24:1.0[introspection?]
+	gtk? (
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0 )
+	>=x11-libs/cairo-1.4
+	dev-db/sqlite:3
+	>=net-libs/libsoup-2.42:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	media-libs/cogl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.0
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+	# Fix showing inside devhelp (gtkdocdir subdir and name of the module need to match)
+	sed -i -e 's:package_name:package_string:' docs/reference/meson.build || die # https://gitlab.gnome.org/GNOME/libchamplain/merge_requests/7
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmemphis=false # TODO: What's the state of this vector renderer?
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk widgetry)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+	)
+	meson_src_configure
+}
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index 996e7cacd217..c119093f59a9 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/metadata.xml
@@ -5,4 +5,10 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<longdescription lang="en">
+		libchamplain is a Gtk widget displaying zoomable and pannable maps that can be
+		loaded from various network sources. It supports overlay layers, markers, and
+		custom elements displayed on top of the maps. The library is written in C but
+		other language mappings are also available thanks to GObject-introspection.
+	</longdescription>
 </pkgmetadata>
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 36b42b08b390..8a2e3c6ea616 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3.ebuild 1245 BLAKE2B 92eedb81dceb23c164818711fe1418e7b2ccdcb18364918ace8f7f78ba9b61ad67897888e5fac4ed4bb62fe834a48c49950f7acd11ce5bdec61e3432c38f4d0a SHA512 ed5952f8233c8aa2638ceb1eb77177fe43e323a13d6fcac7e14b3ab2ec548852657f950e2bd05740f93c874d86b1adb18dd26acc4b9e928719829ac76112ce60
-EBUILD libepoxy-9999.ebuild 1250 BLAKE2B 7566df5582dca287763302ad9ecf95810cc803eba09108a699a5739076b883f29ba26086fed4760a89147ae337e3a3181f1781bcdd885547b7a2295d6435c0ce SHA512 0c090d202ee0f329ffdc2b1a7e69eb2d46b559d88046ff88c6bf898d1e260898e9089a3228afa079e611377f78aa4afc25ba3aebf498bd7dea5afd3e5c375cc3
+EBUILD libepoxy-1.5.3.ebuild 1249 BLAKE2B 4eda9672aa42648a0fab95a810d286ff9ba593da8d0c12dd0f13a69c8385f44834b03b1efdf7c35b9fd6c5fdf558dbbf0217c83d99b3d4139d8b71a1056ff438 SHA512 6b320446249bc68ecadf9a2cc48e9885f453914484045cc991c31f30414130198ebd5593dc63a87afa8a87e0af3405e961f0d906d85d07b15dc2559331e494f5
+EBUILD libepoxy-9999.ebuild 1254 BLAKE2B d5b828ddb6f61f32165389b4ac14dcd86dd5b4cddac8a107d6b78af90b799bfb08a35ddd1c3d43d3fee49c0660e03a3a7d70cfa46315d5aa79c11353a8163d26 SHA512 92146d55794ab3b8e9f0b9a71d6f4f02b635b41624b25eb35c8a234f416d67790a076f88bcf243c113ba3791e3ce5982eb3b3d58f5568cb2b794d011cbc17eb4
 MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
index 24977945905d..cec62781b845 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,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 ec896cd974cf..bb809e2ad9b4 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_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index 005ee4bc24d2..da33315a8488 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,5 +1,8 @@
 AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
 AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
+AUX libexif-0.6.21-CVE-2018-20030.patch 4629 BLAKE2B 574f95d21507887851da9486cbd8d263ad25e1df59dd8020f1e4b640d5cc4852667c689993e67a7d705c748b521a46cd5e187a99c9d92787bc9758631c8d7741 SHA512 c49437dffebb901209748b884d67192d2b77072b2fb96c77b95f398d3c68272b14ac4a6ddd33111df8dac49cd6ab8f38e230f8f3f0a842d4b40f2fd38f141a1d
+AUX libexif-0.6.21-fix-C89-compatibility-issue.patch 1138 BLAKE2B 5b3923a7fd82fc4c0f267684c67f329b4ff2dc43f9d088acd4a352a9f3c329b08c338c51c77b3f55654e5cf2dbb2f7ba317b10de7e963ccc7b4c1989332fd544 SHA512 a91c2f12141b7a0c399f08f038746ca44cbc468776e5b34672d38921b8a131df3938e400fea04d20c323d6d1363f8fb176a4abac7be4b1ea9bb9694aa902f19e
 DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
 EBUILD libexif-0.6.21-r2.ebuild 1270 BLAKE2B f8753e55e91ca4e35e390c326c14945a288b81dcb717476594d6299f126455de5fc5e3f1095b340140ecea93453dffff37fdf6f4061d658d28774d67de00ec65 SHA512 f1a6e41ea987e51f36e70e4078deddcbedc28c7c8931c0b8ce6e5e68fc8411a8f23319c05e6dc178d1799990ea42d223ab587452d4329445ab1605fc47ed34f6
+EBUILD libexif-0.6.21-r3.ebuild 1374 BLAKE2B 8b31dff514504dbacb510bb5a15c14064b43f233134d4ed4023d442f30076a09e04f3c8c899f045d71097f5577d8f24a4cf50f504523255cb591bb832c8fe3f0 SHA512 597660c2235e5fdcc86abcb4ed6cc7ceb960f1d7f68a5b28cce7eb6cf2ad6131df1fb3621cb7eb9953f8bf3b7c6e695ab22054cdef91ba872c1475aac77e8a07
 MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch b/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch
new file mode 100644
index 000000000000..08179f84b500
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.21-CVE-2018-20030.patch
@@ -0,0 +1,117 @@
+From 6aa11df549114ebda520dde4cdaea2f9357b2c89 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Fri, 12 Oct 2018 16:01:45 +0200
+Subject: [PATCH] Improve deep recursion detection in
+ exif_data_load_data_content.
+
+The existing detection was still vulnerable to pathological cases
+causing DoS by wasting CPU. The new algorithm takes the number of tags
+into account to make it harder to abuse by cases using shallow recursion
+but with a very large number of tags.  This improves on commit 5d28011c
+which wasn't sufficient to counter this kind of case.
+
+The limitation in the previous fix was discovered by Laurent Delosieres,
+Secunia Research at Flexera (Secunia Advisory SA84652) and is assigned
+the identifier CVE-2018-20030.
+
+Adjusted for missing https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a
+
+---
+ libexif/exif-data.c | 45 +++++++++++++++++++++++++++++++++++++--------
+ 2 files changed, 38 insertions(+), 8 deletions(-)
+
+diff --git a/libexif/exif-data.c b/libexif/exif-data.c
+index e35403d..a6f9c94 100644
+--- a/libexif/exif-data.c
++++ b/libexif/exif-data.c
+@@ -35,6 +35,7 @@
+ #include <libexif/olympus/exif-mnote-data-olympus.h>
+ #include <libexif/pentax/exif-mnote-data-pentax.h>
+ 
++#include <math.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -350,6 +351,20 @@ if (data->ifd[(i)]->count) {				\
+ 	break;						\
+ }
+ 
++/*! Calculate the recursion cost added by one level of IFD loading.
++ *
++ * The work performed is related to the cost in the exponential relation
++ *   work=1.1**cost
++ */
++static unsigned int
++level_cost(unsigned int n)
++{
++    static const double log_1_1 = 0.09531017980432493;
++
++	/* Adding 0.1 protects against the case where n==1 */
++	return ceil(log(n + 0.1)/log_1_1);
++}
++
+ /*! Load data for an IFD.
+  *
+  * \param[in,out] data #ExifData
+@@ -357,13 +372,13 @@ if (data->ifd[(i)]->count) {				\
+  * \param[in] d pointer to buffer containing raw IFD data
+  * \param[in] ds size of raw data in buffer at \c d
+  * \param[in] offset offset into buffer at \c d at which IFD starts
+- * \param[in] recursion_depth number of times this function has been
+- * recursively called without returning
++ * \param[in] recursion_cost factor indicating how expensive this recursive
++ * call could be
+  */
+ static void
+ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
+ 			     const unsigned char *d,
+-			     unsigned int ds, unsigned int offset, unsigned int recursion_depth)
++			     unsigned int ds, unsigned int offset, unsigned int recursion_cost)
+ {
+ 	ExifLong o, thumbnail_offset = 0, thumbnail_length = 0;
+ 	ExifShort n;
+@@ -378,9 +393,20 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
+ 	if ((((int)ifd) < 0) || ( ((int)ifd) >= EXIF_IFD_COUNT))
+ 	  return;
+ 
+-	if (recursion_depth > 30) {
++	if (recursion_cost > 170) {
++		/*
++		 * recursion_cost is a logarithmic-scale indicator of how expensive this
++		 * recursive call might end up being. It is an indicator of the depth of
++		 * recursion as well as the potential for worst-case future recursive
++		 * calls. Since it's difficult to tell ahead of time how often recursion
++		 * will occur, this assumes the worst by assuming every tag could end up
++		 * causing recursion.
++		 * The value of 170 was chosen to limit typical EXIF structures to a
++		 * recursive depth of about 6, but pathological ones (those with very
++		 * many tags) to only 2.
++		 */
+ 		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifData",
+-			  "Deep recursion detected!");
++			  "Deep/expensive recursion detected!");
+ 		return;
+ 	}
+ 
+@@ -422,15 +448,18 @@ exif_data_load_data_content (ExifData *data, ExifIfd ifd,
+ 			switch (tag) {
+ 			case EXIF_TAG_EXIF_IFD_POINTER:
+ 				CHECK_REC (EXIF_IFD_EXIF);
+-				exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o, recursion_depth + 1);
++				exif_data_load_data_content (data, EXIF_IFD_EXIF, d, ds, o,
++					recursion_cost + level_cost(n));
+ 				break;
+ 			case EXIF_TAG_GPS_INFO_IFD_POINTER:
+ 				CHECK_REC (EXIF_IFD_GPS);
+-				exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o, recursion_depth + 1);
++				exif_data_load_data_content (data, EXIF_IFD_GPS, d, ds, o,
++					recursion_cost + level_cost(n));
+ 				break;
+ 			case EXIF_TAG_INTEROPERABILITY_IFD_POINTER:
+ 				CHECK_REC (EXIF_IFD_INTEROPERABILITY);
+-				exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o, recursion_depth + 1);
++				exif_data_load_data_content (data, EXIF_IFD_INTEROPERABILITY, d, ds, o,
++					recursion_cost + level_cost(n));
+ 				break;
+ 			case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
+ 				thumbnail_offset = o;
diff --git a/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch b/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch
new file mode 100644
index 000000000000..c423c9daa61c
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.21-fix-C89-compatibility-issue.patch
@@ -0,0 +1,30 @@
+From 3840e4f1f550e0d113e4ed70bd74f9f798f7e6f8 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Sat, 13 Jul 2013 13:34:50 -0700
+Subject: [PATCH] Fixed a C89 compatibility issue (bug #117 reported by Guenter
+ Knauf)
+
+---
+ libexif/exif-entry.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
+index 54a90a2..bb42473 100644
+--- a/libexif/exif-entry.c
++++ b/libexif/exif-entry.c
+@@ -1375,12 +1375,14 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
+ 	case EXIF_TAG_XP_KEYWORDS:
+ 	case EXIF_TAG_XP_SUBJECT:
+ 	{
++		unsigned short *utf16;
++
+ 		/* Sanity check the size to prevent overflow */
+ 		if (e->size+sizeof(unsigned short) < e->size) break;
+ 
+ 		/* The tag may not be U+0000-terminated , so make a local
+ 		   U+0000-terminated copy before converting it */
+-		unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
++		utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
+ 		if (!utf16) break;
+ 		memcpy(utf16, e->data, e->size);
+ 		utf16[e->size/sizeof(unsigned short)] = 0;
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
new file mode 100644
index 000000000000..b9af2c870d3c
--- /dev/null
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="Library for parsing, editing, and saving EXIF data"
+HOMEPAGE="https://libexif.github.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
+	"${FILESDIR}"/${P}-fix-C89-compatibility-issue.patch
+	"${FILESDIR}"/${P}-CVE-2017-7544.patch
+	"${FILESDIR}"/${P}-CVE-2018-20030.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
+	elibtoolize # For *-bsd
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		$(use_enable doc docs) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING} || die
+}
diff --git a/media-libs/libggigcp/Manifest b/media-libs/libggigcp/Manifest
index b69969ffc52d..131d1bc8636e 100644
--- a/media-libs/libggigcp/Manifest
+++ b/media-libs/libggigcp/Manifest
@@ -1,4 +1,3 @@
 DIST libggigcp-1.0.2.src.tar.bz2 365368 BLAKE2B 797b1e739319e3982836ec2a7eb14626ea39c116a593703af4de4486b0f43b4ffad89fb4a5245d50f434a97265651554f450033fa66b086a35c76837227b2d6c SHA512 88187eac6f9cae56a2e4d184c0eed2f46c8e53c8b69143479775330abc3f03b48f463ecc944788daade871e4bedf86948c2dcae714c037f8c1284b1576428b3a
 EBUILD libggigcp-1.0.2-r1.ebuild 624 BLAKE2B 7fa0138383761fce187eb569531961a8e8279a3d79e41737d0fd1bd8c9ae90f63e496963fe11a1964a84ae221a5a821c8a892b4cf46c7958f14131f6ae7c76e4 SHA512 54c9224da9730e35370e1fc521fd43f457bece67e943840144687979baf53ed1ede2a77f30b9270124b46b760e9fc6325962017b5bec86524a52063a125fa305
-EBUILD libggigcp-1.0.2.ebuild 537 BLAKE2B 085097b8c3bb994a0ae8629cf2dfb3970f50aff1b137c01c0f3751e87aa47f968ecd202fcb5f7f1fadd4791cf4a6fdb79d8810701448afe7be6b87765c975364 SHA512 f961d9066175d78b0f5a75b23b14de4871843d7229031cf5f06f6d54de5351889b3cfde234a7bc86f4dd9eb2d1717d38889796ccfe6e824664ca3bb6b84bacd5
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggigcp/libggigcp-1.0.2.ebuild b/media-libs/libggigcp/libggigcp-1.0.2.ebuild
deleted file mode 100644
index 3ae8950cd253..000000000000
--- a/media-libs/libggigcp/libggigcp-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Libggi extension for advanced color and palette handling"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libggigcp.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libggi-2.2.2"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README doc/{TODO,*.txt,*.faq}
-}
diff --git a/media-libs/libggimisc/Manifest b/media-libs/libggimisc/Manifest
index e711d3556f7d..ecd695588fdd 100644
--- a/media-libs/libggimisc/Manifest
+++ b/media-libs/libggimisc/Manifest
@@ -1,4 +1,3 @@
 DIST libggimisc-2.2.2.src.tar.bz2 320084 BLAKE2B a63c6f3111fe577be4d75483982c4ea504f649b9ccff01ed10d6b40da3e36a5a6c44801e1dbca9f62fba67551c644607d90be0a009e4bc30a95638d822dff30a SHA512 1b4fcc7260d03a7f5f5b1679adec4904284f370ab428c4f3ce1a6ef9fe73b2c9b86acecbcc90a8375f2c271e82a07622782868a353dea55523b8f6a66ed05ccc
 EBUILD libggimisc-2.2.2-r1.ebuild 859 BLAKE2B bacf5bea206cf6fd8b22b9541daf8d45f0b7ba0dcbde9dbfbb6eae863b5858136e711016ccfe9eeb70b1c94f9e8170c308b0c75e38d3d0052f500b74399a0155 SHA512 58ed4ed3ac05681e0bb53f48c8be24225ee3ea106780ebf918afae5d3fe64a576602186182a3fec0dd997585b4cce41e1b124bdbd77b806bd3f3bc810f71f838
-EBUILD libggimisc-2.2.2.ebuild 808 BLAKE2B 923be77909f7339823ef204e9a60ab3bdfc4e299799dff6f4aaf7b2127f7ecf01c3eedaceced3238e2ffff17edeac6a7666c5646b335edd3ae6f6a495ecf37f6 SHA512 4aa4eee8da4473bedd39d47cda9f3f213a8c79100cddf78343f331fd8a5fc0cb5aa17b1cc92ef48e005ac7b0670dab63993005d3c64e5d290d8f140f17718321
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggimisc/libggimisc-2.2.2.ebuild b/media-libs/libggimisc/libggimisc-2.2.2.ebuild
deleted file mode 100644
index abf922bfdd7b..000000000000
--- a/media-libs/libggimisc/libggimisc-2.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Adds support for some special graphical target features"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libggimisc.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="fbcon svga"
-
-RDEPEND=">=media-libs/libggi-2.2.2
-	svga? ( media-libs/svgalib )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf --disable-x --without-x \
-		$(use_enable svga svgalib) \
-		$(use_enable fbcon fbdev)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README TODO doc/*.txt
-}
-
-pkg_postinst() {
-	elog "X extension for ${PN} has been temporarily disabled for this release."
-}
diff --git a/media-libs/libggiwmh/Manifest b/media-libs/libggiwmh/Manifest
index 8b7a873997de..71c89fae1e7f 100644
--- a/media-libs/libggiwmh/Manifest
+++ b/media-libs/libggiwmh/Manifest
@@ -1,4 +1,3 @@
 DIST libggiwmh-0.3.2.src.tar.bz2 316669 BLAKE2B b14f8df0849bbe6e4a59d2285423238c3409bea3a00ecb066042df095ea8c7c4f75de9c4b3a79f0c1eacd436aae71b67be1e084dd23243dd3cfcaca5dd137077 SHA512 d12a9f158ba76ca8077568cd48f26f0fd8ab561b68cc33e74a8898f7fd594b417cd514806f827a63a4315c546bb35f5b71a5f54f5a2b54562f276e37146224b8
-EBUILD libggiwmh-0.3.2-r1.ebuild 771 BLAKE2B f3b2a1e20dcb30a61e3d62464dc4f007c7ad445c46f4f09d7c280a4c7bb98170152f1e558497e710c58df3a8ab1750cee4cf26ff2e61803781c464f0382e77e1 SHA512 c97b327cbd8301a263a8f67b645c0acbff6a0677fe82faab3dbb8ae575ca8f8a9f0e5fcd3e9b20126a86c6345b1ccb3e32d97f79de9051e4a570ee332363f188
-EBUILD libggiwmh-0.3.2.ebuild 742 BLAKE2B 5619df6c6a13d59149d7b3a6f7f8fd14d81841eaca9fe9794c6f7b9094ef4fc32e2c5494fa7b2e2656707a3fae0cacbd49c75d9f28275d621dfc527005c95391 SHA512 ee93e804304fce560d4dddb8fe05f615ceac8150aeda62b802df02da66125f1efdbe13b77c743f322ca3d2ba673d1abadad2d51d15593f990ea328ce668524fe
+EBUILD libggiwmh-0.3.2-r1.ebuild 770 BLAKE2B 8bdc69251f98179115ae5abd0f67f1e6855a8ba5c8c93e3af9ec886d8a94c76a25bd6c10fe36195128a06c13edfe804dca5edbfe81a7011945c8f0db1a40c3bb SHA512 1915dac3dced93e8dd5c69e166e60edff21a6d9d35bbea0a7f785b4eb4307704b44345ee43fdda354929b09aa752b4e459360db1f0345780dcbc95e7fbdc6580
 MISC metadata.xml 296 BLAKE2B 6b8887bb428a63d2f6b54f6c170ad69d9c5d41f718b6ab9cd3312748e4fa9a74a79c155343a6434525054fccd74838b93026ffad7ff30a067d0c45f683267797 SHA512 5e1f45111c1b86547646ddeb2b1c8435e10bb2743132325bfc156e560874a9871baf81e621004fc03bad3b32e7266894636916b292b096c25be80ba828c264fc
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
index dd28c413ec20..d4a322807f20 100644
--- a/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
+++ b/media-libs/libggiwmh/libggiwmh-0.3.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="X"
 
 RDEPEND=">=media-libs/libggi-2.2.2
diff --git a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild b/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
deleted file mode 100644
index ae533a708091..000000000000
--- a/media-libs/libggiwmh/libggiwmh-0.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Window manager hints extensions for libggi"
-HOMEPAGE="https://ibiblio.org/ggicore/packages/libggiwmh.html"
-SRC_URI="mirror://sourceforge/ggi/${P}.src.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="X"
-
-RDEPEND=">=media-libs/libggi-2.2.2
-	X? ( x11-libs/libXxf86vm
-		x11-libs/libXxf86dga
-		x11-libs/libXext
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	econf $(use_enable X x) $(use_with X x)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc ChangeLog README doc/*.txt
-}
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 3df7efc29f9c..e7f54991fb63 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
-DIST libglvnd-1.0.0.20180524.tar.gz 796997 BLAKE2B 75c50d2eb864b84e97af5b5f0c9bfde2651436acbad323312ca8b88df8cfa4dd170a743748e8c2269f39d9cb492d6ffaabd66a76ffca3062be2462adca4c79cd SHA512 3e49e4647b50f04dd534282b2f7ae76d84ea3dcd071771492a6560ae327d6167fcd071d32c447af097e68d84e6560d6b2c2b00d1409664e8b6a628b49ccdbdad
-EBUILD libglvnd-1.0.0.20180524.ebuild 1038 BLAKE2B 42a2ae7f9e5d3a923c6590b00357523811ec2b8ae29314f9aa1340f7544e9bd7ec1e3880fc616b51afebf07c512e0d1b70d01513b1d2b28cb8b33aca4b4e5791 SHA512 d83158a4f7bde62e3096e320f488d1bce3418f2a45814c06e51518642eaff1fba22717ed803ae22e824043039710a0c681335ba448485777771ac0edba122b1a
-EBUILD libglvnd-9999.ebuild 998 BLAKE2B 4796525b97166079c2364bb0d75157ae405a6f8089742d7b691934bc67f32f2e8273a3ff25e47f6bdd083e7fcae64ef705a96d7e99c9d88ec7aa30449b5d4ad2 SHA512 6d2ec15fe6c651997152f39f64060f98cca6c9f2ffacb78a4f485e76c8e160dcec14cd85b9407f6a080871e0a38422e61e630051e547137ccf4eb8509d7b7e03
+DIST libglvnd-1.1.0.20190213.tar.gz 829094 BLAKE2B cf977846693a5de3485e23fe8b4c8e2bc0472d994dc85530ecd85c685d71abd7aa69e815292141f60fd69a299cf39ac16dda5822128295747bfd42db3408df66 SHA512 772445cbb5574c1900109b3e0d8aab442b8c8d9790c4d91e1400fccdff4a53b653b59120e4fb631a45fc47af02949288924e62a22c3d877d4f741d5596736e37
+EBUILD libglvnd-1.1.0.20190213.ebuild 1073 BLAKE2B 0d0724d15fd6e1589235e5b1cdb8f39590535ea741c3213b20af42a1572b73e155b72e927cfa4a832b525b568e810a9d3785316d8152dddb61bb8632e06d2f45 SHA512 291b176d21ad08b26b427273ec0827b83e3cc6a660aef187457691c2768299b88175b78da8266b50e38295674b6d91d5540b5fbe98a17f030e3cffa012ee07fb
+EBUILD libglvnd-9999.ebuild 1033 BLAKE2B 3c69ab9bec691b032a39217e45e61a9f76c6bb28624e0829744b84bc4022788fbe923d827d792704743580c0349b5e61a6f5ec314afea79564be5415917f10a5 SHA512 ab87158b8d88c37964dcde6e27228691548d8c6e815d9d35cf1b516163c62106d787f7b5df9c3b8c05faf78f54a924965afa41a4b8668ec1f1c1609d125ed3a6
 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild b/media-libs/libglvnd/libglvnd-1.1.0.20190213.ebuild
index b1d53c3d68eb..c1e812ba70bc 100644
--- a/media-libs/libglvnd/libglvnd-1.0.0.20180524.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.1.0.20190213.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
 
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	COMMIT="8709003ffdc905d144855c3117a31da220149d4c"
+	COMMIT="f92208be88dd06a70b6f79a1cb95571e2762a9ec"
 	SRC_URI="https://github.com/NVIDIA/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${COMMIT}
 fi
@@ -52,3 +52,7 @@ multilib_src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 9f9f724cecc2..f62514e30584 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
 
@@ -52,3 +52,7 @@ multilib_src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+multilib_src_test() {
+	emake check
+}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 56b42643df6f..7d7a2e034503 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,5 +1,7 @@
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
+DIST libgphoto2-2.5.22.tar.bz2 7169810 BLAKE2B d4947a4b5cf4a6f48ec619e0531ab29a035143031529436f566ade26d11b354328dc70e5d20533a3c023fd8b87afd0db9d85617fea9d06ee433137da6a1d9413 SHA512 8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb
 EBUILD libgphoto2-2.5.16.ebuild 6230 BLAKE2B 14a4b1f316a0f4ba439c42a729cd5fc763662f4c78199edff7765ed5bf70e36e2234f07f7fca9e7a4f42a0d888317449b2342e7eb50412e26048f08cebfb5f4c SHA512 91baa693f5cecc6d54f3d1cf55d703fcfb62bb11b266f49c99e615fb924e20ff70ad736ffca98b67677f2e340b3fb9b55dc4e6215ca41237182b56c5702bc00f
-EBUILD libgphoto2-2.5.20.ebuild 6239 BLAKE2B 2fd9815fc3a3739455c511bb0674a74f023f098403e5f87b697768d8cc00f5fe6e9833f0a01aea2ad094617d687d12b900af216039135e763ef56178e9cce4bd SHA512 62ceef36668d07096784f243b1dcbb2e92ed7299725db4189fbc2056cf34578d52e7df52bf430352f5a3e10add49fa527bbed228d3e996f54223716e1e579604
+EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B 445fa8609fe2ad6c4661074fe31c4712c6c45326094cc8a0aaf6916bdfe6d356c98d4c0a179e818c3ddcbd280840c0ea028db66c880a94ac11a09c54059773d5 SHA512 770eae80cdd089c695d14cda014c740e9d466e9920bc9dd2bfddd7f5c4ecfddfa7b45e5a0b8de5a110fe9532d5959126755f43c38f0b5c402130eb7c46e85399
+EBUILD libgphoto2-2.5.22.ebuild 6239 BLAKE2B 2fd9815fc3a3739455c511bb0674a74f023f098403e5f87b697768d8cc00f5fe6e9833f0a01aea2ad094617d687d12b900af216039135e763ef56178e9cce4bd SHA512 62ceef36668d07096784f243b1dcbb2e92ed7299725db4189fbc2056cf34578d52e7df52bf430352f5a3e10add49fa527bbed228d3e996f54223716e1e579604
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
index 244269d65884..9e9990c9a10a 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
new file mode 100644
index 000000000000..244269d65884
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.22.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#    https://sourceforge.net/p/gphoto/bugs/643/
+
+EAPI=6
+inherit eutils multilib multilib-minimal udev user
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} +cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
+	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+	!<sys-fs/udev-201
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gphoto2-port-config
+	/usr/bin/gphoto2-config
+)
+
+pkg_pretend() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	default
+
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	sed -e 's/sleep 2//' -i configure || die
+}
+
+multilib_src_configure() {
+	local myconf
+	use doc || myconf=( ac_cv_path_DOXYGEN=false )
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${cameras} \
+		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir="$(get_udevdir)" \
+		"${myconf[@]}"
+}
+
+src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		einfo "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	einstalldocs
+	dodoc TESTERS MAINTAINERS HACKING
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug #????
+	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	local udev_rules cam_list
+	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${ED}"${cam_list} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${ED}"/${udev_rules%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
+	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+}
diff --git a/media-libs/liblo/Manifest b/media-libs/liblo/Manifest
index 7f2dee8dda1a..76bf24b6f833 100644
--- a/media-libs/liblo/Manifest
+++ b/media-libs/liblo/Manifest
@@ -1,4 +1,6 @@
 AUX liblo-0.29-ipv6_build_fix.patch 4943 BLAKE2B 3555606b1f3aa1409facd5bb81947b02bfc5eab60463134e591249d3eef0b3638eaa002feb4b101decd344efe751310b15d8e8e645d2a2fc9345a88987a2eb20 SHA512 3f077109bcc8e0e5ffb18e41b8e27a9809aa00f59dbba40c30f3a83a526aad4ca25e620b0fb59825de5da37e27b4596572cfad0769c330eece1cfe857293dc3f
 DIST liblo-0.29.tar.gz 645313 BLAKE2B 2ef68c49446c83e13541e626eb666360f4b1b579abd2685a9eeaf18989e0252860a7c2eb99e9f6991210873b60dd4b0a62f4f2adfe88c8ac2e069b41fea0e2d4 SHA512 11e20725a049c55c02ef8cd106be5802507f3df95422d8dad10009bdd1237af7517e3261c7336c3005e21ae8fd1e663badef46e4bae006c7af70520bdb336c7c
+DIST liblo-0.30.tar.gz 641498 BLAKE2B d884cc723d770f45414e838b6f2520c1f3b2a11972a9977d19b20ba68bc653f895eeb21ba0182a09fde1f096c9be084def1572f747463cd71e96bf0022ef7549 SHA512 51132933cc23237b70ed08fa7986a4a9f838529b83807746b358bcc171f8bbce7f37115b7c855520c9219bae93c74e502aebfb90e44dabdc6d0a00b8335336e3
 EBUILD liblo-0.29.ebuild 954 BLAKE2B 7fb70af478e08e76f4a78ef76cf4fe55437765097bcfd0041eacf189238f6b0a5521d462bc2e19b990e8d1b197b731db2cc424d1d9cfab9257ddc29b433a025f SHA512 bbb2fdae4173ece64cf88700ca30bf206c1c1c134e4f6d9ce4f008536d065cc38113102440d0c4a70ef369a50466678c1f8d56a12661757c0bd5352709722fc5
+EBUILD liblo-0.30.ebuild 920 BLAKE2B 22b230178e8d79ea42066fa952d58b74effd8be304a6db3626351b3f2111d836e95decf4029a0d91342708aa9e2fdab056ad27317db80096d5513102243a18b3 SHA512 4c9adb5529ea9c9ac9dc9f6f155d5932accf0c341497ee8615d23a910d914e67f95bbb6f31b7a077cb7ef6c494140de1c8fc7311dc2a9c9683d43c9b9fb3d092
 MISC metadata.xml 470 BLAKE2B 1402a4921f55313ebaa73a1b4733f9e850943fe23033fdd0980df892665ed42355762d27c64f2091a23d4d72e991498628dcca0a26df55603b086ed3c87ab6f5 SHA512 2604ac7fbd125c9f45faeefcad35a40bcd65d4034311cda5a95ceaaa3904b7e46b6e449f0373ad6f0ffca66ff9bd23d785a035a63888adc754939e19fb93eb56
diff --git a/media-libs/liblo/liblo-0.30.ebuild b/media-libs/liblo/liblo-0.30.ebuild
new file mode 100644
index 000000000000..77076911f198
--- /dev/null
+++ b/media-libs/liblo/liblo-0.30.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Lightweight OSC (Open Sound Control) implementation"
+HOMEPAGE="https://sourceforge.net/projects/liblo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="doc ipv6 static-libs"
+
+RESTRICT="test"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	default
+
+	# don't build examples by default
+	sed -i '/^SUBDIRS =/s/examples//' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	# switching threads on/off breaks ABI, bugs #473282, #473286 and #473356
+	myeconfargs=(
+		--enable-threads
+		$(use_enable ipv6)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index e3148557fe51..f4949deadeb0 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,3 +1,5 @@
 DIST libmatemixer-1.18.0.tar.xz 418772 BLAKE2B f37689b9929ac659c6f314f2d5751beff18304575680985f4e3b24b3032237464d2ab32e4675ca3bbb0be796d90ecca47d49925a4a6105bf50907722c4505765 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407
+DIST libmatemixer-1.22.0.tar.xz 432592 BLAKE2B 36f16c0ed516dea05368ae5b4f287cce275844b547fb7eebe7fb0604d0fddce72649dcac1c16475539dc5199f5d310b8bd19f165efd4bfa5c4f1bf31c1141df7 SHA512 6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8
 EBUILD libmatemixer-1.18.0.ebuild 778 BLAKE2B 1f503c2e32a091cc8fd598f87d4ebe4b9dcf0666cdeeeffd2ac8bcd1f7d452fd1c18a7986fc905bbd112db0d301f12cfdea72f6eff8e1957d1e4b5b000f13260 SHA512 1c9037c115b9036c4143a2e771d80172aa84ca5475b5e84e7ac9e031656c2d067bc0fc4d0badd6abee48161f1d6faca72e682e9ba9e71da251cfa6c01150d700
+EBUILD libmatemixer-1.22.0.ebuild 775 BLAKE2B 84035ef7c5651c64642827340ab1404783af8cbc62465eed858b94efcea744b41280d0900fe637b3196058e50b79a8cb98296f68d9f7d5f109f819d35eb84b4a SHA512 c24124342d42eddd9d3bab7ffcdd985ae71fbb59ba8a599bfc8e3971608887d1ac3f3c15d84b125275211ed149c9faffc60eced91bebe7c673a6911f0f3ccaca
 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359
diff --git a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
new file mode 100644
index 000000000000..bc08d21212ed
--- /dev/null
+++ b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Mixer library for MATE Desktop"
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+
+IUSE="+alsa oss pulseaudio"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	sys-devel/gettext:*
+	alsa? ( >=media-libs/alsa-lib-1.0.5 )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-null \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable pulseaudio)
+}
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index 38324313800f..e472ad92ae60 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,5 +1,5 @@
 DIST libmetalink-0.1.1.tar.bz2 324472 BLAKE2B 7ce82dd8954c96b31d15633995f5e1cad9e3aa56568241601e3f79c25e217a5ea3333df397bc2ed2e96ca790ae1e187d5ebe32113e11cd43f2ecbae9eb6cdf32 SHA512 9e9a2bf17b3696b199844703377cf6615bab44fd61b89be9afef579c21b0ac462f156719f60df9b8e7f7a9edb259d9bf461f20cd11ad9960d8376bf20e04f62c
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
 EBUILD libmetalink-0.1.1-r1.ebuild 798 BLAKE2B c2ccd770a6e05721b42daefd89a9a399eb5b88b86db97aa5bda3ae0518f844075a08129257113179d12a48bc9fdcd231afb94d5ab15fb10a22983d20f71f3975 SHA512 12facd74a93ca688f5f56194ef677e572a91bac2905798f0c4550df76f83a35daf28a1926c4199894a3199bb98ac67cbf0d0e185b1a06af59e2ba711ed36acd5
-EBUILD libmetalink-0.1.3.ebuild 809 BLAKE2B fc16fd907a325c7de92ad51e40ac1fdd7ec850722b76c67e8b6dd48e12b22727b737cf794cd5052f9e9a5a8931d146192c8b5f221bbd10c009dbd9e613b947a7 SHA512 85e620e5863ed813751d106991a10b19defd7670b68ce8d612b35dbf0bc8f51f617b548857284f3f95d9669ab2ce5794035ad6b31b77f9382487c9e09aba4815
+EBUILD libmetalink-0.1.3.ebuild 808 BLAKE2B b2eeca5ec711d8dcadc683163b94ccf46b00f62befdd2e8265ae577976d82a7d1700ec161757132caa578aa3308458fccec8eac2d3b21f68dc9df33f8593726e SHA512 bfd6cb4863753ad72ee6a56f8cc8a7025cb1b97013e6023489a6e267bd61d19896af6b5d6e0e9f4af2e14527b2ffdb600ed0fd9a68ccc25b6dde6baaca977407
 MISC metadata.xml 246 BLAKE2B 8de378056256c0217da9beda2aaea7afe4967f48fa4b62cf3d8cdf2428791003a6cf4bbef204342dadbfb05e1be7a8914a637de532ca6f8ea9f4f68273cb6f4a SHA512 c7a53354d3381e820c1a7cfdd90850f45dc034c96006ba7d6c9459727fd0f1adf5473a35ab52de8bde5a14b66099cc67333c75953199bcac9e7567dacea2838d
diff --git a/media-libs/libmetalink/libmetalink-0.1.3.ebuild b/media-libs/libmetalink/libmetalink-0.1.3.ebuild
index 507b8c7fbf08..24c7713fe875 100644
--- a/media-libs/libmetalink/libmetalink-0.1.3.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86"
 IUSE="expat static-libs test xml"
 
 RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 3c82935970d7..2bcf8207e3c7 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,6 +1,7 @@
 AUX libmypaint-1.3.0_beta1-as-needed.patch 804 BLAKE2B 8aa4f9215651b540cb9517851f13bea57df56b4ad9cacfe7d2e176060773a6ae4f0e7506cc4325b72cdb8b99e1c4bd0bb274dd1956262909a33d66834cdce618 SHA512 49853d92f723690d67edb35b01e0907c314b07f99f468e73256faaaa49d4d3a7a35fd4b7b0d897223c14f4567d2f8d33689a21deee80d82413f72e840fea888c
 DIST libmypaint-1.3.0-beta.1.tar.xz 421424 BLAKE2B 3ca1718035de301ffe037ab25b5e6e7c48f92a31ba337b6652977cae71d94e2fa11f01f81b87598e71392d51e13747e82d813d35e981753c85674f0f8b5bb167 SHA512 ae98ec8947d521749d82bc1e683efcace2da7e3c8b8453e79e5191d65225f0963394344628d646947f79b141503d268277d26ce2eeaf482bbe24f1bfb1d103fa
 DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248 SHA512 553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
+EBUILD libmypaint-1.3.0-r1.ebuild 1380 BLAKE2B c17825bf21bfbf5774a85a2f2b088ada6b700d3ea7f39b7a5a87c190a4ee18b209dec2b50524c0e24f0d206305f4adb553c9e990ba40b1d4277dd7361d0f2e01 SHA512 f8ce3da4972b0138025522aaa5cba4f78bb10d049b94fe13af1b1b3a53d4f26c3b5ab6bf4b213458f95ed65ba8f16b197fca6a70c5d1ef88c9df70d9958e0ec0
 EBUILD libmypaint-1.3.0.ebuild 1308 BLAKE2B 3687ae2f158f53afe6768ae4db384098f0f34a606562224831bfc6a44f6aef8921067a93b8fad5678413abe6de328aed787ba8d5069d32c3e7ea5ba9622adca3 SHA512 b7efa95bd8315bedf22a8415e742507569ee38243c167d4f09668cc6477878f25642a4947867e550030f244b1c97f16647f0e90ebf8c8b52daa163608c200c9b
 EBUILD libmypaint-1.3.0_beta1.ebuild 1346 BLAKE2B 84a0e4528d9ce0096f39d2f3f495f1809d1e49f20230f06f9411aec57097197a7aae94724807e85879eee30a1692dbf6b843c2b24f1aef96279aca4f81119bf1 SHA512 4ff1f158d528fac42e70c268a89884ff23b46810fcba8452a7426657537fd246c65e45e8e0e75280f8d0e03b863b2c5552b1c16164cfa97bf6d7a7096b0257e8
 MISC metadata.xml 417 BLAKE2B 475b260c1300908d836d6ab22ac6d302b28502a817c5e0bd2cd3be2d4331b91db0d4579b4a38c78d81b02e37549fad8511f2b964f9020719bee38f531c627798 SHA512 2e106cc8c3dc9249aa34eefedefb2dbc72e9992e19f6bfef425393629d3e676ebfbaadba9c8fcc13014158d98fa463ff49c812103b11524c851cb0b457ad0f7a
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..48b121713f5b
--- /dev/null
+++ b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 xdg-utils toolchain-funcs
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Library for making brushstrokes"
+HOMEPAGE="https://github.com/mypaint/libmypaint"
+SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/0"  # first soname component for subslot
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+gegl introspection nls openmp"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	gegl? (
+		media-libs/babl
+		media-libs/gegl:0.3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	openmp? ( sys-devel/gcc:*[openmp] )
+	nls? ( sys-devel/gettext )
+	"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	nls? ( dev-util/intltool )
+	"
+RDEPEND="${CDEPEND}
+	!<media-gfx/mypaint-1.2.1
+	"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	eapply_user
+}
+
+src_configure() {
+	tc-ld-disable-gold  # bug 589266
+	econf \
+			--disable-debug \
+			--disable-docs \
+			$(use_enable gegl) \
+			--disable-gperftools \
+			$(use_enable nls i18n) \
+			$(use_enable introspection) \
+			$(use_enable openmp) \
+			--disable-profiling
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/libqaccessibilityclient/Manifest b/media-libs/libqaccessibilityclient/Manifest
index 94dae3b97ade..02dde5805436 100644
--- a/media-libs/libqaccessibilityclient/Manifest
+++ b/media-libs/libqaccessibilityclient/Manifest
@@ -1,4 +1,6 @@
 AUX libqaccessibilityclient-0.3.0-tests.patch 1117 BLAKE2B 0382b50d8244249b4b1e7cf1efd3ad301648341ae66496296d7f216dae79a7acd6641fe9d69ecd94f0e6124b92c7aed7915dcbd9f8bd217c620125437a7ecad0 SHA512 becaf6dd528f461370ec474e98aac8da33ee6803096d33137f5ea9284b65f4db2413553566def1c0615bcc920c885dc459c425afa105af02522da67f5a25859f
 DIST libqaccessibilityclient-0.3.0.tar.xz 104784 BLAKE2B a472cd2287340fbe5e5e4404fcdb4d1b6a28f39bf61117156f2e38622f10e0913f4c3818a9f7ff682eb195905e837c589d396df5fc8637a511d6e293e4b59a6a SHA512 d3c28a2dcb308e3248276c5b1ab822decb0c32afce8636ce30941320381431a8d7e064ff1451b14e64cbc83d03e3693d645d1739e64830bacefcd7fa68b0d2e1
+DIST libqaccessibilityclient-0.4.0.tar.xz 105700 BLAKE2B 30c2ebcae046480536fa2c193130b3e0e99bfeeacb40ee9fae22574d9a8ff84da4fc5d746e1ba2f369f99c9d6227fea65ef55628aeff37b455cdf730708608c9 SHA512 bd2e0d29605f222084f86664a52488a5340e0ac16433fd65c8ada195e4cb5988ebac357a991ea8ebc5af22f81825212ce07209939ad5e4a00a9daeed37b56ffb
 EBUILD libqaccessibilityclient-0.3.0.ebuild 670 BLAKE2B ec6c4e9af062116a47addb5cb595a52d23f0c7e0e20dcdd2c752b848761f8f6ad57a38da3501c7a0cfd122386507ef662ef7ac7efe5d090f58f32b5b1e6eb341 SHA512 864d17e0172c08d0026f3a8f177d53149f4bc12f781e232518fd106cf474358c312bd822f6ecc7002d9a7d69ddaee63f80473f1ebeb6863e16945bd924fde2bf
+EBUILD libqaccessibilityclient-0.4.0.ebuild 631 BLAKE2B 3724c327cf59a21cecfc9c099e36ba48d41f6890f9e3a5740a13f1eaa168e9e099845e682e5442347b95462882a0317f3882bb31b28dfeb83409e692346fe046 SHA512 1bb9dd5226df0ceb284241748a8d96c2047553d8febdec84eda35f9299dc06bc254d73f101ee2aaefa3016790397ba128eed9b4849673800ceda0450ebc83af7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
new file mode 100644
index 000000000000..7cf95fcd3bdb
--- /dev/null
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_KDEINSTALLDIRS="false"
+KDE_TEST="true"
+KDE_EXAMPLES="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for writing accessibility clients such as screen readers"
+HOMEPAGE="https://accessibility.kde.org/ https://cgit.kde.org/libqaccessibilityclient.git"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+# tests require DBus
+RESTRICT+=" test"
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 1112bc03fb1c..c358e769083c 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -2,5 +2,5 @@ AUX libshout-2.4.1-tls-compile-with-OpenSSL-1.1.0.patch 1727 BLAKE2B d270ff05d53
 AUX libshout-2.4.1-underlinking.patch 529 BLAKE2B 993ab69f011caa49b96f28ede17bbe3fe68b304521a1d7185e865f4ac254d2bd313686e0d6a59e5aa50a0fe41a0e0214980aefe1fe3dcb8a45d827d4962fb153 SHA512 4717ee913ff50e276cca9983543a046271c34385bca2525bc64f6de90a25c7becc7e780807ff2534147dc17b1f57b57e23746948ea78288addfbeca7c495f78e
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 EBUILD libshout-2.4.1-r1.ebuild 1317 BLAKE2B 34e99363db05398190a065358d1fde860372deb4750c5d22d8f128d1fe5d257881faba01e42f3b3bbc1f4094e7ec7a6576776a63712d44987e1732eb3efc4618 SHA512 d3e14eaf24dc7bc450274cb106ba2c2720318d295db20f3a9305849e53f72cd9d4d371ae64a18bd74ec90c4b854ce1c6c831e147b5c086acb62e619fff04619a
-EBUILD libshout-2.4.1-r2.ebuild 1430 BLAKE2B 340b3579e2d86debc85e7c5d7e3352b463b9b49bf6ec4438353dcb83b8ffaa93b85241a26e33af34b15368c329c74107e0e1cca05696b60e08b319a6841e59e9 SHA512 5708981bd1f106c14b0792a83c59df4b6c1084f1ab75bd15c04de64d4fd19bba3604da1b1d70f25669627fb2b9a7e8de407d877ec3fd5305a26250f4762ba756
+EBUILD libshout-2.4.1-r2.ebuild 1424 BLAKE2B f31d461ba030b40474d536098365905924661887f3683ffbab2711ab7797ab8d59b65992d7d2a6d3bcc8969fbb5b3f63285a3702cb1df7af0726d342d135bc3f SHA512 ff692d639e4d9a683412d4cff0a3ced28c94d312a5e469642252ecdca90983ddc6994b45448a79365c24e70aaa4768fc0f6e7337111cc10a5f7e216a7f0b1e69
 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 f06a9e6f7786..335f16867f85 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="libressl speex static-libs theora"
 
 RDEPEND="
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 910d7a85f71b..9fb6e6c25887 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -10,5 +10,5 @@ DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6b
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 769 BLAKE2B 958c67f849ad398c6f4ea6d685a0b33f924884859a32e199d6dff19d1fb4819403eb3e9455bfaa350864335bc12f51a4a71c748684bf80ff6c4f51dfefad947a SHA512 eb762f63d10c9e4c67b6a51523d8e36bce10a5ee837da7a6841536c9b249a371cb4b1488c9041dbddfa0d04d9adc6508276e8890f57b369eed73ccd3e1d0244e
 EBUILD libsidplay-2.1.1-r4.ebuild 1168 BLAKE2B 8b69bec5f74b52932a64ee8ebaa8195afe5ab5cac8fe899c465f32b125fbaeac0f2d8dc03203e3225aa6ed94cc841124aab4613a71f90e71f95a04f3a35f8db3 SHA512 ee3ef694f09cccc476bf1003441afddadc8f085a311889f6cc6be21414581c833bfad9d898aaf8f92380787e7949899fa07907258ace1d902c1131f70d53a8ad
-EBUILD libsidplay-2.1.1-r5.ebuild 1248 BLAKE2B c3cc074db931680dbcce42b8b35b88904a2ce76a64b5222afed12c471b3556ab17616c63b040a8bde8982af11d7c6c86e2b2bb7775585a6914667240641c88af SHA512 7a8e10255a796e42c84096543a4f6905a42022f35c4fefe77bbd69da24b18e62e840492e195511d6482c6c9c968b04212a0c11b645ce9dc8b5909f80aca1736d
+EBUILD libsidplay-2.1.1-r5.ebuild 1246 BLAKE2B 75529214ca609b960f3bda668d2ba92c76ec978d1cf1df02917d9db6a182a08365b2dd3c4882d83f9bd1899ee874f8e35866dc7d30e20dd5fd81e59b527f1a33 SHA512 82616ab84ebd5cf2751f13a39975bdd823e74b83092eda71ac658925510a2c9a5b2104ac92ce980d2f89b879d1d5510d5e559cbe6e17262cc4d42543ce267ee5
 MISC metadata.xml 294 BLAKE2B 8fcfebdeea5012bebd45c78bf374aadf8092aa88fe731a66e0ec56e642745d613139b6c2cc080f49394d87ff3d04c2e6f84dcf4538e22cbb4299e0decfa83fa7 SHA512 f2ca3b91c3f0f046bc5fd9eafb91a8acfa5a7987d0db24a6e1e6b79bb54a4a466f660953699ca4a84d500a42542e403e12523220e881a466d54b4ea6a4508998
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
index a8fdea6a10f6..37e1a80b23fb 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index 0ae98c67b375..a2a31414d6e7 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,7 +1,5 @@
 DIST libsidplayfp-1.1.0.tar.gz 620228 BLAKE2B 4e51092d84817c6c90ebb0327ba1816c6dae42868f6296f269cdeee1cdf8c226e71e799ab5d7a8609546cb07669dd80f5bd1fb70e14ef594ac128c43a5c7bf51 SHA512 fb0ce00d220772aaf97fc88b7ba3e764f1c94439c9d35713743726872cf6bc6524893489c5909be538f0630896bd328560c6b189d6d2d09932457671080ed76f
-DIST libsidplayfp-1.8.1.tar.gz 669478 BLAKE2B af6657ba2eceb40585f9900a72605455b50dc3afb36f091e05b8d9b557ae7dca13c2feb36ecf4a9dbab63e82d3d986a21008034b30189b5e9618518b68385284 SHA512 54731b33071a6bb7300b50c4d899706b71779977d8999302f7aae17d6a9406c9ec407baf87788cae073b04ce6b3f516d90af365b5d95d9dc5525c00cacf79ffd
 DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
 EBUILD libsidplayfp-1.1.0.ebuild 726 BLAKE2B 5886610a6039945303e0d1b4dbadf7424e0847cd110f9bfdb73a7867f75a9d5cfccfae6b0e901ec8029722e0dffadf4a9ce208a1b9621a7a68d01c78e3d41ae3 SHA512 26bbeecb97ffc460c236f33527c0be1ccaf1605192e553ffa8a45553a66903e1a5e1d90634bb974b54511f8358aaea2a626c614690968cc770db32bdf71e2c1a
-EBUILD libsidplayfp-1.8.1.ebuild 854 BLAKE2B 992f610326914148cf7798751843bc29061709d9841aa22b0b098ff57c265fc2e58d2a4529749dbe31fee5338860a4a7172028370a514e803ead8ee5ffa8fd6b SHA512 fb4d338382c2264514f9da873fe3f6a16a0e198cad7fa79a98330b133317d9320bbffe6438487e6371c2b059a9346444a37d3acb29555ef40fe13aaa592abbe4
-EBUILD libsidplayfp-1.8.8.ebuild 839 BLAKE2B d986f320473dc555b7e6d4b2e132cbd5ea230a10b081bf517fa3957d8ef921eab62c3031670baa6b2e8e126e42a7f99e97a7433854619f25b3603bdd52f4bab0 SHA512 b6793f915a34922af72d81edf1c9194b82706f6b4b97c530ca9135d1d19b731ba4dbcd58665d877ecc51ab326649809fdc7a47339907f9f1e8c6e032a8ade6d0
+EBUILD libsidplayfp-1.8.8.ebuild 838 BLAKE2B d6f03d33642f0e458cb69b0bfbe6e59068017dcfea9e7070c51afcdc12cae91a766e3a3272eac9af53af92637fa669838601ce707361dad3dfc7883a0eb15e4f SHA512 6025d3521e6ee55bf1a7558e784e6f401561e7f652c137f1cf02584fe42f0f8a4c4f061b49d7c2d130c93f91e2e95e41a377c08b24bdd7aa6d971e7a5a4ce9ed
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.8.1.ebuild
deleted file mode 100644
index 93296cb979e6..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic versionator
-
-DESCRIPTION="A library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="cpu_flags_x86_mmx static-libs"
-
-src_prepare() {
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	# relies on undocumented "uint" type in libstdc++
-	# bug 649832
-	append-cxxflags -std=c++14
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_mmx mmx)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
index bf0faa527c68..866426a3bc3b 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 src_prepare() {
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 1f179db7e4de..d3c9dd29f408 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -14,4 +14,4 @@ EBUILD libv4l-1.12.5.ebuild 1370 BLAKE2B b122ee457e5e0879d2d1e584b4165e2a9b49cdd
 EBUILD libv4l-1.14.1.ebuild 1434 BLAKE2B 3fc61c41c012477e5b736b6ee488c99f5fc73c466b87228625ecd1822fd9d60f0999354a16eeae28394c5d9939c83a6cde15b14b9afd9ce6fe582d9f7661b504 SHA512 8d9bc01f3a6c3d27a8a896db01471d30dd0f56b65c5c6f60dd992171e4ba746089e9c6983646424fc3e449d6e1f725bcc7bfa8185dbdea8ba6075e496f10f209
 EBUILD libv4l-1.16.3.ebuild 1362 BLAKE2B 81e91db84ea5c8925cbcd54717c5f256c185ece1650c65dc8b14f329d5064971dacdb562937151366a99eae75898a8c519dd86ce032965e877ead3d960334215 SHA512 58f47e4a52ed2d4c496241e630e8572d77a184b4188e53c7a7a6de9499049fa93b772c0bc19bb4abdc69f67dbe3d5a015ec76b94199ff0c7ec2b58ce98f516cb
 EBUILD libv4l-1.6.2.ebuild 1366 BLAKE2B 4b4d13e9e8723e0a846cde04627ea6a4af400633146b3e424b794264f9b6eaa8fec10d0e2d1d12b6572de3e96caaaa80368242cf59d33131c0afda86127e9f37 SHA512 24ae9e13eb1efc7a7e071c8a8102c065f1e9feadf8e02f4477c004403d5b94eeaba13510970bdfe48852e723619ce0579f82dc25b9c2975104fef97d1d3ba8f6
-MISC metadata.xml 1125 BLAKE2B 3404da3f65f90eb87682c99c24feacf97f03616c55caf36c71538fb2f2da424be0ba5cd36b017872268d0efa34441440bcba95a482c0723c0b79ccf6a96a6e65 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7
+MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index e0bdc27ed5be..a5ad2dd06117 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>tetromino@gentoo.org</email>
-		<name>Alexandre Rostovtsev</name>
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
 	</maintainer>
 	<longdescription lang="en">
 	libv4l is a collection of libraries which adds a thin abstraction layer	on
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 19c309260818..a78b11b293e5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,22 +1,10 @@
 DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B c6fbf71e2ab6837f91dfa996cf7e89e9cae22e219cac56bd4201f7a62c787ddd2f65e7d162a329971018f0b1a796ee1a5b252ee6b43bb3b27a233d67b6cdf615 SHA512 04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7
-DIST mesa-18.3.2.tar.xz 11868440 BLAKE2B 49612671fd4187e71441bc88094f2cde2057b8b45ad2546357be715a7c69dd38f5ef03b837369e302509e0b9882ba209e7901b172dc3f7d797804fa4ab383c91 SHA512 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
-DIST mesa-18.3.3.tar.xz 11874468 BLAKE2B 406ec67c998934d5334eaf3c34df3012efdaede1850878c9f003a0f06d9247da733f5efa8b27b47b4cdc29d1e2d677e8345aa67b50c508ff8719e0e90a6a3d2d SHA512 cd6214b8bbeb3e3d187139ae1e949684f32f90152e1d7ba8d81222bd088770e28cff7ff165f2ccc41c068950561fe952420c6e54472f7204532a8d8700ff18bb
 DIST mesa-18.3.4.tar.xz 11875224 BLAKE2B 81d34349c644cc93b3ca525046cdd63a5aa2a16d8f6b841830a138c8e9e375fb0f75a17bd80b4c48ed573f4976dd6612b0773305a3bec982540914365c9925ff SHA512 e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99
-DIST mesa-19.0.0-rc1.tar.xz 11917372 BLAKE2B af8003babd9cc5bf8166e4efd4054690a4cbddb43912b7fddbfea6ca3bba0bcc077bcfa05053b53d4ca3c12d112b0a5d4c6176eda245e5cecd2810c8bac7a6a0 SHA512 23d21d6c4f03a1d9073ecb1f43dc251d581cdeb6b7cc24a19c299571070b4184ad4f22b0ca170ca42e58c62bb46eca0dadc334a952bbb7e0379961a30a6ca856
-DIST mesa-19.0.0-rc2.tar.xz 11921808 BLAKE2B 279552393209ee263dd24a5bfdfa1caf2014d3a14249fc738704593aae92de5094d6aafd1099df3136b0efd7c49923d98243e94492d2cd3d065e649b630c2256 SHA512 208f1f40c2724b34447f70cb97bd8e7072ac27f6de030205aeeb754480ffca0101edf536af3e3a8e7cc2f990ef53f485fe4ad44a495b3c27e5a33e091381a087
-DIST mesa-19.0.0-rc3.tar.xz 11919960 BLAKE2B 24b2b6304cc8332dc5edc8db05e5b09e50c87a935057a46c3e9417ff71e1d6bf6150076be0da024d5e972cf3368856108a6730008dd9cf31842d4247f02ae816 SHA512 adcb4cdcda0ef5c43e2257368a674328cb7533c484e631db6ff80d4a6d15ffba4f3f18a063cb63102a7ae89a5954f5e2f45ac8fe295064513f2656198a12307f
-DIST mesa-19.0.0-rc4.tar.xz 11928252 BLAKE2B 8cf4c2671e3de11e4ed65f0a451dae78bb40bfa32753306060be0d1523ed9f15d0ea479b628b592fcc43927e5c82ea8c68ef02494bb17be58b01ddcd2ea4dc3a SHA512 e17bfc29084a8efa259fcca16374f2f33aa1b62e034a8637fe0c9985410b1722fe68092b6f393fbf23f0db6ec3e1d6a191541d37cee650e42909ec7e0232f5a6
-DIST mesa-19.0.0-rc5.tar.xz 11927936 BLAKE2B 9fe64733df91f1788b6fba7ab64637f332854671bc0b5c647c962e12985c993eb185b95bdbe4baa98ca408c3d68818c925a653b5b12d5e02ca64812d80c05133 SHA512 f73bafa6d63576720a0aa6254b6fc97ba4e6e1ecf8b62bc62dd83967d5624fc83caed150707f1e5bfda87aff0bc3ebcd4872f8020ba5c23d3f6b42ab4523a91f
-DIST mesa-19.0.0-rc6.tar.xz 11928968 BLAKE2B c077973c07485fd8ebf42f1da6f8b8d7d2417dd1051bf1488c5244793e0ad32b01ab73e9f65d9dc61fb9d16716ad4be94c62ac73e521c11cf2ab35daaef8c5bf SHA512 88b3b6877acee4ede515dc986a1ca84a341f59b7283318848ea8eb5fd2892ed37d9ad960baf3f92ea10042d51b4e5e101b9f781af0669e0192503e8a79fc2b5f
-EBUILD mesa-18.2.8.ebuild 13593 BLAKE2B c2038cc507c1b9447f654a1f3b8f6444993393932a48e347fca854738acf1972a867c313a0c86f9c9b6f484bb1d4d817db548694b998dacd169da773bb672a11 SHA512 5807dd6b4a9685409d6dfd6be5cc468f42a979a1baa3684296032edd13a71660efa9ddf910c6d0adeda6bec956e4a5fb44b6d78ab73c1686e82827f41dd3832c
-EBUILD mesa-18.3.2.ebuild 13716 BLAKE2B ca7196dad29a0b79e4233d54d6a8706d09eac7e282af23f0dc54709ae6c3985ca128775ddd1ee56f96fe455dbe23c3ead519a2b74118128d4f19de222573ecf2 SHA512 22f390c6bfdab7314134a70fb204e4b7fdde72487fd5dc23db85bc9e26a2061092e2f34a0e1a7f5dcbea2744582c2720c8a5419b2245457034685fc282bd98d3
-EBUILD mesa-18.3.3.ebuild 13716 BLAKE2B ca7196dad29a0b79e4233d54d6a8706d09eac7e282af23f0dc54709ae6c3985ca128775ddd1ee56f96fe455dbe23c3ead519a2b74118128d4f19de222573ecf2 SHA512 22f390c6bfdab7314134a70fb204e4b7fdde72487fd5dc23db85bc9e26a2061092e2f34a0e1a7f5dcbea2744582c2720c8a5419b2245457034685fc282bd98d3
-EBUILD mesa-18.3.4.ebuild 13716 BLAKE2B ca7196dad29a0b79e4233d54d6a8706d09eac7e282af23f0dc54709ae6c3985ca128775ddd1ee56f96fe455dbe23c3ead519a2b74118128d4f19de222573ecf2 SHA512 22f390c6bfdab7314134a70fb204e4b7fdde72487fd5dc23db85bc9e26a2061092e2f34a0e1a7f5dcbea2744582c2720c8a5419b2245457034685fc282bd98d3
-EBUILD mesa-19.0.0_rc1.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-19.0.0_rc2.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-19.0.0_rc3.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-19.0.0_rc4.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-19.0.0_rc5.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-19.0.0_rc6.ebuild 13552 BLAKE2B 4c6020ad05d098a3ac8c737d51a39e08c99f74da7e686bb439511e33fbe83fdff96c73e0a6b3d2d56ed14b8ff5a416b8700c2adb330dfe0500f295bce8f32561 SHA512 e3372984e141bfd53559fc85ff6ba99b87f78e444643fac7c5c1e4c4c20a7351dca60df9c5000bbbc8d2ae3d3f19c4f26aa589b1a1eb133338903c563336b5ed
-EBUILD mesa-9999.ebuild 13573 BLAKE2B 803b2486f785f04662e70a11531c6f2a45e42a05f22a5227c3983fbe160899b2a7b24bb7bd08cfb937ae6e78a0a839936b0e973be18f175535d4de7e94c57e16 SHA512 2614fd900da21e0b5e28e2381b355965b6e424d64406fd0cfc4e3347d6c7f68f25d964730349c0876049b91c1d02b6920345df0515619d7b8def0d2885786feb
-MISC metadata.xml 1865 BLAKE2B 5c972239c02d0b4c212306d21326706af866576673802c7e28f28434bf1afe4145e89b7fc26947ba2126ecc9b5e57e41f248c9a23dc3e097efaddee177a4b904 SHA512 11a4e9b63b8d7fa041c76ff39694f138781443f80ae8942f845f6b9c30d560c25de83c62ca53f94f5129e42f2ca11c8478e4b5beae427c8352f7489f66e84795
+DIST mesa-18.3.5.tar.xz 11882012 BLAKE2B 88279fe2f24c2a47c8857ad34382b7c8b64119632f1ec7ce8d0fe2afe669e01d2e071726f01e28b001be353d8d9ec1f0ef46d3ba1e64239d63221b100745e8ee SHA512 f229ac122eafee98d1a40c54adeb019eb4458cb67063db9ba760b265da0634fe77247c3c8cb5c5de5fd40f8545e35d45000a74af9257ebf4e2028156add8644c
+DIST mesa-19.0.0.tar.xz 11959360 BLAKE2B e58144bb22f296175d7feb59d2c7940ca795dd417b0b014735d8842a29292cf07a6197184942febfdc85ad062267a55059e0ebd1532a886610dabf888cc68b8f SHA512 5759b85275bcd145513cf14a9ef7505595766fb33b82c53738f74ede462e5850580d48ab4af326b41209e7f4b05aab75539f2bfebf67c3098a4680ea95c37591
+EBUILD mesa-18.2.8.ebuild 13549 BLAKE2B fb6a17fbaf4043b16e264c46608844026751a613650fc2fb1929d7534b9fdd7e1a4efef5c90634490234e5b1a437df944afb611c0c65c81dcc735a7dbfefb100 SHA512 e36990056e9e20b6ad7fd9af6d1baf0322482e84aca03c727ebfc6686ae117640dfb208dd1b33669836a7c962b2e93f4871af5c49eaab51198942dfa2e1a1548
+EBUILD mesa-18.3.4.ebuild 13684 BLAKE2B f6628df530fd9c2985969b9de8a794147234115ac5a4bdee64d3bde10ffd2fa794bf11780131427154a19d400b490abc258fc0cc791dc0d2db5f8c89de12c576 SHA512 7d6bfc9ed513776f53bb9e76039fe13929539c385e052a767b95c4f2bace4c207b1c12a206ca22e0c2a2273a729a7b6964b6c9e87e626b5c87268f9a849061e1
+EBUILD mesa-18.3.5.ebuild 13685 BLAKE2B bed1f431a88d2ed2617e28af453100e4d044565643e86b429a15d2ed5edf4a77e14c7621d2664b0f8dbc7e3a2b8b3af6419001c00c5651fada999927f54b3e8e SHA512 89344628dd480c3efbb65857cd5f3b632d9678bedd94cad8c7c7dfff1e5440468c7ae91d84e643f9d2cec5b0fe2535d28ae93508cf25a71fe4bb74a3c43667c0
+EBUILD mesa-19.0.0.ebuild 13823 BLAKE2B 0c7842382f1b1d09b814db7e3584765d3d4ba4b7be5113efc1b6df74f7895b86d6cf5cfe7dc7433548130d6882382b75b7c49f0a13b29ab4e353f8aa2368848d SHA512 9210ad10ad47984c58cd6f5c5b0b78fa21be54b679b8d400bf21a97963abb166d7899a38eaa389683a143bc15f5fde525e42e1537a45fdc6c844b5680a63b3f5
+EBUILD mesa-9999.ebuild 14134 BLAKE2B 3612e0f4b66b09a5849f1840541b18f6e73723be0c4945878b5bccb78bc08d5618b0af1a43aa39859586c4d72c7d17974a4df34d86fd0645bf551b67df81ea60 SHA512 a626383fe69aa01d3d91100c8e2e4a90578a1b7c802699ca43b6bfa3cd3ded40109229edde0b839a9fcc298ac80c22b5b63527548a7bd84a153694b598f9d88e
+MISC metadata.xml 2041 BLAKE2B dd7f78a57123408674d7ca6a8e7a455e84ac668bf9e6552502cf62dc2464f1a62765db5c22c0d4dab82e59a5325ad10d69b436aab96b5a4d5c789f0a7b671469 SHA512 f07128004b03ddfc6d235de15a95c0bd6338133b13daa31907bd2897d65eaa9c8ad1164ec5e21fb7fa6417927a8109cbf86b24bc62b09cfa29d0bb18fcd3c4b1
diff --git a/media-libs/mesa/mesa-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild
index 40b1a582b209..4d646fb9ae2e 100644
--- a/media-libs/mesa/mesa-18.2.8.ebuild
+++ b/media-libs/mesa/mesa-18.2.8.ebuild
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
 #
 # How to use it:
 # 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
 LLVM_MAX_SLOT="7"
 LLVM_DEPSTR="
 	|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
 		sys-devel/llvm:6[${MULTILIB_USEDEP}]
 		sys-devel/llvm:5[${MULTILIB_USEDEP}]
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
diff --git a/media-libs/mesa/mesa-18.3.3.ebuild b/media-libs/mesa/mesa-18.3.3.ebuild
deleted file mode 100644
index b83687d01f2a..000000000000
--- a/media-libs/mesa/mesa-18.3.3.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-		sys-devel/llvm:6[${MULTILIB_USEDEP}]
-		sys-devel/llvm:5[${MULTILIB_USEDEP}]
-		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-18.3.4.ebuild b/media-libs/mesa/mesa-18.3.4.ebuild
index b83687d01f2a..e7bcfac9a85b 100644
--- a/media-libs/mesa/mesa-18.3.4.ebuild
+++ b/media-libs/mesa/mesa-18.3.4.ebuild
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
 #
 # How to use it:
 # 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
 LLVM_MAX_SLOT="7"
 LLVM_DEPSTR="
 	|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
 		sys-devel/llvm:6[${MULTILIB_USEDEP}]
 		sys-devel/llvm:5[${MULTILIB_USEDEP}]
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -301,7 +300,7 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/media-libs/mesa/mesa-18.3.2.ebuild b/media-libs/mesa/mesa-18.3.5.ebuild
index b83687d01f2a..b66948b6e213 100644
--- a/media-libs/mesa/mesa-18.3.2.ebuild
+++ b/media-libs/mesa/mesa-18.3.5.ebuild
@@ -36,7 +36,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm_sensors
 	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
 	vulkan wayland xa xvmc"
 
@@ -132,8 +132,8 @@ RDEPEND="${RDEPEND}
 #
 # How to use it:
 # 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 8.
+# 3. Specify LLVM_MAX_SLOT, e.g. 7.
 LLVM_MAX_SLOT="7"
 LLVM_DEPSTR="
 	|| (
@@ -141,9 +141,8 @@ LLVM_DEPSTR="
 		sys-devel/llvm:6[${MULTILIB_USEDEP}]
 		sys-devel/llvm:5[${MULTILIB_USEDEP}]
 		sys-devel/llvm:4[${MULTILIB_USEDEP}]
-		>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-8:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -301,7 +300,7 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/media-libs/mesa/mesa-19.0.0_rc3.ebuild b/media-libs/mesa/mesa-19.0.0.ebuild
index dd35b9d8a136..f3f7b57f517d 100644
--- a/media-libs/mesa/mesa-19.0.0_rc3.ebuild
+++ b/media-libs/mesa/mesa-19.0.0.ebuild
@@ -36,9 +36,9 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan wayland xa xvmc"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
@@ -70,7 +70,6 @@ REQUIRED_USE="
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
 RDEPEND="
 	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -80,6 +79,13 @@ RDEPEND="
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
 	gallium? (
 		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 		llvm? (
@@ -132,14 +138,15 @@ RDEPEND="${RDEPEND}
 #
 # How to use it:
 # 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
+# 2. Update the := to specify *max* version, e.g. < 9.
+# 3. Specify LLVM_MAX_SLOT, e.g. 8.
+LLVM_MAX_SLOT="8"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 		sys-devel/llvm:7[${MULTILIB_USEDEP}]
 	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-9:=[${MULTILIB_USEDEP}]
 "
 LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
 CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
@@ -297,7 +304,7 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -458,6 +465,7 @@ multilib_src_configure() {
 		$(meson_use gbm)
 		$(meson_use gles1)
 		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
 		$(meson_use selinux)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
@@ -475,6 +483,8 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/mesa/mesa-19.0.0_rc1.ebuild b/media-libs/mesa/mesa-19.0.0_rc1.ebuild
deleted file mode 100644
index dd35b9d8a136..000000000000
--- a/media-libs/mesa/mesa-19.0.0_rc1.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-19.0.0_rc2.ebuild b/media-libs/mesa/mesa-19.0.0_rc2.ebuild
deleted file mode 100644
index dd35b9d8a136..000000000000
--- a/media-libs/mesa/mesa-19.0.0_rc2.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-19.0.0_rc4.ebuild b/media-libs/mesa/mesa-19.0.0_rc4.ebuild
deleted file mode 100644
index dd35b9d8a136..000000000000
--- a/media-libs/mesa/mesa-19.0.0_rc4.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-19.0.0_rc5.ebuild b/media-libs/mesa/mesa-19.0.0_rc5.ebuild
deleted file mode 100644
index dd35b9d8a136..000000000000
--- a/media-libs/mesa/mesa-19.0.0_rc5.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-19.0.0_rc6.ebuild b/media-libs/mesa/mesa-19.0.0_rc6.ebuild
deleted file mode 100644
index dd35b9d8a136..000000000000
--- a/media-libs/mesa/mesa-19.0.0_rc6.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	EXPERIMENTAL="true"
-	inherit git-r3
-else
-	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
-	!test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
-			  video_cards_radeonsi? ( llvm ) )
-	wayland? ( egl gbm )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_imx?    ( gallium video_cards_vivante )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4? ( gallium )
-	video_cards_virgl? ( gallium )
-	video_cards_vivante? ( gallium gbm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
-RDEPEND="
-	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	gallium? (
-		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-		llvm? (
-			video_cards_radeonsi? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_r600? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-			video_cards_radeon? (
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-		)
-		lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
-		opencl? (
-					dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
-					dev-libs/libclc
-					virtual/libelf:0=[${MULTILIB_USEDEP}]
-				)
-		vaapi? (
-			>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-			video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
-		)
-		vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-		xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.8
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-
-	video_cards_intel? (
-		!video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	)
-	video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:7[${MULTILIB_USEDEP}]
-	)
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	valgrind? ( dev-util/valgrind )
-	x11-base/xorg-proto
-	x11-libs/libXrandr[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.0.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm[${flags}]"
-}
-
-pkg_pretend() {
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use gallium; then
-		use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
-		use llvm       && ewarn "Ignoring USE=llvm       since USE does not contain gallium"
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain gallium"
-		use vaapi      && ewarn "Ignoring USE=vaapi      since USE does not contain gallium"
-		use vdpau      && ewarn "Ignoring USE=vdpau      since USE does not contain gallium"
-		use unwind     && ewarn "Ignoring USE=unwind     since USE does not contain gallium"
-		use xa         && ewarn "Ignoring USE=xa         since USE does not contain gallium"
-		use xvmc       && ewarn "Ignoring USE=xvmc       since USE does not contain gallium"
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-}
-
-python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	if use classic; then
-		# Intel code
-		dri_driver_enable video_cards_i915 i915
-		dri_driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			dri_driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		dri_driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		dri_driver_enable video_cards_r100 r100
-		dri_driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-			! use video_cards_r200; then
-			dri_driver_enable video_cards_radeon r100 r200
-		fi
-	fi
-
-	emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
-
-	if use gallium; then
-		emesonargs+=(
-			$(meson_use llvm)
-			$(meson_use lm_sensors lmsensors)
-			$(meson_use unwind libunwind)
-		)
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use d3d9 gallium-nine))
-		else
-			emesonargs+=(-Dgallium-nine=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vaapi gallium-va))
-			use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-		else
-			emesonargs+=(-Dgallium-va=false)
-		fi
-
-		if use video_cards_r300 ||
-		   use video_cards_r600 ||
-		   use video_cards_radeonsi ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use vdpau gallium-vdpau))
-		else
-			emesonargs+=(-Dgallium-vdpau=false)
-		fi
-
-		if use video_cards_freedreno ||
-		   use video_cards_nouveau ||
-		   use video_cards_vmware; then
-			emesonargs+=($(meson_use xa gallium-xa))
-		else
-			emesonargs+=(-Dgallium-xa=false)
-		fi
-
-		if use video_cards_r600 ||
-		   use video_cards_nouveau; then
-			emesonargs+=($(meson_use xvmc gallium-xvmc))
-		else
-			emesonargs+=(-Dgallium-xvmc=false)
-		fi
-
-		gallium_enable video_cards_vc4 vc4
-		gallium_enable video_cards_vivante etnaviv
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_imx imx
-
-		# Only one i915 driver (classic vs gallium). Default to classic.
-		if ! use classic; then
-			gallium_enable video_cards_i915 i915
-			if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-				gallium_enable video_cards_intel i915
-			fi
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-			! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_virgl virgl
-
-		# opencl stuff
-		emesonargs+=(
-			-Dgallium-opencl="$(usex opencl icd disabled)"
-		)
-	fi
-
-	if use vulkan; then
-		vulkan_enable video_cards_i965 intel
-		vulkan_enable video_cards_radeonsi amd
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		emesonargs+=( -Dasm=false )
-	fi
-
-	if use gallium; then
-		gallium_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
-	else
-		dri_driver_enable -- swrast
-		emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=dri
-		-Dshared-glapi=true
-		$(meson_use dri3)
-		$(meson_use egl)
-		$(meson_use gbm)
-		$(meson_use gles1)
-		$(meson_use gles2)
-		$(meson_use selinux)
-		-Dvalgrind=$(usex valgrind auto false)
-		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		DRI_DRIVERS+=("$@")
-	fi
-}
-
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 919f2e68bb28..ae4a7c1da5f8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -30,28 +30,30 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel iris nouveau vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm lm_sensors
-	opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
-	vulkan wayland xa xvmc"
+	+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+	lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+	vdpau vulkan vulkan-overlay wayland xa xvmc"
 
 REQUIRED_USE="
-	d3d9?   ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	d3d9?   ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
 	gles1?  ( egl )
 	gles2?  ( egl )
 	vulkan? ( dri3
-			  || ( video_cards_i965 video_cards_radeonsi )
+			  || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
 			  video_cards_radeonsi? ( llvm ) )
+	vulkan-overlay? ( vulkan )
 	wayland? ( egl gbm )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
+	video_cards_iris?   ( gallium )
 	video_cards_imx?    ( gallium video_cards_vivante )
 	video_cards_nouveau? ( || ( classic gallium ) )
 	video_cards_radeon? ( || ( classic gallium )
@@ -70,7 +72,6 @@ REQUIRED_USE="
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
 RDEPEND="
 	!app-eselect/eselect-mesa
-	>=app-eselect/eselect-opengl-1.3.0
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -80,6 +81,13 @@ RDEPEND="
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+	libglvnd? (
+		media-libs/libglvnd[${MULTILIB_USEDEP}]
+		!app-eselect/eselect-opengl
+	)
+	!libglvnd? (
+		>=app-eselect/eselect-opengl-1.3.0
+	)
 	gallium? (
 		unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 		llvm? (
@@ -132,10 +140,12 @@ RDEPEND="${RDEPEND}
 #
 # How to use it:
 # 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:9[${MULTILIB_USEDEP}]
 		sys-devel/llvm:8[${MULTILIB_USEDEP}]
 		sys-devel/llvm:7[${MULTILIB_USEDEP}]
 	)
@@ -297,7 +307,7 @@ pkg_pretend() {
 }
 
 python_check_deps() {
-	has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -346,7 +356,8 @@ multilib_src_configure() {
 			$(meson_use unwind libunwind)
 		)
 
-		if use video_cards_r300 ||
+		if use video_cards_iris ||
+		   use video_cards_r300 ||
 		   use video_cards_r600 ||
 		   use video_cards_radeonsi ||
 		   use video_cards_nouveau ||
@@ -404,6 +415,8 @@ multilib_src_configure() {
 			fi
 		fi
 
+		gallium_enable video_cards_iris iris
+
 		gallium_enable video_cards_r300 r300
 		gallium_enable video_cards_r600 r600
 		gallium_enable video_cards_radeonsi radeonsi
@@ -423,6 +436,7 @@ multilib_src_configure() {
 
 	if use vulkan; then
 		vulkan_enable video_cards_i965 intel
+		vulkan_enable video_cards_iris intel
 		vulkan_enable video_cards_radeonsi amd
 	fi
 
@@ -458,11 +472,13 @@ multilib_src_configure() {
 		$(meson_use gbm)
 		$(meson_use gles1)
 		$(meson_use gles2)
+		$(meson_use libglvnd glvnd)
 		$(meson_use selinux)
 		-Dvalgrind=$(usex valgrind auto false)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+		$(meson_use vulkan-overlay vulkan-overlay-layer)
 		--buildtype $(usex debug debug plain)
 		-Db_ndebug=$(usex debug false true)
 	)
@@ -475,6 +491,8 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	meson_src_install
+
+	use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
 }
 
 multilib_src_install_all() {
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index ea7584d836e6..1adb4bf77ae7 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 		<flag name="gles1">Enable GLESv1 support.</flag>
 		<flag name="gles2">Enable GLESv2 support.</flag>
+		<flag name="libglvnd">Use libglvnd for dispatch.</flag>
 		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
 		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
 		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
@@ -23,6 +24,7 @@
 		<flag name="valgrind">Compile in valgrind memory hints</flag>
 		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 		<flag name="vulkan">Enable Vulkan drivers</flag>
+		<flag name="vulkan-overlay">Build vulkan-overlay-layer which displays Frames Per Second and other statistics</flag>
 		<flag name="wayland">Enable support for dev-libs/wayland</flag>
 		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
 		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index bf67443f53be..6c5ddbf73069 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -2,7 +2,7 @@ AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6b
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 DIST openal-soft-1.19.0.tar.bz2 575163 BLAKE2B 492166cccdfb0d5f35a2d731d2194ab844d89e7754ee636fc00969abe68026d9ffa1ce05c1b75f1c465ba413e1d16c1aee7e0dc86e24c97cbacb29353de20b73 SHA512 5fb8f54f271b36970f29335952173300dde15a798b4ac60e8167143b5806ed3178cc4f400e1d8da4354c2c3f57f28c90064e61740264b70d7c605d7d1b4273b3
 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
-EBUILD openal-1.18.2-r1.ebuild 2085 BLAKE2B 80e0972626619637a2d29f9b364df648be4159dd87001fa6930222d4eb3f5eee8ad975835173319f61e2c143ab908c6f4f2f253aa220f4db4cd897aaae236df4 SHA512 b6ecc822bf66d87751cdbd962bebc7a293cb68a818ea6e1692edeea0aff9960b9c515d7be87690121b7732d6385110459fac45ccecc6a3ac3f5b9d53bdcf0bcc
-EBUILD openal-1.19.0.ebuild 2094 BLAKE2B da874fc017b10205c813ba9bf46df2b22d8fa6821bcc18e0d0cafdd43b93ab468b94dd50de0cd436e84035e1cf4d90c9331e21990c548172220c0fd416f602b7 SHA512 54aefe06f6aeb864c5f1a0f8ec75b91585dc9d77a8f7a0645f37520a7fcef52a4743f5c6708f6362f0d29556719ff52d959227a801619f3f052f9cd6aca377c9
-EBUILD openal-1.19.1.ebuild 2094 BLAKE2B da874fc017b10205c813ba9bf46df2b22d8fa6821bcc18e0d0cafdd43b93ab468b94dd50de0cd436e84035e1cf4d90c9331e21990c548172220c0fd416f602b7 SHA512 54aefe06f6aeb864c5f1a0f8ec75b91585dc9d77a8f7a0645f37520a7fcef52a4743f5c6708f6362f0d29556719ff52d959227a801619f3f052f9cd6aca377c9
+EBUILD openal-1.18.2-r1.ebuild 2087 BLAKE2B 21e2e6683182f2eb8779763cc46b682c01c33cb28b1a0828b5bf227eb9fd41c0f747ae136173eeb29b63f24d44de59293e3a5770d614dc7384a82f993bed6ca8 SHA512 24c1cd5cbadf059edc9554bf719e4318623412fc7f63bed1d0fdb15db75cac978072bec83ddee6480f14210008ed6cc85aadc3f4b439fdbe975fb25c1859f42f
+EBUILD openal-1.19.0.ebuild 2096 BLAKE2B cb10d181a01532d2c9872e9aa84f8f4fd00846372ec943a7ad3800aef7bc3aca306001312e2a5460f70134c9f34806a0b12380f71b2da5c0deb7af6ce2fd31c0 SHA512 abac1e5c860f6666938f47b897a1540a7ffe8dad41cc784378f8f703f51cba92376a16d02ce69dd76a20223ab4c80c5aca4edd502408f2e6b6d09d7955c4b729
+EBUILD openal-1.19.1.ebuild 2096 BLAKE2B cb10d181a01532d2c9872e9aa84f8f4fd00846372ec943a7ad3800aef7bc3aca306001312e2a5460f70134c9f34806a0b12380f71b2da5c0deb7af6ce2fd31c0 SHA512 abac1e5c860f6666938f47b897a1540a7ffe8dad41cc784378f8f703f51cba92376a16d02ce69dd76a20223ab4c80c5aca4edd502408f2e6b6d09d7955c4b729
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
index ade86d9edbb7..ccc0f0929a40 100644
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit cmake-multilib
 MY_P="${PN}-soft-${PV}"
 
 DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://www.openal-soft.org/"
-SRC_URI="http://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/media-libs/openal/openal-1.19.0.ebuild b/media-libs/openal/openal-1.19.0.ebuild
index 6915a636ee29..c79250a4e7e1 100644
--- a/media-libs/openal/openal-1.19.0.ebuild
+++ b/media-libs/openal/openal-1.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit cmake-multilib
 MY_P="${PN}-soft-${PV}"
 
 DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://www.openal-soft.org/"
-SRC_URI="http://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/media-libs/openal/openal-1.19.1.ebuild b/media-libs/openal/openal-1.19.1.ebuild
index 6915a636ee29..c79250a4e7e1 100644
--- a/media-libs/openal/openal-1.19.1.ebuild
+++ b/media-libs/openal/openal-1.19.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ inherit cmake-multilib
 MY_P="${PN}-soft-${PV}"
 
 DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://www.openal-soft.org/"
-SRC_URI="http://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.openal-soft.org/"
+SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
diff --git a/media-libs/opusfile/Manifest b/media-libs/opusfile/Manifest
index e07af6439629..5fe55807bcd0 100644
--- a/media-libs/opusfile/Manifest
+++ b/media-libs/opusfile/Manifest
@@ -3,6 +3,6 @@ DIST opusfile-0.10.tar.gz 467700 BLAKE2B eab1c5eadd13ad574590c5b6a4bf8cc7f82ec0d
 DIST opusfile-0.11.tar.gz 467420 BLAKE2B e3e6ee2d1d4c7030bdd5f7ec14503d46ebbfcbc4481ab4652a0be9171d45fe2e855e0f17801cf28fda66f44496ba9f9a2996af7e5aaf5b008e4c3b14263f3160 SHA512 ec3e282310cc4f25475c27b7bc8d1652dcb25d3ac6badf87bd1b4e5397fbe106a0dab81c60d88d198003a23d8a2c9bae8b661edc9b31433effeca438ce56a349
 DIST opusfile-0.6.tar.gz 437980 BLAKE2B 13250d08f9cc9564541bbe116c5482e5b9a0de1c28a8a9e9509b1019cb75d40caefc2b8eb0ad444bb67e05cc4d0813b7b3f1783e4d136201c71200b04f7690c2 SHA512 6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02
 EBUILD opusfile-0.10.ebuild 890 BLAKE2B 35e7a73420a5aac646805f1175d627c6e3227b7ae5bea191cbc102da955b3ff319099994d440853e9094d33e02a9307729da28be38ad82a04aa0c6df524f90d9 SHA512 36d9df9967f117c7a65354e949eff47e5e78ae681004c1d5f4a287d39fafe4d943c2b9390eb98a1aeb6c4f142911ec2d83271c477e0da3bf3e4cd8f1641fe6d6
-EBUILD opusfile-0.11.ebuild 1026 BLAKE2B cb59006fa7b66f4c2c36df7004fe852379503646802f9b247807be22943fc520401bd2478b364076ecb5f7669f8517590f2765c22236e55b0c4221c0b1b539e3 SHA512 f1533ef12020ea9012da9c343e382d2d9b649c594b33e0959fe6284c8f29476994d18490cf18bc641452c613384c72413227553be9840d151094e0215b28243b
+EBUILD opusfile-0.11.ebuild 1019 BLAKE2B 9c41da1fdcaeb08db323cadc7de2fb9056c55be5610ab449ef801bc766f4334a70ff6ae29b20236c2658936646058d5ea44221ee2b165213021341f0b8000ee7 SHA512 1f4be44ee2a17b45749effd514ab67d59dac12cd6b3cf06b959bf53739af4b600eb1c641581af45dd4d8cf01434ffcab5b0d4fe8e499317c673786b30a48f3cc
 EBUILD opusfile-0.6.ebuild 774 BLAKE2B 524fdfebca63b5cc98d8306131210453659d905c8528952f6fe245910f84504216a6514194ffc3790f57853479e6a0eef2a515a4ffabf2b3bb3fefc2b5a8522c SHA512 8cd751db321e6e25c4ddd3028503d2621af55130a89106b44823385aedb07101c4f30d6a00d395641102bdb3efa90dd3c5b0e31269dc12fa498ee7fc12e16c79
 MISC metadata.xml 584 BLAKE2B da2277516b7f14b1a800d3b511ff10579b9544679e5d71535598d2e4a476f0f7cc9bce41247363ee7c50384e5d678379ab0a42fb6172013f873bc1e727d2b5db SHA512 4a4a0c3766de010ae39d0ee2339c21df051e082a36fefa9b8c53ef3ecb184072c1f8cf42aed0e4baa70f5b93d507e942a052a02a6a53ce4ed90496eb445f74c3
diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index 92e3dbb30f64..0cc03a2fcb4f 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="doc fixed-point +float +http libressl static-libs"
 
 RDEPEND="media-libs/libogg
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index d1965b1c7c34..853dee0a4594 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,3 +1,5 @@
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
+DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
 EBUILD portaudio-19.06.00-r1.ebuild 1304 BLAKE2B 7b7d5a1df2595d2541f0e4c502f2272bb85977168fd1b2637228fa6ec62694a5923cbaa5d5acd90edc31932dc1c271b3482d0579625a6d4be1b1cafcbb433307 SHA512 acff9301c7e2d2faff2a2c3b702eb29e0f828161ea08bb2395dc829caa5c88ea9a793ae36954dfb33b5782f53c5554d6b577c4f3de250c53130f84197230dfe9
+EBUILD portaudio-19.06.00-r2.ebuild 1547 BLAKE2B 80c4c05d4039e408ab4ff6f7b331deecbf3c76f2cac2087e26cfae75d80444830310f214696c0c44db5d6eecdca8b9cb89554cbd95e2484a4bd10f4a3b1e4f50 SHA512 e3c4a4f27f3ef9837589b4825a12d55b039884c669564e2919410cba6d64fd25139c297295463185d6471d483adeaa34e6d15bd774ed3ec86b558336252b0868
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r2.ebuild b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
new file mode 100644
index 000000000000..6cfde7247b8c
--- /dev/null
+++ b/media-libs/portaudio/portaudio-19.06.00-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
+HOMEPAGE="http://www.portaudio.com/"
+SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz
+	https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> ${PN}-19.06.00-audacity-portmixer.patch"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="alsa +cxx debug doc jack oss static-libs"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.txt )
+
+PATCHES=(
+	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug debug-output)
+		$(use_enable cxx)
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with oss)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	# workaround parallel build issue
+	emake lib/libportaudio.la
+	emake
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use doc && dodoc -r doc/html
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/rply/Manifest b/media-libs/rply/Manifest
index c099299bad2b..c1696eb818c1 100644
--- a/media-libs/rply/Manifest
+++ b/media-libs/rply/Manifest
@@ -3,4 +3,4 @@ AUX rply-1.01-stdint.h.patch 6326 BLAKE2B bc839f43e96923c0f2bcec7ca28b5ec548c122
 AUX rply_CMakeLists.txt 1256 BLAKE2B fa8aab3001c3d1ea22f3b2aca8ff6447bb90019ba5d2e1efd31d7b8434965b1192bdb34ed20291f7e768759a30897776a69e20d5732429f3d30bf66b71860a36 SHA512 071e58199b832b371211f6b9de8ad517fca8dd5eda2850eef50d9166fa7f3f4ba8f579b7c82afdca34f57246a795957c800449ca8ded8c3af2217a86be634e59
 DIST rply-1.01.tar.gz 28903 BLAKE2B f6b6cef38951ed48eab58f3336501d9d3875a340b7475c6dd52f3823a126873d5f43bac9b38423ec1a89fb746e234f060e1cb4ec62bb509a79641f757d61e254 SHA512 c5d9b8b031bff24ad6ae71a0b3b2fc265cdf9db4386389d48dbe05eac48d2db289d7ca86aa4e7379f8596cf08909c647e74714775b2c699bee31d987ad355474
 EBUILD rply-1.01-r1.ebuild 1073 BLAKE2B 4744e65fbc4548866b84b5cd88ec4751e4c89ba17bdf08507124f7365cebba3de2ad79ca4730cd75c14585dace3bf00968bd1f8d3afbd71fbf1b9b62bfceae43 SHA512 e87489bd5fc108f1a1fc6be7af9f96102ee0b1643e81ffc4b7387c31efad62462444940c7b561b6638a056306b084fb5824b6809b489f52834f961b17acdb746
-MISC metadata.xml 250 BLAKE2B 7ca84600199e8b1f7a834e407beb29fe0876a38438e3e0691dc63687c6d77d821d55fc13fc0f52896b6f875896c420b56aefff2679229faea17d1f9223809289 SHA512 fc12ea8d7a62e7510122a1a79230ec6871e157c955e37810adc8441e0a1588cec6bcca80aaa727c43c391275cd9c62fa650ed9bdf0c9c1945f0e159858767cc0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/rply/metadata.xml b/media-libs/rply/metadata.xml
index d18cf05fe0a8..6f49eba8f496 100644
--- a/media-libs/rply/metadata.xml
+++ b/media-libs/rply/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>tetromino@gentoo.org</email>
-<name>Alexandre Rostovtsev</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 2859fea782de..97124cbd65e8 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -4,5 +4,5 @@ AUX sdl-mixer-1.2.12-mikmod-r587.patch 1416 BLAKE2B b353de5432714f3968c5f69ff439
 AUX sdl-mixer-1.2.12-mikmod-r588.patch 1128 BLAKE2B cc6ff884b3e157064a583d64adf978a091c7786a3c5417c5efd911f80407d30c866c527400122866bcffea25ab645533ae8e972834a2085a4bd8563ef5e8607b SHA512 36bbc5d10a63a73b7860a6f381a88849cc465dcabbfe3db21d6bd156110eb01e03e8369f0ed234f72f0227566919f5f823d0350d431575f0ae0f2a4b244cf704
 AUX sdl-mixer-1.2.12-wav.patch 796 BLAKE2B a0b310db2b789d24fd60927d23859582a8ab1449ba0934e10abdd1361a0d92fb5925625d9c3a0885f812dde12af9931cbae06c652b51e76d18759db03cacfc2a SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491
 DIST SDL_mixer-1.2.12.tar.gz 3707781 BLAKE2B b2fa822204fdaad860ff30307120bff7badbcc042d0b891563973794f715099aa961983e0dbf7e3d936179cbc615517c268f01f4619fcdcd48f18ff66dc49bd1 SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96
-EBUILD sdl-mixer-1.2.12-r4.ebuild 3259 BLAKE2B 8a134c5b13b0566088dde102c4b3040f88be7b0aa878893461ce5256604d01c4d24a3e5549184855ced2655b34a9dd21e0fb646a257295b925c5776aae3a8ff6 SHA512 837ed770e2c9004f20a0af0294296b5a97fbfe96d62e0841cb0a9866c919d89d08736e8bdbb7c511920a9f37ca7603e016e65a1b794115166868c402ff134d64
+EBUILD sdl-mixer-1.2.12-r4.ebuild 3258 BLAKE2B 402500bfcedeb3ebf28e28e8eb3574ca0156c706593334e396a12b8f4655eeffa717b3d9af4b6aada4944cb54f87da0c9885b35ae4e052673dbec45569b15bb3 SHA512 300a5d27d27e22eafbdf727ff2621bdb74221c4b9f23703c9b48946d9aebd95e7b27216e1d8f2cebd9635a8f166bf0244c6c65791a9cbf9d1a033864ef205e1a
 MISC metadata.xml 663 BLAKE2B 5d86fe5c016f831f870da2f9b3d0192b6719bc6a98c0101c06c382d62e6100af314f46980ad5c246c8bea9db8ea99e9cd47afe2e5aee5b7887f5f6d529dddee2 SHA512 16a16403ac93fe964330da05038a0e904d0c6e895413994db9ef587170eaf7161f3cc2ce7fb0fe13ded675306b489837d96e837c1002f216b8ffe72d6fd49591
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index 789b33486221..8d73e8e50b67 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ REQUIRED_USE="
 RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
 	)
 	mp3? (
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 8491c5791273..f0c7907bab7a 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,5 +1,7 @@
 AUX sdl-sound-1.0.3-automake-1.13.patch 231 BLAKE2B cc17a9d7a9f8ea42f84b6a65505d497c0f895d883692508a3ce366a6742533bf4d29b8eff4f09df1753b77819b71dec119950e3ff8a2059e3fb960bb63848be1 SHA512 aba96ba3d3027604d6fcb2f184db37c7ffd2e6204236cf114393e9f5e26acf4040856eb7e4354981f650875d5f991b3cf59c42ff723d75cf7a7e1dd5649f0845
+AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547dbebfe03bf730e80d76b5b15afc66c123a87e0ab1fd9819372e37ed505c1a9e214c27583cb56e12920b3fe0c88a211177c79bc SHA512 ac228520e1c8e682b58919335ea117289087962b4b98fae23e743830709d8dca60a3d22c7171ee13bdbf84f528cfddcad70231edbba64a7cec88c7dd77295eca
 AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
 DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
 EBUILD sdl-sound-1.0.3-r1.ebuild 1859 BLAKE2B 34700a6ec4e72aaa5da68fcf7b6cfaf8be86e3d2d03b6efdd92f09243776972ecdf074b163bb5a84a41959ab850af6e567676915c1bb13d54e62ae8d559019a2 SHA512 65da9213c7657a44ebc0b8d2e54cc095b0338c2e8b9b53071f51cce4dbca096eee15267d5ab5c1377eafb7b7ab7226fb8be2090fed4364d1fbdb6221321a82e5
-MISC metadata.xml 329 BLAKE2B 48629ddb61e6a0f89abf5682da954f242d1215a10c7f65c2df2a39a99a55654772e204d09731df371a6fe1c10f97250da3da80470e402f8e8d5cef598fd107c3 SHA512 684d7fca1ea67c78831e6fbe416af3beb64eabcaec4772ac3ea72a48321b10b2090b73ef1ee9e914b903d8ff1fb2275bb9efee41d8bee1cefb7fcbeb57f85549
+EBUILD sdl-sound-1.0.3-r2.ebuild 1986 BLAKE2B fbf90a46bfed1706a5e7b67900b97509d6efe5fae787f93b034fa5d251ac31da3ff87d78a61b36d37d4d0689edc121071b92167f1cb09c31b6bfcc406310a799 SHA512 d85044e17dca33b336d8a80ee6f96524c1124f930a088a246c1623c5d915cae25e28112d2e8136d98e9f47d81e886f422e7ea84bfb4d82a32a4b528ca7ce68a1
+MISC metadata.xml 443 BLAKE2B 5ca8d53cd8244754cc018b9cc771a6c02d20613a6bcb79adc7a16ff869655dc2a54b7253f8bc16d0675a7536188729f913a03f5c0c5187eb604742a2d7ac4cbc SHA512 522c8dcd761d563136729cca7317ba139e36e85cb7f052113e7317ba0c2b8e8a2d207b1901def3d14b0d57602038d3d32b7091c2175a28709305e7c340de4933
diff --git a/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
new file mode 100644
index 000000000000..1aa06d37f5cd
--- /dev/null
+++ b/media-libs/sdl-sound/files/sdl-sound-1.0.3-physfs-3.0.1.patch
@@ -0,0 +1,38 @@
+--- a/playsound/physfsrwops.h.ini	2008-04-17 13:56:21.000000000 -0400
++++ b/playsound/physfsrwops.h	2017-12-23 05:05:31.657371092 -0500
+@@ -39,7 +39,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for writing, and make it accessible
+@@ -51,7 +51,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
+ 
+ /**
+  * Open a platform-independent filename for appending, and make it accessible
+@@ -63,7 +63,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
++SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
+ 
+ /**
+  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
+@@ -75,7 +75,7 @@
+  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
+  *           of the error can be gleaned from PHYSFS_getLastError().
+  */
+-__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
++SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index 1e8838a26618..b8a69a91b165 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="physfs">Enable physfs support</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="physfs">Enable support for various formats through <pkg>dev-games/physfs</pkg>.</flag>
+	</use>
+	<upstream>
+		<bugs-to>mailto:sdlsound@icculus.org</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..96b514fa29ea
--- /dev/null
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+MY_P="${P/sdl-/SDL_}"
+
+DESCRIPTION="A library for handling the decoding of various sound file formats"
+HOMEPAGE="https://icculus.org/SDL_sound/"
+SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
+
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+	mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	mpeg? ( >=media-libs/smpeg-0.4.4-r10[${MULTILIB_USEDEP}] )
+	physfs? ( >=dev-games/physfs-3.0.1[${MULTILIB_USEDEP}] )
+	speex? (
+		>=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-automake-1.13.patch
+	"${FILESDIR}"/"${P}"-physfs-3.0.1.patch
+	"${FILESDIR}"/"${P}"-underlinking.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-aiff
+		--enable-au
+		--enable-midi
+		--enable-raw
+		--enable-shn
+		--enable-voc
+		--enable-wav
+		$(use_enable flac)
+		$(use_enable mikmod)
+		$(use_enable modplug)
+		$(use_enable mp3 mpglib)
+		$(use_enable mpeg smpeg)
+		$(use_enable physfs)
+		$(use_enable speex)
+		$(use_enable static-libs static)
+		$(use_enable vorbis ogg)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
diff --git a/media-libs/sdl2-image/Manifest b/media-libs/sdl2-image/Manifest
index 289ce6a3613f..46233c53a751 100644
--- a/media-libs/sdl2-image/Manifest
+++ b/media-libs/sdl2-image/Manifest
@@ -1,5 +1,3 @@
-DIST SDL2_image-2.0.3.tar.gz 8685512 BLAKE2B c54114f6573632561443bc57af8fe3ddbccc0bfcf027939685add7b06cb6999a5bc41119c474481047a7216ce6110a58a08571fefa6b5c80322f15f0c528ad6f SHA512 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
 DIST SDL2_image-2.0.4.tar.gz 11682695 BLAKE2B 5e2a456d770ab2b6b82d5573d9e6eed874b2b65fe3225287aef853b27f79251db4dae155721018c69f30e272d9cdd4a4f97db30ca93f63bc08e270019888edb6 SHA512 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
-EBUILD sdl2-image-2.0.3.ebuild 1518 BLAKE2B 2a1fa4029e2a0ca9c555f291dce592fde48e1b2f17ae05f686999b8599ee4a820cb46be0821687c6b16adcb4654e622d5b38fe9b560dafe7c14ebc8c81ff8910 SHA512 57b1abc7ca0ca0c4c7233ad639b6901db722503f577aae933653fc742a4b4e9bfeab96ff68ff41dff4ed4720c0d52c41635beb2b910da2eaeda952cbddf8a64c
 EBUILD sdl2-image-2.0.4.ebuild 1538 BLAKE2B 80bec7b5519034007d44ed05c36cc685f536eb274a139bfe2e2bde658b86c1a16c3fc6540db1954dc28b95df00f1eb5e7c385443a9dd99f73ddab9c216968564 SHA512 b1705651937d5819642f519fdffc4165266d108d5c04ee4a5863839cbdd490cc5a6ce7e562431befdd6af18823a605a2b90152f6805b415591ed754ec7efe8e8
 MISC metadata.xml 323 BLAKE2B 7d9dc08cddd37155dbaada0cf585700675350e874677346366807037987e1329fa141585f64101bd844d2ffb7bb6e80d0f53793af223f7a9a716f2e2b80bd245 SHA512 5502470417abb179d755e9d913a30e654bc961aeadcf91747b72b0be3823137ea0f344454744b7e3c450ef4923bce844f8281c85b6019f8decd63a50ea307089
diff --git a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild b/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
deleted file mode 100644
index bbb163c9f538..000000000000
--- a/media-libs/sdl2-image/sdl2-image-2.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune multilib multilib-minimal
-
-MY_P="SDL2_image-${PV}"
-DESCRIPTION="Image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gif jpeg png static-libs tiff webp"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.9[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-3.9.7-r1:0[${MULTILIB_USEDEP}] )
-	webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		--disable-sdltest
-		--enable-bmp
-		$(use_enable gif)
-		$(use_enable jpeg jpg)
-		--disable-jpg-shared
-		--enable-lbm
-		--enable-pcx
-		$(use_enable png)
-		--disable-png-shared
-		--enable-pnm
-		--enable-tga
-		$(use_enable tiff tif)
-		--disable-tif-shared
-		--enable-xcf
-		--enable-xpm
-		--enable-xv
-		$(use_enable webp)
-		--disable-webp-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && newbin .libs/showimage$(get_exeext) showimage2$(get_exeext)
-}
-
-multilib_src_install_all() {
-	dodoc {CHANGES,README}.txt
-	prune_libtool_files
-}
diff --git a/media-libs/sdl2-mixer/Manifest b/media-libs/sdl2-mixer/Manifest
index 71072794c88b..254928be0568 100644
--- a/media-libs/sdl2-mixer/Manifest
+++ b/media-libs/sdl2-mixer/Manifest
@@ -2,5 +2,5 @@ AUX sdl2-mixer-2.0.2-smpeg.patch 698 BLAKE2B 04f58b64a190c22636c8d0f8218e3070707
 DIST SDL2_mixer-2.0.2.tar.gz 9620763 BLAKE2B 9257f7f3dc3453b600075011f1879391c4a4def2c67709a883a8803f752928d3883fbe11371609cd5e690647a33b43bfd38f152aa620f63af12e1b7b72fa0ec4 SHA512 c40b5ac93933df1cc932e7afe796ad6765aafb24077601a23f98ac625a83341079ad903c164eafd022aff6011872e7a7956eebd8e3d3edad1bf5dc7eb9c306b7
 DIST SDL2_mixer-2.0.4.tar.gz 11125077 BLAKE2B ccb55020e360fa000e82807b8c4e2371228291943d2dc7371606834ca0f781d4e82581b5427e9902156bf3072208db4ec07e95a06f206e40ff530f432dd9e491 SHA512 98c56069640668aaececa63748de21fc8f243c7d06386c45c43d0ee472bbb2595ccda644d9886ce5b95c3a3dee3c0a96903cf9a89ddc18d38f041133470699a3
 EBUILD sdl2-mixer-2.0.2-r1.ebuild 3258 BLAKE2B d5962eba570d4b2a42589d498118977cbfdb7baf83c1422c3614920612a7cc6fdb5c3d0623fc74c9a24b5120beffd3ee2409cf8b19380cee0f13c54f879f3fe4 SHA512 5de83350d6b84e8b2cc6db63a786a9495b6d5b4b864634916b69c18ecbb0c2b46dfd14d881a14755c4483f3b1eae5f0b15f5e2a420a7b4cef69d8f6115c4124a
-EBUILD sdl2-mixer-2.0.4.ebuild 3234 BLAKE2B 9eddb4375f8124ce514de05692e6ba665834e65a89a16c6ef931a067781313704898b085a3c20c7c7df6f43d5cb7b051ae187af5a33f07e8cdffbbf3ccd057e0 SHA512 6ea52f437fc3205345d89c10de3059ded6f3c10340448588d6438032ab460e168c89b2dbae6145a2499719c8ef97ee7058b90c1ebbc4dc1c2cc35c7b3778dcdc
+EBUILD sdl2-mixer-2.0.4.ebuild 3236 BLAKE2B f86682c2d62974d81d7f0865c3c43c76ae63cd9999e31e817f974cc45fa4bdce7a3076ff71e358aa12ced298ff6afdfac9c93d942069fb76538a10f197b83579 SHA512 c5bc8e9cb00f4470de7ef7f74fc7ebf64c739608b1a46d2313e2f27830b39baebbb7c0ba75e63f314c3ff38351a753abfd6d64953104417383c7b67e42fabc86
 MISC metadata.xml 751 BLAKE2B 7bc41a1afbb031953f9621d7f9059fc27bb588fc813c4dc68fbc760824a0a1c301997803712b6bc96d9814439fd8274ad388d18d54c2b125b71002247253ea7e SHA512 2376560d848b86e6d3b1728f581cd43bd812b8bfa4e89eb839f2505dfd3f75cfbc3c82bd9a91e571f6021e6ce7ea39df99d964fd29d0159f241539e86d65ce4b
diff --git a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
index 1e3995f3f5b1..a609fd86c22b 100644
--- a/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
+++ b/media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=media-libs/libsdl2-2.0.7[${MULTILIB_USEDEP}]
 	flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
 	midi? (
-		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1[${MULTILIB_USEDEP}] )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:=[${MULTILIB_USEDEP}] )
 		timidity? ( media-sound/timidity++ )
 	)
 	mod? (
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index d63f65d53e9f..e1dd05fe94be 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,8 +2,8 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B
 DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
-EBUILD vulkan-layers-1.1.101.ebuild 1392 BLAKE2B 425bfe63cde877b3cf5a0a705d75eaa2c8c0073f6c3e32158e033d7ed64fae6b9f1efbe306829cab3014af8357e7d4f05d3b6c34f2c73b582dbd9e548a831a27 SHA512 1e846e3a136b1cf8483929a3b5cd04ae7a3e51c383f4964b1e0b0df695f9405ff36873342acc2a94b0486013911c8e6a67f0989735f49403e2d798f76f406986
+EBUILD vulkan-layers-1.1.101.ebuild 1400 BLAKE2B 6dad1dc55f3d64f298f265e76c7c3c7dfa9e28c790bf466af5fb30b273cbe624baab4d417eebf1ac5f908eb1f8190219b85a4ebe809aae8339914a05e16c75df SHA512 b016fcfdafe1755e6195480690ebb3bdcbbd369ee455f41432c2f5ef99e2af2e4e52105dc8218db49e666b93ce3b9d734f0b238c183cd54f7816c5bd6ca04117
 EBUILD vulkan-layers-1.1.82.0-r1.ebuild 1513 BLAKE2B 9e9d3274b3eef9197b08fa6f0a1d07439abef1774194b63d6d0b0ab60da4a1f477d6c30239c91df87317f05a0d260a6220f0bed5b949a908314ae5a469eb94a9 SHA512 f890f1ece720ba37ff414b0f1a912c27ef68c1fe8e07bea10d06eb4f156e927b517a76b7b0918d12347e9064846eb9338706a7c088c1602a71489023ff07a9df
 EBUILD vulkan-layers-1.1.92.0-r1.ebuild 1395 BLAKE2B 4c2275f707fd5a4239661640dc9babd20c6b685f572c765faacb19ab498669961940d37bb97462498b563fc6baf9464d8a1d8c215dcf38dbea6b6538afda7279 SHA512 72c9e52f422973584d598dd9f5e808de7786e6102263d2f97789e32a0081a7585f9c196318df4c59399d98bb0429c3ae42d44ca38fef12c5f9b7b4e1d5245870
-EBUILD vulkan-layers-9999.ebuild 1393 BLAKE2B 3b56717bcee88b852af50d847ec3d5085b2db758377e5b18c4595049cd8a565db478390379c00da814bfcbaae8701e9a17ed065af8796ecbe22a94071ea69c88 SHA512 0a3c78931607c4bac6c51b0c6982ab3398350ac54865b7fb3c330999e71e56271c0e3092944a682343ce36a798bee2b0212a04ec9e01c54c8ec6cd928e2ce8e2
+EBUILD vulkan-layers-9999.ebuild 1396 BLAKE2B d1a6e4aefabee0ade2fc3ad569aef6a9cf92a7f179f5ecc29456a7e696edff288bb180f839f15b81dccaa8df7f3630f0a8ccde724e652401f3a0afad800c2533 SHA512 0bbec65fcb36640d461bbcd9bc09930dc1c16399265f66b54164de1251e16a2d794a71276d6559373eda465dd0d4edadf9f46133158b49162aea9efdd9442423
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
index 9ac4ea00384e..9f68781e15a1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.101.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="f06d731b7caf3e446acef3f4f5e62bdecd6f73d6"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
@@ -26,7 +26,7 @@ IUSE="X wayland"
 
 DEPEND="${PYTHON_DEPS}
 		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2019.1:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
 		>=dev-util/vulkan-headers-1.1.101
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index f11a1d33e59d..1074eb79739b 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="X wayland"
 
 DEPEND="${PYTHON_DEPS}
 		>=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
-		>=dev-util/spirv-tools-2019.1:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
 		>=dev-util/vulkan-headers-1.1.92.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index f72f1798b3e8..b104fc524510 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,7 +1,7 @@
 DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e4f0d366353f1949c27f5dc3bcbd9997bb97e7d7dc13f141c0423ab162706399a45693da5dc5ed7e6802cc65ec55c711724 SHA512 b26a9389a90cd833c7b18a50766ee0d54ad52aa252d33eb1760ebef38305559664974198a84b0ddbe92950fffc8d2a136c23acff40f73d3cbbd183bc75489a10
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
-EBUILD vulkan-loader-1.1.101.ebuild 1543 BLAKE2B 74b64f6e9d37ea87c244940bb203652dbcd4a822e40c0c53acbc1712dcd1e5faf7742023801f9eaed65d6215d5f17f7e5c6a2b67722db8fd2cff1e2e7607f427 SHA512 67bca56bd29b72fe4a91a3d83ded2c0ed3cee3e10380bfe0ebdc01af756df5ce60dc48bd7aebc012c243b4d1421fcd2bc25c02e6cf1e1ee635a22937b849fc4a
+EBUILD vulkan-loader-1.1.101.ebuild 1548 BLAKE2B 4906bc12df3bd783e0d3a7f4c4a4e9653eeb2d991b82070357811d8d0ca10dda987ab86ab3fce270907c6bf0904555e5ca4bba64739e83d396e49266f2c07e9e SHA512 4fa72cb0189599f140544c1970ec555a1b438f2032d38a31c9040903e216a8ec88e85b719c93a65a4a52205ec2195a3df39e0e86268bc31ba5a99b0271210be9
 EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
 EBUILD vulkan-loader-1.1.92.1.ebuild 1543 BLAKE2B c0d6c78fdf83fad0fe0bd75a873962f2d2121d5bbd8d29b8e8e219928935d26f48ba767e9c2cf236d97faab69c5e6bc39f3adad957c6978b3f809fcd540aaa1e SHA512 258c4fa187f4c86ec3ac8bb75458cfa1ef3f5497ef28db1ab4cffc3250dfb7995fd31b5144174653e372ed69cc490cff3203afa63aa3beed22f8f750e3585f1e
 EBUILD vulkan-loader-9999.ebuild 1544 BLAKE2B b1cbf1e197db3080f9c1d2a7c14cd7e68adadd19639148a0e4ba42b17aa9c57cf237a62b659554d5072f8c84d59dd58b15112726c1a521df10e0a6c0f6cb87b9 SHA512 af081aa47ef8fc799e5c558e89d8dfc2c8ca472ede7d167842776e06b8b50b5c325d496a35467c64b84b2785e200ddbb13781d440bf6e63410c893ff35e5f695
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
index 28212063359d..e3068ca2bfc0 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.101.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	EGIT_COMMIT="15fa85d92454f7823febeb68b56038d427e2a7a4"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /media-libs
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)