gentoo resync : 11.07.2019

32 files changed, 195 insertions, 306 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index c6bcb0395eab..0e848d457697 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 6d410daed6fb..67985c9c0336 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,5 +3,5 @@ DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf51324
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
 DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
-EBUILD gdk-pixbuf-2.38.1.ebuild 4087 BLAKE2B 2f96f308f8d9783925487e8211ec568a8b92d8dc30e57dd7982748b6fa660986ab2b960dbf7c4b3f30d8306488fd71bed4e0a20df1ba9b097b45357a6bc02934 SHA512 bb68fe4e04434b55f44193639d8847028cf36c844124496a19b0f2660c7ed741a056509aa585c355fe62df8b10034ef6c4e3afe79be3e702ae8f483fdb903681
+EBUILD gdk-pixbuf-2.38.1.ebuild 4086 BLAKE2B 5befd1e92bbae70ff6294fcac99f24d3f23d327295fbd2751c5da9ff8936d495371acbbcedf0eb8853223639e8089325247a18792f8cf82325d2fe3f8a75f8b7 SHA512 b9072ab977f05347445ee0c696113be679b887c4be0c4b5d42f23ca71e2a21fc4d2dd117e57cb28e9fed38143be11cf9ee453e099c0c4dd98589cbaa4b213e2b
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
index 58581b418043..feca458cf8df 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-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"
 IUSE="X gtk-doc +introspection jpeg jpeg2k tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index a614fb0b49ec..de13ee04d7a0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,13 +9,13 @@ AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ecd021817e34e71b101a7d222604b395c850c559f3ff0c38e0848abdffc483efe65f086357532be85db872028e7 SHA512 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
+DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.8-patchset.tar.xz 3684 BLAKE2B 686356993b95f5342942764af5f92ab52b17fcd326ee3fd0de5179ed2a55b6e0192e16707ee882866d39ede7d28150b8b8bc6945355f04a4b191b671ae70fb7d SHA512 31f9b982592a81095afad91f16ad96e72a7a2b0e2bf812f0b719da56d70235bc06bc991b5f619fefded3e1634efc5b7e8ef00053929c89e967351d8625518428
 DIST gtk+-3.24.8.tar.xz 22419364 BLAKE2B 262384d0bf1d843edfcb13007eae3584235fa166286f071b8b98803d452df3f4f8934f2b1830427d0c0cd956b67170e576f8c3f733e9b6323b8f89f6d0ddea71 SHA512 a988ca2e25f0f32e55b2931f16c72f9649ed98405579d217e8a5e7f0ac10bcd1969090c622c5d9eb7d75235813ff7ccb90e30e252afd71ba283c6172ee459fe5
-DIST gtk+-3.24.9.tar.xz 20983908 BLAKE2B b9f85eaddc978744b6e666162378c0e747dd2f24141f941fe99a7202832c92b3869318b6b842bd7fb029bc57f1ad1eb5189e79f7bfcf592813db04c8939ab765 SHA512 b303db40d5e277841738982a97edd67076febe41b3a455344aeff05c6a5b149c6d3b953cc5db1a792b63cdcc44c2d28f955d81065cb2c6b3f00d0b133a555d7a
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
+EBUILD gtk+-3.24.10.ebuild 7282 BLAKE2B d3da35953d01bf291179469241325c2a696d0dc5273f87f324355eb64a95f2979f8a5743ee8df7c8053b1baa1bfb91141af6fd0c3d1633494783c64a91ce9a3f SHA512 6f776fd68dc300ecb3f349f1be88e1b95ad365819c71d33803b3dc50c9bdd9addd014217dfa446fabc45bdaf90fd6695ecf58434e5384532156b1e2b39a1f2c2
 EBUILD gtk+-3.24.4-r1.ebuild 7234 BLAKE2B 7f9ba74e4e52d0a12c350782005a939dd35dfba9c488296307a51c46aab52eb5c9548dcce600931f5041323b9471d01639fb80ebef562b4c75c3055839062663 SHA512 c036f96ed89adeb14441a07a04a6c7be48871a207c07faf2ab466d37e15d944a2cfc808198fcad0762db01ddee406ebd75186a07f67c6b644c46ae08c1516363
-EBUILD gtk+-3.24.8.ebuild 7065 BLAKE2B 4bc3337dc2104bdce97099948805ba992d50f554f6ccfdbaf909e2e7a9dcd54e22679e309d962d75256d3ae936b2d5e387d5d2c378889ff775f70398b4db17d5 SHA512 fda792fdc877fabba901412a8d27d850097808681d303bced12824f83d84abbe62277673f4ee1bfe9d67f40e708d622f84bd38e05df9d208f5d6a961c57ed7bc
-EBUILD gtk+-3.24.9.ebuild 7390 BLAKE2B 46eed9d315137d7597c1659b3771c26e67382e7b4c22ce34a10c73b30f225478b42705ccb05a8c9640e20c4cca8e756003ab8af906f9a90a458bac49ce32d0f1 SHA512 91b32f6abb26a9e39e64996f86e4076ea5198fbdae301bfbfb0cc7a87399bac4666ec5a51db0a9ca2fb0c95ae6ce9998302071a33f13cd70b680a481fccf21bd
+EBUILD gtk+-3.24.8.ebuild 7064 BLAKE2B a01098b0b5faad0f845261289e07cbc515d26cc1a608528ba91914a66f78c6137c20729c621f0497dd9738a3775b159c3f2b5fec9b2840214bebc434f16522e2 SHA512 07c33d2a52adb53df62be8c89312b980065b5b98f133aa5d97233ba609d8268ef59af47eb696b5f4b5ddd8a25f75f5abb1d24e5bbe965514faddf2ccc08e317c
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.9.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
index 3892915f3b19..6a435ba6df4a 100644
--- a/x11-libs/gtk+/gtk+-3.24.9.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.10.ebuild
@@ -152,9 +152,8 @@ multilib_src_configure() {
 		--disable-cloudproviders
 		--disable-mir-backend
 		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2 and passing --disable-profiler
-		# would force enable it - https://gitlab.gnome.org/GNOME/gtk/issues/1965
-		# --disable-profiler
+		# sysprof integration needs >=sysprof-3.33.2
+		--disable-profiler
 		--enable-man
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
 		# need libdir here to avoid a double slash in a path that libtool doesn't
diff --git a/x11-libs/gtk+/gtk+-3.24.8.ebuild b/x11-libs/gtk+/gtk+-3.24.8.ebuild
index 1b86401ae049..37ea639ea409 100644
--- a/x11-libs/gtk+/gtk+-3.24.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.8.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 1941ed2568d1..6e25da847c88 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,3 @@
 DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd
-EBUILD libQGLViewer-2.7.1.ebuild 1291 BLAKE2B 711010c65c0a0cebe90f239d1f223ee3a66cce014770e712b9997eca165bd39af562a44d000f5271aec7df0cb303c924ffe0785166b4ed0dc567940d9a011f7a SHA512 6620cba4f14e98f4b827ded73d98a9ef935fd7da30a8908005cad327b339f4a962a6476b2890f27565e129adf9a326058d8f644acaf7d50d69ed0259cf0e87ed
+EBUILD libQGLViewer-2.7.1.ebuild 1285 BLAKE2B 9ce932050319d865cadff1ee5d8521774f5391fe761e61bda3af5566e4d26d1a3ffacc9e68e6d899bfb569d71bd7ddd4f96383f0437b3870d000b6c8a92af48c SHA512 db5405f9bde9c3a516dc27a17f1041b3b3ea499ab4f63428d03a1142e00cbdfa3b04d8264ba0ddbefb3b2dc41eda0983e4878370d165f6a7cb832dc5501184e5
 MISC metadata.xml 337 BLAKE2B d41f3f134ae930728e76d4924cd145a6a958482a008c047deda9e0ac8864496ceed43f939792583cc49bb572785a4924fb3e44da738b6ea2c84e43ca592844f4 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
index 19eae03cf769..9354dafafbbd 100644
--- a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit qmake-utils multilib flag-o-matic
+inherit flag-o-matic qmake-utils
 
 DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
 HOMEPAGE="http://www.libqglviewer.com"
@@ -14,18 +14,21 @@ SLOT="0/qt5"
 KEYWORDS="~amd64 ~arm"
 IUSE="designer examples"
 
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-qt/qtopengl:5
+DEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	dev-qt/qtgui:5"
+	virtual/glu
+	virtual/opengl
+"
 RDEPEND="${DEPEND}
-	designer? ( dev-qt/designer:5 )"
+	designer? ( dev-qt/designer:5 )
+"
 
 src_configure() {
-	append-ldflags "-L${S}/QGLViewer"
+	append-ldflags "-LQGLViewer"
 	sed -e 's#designerPlugin##' -i ${P}.pro || die
 	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
 	eqmake5 ${P}.pro \
@@ -33,7 +36,7 @@ src_configure() {
 		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
 		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
 	if use designer ; then
-		cd "${S}/designerPlugin"
+		cd "designerPlugin" || die
 		eqmake5 designerPlugin.pro
 	fi
 }
@@ -43,7 +46,7 @@ src_install() {
 	dodoc README
 
 	if use designer ; then
-		cd "${S}/designerPlugin"
+		cd "${S}/designerPlugin" || die
 		emake INSTALL_ROOT="${D}" install
 	fi
 
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2ddb41c6fdb6..482d1652a3be 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -4,5 +4,5 @@ AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf
 DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
 EBUILD libX11-1.6.7.ebuild 1287 BLAKE2B 82da20e7f5c237b6b98dbac3075ed9aaa57ff094adfe0fc35ab6f8dafad0a97885869525c45884958d1cd0891b4afaad3aa3c921374533a1bca3319cf0caeac5 SHA512 6f8f758a1f1b01d7b1858a19c17647805f9c67c453def0c1e3d1a108a9b070c3397a442a9616447701a5933685d9efcbb4a04e4d78faa86708f30089c40c8396
-EBUILD libX11-1.6.8.ebuild 671 BLAKE2B 26f37c7c648f67a912a36a96f98cf63e266e8a7383f9cdd888e538cbc28246a50111ce551bbae73acd6a48965b2a232e584bf7eea7ab66ddb60906169f12b67f SHA512 ab048ddc6d343cdaf5befb319326daff1b63f75f46733c54d3c156851cf278be7da53bd9b06f8a389a8cb3fd0bad4a303988d27b63309b7b22a9466a918b4d11
+EBUILD libX11-1.6.8.ebuild 669 BLAKE2B c85b9a0c3a55788a5f9985c81fb10b52aa98f89848ffe6fefa75192813a38845d291692e2239f9a43560052c06f40142fdebc1d20fc5f0ad1029260cc7c02d2b SHA512 4da5608082994cd33a229ab64a8e24d2725480056d3e839cc5a020cf53c0f5cbc20de32118765a4c519cafd3d3974f215d6b85b7673d5808921ee9a2d38909ac
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
index 6cd68250158f..e42b89f7859c 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 37eb0b83d986..e4231ff016df 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,5 +1,5 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
 DIST libXi-1.7.9.tar.bz2 486312 BLAKE2B 2dae307168431ed0a629ee1be1fa0f93732105452be822bc9cf54cc0863286306c2bdda67c16bb7ed92d63d669f884a4a67ae67ffcc7c170f91848039d470c0b SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5
-EBUILD libXi-1.7.10.ebuild 767 BLAKE2B 621436bd8e6cb850fa248d6987aedaafbff3929570b33cae4ec7be11d80db375a4061bcfe83e0a30107d083fc4d4b2acbc7a4bcd8fa3dc5534620ec4136d889b SHA512 28a700f6209e0baab9cd85b80760a74c7a317ceb2066ab87e999ebd46adf54b102c4ff22d43e8b84f9ca1144cb5defd6ac424efed2029a1eb7dc7a60882a6e8a
+EBUILD libXi-1.7.10.ebuild 765 BLAKE2B a4a5472b258d335e21f7085eebefc5620b9ff33bf09340c12202bee63da7257c10af05c61cf84119cef278f465bc5c9dfefe919bc791530a07241c888d7da5ef SHA512 ab5ae7a18acfa30369bafa17a196f34b347b2cdc5e7074a56ac32b76298c4f84b0ad742e587fc277af98d2c9faead79a89b6d7d3ef1a5848c154592c2da4530f
 EBUILD libXi-1.7.9-r1.ebuild 783 BLAKE2B d94b72e1fcd97ecbe865e5e4afeb2d11ad66d84f29c35a3159c73a816b66855e1037947c985ac57fe01b7ac555720492c0012cf5599b904840149a9de699f356 SHA512 2ec5e1467eb55105c367f49a90a182c6ed3a08aa7d8d4375b7815a5cfab6f3d6da39ac05668dfca05ead845ab553589c42862fb0f5a5e5b90921992bbaeec403
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 30970c5860ba..3f420f81502a 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index 93432536770c..d24d34dd5a99 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,5 @@
 DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 EBUILD libXt-1.1.5-r1.ebuild 752 BLAKE2B 3a7dc7462b012c6f8a75d3fa7d23351da7291eaf8ab5613d9e72fbf8e150696f02b6717f891b471ceee17562e09c57545ba0e4d2614f824a3b4959c10d2b03e6 SHA512 1851a262d4f32042bcf76ac7d1994b8b4c78de8c966a408000fcebf068be0261821980338d04b180ad3c65965fb33c267f30d37eb9dde2e434e80b9be346936a
-EBUILD libXt-1.2.0.ebuild 842 BLAKE2B bdf306386d6a2b82263259468196c3db410f003aafbca73753f9128e30385432c77228feccb33e9835697f154454e335e6756998fddf7ba1c7c5cec97eaada20 SHA512 ab59521d863173ff71165b7b32ba9b99eaddaad4c050bf308bda09c0acd1fa617276e0d06bd2ce292c08d7d89319ed28f3a62aa98a49b492f8fb2a2858a07a61
+EBUILD libXt-1.2.0.ebuild 860 BLAKE2B d374257606fb597cf2ebfea12668bca01c7d8b99a7a632db80e76c743e309fcb2e8c36460ac3fae8a83cb1ac76089365a8e3749eb60532e5ebd4952f6564df5c SHA512 c61d0370a7dd31ec1154dd635f63e8fdadc86993f111bdb039bc572eaa5055b73ddaba9c5fe771ae5db4d5ccf5d5bb5b0eaa74d027b7f0798739e3f3be70f376
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index a13cc801954e..c1df5c10ad43 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="
@@ -18,7 +18,7 @@ RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto
-	test? ( dev-libs/glib )"
+	test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
 
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 0714e2fd2dc6..a735b35089eb 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,10 @@
 DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 DIST libdrm-2.4.97.tar.bz2 837329 BLAKE2B b47393d81917a0b43c22f7798ff2e1c21a05fc716a63092dbe0e49cda0fe3bd899d5cc4d703ae49f781e283f5067c62cd37a4931362427e21c3356584cb5e810 SHA512 3e08ee9d6c9ce265d783a59b51e22449905ea73aa27f25a082a1e9e1532f7c99e1c9f7cb966eb0970be2a08e2e5993dc9aa55093b1bff548689fdb465e7145ed
 DIST libdrm-2.4.98.tar.bz2 833295 BLAKE2B abcb51046d95dd0620d8ae705a731c4a0b9db817cc897c6bf2063c3c25c13f45019b5c016248fe93269b77252de96724c3215eaf5be990b925a38034bfe4a4e4 SHA512 3d333d060ceb14fa8e204ef468ca2c95d6f07205185ca90a044b685832b9b2d7256faa5e81d5871ce8b70aa1fdf9fb1ade18b4e582ff0c7ef5551da8506eb27b
+DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
 EBUILD libdrm-2.4.96.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
 EBUILD libdrm-2.4.97.ebuild 2143 BLAKE2B 3e2c8d221b892ec17c3f36036be0398061ac3aa50b05259ef89acc2b86309953a5c87382cdda95df152a603ff624216b3108c9754a6bfe88b6c6053ccd24a06f SHA512 30cfc0c66b0a8b6b303e68c891ed02239a9a9767289523d7cbb74b37ed7b592975450d0f130ed47ed67ff82e0ea32250a7d4e3d07706ae1030e32096e8e0a108
 EBUILD libdrm-2.4.98.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
+EBUILD libdrm-2.4.99.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 EBUILD libdrm-9999.ebuild 2154 BLAKE2B ce5a70ac7497f4dd11c616e24ae1407a4a0d4e96635fcc2a3c915777c2892b7dfe3cedf561e5391d2df13f15a06a07c13cfc0f693f8a19342a0e89b2f9429642 SHA512 99bf291b61db6b47ddfb2f2c515ff2d58a169186e4ae8b6b7f8366d04b700fed9c7c720149a16209f18b829a7c96e57d7da59e8a87ebce39e840f5d21b87331c
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.99.ebuild b/x11-libs/libdrm/libdrm-2.4.99.ebuild
new file mode 100644
index 000000000000..29daf988738c
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.99.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${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"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index 865bdc65cef0..4a462d1839a7 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -4,5 +4,5 @@ AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 446 BLAKE2B 3fd96d388be5d55541a3
 AUX libva-vdpau-driver-0.7.4-sigfpe-crash.patch 742 BLAKE2B c1e3a3af09c0c121747b0da28cb256ab4f9783254349be6accad512b7c4872065909bb6701ff0bee07c04e8c7ed34b93a7f6e50b964a1207501209d75f70d26b SHA512 f56d7e64bfc36f0c54eb5bef8fec3ce0b3efcbcec3fbb4dcda599fb4d553f2ee494a87b8b8a7a1c642598dcca385872b68b612b31f965eb1c943123e75630ccc
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
 EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1131 BLAKE2B 4e07ca091e60a04ebf2d3dbfdf4adf572f37fd8c990814e939ed6ed62f986fada773947a0ed9fe8fa0e35034a2f08ef89965bf08208b3cdfae4496012cfd9b17 SHA512 869c76363f55138f35f01e9ce2c051d4f46d53263a759cac286dbd3a1028457793c5c234eefbb7909f7af9b4eb5e36ad2d6c6f4cb3fef32ba8bffd86dad881b3
-EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1153 BLAKE2B f2a457e9e66a3f9cd41811b732075b2be57f187b4fc290fece6c17095293b678b986adb9af8e8e72cdb903c71b994f3c341bb84d5071cb93ccc8604cdecceb4b SHA512 acdd83d8eaba4dbda5b6fb40edbf931d52f87c1d7940f3b707293b47eb47b5aef719f355404d0a923b05e9dd23366ba0ccc4f650cd9b9b54eee1c704fc185cfd
+EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1152 BLAKE2B 383ec32f8ef056a067b749699940303eb1e09241a3bc58b0541386f8fbbdcb89ee50957377f9f7fa694b957587f4712ce1f16b6268c05cc5809528ada554755d SHA512 2a83f67a65ffba9f6a709e3ef54e069553636e18c0b723007c11aa9fc4fbd9a719d42c1b1c7b465745257dfa527458115ceea29fcd7a3e62e6c1585846b4aaf7
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
index 35a25d844b00..fb0c732ebe5e 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 2ef5a5c6a294..9c0ff4b2eb23 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,14 +1,10 @@
 DIST libva-1.7.3.tar.bz2 824490 BLAKE2B 0579492b700b00e9ed009798e6dcf6dd7fd6cd19e32af9fbab6d780ba83ae3a264dbbfab2633a3458a624fec1935435974875e58a9e57baca9be9cb7ce627488 SHA512 ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
-DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163da92da7d8791547d6ca2fd407319093fee89bce5b26b26818cc0131cc0c7f3cd4f511e3f847e3fd2cf1dff3 SHA512 dd4c901f9c75d03fa45b32af5ca08ba24ef68d354ad26ad53d0f87d3290bee152eed9e61b4dd4116c2d15baf0c74f2d37996d08f007d485c57af5e8d9648eb82
-DIST libva-2.2.0.tar.gz 218971 BLAKE2B c715f5f94cf25bcdf03be9ddeeb390fc073fe3fc7cea324e2f6da9bea490b14a99c41cf5f74d89fa3847c1357297d2c6faa877e76dce470319f532dc76d36f8a SHA512 0b026c99be2600a56833377a1cfd8efb736862dee942576d4d360b9844ace1efb21a2f1b9b1c2fabbbe4a9c483af24e47f31dd07516816acc8fa72e207f8cad4
-DIST libva-2.3.0.tar.gz 222152 BLAKE2B 235cb4ba79eeac334163e32b51313f74506e54a7ca5693b81a2bf00eff1d5204ba630e32028dc02fb47268772d12032471d7d6d47e189318230e8a52cc940fcc SHA512 b328e7426bd5fb33a4ed4817d7a33fb104b1f524f5ca83f60349df66cff22e9cd46d40238d29d5bf527f32c7da153088525e43d50454832ac9b4b7fe0be40692
-DIST libva-2.4.0.tar.bz2 455989 BLAKE2B 740460b5e23fc09dbb4de61dbe6c7d3820032d54d0ff9895d0a5e3235362e559e50d5349eab4c907367cef101f367256a9da3cf3a87526c444450f830b0ac4d6 SHA512 67373e20932bca0d52cd8f48ed10c1f01752be73642ad4d2c85dcee813dccf205c8ca62fdc69fb3f4f83a685e2a8ef2c6646174e3453a8f5763cac16a58321c3
+DIST libva-2.4.1.tar.bz2 456435 BLAKE2B 8500d5d234f6b5841611b7e46c9a729d8becaba0ce8311fe41cc6689339fb80ae665a974152c04c9b7ae5ce7693ed2549c3c0f284d8b21ecb25964745b6f43e1 SHA512 24af06e407c833f588e05e2be853bf004b0322d35ab35838ec2705c4158feb41e8ecc3a1b619fc291dfa7da49c8e17dd49993937624df0d4ed7ee2dbb90b1568
+DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106
 EBUILD libva-1.7.3.ebuild 2266 BLAKE2B f7807f5eca706ca9895d517626d8114e8db889d37ca44a09370243f4a8b89ac00b01416ee41ddb14110b91cd9923610a87699c05302523ec771755a0265e99d4 SHA512 fb26954bd83809530bfa4358e5b8021438c5743ba3deafb988a94cfdd92a56c960a7bd5a1ebca3c03f1c84aa96305b3b202f29c9e1de8d84b4b25ce8df5fdb71
 EBUILD libva-1.8.3.ebuild 2228 BLAKE2B f8ec448a272a59b1a15fd863bb813215d15c5c30a7fb7b100548a89e03a0af46d4a001c9ea76ed51fd2086c26c235101ac23cd13f6c46c6e9b2aaa7dabf54b42 SHA512 61a2b89d42c961f6a12c956091ec5cebc9dec5094854c8dd8191fa891c3de76254dd5df60ecbfa8b5387a30a4c2091848955145edcae5a9d98496b1804bcae85
-EBUILD libva-2.1.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
-EBUILD libva-2.2.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
-EBUILD libva-2.3.0.ebuild 2184 BLAKE2B 92b05e58ba15e2629bfacad470f97b4e04f46f97e97cc2bf38d7f73825c95d68cba13e13e73d77b7bc0ec549b539f8f776a1b3d291edbd72bb79c7525acbbc4c SHA512 487fbbede1034edefb87eeb854cac46476919037b7e55a0d1d18def4f514125a454fcac1b52db6297304e61f68bbe72454416e0834b2235a22bffe9721f84856
-EBUILD libva-2.4.0.ebuild 2053 BLAKE2B ea191297339491e347dc69561a740e5e73eee8e31398b43d4da4ac4bd9801542e03bafcf86b0395032c4d5fc5ef711ce4a68c81d424332f88ae31da30c9237bb SHA512 0907ae20fb8e229ec7559ff61c415d5a8a556106f5cee6ae68ea63666eb99e0ddeda6690470a6ed5c1ca206e333dc77538ced3f61f7a14b0904f5bf078346a1e
-EBUILD libva-9999.ebuild 2053 BLAKE2B ea191297339491e347dc69561a740e5e73eee8e31398b43d4da4ac4bd9801542e03bafcf86b0395032c4d5fc5ef711ce4a68c81d424332f88ae31da30c9237bb SHA512 0907ae20fb8e229ec7559ff61c415d5a8a556106f5cee6ae68ea63666eb99e0ddeda6690470a6ed5c1ca206e333dc77538ced3f61f7a14b0904f5bf078346a1e
+EBUILD libva-2.4.1-r1.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
+EBUILD libva-2.5.0-r1.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
+EBUILD libva-9999.ebuild 2189 BLAKE2B a57e450dd0eaf80a440f5dafdbf48e1ea337ba897468bf831f11c89e412a03916f2c9190f06bea45215d34084311618d29089995af9cab7011f20ba3693725e2 SHA512 94cacf1f0eea1290e3e493ec7d7a30bbede70a9ad9d372c762c9905d01e9a2558bd31e9d5f4c80539d53ee25b7146744d28742add3676b7b1f9cd642a2962f74
 MISC metadata.xml 518 BLAKE2B 2d363f9ee3a690cda208cd96d14003254c0226bb8c396e367d4382107b675fe9f5d0713f826ef611ddb250e3dd919da5e19473f6e10aa59c05e99cd13335e34e SHA512 655f89ce0b04f3d31f02617065baf715a4e6394828b83b18fe12f35a7fa3a626192d9165d2520a5731b98215afea3db4e5b50caf3ed1915be1a707389449a367
diff --git a/x11-libs/libva/libva-2.2.0.ebuild b/x11-libs/libva/libva-2.2.0.ebuild
deleted file mode 100644
index 2cfeb67ae2f1..000000000000
--- a/x11-libs/libva/libva-2.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib versionator
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1)"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm opengl vdpau wayland X utils"
-
-VIDEO_CARDS="nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
-	utils? ( media-video/libva-utils )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-2.3.0.ebuild b/x11-libs/libva/libva-2.3.0.ebuild
deleted file mode 100644
index c22f59b50128..000000000000
--- a/x11-libs/libva/libva-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib versionator
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1)"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm opengl vdpau wayland X utils"
-
-VIDEO_CARDS="nvidia intel i965 nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
-	utils? ( media-video/libva-utils )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-MULTILIB_WRAPPED_HEADERS=(
-/usr/include/va/va_backend_glx.h
-/usr/include/va/va_x11.h
-/usr/include/va/va_dri2.h
-/usr/include/va/va_dricommon.h
-/usr/include/va/va_glx.h
-)
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva/libva-2.4.0.ebuild b/x11-libs/libva/libva-2.4.1-r1.ebuild
index 7de898cf6aa1..00629ae44aeb 100644
--- a/x11-libs/libva/libva-2.4.0.ebuild
+++ b/x11-libs/libva/libva-2.4.1-r1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
-	inherit git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva"
-	AUTOTOOLS_AUTORECONF="yes"
-fi
-inherit autotools-multilib eapi7-ver multilib
+inherit multilib-minimal
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 
-if [[ ${PV} != *9999* ]] ; then
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit autotools git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
+else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -38,7 +37,8 @@ RDEPEND="
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
@@ -62,6 +62,11 @@ MULTILIB_WRAPPED_HEADERS=(
 /usr/include/va/va_glx.h
 )
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999* ]] && eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
@@ -70,5 +75,9 @@ multilib_src_configure() {
 		$(use_enable wayland)
 		$(use_enable drm)
 	)
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/x11-libs/libva/libva-2.1.0.ebuild b/x11-libs/libva/libva-2.5.0-r1.ebuild
index 2cfeb67ae2f1..00629ae44aeb 100644
--- a/x11-libs/libva/libva-2.1.0.ebuild
+++ b/x11-libs/libva/libva-2.5.0-r1.ebuild
@@ -1,61 +1,56 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib versionator
+inherit multilib-minimal
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
+
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit autotools git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
 else
-	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
-SLOT="0/$(get_version_component_range 1)"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm opengl vdpau wayland X utils"
+SLOT="0/$(ver_cut 1)"
+IUSE="+drm opengl utils vdpau wayland X"
 
 VIDEO_CARDS="nvidia intel i965 nouveau"
 for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )
 	X? (
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	utils? ( media-video/libva-utils )
-	"
+"
 
 REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
+	opengl? ( X )"
 
 DOCS=( NEWS )
 
@@ -67,6 +62,11 @@ MULTILIB_WRAPPED_HEADERS=(
 /usr/include/va/va_glx.h
 )
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999* ]] && eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
@@ -75,5 +75,9 @@ multilib_src_configure() {
 		$(use_enable wayland)
 		$(use_enable drm)
 	)
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 7de898cf6aa1..00629ae44aeb 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
-	inherit git-r3
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/intel/libva"
-	AUTOTOOLS_AUTORECONF="yes"
-fi
-inherit autotools-multilib eapi7-ver multilib
+inherit multilib-minimal
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
 
-if [[ ${PV} != *9999* ]] ; then
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit autotools git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/libva"
+	AUTOTOOLS_AUTORECONF="yes"
+else
 	SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
@@ -38,7 +37,8 @@ RDEPEND="
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
@@ -62,6 +62,11 @@ MULTILIB_WRAPPED_HEADERS=(
 /usr/include/va/va_glx.h
 )
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999* ]] && eautoreconf
+}
+
 multilib_src_configure() {
 	local myeconfargs=(
 		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
@@ -70,5 +75,9 @@ multilib_src_configure() {
 		$(use_enable wayland)
 		$(use_enable drm)
 	)
-	autotools-utils_src_configure
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index a52ab40ce435..6aab121f7224 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,6 +1,4 @@
-DIST libvdpau-1.1.1.tar.gz 541752 BLAKE2B 346dad1ee83193fb489a67016874b1cb9eccc88833766f1df987ed7369078cf259c168546d64ab847d81baceb4e4969d859c29a4081befbe100925d457dfb6df SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb
 DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e
-EBUILD libvdpau-1.1.1.ebuild 1165 BLAKE2B 6fb9d1bdac07ea034a84c7d30377c745458069c25fe472e03be4a1a37aafce067fcfe8983e3e3b97d7445dfd42d72258834ebc4fd19a5d3d10f409528d490c37 SHA512 932f0a2b09e6cd324847e035c9d28882ea4b4dfc268df68c280b288bbc0e22a5da83e4d0965b2b7e605f54724a5c52600c6e2055481b7635841f9b61d6bd495d
 EBUILD libvdpau-1.2.ebuild 1141 BLAKE2B 58d92ed94816b94efc377b9e8788853b6e0e3c6474998727e03ea5287814007f960f921f0b38b978ea7caae78cc915bb85fb42c07cfecd36cc43df01688f6b62 SHA512 ca5e09592d0de74fe1b430b562e486d0bdee721eb42e0fcf41cbe54b4fcb46f168a36f882097f0903e276257b6bbacecd98194322949910099536f70a5b472a6
 EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
deleted file mode 100644
index a9de7350064c..000000000000
--- a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-VIRTUALX_REQUIRED="test"
-inherit autotools-multilib flag-o-matic virtualx
-
-DESCRIPTION="VDPAU wrapper and trace libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="https://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc dri"
-
-RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
-	!=x11-drivers/nvidia-drivers-180*
-	!=x11-drivers/nvidia-drivers-185*
-	!=x11-drivers/nvidia-drivers-190*"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-		virtual/latex-base
-		)
-	dri? ( x11-base/xorg-proto )"
-
-src_configure() {
-	append-cppflags -D_GNU_SOURCE
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc documentation)
-		$(use dri || echo --disable-dri2)
-	)
-
-	autotools-multilib_src_configure
-}
-
-multilib_src_test() {
-	Xemake check
-}
-
-src_install() {
-	autotools-multilib_src_install
-	prune_libtool_files --modules
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 8a4df318d0eb..62ecb2eac4cc 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,6 +1,6 @@
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.42.4-r1.ebuild 2289 BLAKE2B 947cd18e0953e1cc2839f591035601f92b6f8ed4f9a820bf51b4e21562724f6ba9e251adaf939cb4d48e7546a72bfb25215c249a14d535d95a18876b71e482f4 SHA512 d2cd130ca768f927989901bcae34655d2df4b283a829d125b2880e963d08e3fbd51d50fa3286c9f31af37b0518d516e3efc0eaf6ba63cb3356ce8af4f1077153
+EBUILD pango-1.42.4-r1.ebuild 2288 BLAKE2B a619b83bf9e3908357316cfcbca8032537c4337fdf98217e211a186200f7e06ce02694c5d157bb015862aa06dd01a2d51e9dafeca56c64edaaf08544ef1e9702 SHA512 8b12238b2dcf46e07561459170e6db7af3ba8dd2d2bf4a36995735fc11b013b65fa1630330ef5f36c0cb5b69c85682d85a651bf7f0e7c65ff8c82175c321d786
 EBUILD pango-1.42.4.ebuild 2047 BLAKE2B 1248ddc636fd6345ddf29062120a48e81e6047f609e0ee2f18d62ebb543163b7b0c37ad7457882b50c07af0a781c95e5e93a31bd033755f50ccab3c9e337a79f SHA512 4da1edd151fc0bc03c8712520ea21145b9bc84209372ca9d81023d0f59e66a0883820c0a5f188f575d709ffefb91b81c8eef04b0b4a5f13b3392d49a9da624c5
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4-r1.ebuild b/x11-libs/pango/pango-1.42.4-r1.ebuild
index 485809becfe4..5d4b11bce282 100644
--- a/x11-libs/pango/pango-1.42.4-r1.ebuild
+++ b/x11-libs/pango/pango-1.42.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+ FTL"
 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 ~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"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index a0eac10f25e3..b318051a5bc6 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,6 @@
 DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
-EBUILD qtermwidget-0.14.1.ebuild 653 BLAKE2B 52ea1ad162390b40dbc8ee65fc5809b567d51be644f199ac92ae9f4eaf1ab4acab4a6d776507a96c34ef8286a19b99a6f1ef6cca884c3d5bf28155bd9190a1b3 SHA512 a907e1aba9e50429ada5c6287580682eb7beec949f37de9d3cf7beab874630fbc6f811411d2a123b8c8a507f1a629063a8781462ed54b1edfa2f97009684f714
+EBUILD qtermwidget-0.14.1.ebuild 652 BLAKE2B 1b097362bcce211e135074202a0161b96ec0681b6641be70ab7dc55ac863034699b7e7ed4020638b481ddb717262cb5f9873a968cc20b78513ab723ead86ef39 SHA512 37669bc3a93eddfddf62afe8b695a0ad29d45344d6cedaf0f6963500702c8de7e040fe17999e27bf6dbefdf1b66f4210d25b77102e53295e7907566e0e439912
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
 EBUILD qtermwidget-9999.ebuild 623 BLAKE2B f387d0f3a47afac376cd5661718a61155b0943aa57776d286e279f629151748cd268ed87a75ddfca4c063d33c614c3293a2660b11b1bc812881d2fad7606bd87 SHA512 d335773a0d9aed1322a68bcf7bb0373013e6a49021d406212595c60aaec39244945e31727354c5997a448dfa734cf7470b878aacad22eb21bf074bfe4fb71856
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
index 5f2257ff950b..0300aff607a4 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 114127a3b7a7..2ea75f28acc5 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -9,5 +9,5 @@ DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444
 DIST vte-0.54.4.tar.xz 1087748 BLAKE2B 65fb762414e832930ce1519dc99fe306b3c9c3860bf8116c29e66b758178d1f0a52705cd6f7ab1be30374fb2956a01aaccc8f6859d0af971f2037809421bb502 SHA512 7e0f4140a4c474fad9a48eaf0e4c29f83e7bf50719087983c238b362c6303824836c34485eb2ca135be0961fa4b83a318d08ef70d4cf0dab0d37dc2e36710c41
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
 EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
-EBUILD vte-0.54.4.ebuild 2217 BLAKE2B 28e47005b660faa73524d2ddc6eeb73ee595d191b77ce5391257eadafca8f9b39830da8e8fd6689a259cf0a0284f80a9b625bcac6b4ea67f86e30dc16b43a74a SHA512 89ccf42c47a237d262fa3d425ce2ed8a1f4ca09257b5cf2e51ab2fb72e3e11c7bfcbc849c7d720be08bbeba8e3fd16dd9c2ad67c87a57162ab4bf1ca3046c9da
+EBUILD vte-0.54.4.ebuild 2216 BLAKE2B e7ebb0e7d64ede80d874c167bb1602c47f0df48b29586f6e2254f4ad0bfcd9a26f0d1a7fbbfa149929f1981fe4e7fc889dc752dd66067014a7bf88a07bea2fdb SHA512 476cd5f14d8df60ed89760a23d7b54c6ea7e19dcce65eac1e60c0d1ede553b32d753cbefda8affad379c0c63c019fc022d6b32f3c860d545bf7b699dc874f7b3
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.4.ebuild b/x11-libs/vte/vte-0.54.4.ebuild
index 427c4d07d4e4..fc40d1470fab 100644
--- a/x11-libs/vte/vte-0.54.4.ebuild
+++ b/x11-libs/vte/vte-0.54.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"