gentoo Easter resync : 12.04.2020

18 files changed, 340 insertions, 73 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index c081478687e1..eadc0a8b2740 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 a3730eeb9327..5e5d6faa4307 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
-EBUILD xcb-proto-1.13.ebuild 1570 BLAKE2B 9815944c3f934a4f1a8730e2c0c42f729b3c26cfc9df4715b8fdb0919b2d7318874f1f783359fba913091834beadfbdba521304fa008f3a0e6b9772403b636c8 SHA512 fa52928d5a7a2565c7049fc232bf8890ea28e8fe3fbbe4786c600c35ad7b2968829fffd7ecafafce457e6ff7fc9c2d82eec3cd560a38655ace8b2819895db6a4
-EBUILD xcb-proto-1.14.ebuild 1126 BLAKE2B 8c5407081463451dae4ec0cfd08835047b61a1babcf9959d7b0b2ea062343cf043a2f4730d1a969b87de81e1b3890d49aa47858e6566b1d23d628562b386f213 SHA512 0364e26f2e25d62d257f6af590f753033f3d27c081fb16602b9ac6386628cfac48cdfb2e48b1166a0068c6a3fff19b8e3a45886c38a2e4e29f5ec7ae85dbae6b
+EBUILD xcb-proto-1.13.ebuild 1567 BLAKE2B aa0105ebdcba0b3d56e1688bd5ab00e8e2761897c21ef3ac1c541994cbdf9dfe65abed53129c5418d1d2178865d7d7a0499077a442b52bbb9f1e0a1ed27c1868 SHA512 d1cc2521b7c24ec2cd37f08166f25e910a1608e8e1e0ecda5583879b446f5862ef45f5d63b0663021e1b2d684ebb99bd6cffbdd787bc88cd6f05d7030b0a6a56
+EBUILD xcb-proto-1.14-r1.ebuild 1293 BLAKE2B 4a0d66f2164f6147e8883a9bbed81073b6f371850aa89c0f0f7709e10a84df3c569cd9b348e443229ac93672f81387b031c1ef010eca074bee77bcb95c18886c SHA512 759395c47cd8b2b859cee1ad8a90da9035f294cd8474f36862fe2b03c65a0eee4e3b4baaddec77fcf27187dd0fa85395ec7c002e9e768a019bf1781932aa1a44
 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 04f6f40a17fb..6313d75278e2 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
new file mode 100644
index 000000000000..2a73cae43dcc
--- /dev/null
+++ b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+XORG_TARBALL_SUFFIX="xz"
+XORG_MODULE=proto/
+XORG_MULTILIB=yes
+XORG_STATIC=no
+
+inherit python-r1 xorg-3
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2
+"
+
+ECONF_SOURCE="${S}"
+
+multilib_src_configure() {
+	# Don't use Python to find sitedir here.
+	PYTHON=true default
+}
+
+src_compile() {
+	:
+}
+
+xcbgen_install() {
+	# Use eclass to find sitedir instead.
+	emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)"
+	python_optimize
+}
+
+multilib_src_install() {
+	# Restrict SUBDIRS to prevent xcbgen with empty sitedir.
+	emake install DESTDIR="${D}" SUBDIRS=src
+	multilib_is_native_abi && python_foreach_impl xcbgen_install
+}
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.ebuild
deleted file mode 100644
index 1d2fe92f1d17..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-XORG_TARBALL_SUFFIX="xz"
-XORG_MODULE=proto/
-XORG_MULTILIB=yes
-XORG_STATIC=no
-
-inherit python-r1 xorg-3
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="dev-libs/libxml2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl emake -C xcbgen top_builddir="${BUILD_DIR}"
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl emake -C xcbgen top_builddir="${BUILD_DIR}"
-		python_foreach_impl python_optimize
-	fi
-}
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 60621c62bfbf..542064b87dd8 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,3 @@
-EBUILD xorg-drivers-1.20-r1.ebuild 3749 BLAKE2B f157168f0ae04c71d85575e063c01722baea75d5df1d07c6fdef88e228416461111f689dc8d3095af5159fc27edba05256423a55c6841b844572369acf010480 SHA512 0792dd3870b224809a02d35bbc45f7f47efe4f28a822e1ab3afa47c21112a21aa64e7528b8f63b56261d70d3a42d914a915c227a629e9fccabf62a18eae065fc
-EBUILD xorg-drivers-9999.ebuild 3719 BLAKE2B ee213732d21caa198c30565601cf60eb328f21ece641f979ff6f29b91c696a40ddaa231354920caae9b863eca9127062c04def28c85797b3803c24c1cf561346 SHA512 fe374c9a8d54af916c4ec7061e41b9e9a2a9665226d807649aeedb0117d312bb5b724360f05d1a93d4bac5b3975591646aa849adddf3590ef32433f247329b81
+EBUILD xorg-drivers-1.20-r1.ebuild 3746 BLAKE2B 6f94ad8b6e2ba1e5024b7a741205e3f89a01c3ed861311aa700e68276af20aa0834a67d8daf4238a05e503ac92cc543feaad247c51f12c4d5979967ccf371b74 SHA512 110d09989a77e7c47cde4140a0f8836e609bf1b114d44c53355e53cd2812b4cc3c6c70724d3484cf4c747d6a42a3cc6d083b381226556d7d1dd7620a872c6de8
+EBUILD xorg-drivers-9999.ebuild 3715 BLAKE2B a56317af5482b20484478c4f3c27884d58e1d03c0eeb6befcf4f94de97f95d9f77bcb10b3527919aa8658411d16c699d8e86db2200446a7883db7550e043ce62 SHA512 55ab43d588d76451bcd8b067b76f8bd468ca678ee1e79a5f254e5d4e754bdf2caaf1228c45c11ed8bd186044ba2cf58fcdc1e6a93b0ec0e14ccbc3a99caa1a17
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
index 56bfdc3bdea4..a015acc2828c 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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_INPUT_DEVICES="
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 615936723c97..5bf741ecf02a 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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_INPUT_DEVICES="
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 9a49b7da2992..e04b0d18c7a3 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2019.2.tar.gz 1080686 BLAKE2B 4e0218ef02a8df5220431ae36ac1bc8feaa2bfdefe784f9b7393fe1d27db5b39ba90a38a3570bd78279964c5842ea65df3724b2407535a43fd867922156d92e9 SHA512 3385e7eb8ae1384aa01945c7f5a300884a1deb8d564ab62bd5bcaa3703d3dbf9bbc19797ac17d19e15417bf8456f706f993e90ece2d34cc94046ac302c062cbe
-EBUILD xorg-proto-2019.2.ebuild 1840 BLAKE2B bb1ba25adc9a55c264d6946fbea4f0a6516e30288d96ac912340f35ddd9362a3ce4aea93b7ca0cc61f11b42c28ef43ae84198c81857beb7844b5377cd24b4e6c SHA512 427a1e224752f02ed11cf2228d870546aa82681286db31e8635ed9eacdee7dde364145373dddbd45e2fb46befe8a01093cea2f5ad3c1f4184fa1df3e154844fb
-EBUILD xorg-proto-9999.ebuild 1852 BLAKE2B 5727d1f00332889a9e297b78c2936343c1e0112e17528bf1f68a7b1d4aac952c0a7931ef7724c9fabe30fb6728e220543a897535c2bc42991e614b6540021673 SHA512 1800ebad480df5ec34d08c2f40bbaa2bb6920da2fad8f9e71b809888c1f35e0f4dafaabfb333310859f7ad8c133bc0b20e538bfd397e7808033b0c8abac6c403
+EBUILD xorg-proto-2019.2.ebuild 1838 BLAKE2B ea01a806ea80bd23247869fe336d4c4cb4c8ece60948af03b72ada67d54717847df302ddc4962c731662fde38600a8cf079251103681380de74003c76037ad95 SHA512 067ce820ef0351e408f43377f0a1a30e3d15a9db4a7c1c7f4630bc73330f255232ddea7f9a3ced626a326ee6456f6fe2688393f33a2450024304490972bb58fd
+EBUILD xorg-proto-9999.ebuild 1848 BLAKE2B 54948566461d17465ed981fdcfb51ee895a29b2f8360a7fd78ce6bd052f81a373c19a9f8f2bf7e4de2910e897714b9ad9d8c925bc7b2eb739e950597e320fc12 SHA512 7b5961c9100a06d0d229310655521c29aeb7973d013ae310cfd8ce6b2125452764d7c46b9272fb089e8e83c9fbdd4f5fe2d06206b83ff3fcbc0a33276463c9c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
index 86f50955ca53..b84e81272bed 100644
--- a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2019.2.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 sh 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-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild
index eefb01db7b26..1f96a954d932 100644
--- a/x11-base/xorg-proto/xorg-proto-9999.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-9999.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 ~sh ~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 e3c37cee2771..f77e8132d999 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,10 +3,11 @@ AUX xdm.confd-4 573 BLAKE2B 0c2a282acc851b95f925715c31915be469ef3758bbaa800d5fc5
 AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b4e1ffd3d7eec3f84014fcbd221ba4bd2b9839989f8a1aa21e76dbc3612436e4a9b3091cbd7714e SHA512 f1174938e91c323174efedfc332097fc802a1261b882b7ac7b39a8251f7c70908e037335d4ae542652afe8162e1c0f0312ebbaebc8b7c4b036abd94d1d1f64bb
 AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
+AUX xorg-server-1.20.7-Fix-building-with-fno-common.patch 8302 BLAKE2B e37c79e8d14955328243ff61b38a85f809d840b8dca68cd1b7336cffd3bbd2c014b76fe6ed0000b1eb4090d51d917d0cd3e3aae6c3d6e385a062d147310d1de8 SHA512 028c9812a4e059f3feedeb5fbf47d43489bd670751ba893e51b732559d172c4762d0c6d0699113d4fe4a18bba2f579d1ea574ccd719366820c7ea1816fa584b9
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
-DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953 SHA512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6
 DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5
-EBUILD xorg-server-1.20.6.ebuild 5709 BLAKE2B d4654865f6a9464a7d3fe6931725e74fa9ce9c16dd836653a1c8a4764e99c9f7ee98c4a53a9d758b45bdde838346c1c23f25e4905a87772bc1a38f96e522e631 SHA512 34f1aeaf50b2a5dd11186264295d8dc4417449d3ca57912b39d660cd028df37ab6f08921f503584b15f71e12b95009341ac2930f243677572a823b0e6e1c1245
-EBUILD xorg-server-1.20.7.ebuild 5977 BLAKE2B 0b66adfe59d0b08e197f92f1f86ba37af9f4c35e99d408bde481cf015bcb59b6f0072dbdb963757869c1edd8eb711e1b09dbb226347672d235c8a2c680533802 SHA512 5b063ba18902dda2ef56a9db0090a6b889c46ab0efd1d60a8ccdd5817c9ec03c21a07b02a17c325c71bb7162e9f9b49c7db15e4bf20dfcccb689fdde9c4bd1f6
-EBUILD xorg-server-9999.ebuild 5695 BLAKE2B 714ffb5f21dbe8454b881e4500eab341b81094a143591e473fa42fe1924527979edfcf452e4c84107ea67ecd197ab606531ed10c1256a291913a4c384a5d52fc SHA512 854fa40da78c0072fbf6b9b4840b79c87b6b990298947935821f0105266bce7b7f7beb4bf37d08c19e053c000bf9e99a0e2548dfce8240fa5b42498b4985338b
+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-9999.ebuild 5740 BLAKE2B 74acdd4654eb23b4deb59a6719065d1a2bb3dced48053f56feb52349be571d8169474e8bf1a7090d5d42c65d00376f25f1ace4bae796f7a895b692a37ebb713e SHA512 ea0b4720399c43bd219ff8819cb0e1b338695357f6f8eb6852189dea6894bdf9879d6f8c92053a8222b560281dc4403124c06bc86b91c022cd936df4217aa7f2
 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch b/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch
new file mode 100644
index 000000000000..d3011fcb255e
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.20.7-Fix-building-with-fno-common.patch
@@ -0,0 +1,254 @@
+From 1610ef1d6b5ba99da9d1a639f3b65b2e61514a7d Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Fri, 24 Jan 2020 12:49:44 +0100
+Subject: [PATCH xserver] Fix building with `-fno-common`
+
+* GCC 10 will switch the default to `-fno-common`.
+  https://gcc.gnu.org/PR85678
+
+Bug: https://bugs.gentoo.org/705880
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+ hw/dmx/config/dmxconfig.c                | 2 +-
+ hw/dmx/config/xdmxconfig.c               | 2 +-
+ hw/dmx/glxProxy/glxext.c                 | 2 --
+ hw/xwayland/xwayland.c                   | 2 +-
+ test/misc.c                              | 2 +-
+ test/xi1/protocol-xchangedevicecontrol.c | 2 +-
+ test/xi2/protocol-common.c               | 2 ++
+ test/xi2/protocol-common.h               | 2 +-
+ test/xi2/protocol-xigetclientpointer.c   | 2 +-
+ test/xi2/protocol-xigetselectedevents.c  | 2 +-
+ test/xi2/protocol-xipassivegrabdevice.c  | 2 +-
+ test/xi2/protocol-xiquerydevice.c        | 2 +-
+ test/xi2/protocol-xiquerypointer.c       | 2 +-
+ test/xi2/protocol-xiqueryversion.c       | 2 +-
+ test/xi2/protocol-xiselectevents.c       | 2 +-
+ test/xi2/protocol-xisetclientpointer.c   | 2 +-
+ test/xi2/protocol-xiwarppointer.c        | 2 +-
+ 17 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
+index c1a9e1cf3..85bc0dbe4 100644
+--- a/hw/dmx/config/dmxconfig.c
++++ b/hw/dmx/config/dmxconfig.c
+@@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct {
+     DMXConfigList *xinputs;
+ } DMXConfigCmd, *DMXConfigCmdPtr;
+ 
+-DMXConfigEntryPtr dmxConfigEntry;
++extern DMXConfigEntryPtr dmxConfigEntry;
+ static DMXConfigCmd dmxConfigCmd;
+ 
+ static int dmxDisplaysFromCommandLine;
+diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
+index 49e4b5459..05d839688 100644
+--- a/hw/dmx/config/xdmxconfig.c
++++ b/hw/dmx/config/xdmxconfig.c
+@@ -65,7 +65,7 @@ extern FILE *yyin;
+ #define DMX_CANVAS_WIDTH  400
+ #define DMX_CANVAS_HEIGHT 500
+ 
+-DMXConfigEntryPtr dmxConfigEntry;
++extern DMXConfigEntryPtr dmxConfigEntry;
+ static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
+ static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
+ static int dmxConfigGrabbed, dmxConfigGrabbedFine;
+diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
+index 49848bbff..ca9780f99 100644
+--- a/hw/dmx/glxProxy/glxext.c
++++ b/hw/dmx/glxProxy/glxext.c
+@@ -47,8 +47,6 @@
+ #include "extinit.h"
+ #include "glx_extinit.h"
+ 
+-int noGlxExtension;
+-
+ /*
+ ** Forward declarations.
+ */
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index feb1058b7..5fefa5923 100644
+--- a/hw/xwayland/xwayland.c
++++ b/hw/xwayland/xwayland.c
+@@ -40,7 +40,7 @@
+ 
+ #ifdef XF86VIDMODE
+ #include <X11/extensions/xf86vmproto.h>
+-_X_EXPORT Bool noXFree86VidModeExtension;
++extern _X_EXPORT Bool noXFree86VidModeExtension;
+ #endif
+ 
+ #ifdef XWL_HAS_GLAMOR
+diff --git a/test/misc.c b/test/misc.c
+index 3c669b677..f1f76cccd 100644
+--- a/test/misc.c
++++ b/test/misc.c
+@@ -33,7 +33,7 @@
+ 
+ #include "tests-common.h"
+ 
+-ScreenInfo screenInfo;
++extern ScreenInfo screenInfo;
+ 
+ static void
+ dix_version_compare(void)
+diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c
+index 57a15c407..54f1f67cb 100644
+--- a/test/xi1/protocol-xchangedevicecontrol.c
++++ b/test/xi1/protocol-xchangedevicecontrol.c
+@@ -37,7 +37,7 @@
+ 
+ #include "protocol-common.h"
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ static ClientRec client_request;
+ 
+ static void
+diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
+index 8cd85dd05..05dd3c4e7 100644
+--- a/test/xi2/protocol-common.c
++++ b/test/xi2/protocol-common.c
+@@ -45,6 +45,8 @@ static ClientRec server_client;
+ 
+ void *global_userdata;
+ 
++void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
++
+ int enable_GrabButton_wrap = 1;
+ int enable_XISetEventMask_wrap = 1;
+ 
+diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
+index 8490529ad..742ce348f 100644
+--- a/test/xi2/protocol-common.h
++++ b/test/xi2/protocol-common.h
+@@ -99,7 +99,7 @@ extern void *global_userdata;
+  * The reply handler called from WriteToClient. Set this handler if you need
+  * to check the reply values.
+  */
+-void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
++extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
+ 
+ /**
+  * The default screen used for the windows. Initialized by init_simple().
+diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c
+index 9c38bd720..244e8438f 100644
+--- a/test/xi2/protocol-xigetclientpointer.c
++++ b/test/xi2/protocol-xigetclientpointer.c
+@@ -46,7 +46,7 @@ static struct {
+     int win;
+ } test_data;
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ static ClientRec client_request;
+ 
+ static void
+diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c
+index 9a0fac5d4..b14100224 100644
+--- a/test/xi2/protocol-xigetselectedevents.c
++++ b/test/xi2/protocol-xigetselectedevents.c
+@@ -60,7 +60,7 @@ static struct {
+     int mask_len;
+ } test_data;
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ 
+ /* AddResource is called from XISetSEventMask, we don't need this */
+ Bool
+diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c
+index c703a1ee8..142bcecb7 100644
+--- a/test/xi2/protocol-xipassivegrabdevice.c
++++ b/test/xi2/protocol-xipassivegrabdevice.c
+@@ -41,7 +41,7 @@
+ 
+ #include "protocol-common.h"
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ static ClientRec client_request;
+ 
+ #define N_MODS 7
+diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c
+index a068038fd..6ee8a80fc 100644
+--- a/test/xi2/protocol-xiquerydevice.c
++++ b/test/xi2/protocol-xiquerydevice.c
+@@ -54,7 +54,7 @@ struct test_data {
+     int num_devices_in_reply;
+ };
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ 
+ static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
+                                      void *closure);
+diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
+index ed75d7910..0f5a2b57a 100644
+--- a/test/xi2/protocol-xiquerypointer.c
++++ b/test/xi2/protocol-xiquerypointer.c
+@@ -41,7 +41,7 @@
+ 
+ #include "protocol-common.h"
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ static ClientRec client_request;
+ static void reply_XIQueryPointer_data(ClientPtr client, int len,
+                                       char *data, void *closure);
+diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c
+index 3ce758faa..c7ddbfc10 100644
+--- a/test/xi2/protocol-xiqueryversion.c
++++ b/test/xi2/protocol-xiqueryversion.c
+@@ -58,7 +58,7 @@ struct test_data {
+     int minor_expected;
+ };
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ 
+ static void
+ reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
+diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c
+index f136c23d0..06050ade7 100644
+--- a/test/xi2/protocol-xiselectevents.c
++++ b/test/xi2/protocol-xiselectevents.c
+@@ -62,7 +62,7 @@
+ 
+ static unsigned char *data[4096 * 20];  /* the request data buffer */
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ 
+ int
+ __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
+diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c
+index 6584bb9cc..ddc9f0000 100644
+--- a/test/xi2/protocol-xisetclientpointer.c
++++ b/test/xi2/protocol-xisetclientpointer.c
+@@ -48,7 +48,7 @@
+ 
+ #include "protocol-common.h"
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ static ClientRec client_request;
+ 
+ static void
+diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c
+index 8484d54e5..e5c2f31ea 100644
+--- a/test/xi2/protocol-xiwarppointer.c
++++ b/test/xi2/protocol-xiwarppointer.c
+@@ -44,7 +44,7 @@
+ static int expected_x = SPRITE_X;
+ static int expected_y = SPRITE_Y;
+ 
+-ClientRec client_window;
++extern ClientRec client_window;
+ 
+ /**
+  * This function overrides the one in the screen rec.
+-- 
+2.24.1
+
diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
index 86bbf55a2653..ded98b6f8b90 100644
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
@@ -10,15 +10,16 @@ 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-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"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
-		media-libs/libglvnd
+		media-libs/libglvnd[X]
 		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
 	)
 	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
 	!libressl? ( dev-libs/openssl:0= )
@@ -103,7 +104,6 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
 "
 
 PDEPEND="
@@ -118,6 +118,7 @@ REQUIRED_USE="!minimal? (
 	xephyr? ( kdrive )"
 
 UPSTREAMED_PATCHES=(
+	"${FILESDIR}"/${P}-Fix-building-with-fno-common.patch
 )
 
 PATCHES=(
diff --git a/x11-base/xorg-server/xorg-server-1.20.6.ebuild b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
index 55a55f546479..18be04e0f8b6 100644
--- a/x11-base/xorg-server/xorg-server-1.20.6.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8.ebuild
@@ -10,15 +10,16 @@ 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-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"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
-		media-libs/libglvnd
+		media-libs/libglvnd[X]
 		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
 	)
 	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
 	!libressl? ( dev-libs/openssl:0= )
@@ -67,14 +68,14 @@ CDEPEND="libglvnd? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-18[X(+),egl,gbm]
-		media-libs/libepoxy[X,egl(+)]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	)
 	udev? ( virtual/libudev:= )
 	unwind? ( sys-libs/libunwind )
 	wayland? (
 		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy[egl(+)]
-		>=dev-libs/wayland-protocols-1.1
+		>=media-libs/libepoxy-1.5.4[egl(+)]
+		>=dev-libs/wayland-protocols-1.18
 	)
 	>=x11-apps/xinit-1.3.3-r1
 	systemd? (
@@ -103,7 +104,6 @@ DEPEND="${CDEPEND}
 
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
 "
 
 PDEPEND="
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 684b011fb231..252ce275e869 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -11,15 +11,16 @@ 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-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"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
 
 CDEPEND="libglvnd? (
-		media-libs/libglvnd
+		media-libs/libglvnd[X]
 		!app-eselect/eselect-opengl
+		!!x11-drivers/nvidia-drivers[-libglvnd(-)]
 	)
 	!libglvnd? ( >=app-eselect/eselect-opengl-1.3.0	)
 	!libressl? ( dev-libs/openssl:0= )
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 6bbc71e1c4f2..63c40331cdef 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r3.ebuild 3318 BLAKE2B 7fdd07b31ae5ef8cb7104ac0e6402114a8bc78ced301ad993c9c44b877e457c67a66b18562360aad1da753eba0898698ba58f09c157228ee0414b55bb76369dd SHA512 037482646beecb6ebc523ea0ca054810924c47f093f8d5483a704a738b1596b67f8f32be5f59a58434dee789e29448ac774b4e94b559fd6885acc590a6610e11
+EBUILD xorg-x11-7.4-r3.ebuild 3316 BLAKE2B 4868e753968a28f9cabfd37ce738d75dfcf5e517a92d72913cdd3b0117207d2511d14f8a34fd219829f46bc5000b7e9e61e03171c681c0c9031212f9beff182a SHA512 a91434497ce97af782e8ad803b0818a6814c3a8beb2997a9e023fbaaf290fd5cfd71b1adb421b801dda289e255c906832e45533d8a48a4cf778a8164ca6c2d83
 MISC metadata.xml 295 BLAKE2B bf8cdcd84763dacb5bc31355ca5050d30c6808e4aff370c709f07269cf4c3e62a1e107350cf5e6a9cbf0d0ca1ad2e3b57393674595e44dc023b0320dd6f32e47 SHA512 66ad6bd339be8ab149a01cf9039eea3ef06058de715c700ba5e1f511c957ef71ffded1209dab1594f7c899db0d77876bcfec48ba0d43a296704fb8dc33946be7
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
index 8754c305f1a2..c72e23e56b73 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="+fonts"
 
 # Server