gentoo resync : 28.04.2019

5 files changed, 4 insertions, 4 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index f480b20a773e..0d0125b21b3c 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 182b61eed270..e6e9f5c4d159 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
-EBUILD xcb-proto-1.13.ebuild 1587 BLAKE2B 6c31bbc9cb7c4e1063f991a19eabb62067013d5e86883b0b3b7e40b32c71e1350165e2a75debd319b0c57b7dc4cbd8971b274e31e7cc8c16aa845311a844e1da SHA512 b1ff4923b3e43a062b2b2a6245b9a08dddb402d8bf982e1b6f0830f32ca6a15f7b947073899bd1ab16b58c2dde494dbaac026177ea1a90d582a9db652cd89398
+EBUILD xcb-proto-1.13.ebuild 1583 BLAKE2B ac7daef2fbcc5fca61e6ef47e6eab05ef14a4051191f40ea18390fe8f84a991367c4eddc7190a31f25a32d669dfe50530e6de05cc38db555c64ed3407b318ef4 SHA512 a5212da237418fba01b31fc87743accefc54853e66a3f579b40203f8fee82692d19c637d409015c0de918b5e3f678a90e1205e9d88e0667c471907e4e406541e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index c7879409035f..7cf76543fdb7 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 XORG_MULTILIB=yes
 XORG_STATIC=no
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 68cbfcf9c7f7..ee7d6d37e1d9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -10,6 +10,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-1.20.3.tar.bz2 6205000 BLAKE2B 9fc8acf1812d0aa4800941dd1846060f91edf1e7ebc92b35e8c2028266d88d3ab3ba14e95f535e5ee41941f8e20769ee75723ba609f5653d4892f97bc5cf91c4 SHA512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba
 DIST xorg-server-1.20.4.tar.bz2 6123780 BLAKE2B 224dda54f433315f6614cbee5bc54db91d9d9e190c06ac7f26e334b80b9d4a612ff4b2a4f10f50a6f928ecdbea40172d5578289fbf88411f006bcd473253b05d SHA512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8
 EBUILD xorg-server-1.20.3.ebuild 5676 BLAKE2B 32355c665571a87933be6ad780106e9bd40e11861c8fa6e66b935d73b79a0dc6d635d1f79fe9a56ab2059449e128ecb37568603699a87344853ff42d1c68e156 SHA512 624bb6f21bbf10fcb21c1218931323374252ae96ca8f5078bc650cff291fd1b6a062605fd104fc0d7984c15beb1887b84c1aa33b83b94bdb217efbda1a9dccff
-EBUILD xorg-server-1.20.4.ebuild 5841 BLAKE2B 433f32d63aee091eb2a641e3a8dc7e5e56d0b371ea3beac2a1734f27a77f030426c44dfeeac6a7e1a7ac43459c7d0cf166be72be307409b276c713f09bc5e1b9 SHA512 2e9d110b08d7a0f9b2a9845ebad6be7697b04e8d92a3bb6de8d43e60b59f062dffe27838ea307d12ab648c28f8a45f1de18911ab2bd372fb62844f2506fbe2e2
+EBUILD xorg-server-1.20.4.ebuild 5833 BLAKE2B c1b27ec88643e2af9118b976b39212be05c101a65f7e86c3ec00326f247e1bf96505b8321c1fc7f2eb557b6e9ed650f97edefacf45335e6159aba416f6b57b7e SHA512 c543b7efad788c1f5e2102baf274754b0d010ae6b6ea801fd089233b003d3f6fed084ab1b9b6d0142e3a1fdd5a5080a8ff2a94c4d11c3e791ff30b0ea6efa254
 EBUILD xorg-server-9999.ebuild 5582 BLAKE2B 25f4c05b485b2c55519cbe0eef71bcb40f658731bf19a6b4224bb48305da3865b3b1b7e06faec78fa51986a8a8b2ee3890957d0879a4761e73607575e2e8d560 SHA512 8f246f5671616beee25887cee51a5b8b0c871ce869a15970ac27f026cc0fef61f83b279518d056a2b9943e96e65d579bda9e7aaf9b7281f21c4d706443d8dc0a
 MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df
diff --git a/x11-base/xorg-server/xorg-server-1.20.4.ebuild b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
index f6eb007ca3a8..90d447b0b8ab 100644
--- a/x11-base/xorg-server/xorg-server-1.20.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.4.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"