gentoo resync : 09.06.2018

8 files changed, 46 insertions, 80 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 845f4dedc409..0ad0dc3af97e 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 9ac2237246aa..849051485fa5 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
 EBUILD xorg-drivers-1.19.ebuild 5115 BLAKE2B 6dcb2ee9b7c786ab24cf8fc8e6d342096a0401de2dffd7a5cf5590ba431f409600c10d1cd00cfadb53c9e125dccc627a03a87360d7eb6a5318bfc623f11866c2 SHA512 9cdf04cd5358e865cd92f6f68cda3da795d83c1c213a91e54f04ea0cd340af123bd0f3ffc0ca6b0083ec38b1706fa0ef5ec810178d28f56d5985f72fb5ab5bce
-EBUILD xorg-drivers-1.20.ebuild 5455 BLAKE2B 26a01338ae55a59e3a4163c69ff193f240abb4c48c8805b2c02e5404263d4003b3e78fec04863d306efd649a77546ef74fac5f5712dd5a081c85418709646dc6 SHA512 4b76211fb3d6f9647ccbf18207b693ff341949d6bd0fcec6675f0dc6a38cd920dbe703f344cd29d2ff67162fd40d860fff6f95951046eddec93cde194409e41d
-EBUILD xorg-drivers-9999.ebuild 5321 BLAKE2B b49c487edc5b037bd284c3b2a66a77dcc96273ef7fa0f3107c17f898a3371f41ede555a449bee6aecf093f49b33bf5dcd30d801ca4b58d759d157698d4a12f47 SHA512 1004e24ec5e80a1cc6fbbdd57218ecea2198bcd78b092863c5f5f53d9b4c352cc7519705436b9c3a8e34b286388d9878cd7ce6304dbed638d64c863143b8a437
+EBUILD xorg-drivers-1.20.ebuild 4964 BLAKE2B 45050c2fd2f11b01a872fa39cba4346edba32925827ec63b77803ab32d65144df7c9549dd8131179c57581b427020c7fe5f2d4d43f60be513f13bb3eb96832e4 SHA512 003363bb418a99c81b84ff71cc224d56fca2ae60bf0eb81e27ae10b26510c419daeb7d4b3f9057656b21392522ebbb7903720cbe62e574eeb8252549eb654d0b
+EBUILD xorg-drivers-9999.ebuild 4830 BLAKE2B bc325390dd177785e1a453bdaa7b8cb7dd92cc7c115636061a7a2a01d507f54039c5f14c8ced9f0afa633b66f1b18d7ec9012a1fddadc116efdde34b610e0152 SHA512 254564cea1a17f896150ad754025d6bbacbf0143890fb2219e8bc3d300f549cf6bce16ed45cbbc1223888ef1bcbb9525b6e79e4ee1de71265b862d3db3f39612
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index 5f7f3bdc3259..33b133553847 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://www.gentoo.org/"
@@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
+	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
 	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
-	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
 
-	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
+	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_intel?         ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
-	video_cards_nv?            ( x11-drivers/xf86-video-nv )
-	video_cards_omap?          ( x11-drivers/xf86-video-omap )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
+	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
-	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_radeonsi?      ( x11-drivers/xf86-video-ati[glamor] )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
+	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( || (
 					x11-drivers/xf86-video-vboxvideo
-					x11-drivers/xf86-video-virtualbox
+					>=x11-drivers/xf86-video-virtualbox-5.1.14
 					) )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
@@ -133,21 +133,4 @@ PDEPEND="
 	!x11-drivers/xf86-video-tseng
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
-	!<x11-drivers/xf86-input-joystick-1.6.3
-	!<x11-drivers/xf86-input-libinput-0.20.0
-	!<x11-drivers/xf86-input-wacom-0.34.0
-	!<x11-drivers/xf86-video-amdgpu-1.2.0
-	!<x11-drivers/xf86-video-ati-7.8.0
-	!<x11-drivers/xf86-video-fbdev-0.5.0
-	!<x11-drivers/xf86-video-glint-1.2.9
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-mga-1.6.5
-	!<x11-drivers/xf86-video-nouveau-1.0.13
-	!<x11-drivers/xf86-video-nv-2.1.21
-	!<x11-drivers/xf86-video-omap-0.4.5
-	!<x11-drivers/xf86-video-r128-6.10.2
-	!<x11-drivers/xf86-video-siliconmotion-1.7.9
-	!<x11-drivers/xf86-video-tdfx-1.4.7
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
-	!<x11-drivers/xf86-video-vmware-13.3.0
 "
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index c5588e0206b9..a64c5928679d 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Meta package containing deps on all xorg drivers"
 HOMEPAGE="https://www.gentoo.org/"
@@ -59,47 +59,47 @@ IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
 
 PDEPEND="
 	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
+	input_devices_evdev?       ( >=x11-drivers/xf86-input-evdev-2.10.6 )
+	input_devices_joystick?    ( >=x11-drivers/xf86-input-joystick-1.6.3 )
 	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	input_devices_libinput?    ( >=x11-drivers/xf86-input-libinput-0.27.1 )
 	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
 	input_devices_tslib?       ( x11-drivers/xf86-input-tslib )
 	input_devices_vmmouse?     ( x11-drivers/xf86-input-vmmouse )
 	input_devices_void?        ( x11-drivers/xf86-input-void )
 	input_devices_synaptics?   ( x11-drivers/xf86-input-synaptics )
-	input_devices_wacom?       ( x11-drivers/xf86-input-wacom )
+	input_devices_wacom?       ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 )
 
-	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	video_cards_amdgpu?        ( >=x11-drivers/xf86-video-amdgpu-18.0.1 )
 	video_cards_ast?           ( x11-drivers/xf86-video-ast )
 	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
+	video_cards_fbdev?         ( >=x11-drivers/xf86-video-fbdev-0.5.0 )
 	video_cards_freedreno?     ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
+	video_cards_glint?         ( >=x11-drivers/xf86-video-glint-1.2.9 )
 	video_cards_i915?          ( x11-drivers/xf86-video-intel )
 	video_cards_i965?          ( >=x11-base/xorg-server-${PV}[glamor] )
-	video_cards_intel?         ( !video_cards_i965? ( x11-drivers/xf86-video-intel ) )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_nouveau?       ( x11-drivers/xf86-video-nouveau )
-	video_cards_nv?            ( x11-drivers/xf86-video-nv )
-	video_cards_omap?          ( x11-drivers/xf86-video-omap )
+	video_cards_intel?         ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) )
+	video_cards_mga?           ( >=x11-drivers/xf86-video-mga-1.6.5 )
+	video_cards_nouveau?       ( >=x11-drivers/xf86-video-nouveau-1.0.13 )
+	video_cards_nv?            ( >=x11-drivers/xf86-video-nv-2.1.21 )
+	video_cards_omap?          ( >=x11-drivers/xf86-video-omap-0.4.5 )
 	video_cards_qxl?           ( x11-drivers/xf86-video-qxl )
 	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_r128?          ( x11-drivers/xf86-video-r128 )
-	video_cards_radeon?        ( x11-drivers/xf86-video-ati )
-	video_cards_radeonsi?      ( x11-drivers/xf86-video-ati[glamor] )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
+	video_cards_r128?          ( >=x11-drivers/xf86-video-r128-6.10.2 )
+	video_cards_radeon?        ( >=x11-drivers/xf86-video-ati-18.0.1-r1 )
+	video_cards_radeonsi?      ( >=x11-drivers/xf86-video-ati-18.0.1-r1[glamor] )
+	video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 )
+	video_cards_tdfx?          ( >=x11-drivers/xf86-video-tdfx-1.4.7 )
 	video_cards_tegra?         ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vc4?           ( >=x11-base/xorg-server-${PV}[glamor] )
 	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
 	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
 	video_cards_virtualbox?    ( || (
 					x11-drivers/xf86-video-vboxvideo
-					x11-drivers/xf86-video-virtualbox
+					>=x11-drivers/xf86-video-virtualbox-5.1.14
 					) )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
+	video_cards_vmware?        ( >=x11-drivers/xf86-video-vmware-13.3.0 )
 	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
 
 	!x11-drivers/xf86-input-citron
@@ -133,21 +133,4 @@ PDEPEND="
 	!x11-drivers/xf86-video-tseng
 
 	!<x11-drivers/xf86-input-evdev-2.10.4
-	!<x11-drivers/xf86-input-joystick-1.6.3
-	!<x11-drivers/xf86-input-libinput-0.20.0
-	!<x11-drivers/xf86-input-wacom-0.34.0
-	!<x11-drivers/xf86-video-amdgpu-1.2.0
-	!<x11-drivers/xf86-video-ati-7.8.0
-	!<x11-drivers/xf86-video-fbdev-0.5.0
-	!<x11-drivers/xf86-video-glint-1.2.9
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-mga-1.6.5
-	!<x11-drivers/xf86-video-nouveau-1.0.13
-	!<x11-drivers/xf86-video-nv-2.1.21
-	!<x11-drivers/xf86-video-omap-0.4.5
-	!<x11-drivers/xf86-video-r128-6.10.2
-	!<x11-drivers/xf86-video-siliconmotion-1.7.9
-	!<x11-drivers/xf86-video-tdfx-1.4.7
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
-	!<x11-drivers/xf86-video-vmware-13.3.0
 "
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 292d52956c5f..7626c8c230f7 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1805 BLAKE2B 6be19f7568fd3d799675a3e2005f5d066b7cd29363260b0dd1f24f91a5d9365e75c63aa3908cb9b2c69652de7e90a9fdfa6436b8b93a38d790f1ffe1e74f761d SHA512 5f9d9da12464acc6fc03affccfd95901b7c8e56d84f098060527fc4f8fd359438ee66b56178814290b6da5b5efda86c97fd6eacc145cc5e73cde4bf8d6473d6f
+EBUILD xorg-proto-2018.4.ebuild 1810 BLAKE2B 3e7eae7cd90d3eed29eb03b91dd92867c6b7aaa7ae33b2d255e22a37d1a1b18d4be492ac6d2887d5ef4e7d2742d3457641253751df361e4043b01ef0f8a0cabd SHA512 8acc24eb3159f70abd5554367d2749a55fbe0c9f13f251011427878a14b3c83fd8763c9d50e1ab9129ac917c76ed9a766ac88b507a478eda8fb3a2e975998565
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index aa7bb8a5c063..b841b04a2b60 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~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 c9c931338719..25d6b79f9a2d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,7 +8,7 @@ AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD xorg-server-1.19.5-r2.ebuild 5778 BLAKE2B b69bb4fa8dfb9bb52803785fab791a9c976c56cd8a7536b7480017bbefc9f297392d07575af68e5922f6c53dc98105935a0554739d3daf9a638c122f3231a902 SHA512 7dbe59ed9002bb1553ce699dfa4bc14cfddc8d7893d58a59ddf69707cc8ca2b134b48fe07608df7ffd01d7307a3c55275a0ae3564fc9baf1d89d60b3e26727df
+EBUILD xorg-server-1.19.5-r2.ebuild 5777 BLAKE2B 474ad648bed1effaac54a894d2c40639ff64b446a2ec5690bc34aeb67b2b66df54d4200f9b89d03ad855edacaf523464b4ce1e2c13f628e6d24fe62e12f9911e SHA512 63672025c57fb3f9d8d55dba7399d9a16dc558c4f927e66f70b5c0f5483ecebe33a501615d6e099456a6c9534ffe46f568dd3d5da57e3de5203d0c1a73848e11
 EBUILD xorg-server-1.20.0.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
 EBUILD xorg-server-9999.ebuild 5553 BLAKE2B 2b29cb7d785839c40f1357671c07bf8ea2685862ac8375f36ba9888fabd27258745e54b6ef1b126098eda8e155415a816f73b9331881ff975b327216948489b6 SHA512 9d8f5af8959c2635d40b8c9bc75947a1c5765032751a2169fac84af529e82168d111856586b00447704bd46835e1a817527788460e4e8dee6d2d8c9fc0804b1e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
index a1744645895f..5e59d2a205ca 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"