gentoo resync : 03.11.2019

16 files changed, 200 insertions, 10 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index acc36bbc7d00..4354ee3a5afa 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index a7356eb532c4..228b41812858 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0-r1.ebuild 599 BLAKE2B 2b2ee6a8a49a51b505897e514beda9f034d21b52976cfbcc6c0ed0eeabd9e71996d14d585de36af0b0cf91394014d58de1f70859b221bbe14d6fb028b1a21ff2 SHA512 f9b786f583247fd61e40711ce0753d1ad191449de3a4fe30b34a5b2154fcefb876fd1dd00a22f75cef2856137aa1d53f85a020f3f81f742c6b79121c9f0cdcd8
+EBUILD libXpresent-1.0.0-r1.ebuild 597 BLAKE2B 36a56111e70406eb7ff06b85c6de688dc79da9da5a93bac0b3e4f552057a06c30f18652ee475df12023784c662e298b041787abb8dd0cbe278b251288802c67a SHA512 8999a286b7d74464bbffaad3649753133c30ae14cae07bc6b5a6749fd839f51c3049ea5844f817f8e171ff74356ba079abb64dd78cc7cd8cc238d553d5812d96
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
index 497f8e46a72a..45de16c64917 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 676e5191d6fc..9611b24ca0e6 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,6 @@
+DIST libdrm-2.4.100.tar.bz2 855793 BLAKE2B ba2c631de860b8e2a8bb34d8ac0ba2ed11c05cc98a156bb81ffafa0395e22f79878b9936efd1ae33c31049c2a5cc281586a867a974eeb4018dd713a8481ed269 SHA512 4d3a5556e650872944af52f49de395e0ce8ac9ac58530e39a34413e94dc56c231ee71b8b8de9fb944263515a922b3ebbf7ddfebeaaa91543c2604f9bcf561247
 DIST libdrm-2.4.99.tar.bz2 853659 BLAKE2B 66fb3f757ab468b6f6285ae740f67d6c38473f3866b57c6a1e24b322bdd46f2d21132b5ea7a737f1d3fa8dcf55162d4c904f181f17227c239b3322c0af50181c SHA512 04702eebe8dca97fac61653623804fdcb0b8b3714bdc6f5e72f0dfdce9c9524cf16f69d37aa9feac79ddc1c11939be44a216484563a612414668ea5eaeadf191
+EBUILD libdrm-2.4.100.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
 EBUILD libdrm-2.4.99.ebuild 2121 BLAKE2B 56438f523d5b51d46aa69a4d93a6aeac3eb6dad195ac54117327b3dc106f2cb94d9e5d0c5b43ab488feb76d0f54f35b343109ef76b00ea6517757c1dc5f9bbea SHA512 0554b9dba51949e6c14d80c01b87431b8deb1c4f917129c4929e37adb3036826ea3267cb69c69c41b9bd26f8fbf0d562d0ea87d0ab631f68604e36099f248800
 EBUILD libdrm-9999.ebuild 2132 BLAKE2B 355ab8265fbb85c26623fce83ab593b860248b4b8350d1daf8183b5492a73e8621abc4f99edcd017676b6333d63cbf84b2703ca8d2da7d737ded91ea7d99d4c6 SHA512 d4d44bd07c2815a299a8f32ded02c76a46529d8430684164227f5b47d6806d97a76f4e65c32de72262744190abb01b1c35702535f56f6fcc8eac3cc0746d8f1a
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.100.ebuild b/x11-libs/libdrm/libdrm-2.4.100.ebuild
new file mode 100644
index 000000000000..7178075e7431
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.100.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-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/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 8a5c6673a76d..bf7bc37aac3f 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,5 +1,5 @@
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 EBUILD libfm-extra-1.2.5.ebuild 2584 BLAKE2B 62ae765b46748b57827b938c80ef6cddd501a220902b55082f70b4babcfebaae51e2bc4da1efccce995e756057ac990b648d863306b304a014248158679e267d SHA512 2c64ee40a78bc562cfce29df6dbccd8710444ff291d5e91e2e2b26b7119701e43e767dc2e95caf6dd4fc042153e8d0c3cf7610fa378ceda28ba131d196c3d2e2
-EBUILD libfm-extra-1.3.1.ebuild 2608 BLAKE2B aa4f5c1f6c9f87e70516b5352e5c01fee405ef70c5815d4ea2eef5fbb7a0feebc714a80b918f84325c2b9c7b212ae1fcb831f339b7c5c5a51689d8628d060c60 SHA512 db05a26842297817be455eebec555d6d54d0fd28adc5e5205fd7aab27a6ff2f19c980cd633f18aec5d9937d77e10605ad40a87a4a01d0206aae15f1ec27f7093
+EBUILD libfm-extra-1.3.1.ebuild 2604 BLAKE2B 39fb7c56127f27750c17da2c4c25592be689e63cd8e4b0593cd41deb0936ef79898565e0a86339951a9290e60213f5a17248e3efa45f884325acb48ae6e51900 SHA512 15c81cefc5695f1bc1d8b385b6923f2379f046113ac9928f9e38df4b47e3c5f39adcf700a0f568acfee1be4a4a1afebe7e90aed83027b722a621c126dfa64686
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
index 9ff8f51d4da3..b283f140ca1e 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE=""
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index dac29728f543..724a8dd05558 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -2,6 +2,6 @@ AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc
 EBUILD libfm-1.2.5.ebuild 3719 BLAKE2B f117cd5f6312e2734ae70e0ef7046143b6768f3174d4a506f374cbca29d049b6b5fcafd21d4ba4714076adbcbcfa096b0ab22bf8471de31c9f79ba1f9b86a32f SHA512 9d873ec7eb023f3e41c9d43b68415b270c871b0b46aeeecd62c8bd7ab0a6c07519cbd777b46eb11cfb211ecd510afac13f9349c4600b2f8100e8f4499cc7b160
-EBUILD libfm-1.3.1.ebuild 3653 BLAKE2B f0417bca44dd5114f45660c2c447314b6dbafc51f603ebd08f5dbaa2c6c66deb97fd63d54dbdd9e4e15a2848ad335c38085d9616dc8c2e77024603bd588f12b9 SHA512 531d42c1acb0fd99adff1a6b65ce1b89e1328311fd979c7bdfbdc9b294fa5a8932486a2377363d214c2014c2774db6b1010df37912861c747d9253e54b9e2871
+EBUILD libfm-1.3.1.ebuild 3649 BLAKE2B 3fbfe6aca3423bfc23a0ac78c296e746b806204ca637c17546a01c20fc50c89a647f8750bcd161ab6a82d317ab1b80ac8a8967f1fe1dcc6b25cacd3e8bf29d40 SHA512 3eec79fdca23f16467907bc3de5d760c5bec411f52690c5f5a8e34dc0f40b0c9960a32cd6416d2314be8fe87daeea9c75593fc01e8665aac8e1824944acf55ee
 EBUILD libfm-9999.ebuild 3452 BLAKE2B a8d62c8fea51194c5514f973645bb4c5d2ca28ee895b188eadd181764c6c975cbcdb6429ff2e85df5b71c6852a9f0ab7333e6a54a71ae98a88fa2118840cd87e SHA512 55c4dbef3ab6e2f6820e8f98220043a469b3577a04841d8f9b09b0e995364b0ff76fa5b180c4a24147d479796a87dc709152044048b5938d0a39a8567b9b9507
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild
index 74caf039d027..043aed0bea84 100644
--- a/x11-libs/libfm/libfm-1.3.1.ebuild
+++ b/x11-libs/libfm/libfm-1.3.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE="+automount debug doc examples exif gtk udisks vala"
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
index c3d6219c97eb..082e2dae7b27 100644
--- a/x11-libs/libgxim/Manifest
+++ b/x11-libs/libgxim/Manifest
@@ -1,3 +1,3 @@
 DIST libgxim-0.5.0.tar.bz2 469547 BLAKE2B 183ea514b990b93efcf41a56704385e8b84b18d1f4f992ddaa8f7481a74b132f05b56322450258d53bc1fbcaf42d2528d297922ae042f5831010d58540974982 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7
-EBUILD libgxim-0.5.0.ebuild 1303 BLAKE2B 403a717e2747384ea348fb6df68d0f9d08e54e4ce77f6adb4deae810e4d0456d0d6123fcbcefbfdc5854b6c40312ffd333ea8a2b7c0c4a5319fcfc6e63bb36b3 SHA512 f6ec83c4a607dccd7431fd31f9301105b9b1034dfb971582f99943eee6407d6f80de1233f47187a007965853f50a568b28e2d578aa4c96b199b9f710cff7712b
+EBUILD libgxim-0.5.0.ebuild 1289 BLAKE2B 9d5938a280e0028969d3dd3f78ac9fc4b1fcbae09f874b49a095d72a7da663ba8d82aa51d2eb76de73acba413091071e38a84cefb3d193cbb17a8e4a870ab29f SHA512 d23c05d84e9d26d01b5a7401cd12d73901871aafdb99ddbcf4391abdc5f86d56144db8c3e04fb8d7f5677a7de6c38e1d48b6b368e8d934b6f3e7530edc42e755
 MISC metadata.xml 325 BLAKE2B 842e0838af5a3aa081c0cd65b5ffda14736b9d597c8f9117d8e61be977078741a61edec36a1eaf11d3dd8883ab9c821e664194dd298aab39ebee684e20c8e757 SHA512 20ad59c0776da8a8541052eed41f71d8e40604056ffab37a1899d822880d8423d26395ef46d581d71c10128d943a5ad5b45b26f126bd446790c1ba72e33356c0
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
index 6ea2f2c4e7e0..b712cd49c53e 100644
--- a/x11-libs/libgxim/libgxim-0.5.0.ebuild
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 inherit autotools ruby-single
 
diff --git a/x11-libs/libva-compat/Manifest b/x11-libs/libva-compat/Manifest
index 927e3058b6f1..09d5c0d7ce2c 100644
--- a/x11-libs/libva-compat/Manifest
+++ b/x11-libs/libva-compat/Manifest
@@ -1,3 +1,3 @@
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
-EBUILD libva-compat-1.8.3.ebuild 1994 BLAKE2B a6d15675b20ca0d9efeb25e6a54c05f2499dad130ef47a4f04e41b96da7aaf1985fdb000c9441d098df9769dab935c43e711f4f181154a89b4cd78241acc4460 SHA512 be7d9c9a8ac9bcfb580cc98eaf359b7b594b669ab9d8daa3365803ec11605a0f3f2a34e81e7ed0cc355c2aa4c23203992545aad1e6a376d6f475c1fae8fd7baa
+EBUILD libva-compat-1.8.3.ebuild 1991 BLAKE2B 7e0a7b2fb5f958320a270794e593ad3ae6c0acf934b471feea3753d9e065f5ff1fc705a60480e8d0b6458e994deda7df8978dd063632f7d23647b10f26c352cc SHA512 6c8eea6b2f6d66c342eacf31b15d78941026e4a24df64663f8aacad339dd169aefe9f71d9c6455a2315beef74a1ffff78a86bad8111c531ebee9cc3cd181aa33
 MISC metadata.xml 439 BLAKE2B 39b4502d38eb5d2f055a484224930efa991aa5c60960fa62fc64c9662d804c6b9b40bea27089a1b42452376e0517751d5ef1bcc81c512fd2d90d720e43b5befd SHA512 d54a22cf550c696c0078182457f412c0d8dfdf59e6b9a119fdcd629f42e75ffab403cb93815e9b184c5b388ae12d3b1c053119273082f549e440104fe9b2ae5a
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
index 7d5b3a6f0929..5b82b4eb8871 100644
--- a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
+++ b/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="+drm egl opengl vdpau wayland X"
 
 VIDEO_CARDS="nvidia intel i965 nouveau"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 513b0ce89386..014291fc2499 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,7 @@
 DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
+DIST libxkbcommon-0.9.0.tar.xz 376160 BLAKE2B 9a349a7ce9dcd1e9475f4a3b2365c11e91dcf4833d53c99b7231c1a757a410b4e347f90c77013d2a3a2a724765c1f2187d8c1fe96ad4441d34772f62ec081620 SHA512 7e3b03f1fa5abca31574c02e8308be9d5a6e2bdd369e808faeaa62e63a3d3592158cc695df55828275fc10219d79e1915e4f7331f1967aed0c9c54025272e9c4
+DIST libxkbcommon-0.9.1.tar.xz 376164 BLAKE2B 16c95081136ea9ce742f494ae2192cce815f3fb4a3d33d3e525f8ad61f1f720fa6bfe74088a9ab88f3c6ef9cdf78c4d8d4dc87e7478fd84e4b09e03a337efbdf SHA512 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
 EBUILD libxkbcommon-0.8.4.ebuild 871 BLAKE2B e1ecb34684b9999a0a68f1561ecd5e27870308abd51ad2713fb5ece66b2b99b222252d19ef0c01be3b8e8e27d32ce42a963912bae89dcc5c40f8dfe19ab5e27b SHA512 9af26d68f893e7fcf17415df441e3d86ffb7fee253b5092c7000f145d9ca5a5d0db1ac09399c3af4eef5719b6d2461e82d7d4d720891c434c2665ae7d0d33967
+EBUILD libxkbcommon-0.9.0.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
+EBUILD libxkbcommon-0.9.1.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild
new file mode 100644
index 000000000000..be655c7b43b2
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.9.0.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
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc test"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	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/libxkbcommon/libxkbcommon-0.9.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
new file mode 100644
index 000000000000..be655c7b43b2
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.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
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
+else
+	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="keymap handling library for toolkits and window systems"
+HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
+LICENSE="MIT"
+IUSE="X doc test"
+SLOT="0"
+
+BDEPEND="
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+		-Denable-wayland=false # Demo applications
+		$(meson_use X enable-x11)
+		$(meson_use doc enable-docs)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}