gentoo resync : 21.06.2020

5 files changed, 4 insertions, 4 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 5c341444220b..69fda0de4474 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 33f302d259a6..e5d7240a8326 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,6 @@
 DIST xorgproto-2019.2.tar.gz 1080686 BLAKE2B 4e0218ef02a8df5220431ae36ac1bc8feaa2bfdefe784f9b7393fe1d27db5b39ba90a38a3570bd78279964c5842ea65df3724b2407535a43fd867922156d92e9 SHA512 3385e7eb8ae1384aa01945c7f5a300884a1deb8d564ab62bd5bcaa3703d3dbf9bbc19797ac17d19e15417bf8456f706f993e90ece2d34cc94046ac302c062cbe
 DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
 EBUILD xorg-proto-2019.2.ebuild 1839 BLAKE2B c947dc68efd80041ebd656d6f11887a741b8f1bb9fe683d55ac02b92ee1e7788d2d0754ad59135c6086b6dc845509669ab74b0ba2bd89dacfe41ef674b20b6d7 SHA512 872d2677772d953c2dcfe0ea4ca2ddab3e3fab5632d0114c80e59a2d2ca407573ee3bc824d95093cf9a6db44aedfbf7c07babeffbbaa2fbd8978e32327e59714
-EBUILD xorg-proto-2020.1.ebuild 762 BLAKE2B 96107b11d3dad0edd79ab67b513a3c1a0624aeb15514312f691546acbd9d9e9f2a6f4fc9b18cf0cd52a0fe5c99712e7181def059941fb0480fad9a2759c561ee SHA512 929ae7dc0cf21a197556c3e383a3ffc6bd631ef17a01ba9be4c08e47d80e49e8c4345dd3226abb38e8cc5d99a7c0c59e5c8a6911b937974134ce7f139215c57f
+EBUILD xorg-proto-2020.1.ebuild 755 BLAKE2B 78ad2c14548024da40c6ed9e0c866ed6e50fa4fd62a242cbebf5d984977e88c971a556027b9d813cd3c96cf1321d3b2630f4706684ad01c4b417fef465fcc130 SHA512 e8975be4fd553e4f9c1d037267671fc05aee7cd0ef3ea23f7dce18544bf9eb41d6be2a61e1aaa8ce34e692517f9a23029c1858e75373ac0046c3d7574a0dae7c
 EBUILD xorg-proto-9999.ebuild 762 BLAKE2B 96107b11d3dad0edd79ab67b513a3c1a0624aeb15514312f691546acbd9d9e9f2a6f4fc9b18cf0cd52a0fe5c99712e7181def059941fb0480fad9a2759c561ee SHA512 929ae7dc0cf21a197556c3e383a3ffc6bd631ef17a01ba9be4c08e47d80e49e8c4345dd3226abb38e8cc5d99a7c0c59e5c8a6911b937974134ce7f139215c57f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
index cb69f9bbf9b3..5f5e70e4ff2c 100644
--- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f77e8132d999..2514ac973ddb 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,6 +8,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
 DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
 EBUILD xorg-server-1.20.7.ebuild 6032 BLAKE2B 60913a727294a25aa348f596f5972ceeb6664ddddd2c1ef71ad6d1ec72b66daec05e1720c1db1ed6f8bced458304f373fbc3a0c9d041cb19242a568e54f451bf SHA512 e00b1b1056a577534c05d45bce9c93924773ab7748f94cde57bdefcf7bc6671a640ffdd389edc128735a3e63cebabe947692464190bb8961f6bc423ef368bc16
-EBUILD xorg-server-1.20.8.ebuild 5743 BLAKE2B 80d32356f92848b9d953fe19c1138181679c8501c6c0fe43f2c5fd9e24f8b5fcbb80c931e102d5449e401c476334b9028a0e239225322ccd5c415e4c2eb410f7 SHA512 869d793a08b257258ff18fef48801883e3b3e461582bcb692a5ed7d91c863f45073ddce2f703d82816136fbac1ffd7a7332226dd724a8146556c36301cde3ac7
+EBUILD xorg-server-1.20.8.ebuild 5737 BLAKE2B 0ed225a48df9bfec9e6fd0960d51394a61a917e357a78594dd3d6948cd7ab3fa623d024d6fcb4cfe85dabc6b8500bb4a6648130421a70a1c44522689e6a92155 SHA512 a0f6dee6e5f2a0fc4956649f1868597be5be1b18800ff34f10ad4412dc14503728b429ca191006de9b64a85a2a8f826e676f99a383ee7ad0b755ee08eb19dc29
 EBUILD xorg-server-9999.ebuild 5740 BLAKE2B 74acdd4654eb23b4deb59a6719065d1a2bb3dced48053f56feb52349be571d8169474e8bf1a7090d5d42c65d00376f25f1ace4bae796f7a895b692a37ebb713e SHA512 ea0b4720399c43bd219ff8819cb0e1b338695357f6f8eb6852189dea6894bdf9879d6f8c92053a8222b560281dc4403124c06bc86b91c022cd936df4217aa7f2
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/xorg-server-1.20.8.ebuild b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
index 18be04e0f8b6..8640edc77379 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
@@ -10,7 +10,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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"