gentoo resync : 21.10.2017

5 files changed, 22 insertions, 183 deletions

diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index cbc208bee0dc..d9d0ff402463 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,6 +1,5 @@
 EBUILD xorg-drivers-1.12.ebuild 5565 SHA256 3feaf120fa09c8dbda980b53b14f50f64613a248ecbb2ef91d6a8540c01f4f76 SHA512 a0400aae4200837d4cab95fd4f7ae3019c07b29affd5861f2bb7ce8152e74d8e053e2ffc251d146cc63b712f006716559eab4bb79bcc67bd041f2e07b94a2a63 WHIRLPOOL 4f15b7c11e04c763946d8973fe51f9fd6d70774d5a9301d4e4f699f16656f7cce7105c92450cf5a9810aa7df61ccf33cceabf0b1289ab49983204fa1de9a5a07
 EBUILD xorg-drivers-1.15.ebuild 5873 SHA256 d30f09ff4bc63e83e69745ab5ddd8e2317b3f2fe6b52bc5c6db5c8fbbd41cfdc SHA512 23cea6d29a3fd189c0ff64736606e2a1826b8c80d03c1874de9849a0f59dd02755a206c71da71b98af182602b92a84269cc7fc831f11d0c002cd55ab7ea00d40 WHIRLPOOL a0e9965aa3d9b3947bfd59ed65a53402732f1b3f725861743871f4bf351d988074aed874311551cf12b6dabd5faab60d6686d3b8d10f698432a6c4d593d06777
-EBUILD xorg-drivers-1.18-r1.ebuild 6247 SHA256 1e66cfc1be13a23086793903e0b48c34f077f04c29aa84d1d5ae3937e0c462b8 SHA512 9f5074bae3553839625425f10bfe4f6df1654a089a1d28c0669967e233e4c49ee1d4930d74223dc6841835702b33fa9334e9056b34941e55ec95d46a8a76ae13 WHIRLPOOL 856b18d7547e903f9053e4372f6923a74c1e32cc2a53e8a63d061ccce38e822ae4ce62ae3a93ccb013e8b1ce09284084627e0ee99659862724599ab7458b4a4e
 EBUILD xorg-drivers-1.19.ebuild 7542 SHA256 9a39c8821587256190f797cb26ea7a1812b11a8e22ddab6a1516d4044aa5577f SHA512 9989ff131690471b4c2896f79333c1e76419d6936052fee908c874555f5891fff9500d97d71f02d56b1b496f6c43b1673ea58da0ec08c9df430a87c972039c0c WHIRLPOOL f503bc66158b21a3df6c0bcb37c780214a042bdce2c7f7580a80d454ab18948dc28160750bb3d68ccd4740f45c8b70242b40b9a9227b887af48cf1f74ef35508
 EBUILD xorg-drivers-9999.ebuild 5832 SHA256 f5d51c6833098708aaa70b74652e5f4df3dfb41e3b5dc6cd3447fddcecfcd565 SHA512 48cdbaf353e0d1fa778dfbfe7e4dfb9fe35d27636355cb64cdf586396dadce2ac34cad50d427014ea5f424ee3cb4e88ebd5620fc413e7cbe3fa09df17a199696 WHIRLPOOL 2d228a70d71d1456b3654d77af59c3b6ebf7d6d93ac121f9a543fbec57ba9b3ead2eeb72b87d657c6c27b8481aa7d8a5564c8aa75012406c71065d79426e0795
 MISC ChangeLog 7116 SHA256 61a5c637bed0e64f74ff432ebf397b571c351d16257752990a7de0175bd915e9 SHA512 fe492bcce7d82560c9dc53e9720570833c2c292588c5a070586f8e8daa43b843529b98ebba30fc94ab39ca8487ce4fe236d339f7792d7e15a32842b02d63bd0e WHIRLPOOL 17233381744c97e1f20c3344a43e56cbd21a2834fffd873879ca7be2ac4e26324a0a1d51b68191f2d68fab4d1c6bb8d3cb96716efe150e89380e21cd04bcd6eb
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
deleted file mode 100644
index bdd9c12bd4a2..000000000000
--- a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta package containing deps on all xorg drivers"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-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_INPUT_DEVICES="
-	input_devices_acecad
-	input_devices_aiptek
-	input_devices_elographics
-	input_devices_evdev
-	input_devices_fpit
-	input_devices_hyperpen
-	input_devices_joystick
-	input_devices_keyboard
-	input_devices_libinput
-	input_devices_mouse
-	input_devices_mutouch
-	input_devices_penmount
-	input_devices_tslib
-	input_devices_vmmouse
-	input_devices_void
-	input_devices_synaptics
-	input_devices_wacom
-"
-IUSE_VIDEO_CARDS="
-	video_cards_amdgpu
-	video_cards_apm
-	video_cards_ast
-	video_cards_chips
-	video_cards_cirrus
-	video_cards_dummy
-	video_cards_epson
-	video_cards_fbdev
-	video_cards_freedreno
-	video_cards_geode
-	video_cards_glint
-	video_cards_i128
-	video_cards_i740
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_neomagic
-	video_cards_nouveau
-	video_cards_nv
-	video_cards_omap
-	video_cards_qxl
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonsi
-	video_cards_rendition
-	video_cards_s3
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_siliconmotion
-	video_cards_sisusb
-	video_cards_sunbw2
-	video_cards_suncg14
-	video_cards_suncg3
-	video_cards_suncg6
-	video_cards_sunffb
-	video_cards_sunleo
-	video_cards_suntcx
-	video_cards_tdfx
-	video_cards_tegra
-	video_cards_tga
-	video_cards_trident
-	video_cards_tseng
-	video_cards_vesa
-	video_cards_via
-	video_cards_virtualbox
-	video_cards_vmware
-	video_cards_voodoo
-	video_cards_fglrx
-	video_cards_nvidia
-"
-
-IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
-
-PDEPEND="
-	input_devices_acecad?      ( x11-drivers/xf86-input-acecad )
-	input_devices_aiptek?      ( x11-drivers/xf86-input-aiptek )
-	input_devices_elographics? ( x11-drivers/xf86-input-elographics )
-	input_devices_evdev?       ( x11-drivers/xf86-input-evdev )
-	input_devices_fpit?        ( x11-drivers/xf86-input-fpit )
-	input_devices_hyperpen?    ( x11-drivers/xf86-input-hyperpen )
-	input_devices_joystick?    ( x11-drivers/xf86-input-joystick )
-	input_devices_keyboard?    ( x11-drivers/xf86-input-keyboard )
-	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
-	input_devices_mouse?       ( x11-drivers/xf86-input-mouse )
-	input_devices_mutouch?     ( x11-drivers/xf86-input-mutouch )
-	input_devices_penmount?    ( x11-drivers/xf86-input-penmount )
-	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 )
-
-	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
-	video_cards_apm?           ( x11-drivers/xf86-video-apm )
-	video_cards_ast?           ( x11-drivers/xf86-video-ast )
-	video_cards_chips?         ( x11-drivers/xf86-video-chips )
-	video_cards_cirrus?        ( x11-drivers/xf86-video-cirrus )
-	video_cards_dummy?         ( x11-drivers/xf86-video-dummy )
-	video_cards_fbdev?         ( x11-drivers/xf86-video-fbdev )
-	video_cards_freedreno?     ( x11-drivers/xf86-video-freedreno )
-	video_cards_geode?         ( x11-drivers/xf86-video-geode )
-	video_cards_glint?         ( x11-drivers/xf86-video-glint )
-	video_cards_i128?          ( x11-drivers/xf86-video-i128 )
-	video_cards_i740?          ( x11-drivers/xf86-video-i740 )
-	video_cards_intel?         ( x11-drivers/xf86-video-intel )
-	video_cards_mach64?        ( x11-drivers/xf86-video-mach64 )
-	video_cards_mga?           ( x11-drivers/xf86-video-mga )
-	video_cards_neomagic?      ( x11-drivers/xf86-video-neomagic )
-	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_qxl?           ( x11-drivers/xf86-video-qxl )
-	video_cards_nvidia?        ( x11-drivers/nvidia-drivers )
-	video_cards_fglrx?         ( x11-drivers/ati-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_rendition?     ( x11-drivers/xf86-video-rendition )
-	video_cards_s3?            ( x11-drivers/xf86-video-s3 )
-	video_cards_s3virge?       ( x11-drivers/xf86-video-s3virge )
-	video_cards_savage?        ( x11-drivers/xf86-video-savage )
-	video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
-	video_cards_sisusb?        ( x11-drivers/xf86-video-sisusb )
-	video_cards_suncg14?       ( x11-drivers/xf86-video-suncg14 )
-	video_cards_suncg3?        ( x11-drivers/xf86-video-suncg3 )
-	video_cards_suncg6?        ( x11-drivers/xf86-video-suncg6 )
-	video_cards_sunffb?        ( x11-drivers/xf86-video-sunffb )
-	video_cards_sunleo?        ( x11-drivers/xf86-video-sunleo )
-	video_cards_suntcx?        ( x11-drivers/xf86-video-suntcx )
-	video_cards_tdfx?          ( x11-drivers/xf86-video-tdfx )
-	video_cards_tegra?         ( x11-drivers/xf86-video-opentegra )
-	video_cards_tga?           ( x11-drivers/xf86-video-tga )
-	video_cards_trident?       ( x11-drivers/xf86-video-trident )
-	video_cards_tseng?         ( x11-drivers/xf86-video-tseng )
-	video_cards_vesa?          ( x11-drivers/xf86-video-vesa )
-	video_cards_via?           ( x11-drivers/xf86-video-openchrome )
-	video_cards_virtualbox?    ( x11-drivers/xf86-video-virtualbox )
-	video_cards_vmware?        ( x11-drivers/xf86-video-vmware )
-	video_cards_voodoo?        ( x11-drivers/xf86-video-voodoo )
-
-	!x11-drivers/xf86-input-citron
-	!x11-drivers/xf86-video-cyrix
-	!x11-drivers/xf86-video-impact
-	!x11-drivers/xf86-video-nsc
-	!x11-drivers/xf86-video-sunbw2
-	!<=x11-drivers/xf86-video-ark-0.7.5
-	!<=x11-drivers/xf86-video-newport-0.2.4
-	!<=x11-drivers/xf86-video-sis-0.10.7
-	!<x11-drivers/xf86-input-evdev-2.10.0
-	!<x11-drivers/xf86-video-ati-7.6.1
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-nouveau-1.0.12
-"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9c619c5773b0..a054f5554a57 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -19,19 +19,18 @@ DIST xorg-server-1.12-cve-2014-8091..8103.patches.tar.xz 14832 SHA256 a98fd1589e
 DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98
 DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492fc13454ff4149704fb08dac39f051163 SHA512 5fcbf0012af309f80e1db206e05d7861796146d765cd17f3963fde6da7f43f0e57d63dbbdbf2c554612a557aa4dee623ef62f7ca7d007834aafd7a46ca7bb1d6 WHIRLPOOL 22cdbad68462f9bac32b13be958df496411ca72fe47435ec7e3ebb470b121ba4b4a0e023913f31a92113c5a56bc4be660dfec5086bc1fb72a617d2cdeaa8adf1
 DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
-DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
 DIST xorg-server-1.19.2.tar.bz2 5969543 SHA256 4f8ab9f4a1a885fe7550080555381b34b82858582559e8e3c4da96e3a85884bb SHA512 258c5d615efda28170bf0fd4a19e24fd2cefe086d5ef1aada7a407b8dc2ddaa7d74ad0245e0b13155a3e6d30c65fedf054326e191b6dfe800aae881664d63f16 WHIRLPOOL 6ffca7dc695d9551efecbf9061e40862a187f16afba113467640a506c7becdb2e37d7fe042cbfe08af8ba9f2e8f538fd50460ef46a34452796436de15fa463fd
 DIST xorg-server-1.19.3.tar.bz2 6050221 SHA256 677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98 SHA512 b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 WHIRLPOOL acbac6db7ba0aff8d0b906e52a783b38b1ce43a342159becb2fc696e34274c98e546e9712d59cf3360ad745555416e6be89575523285e1ca3954f9e60a5cf079
 DIST xorg-server-1.19.4.tar.bz2 5962834 SHA256 aa758acea91deaf1f95069ddc5ea3818e13675fb14fef40ad1b3d0b2bf03c9a8 SHA512 ff80934e42a7dd2d437e947fe02c74c3b25bdbb3002b7005191d52272d5eae8cb3a83377fa32f40000011be88405830e796f6bd3b914bd7fc163ea8ece76226b WHIRLPOOL 75d82daf7fa87b70182ed5d81fe785b4909b82f838530c0318444bc05ccb2a4073f4bebb2a8dd0d283dfbb5d1498dc98a9098176eff16c7a31b801bd179e3c00
 DIST xorg-server-1.19.5.tar.bz2 5965044 SHA256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c WHIRLPOOL 01039d524a876ba6bd72713993b1d4d6e21f8ba53536ee3189dce9cc7186010e143754fa708d2ccf10905dd272bc68b14c63f4322548e041dfc23cf00e4c364e
 EBUILD xorg-server-1.12.4-r7.ebuild 6339 SHA256 fc06f0d552b2da33e0b232eeeb47f901c5a03b6de43d17d66a978b17770fca23 SHA512 c9ab6283536166d46402c4358e9f4279ec08a8eaf2f0c5b68496435bfcdd901c537fc85b7e2b3b90817921bf4095d7f12564f7fa24e35f49d97368c9d61620c1 WHIRLPOOL c457a40daca30fab1365c5abccde28b24ce24ec4e9feabf0f5713fe7784009b29dd49a0ee75b2ba633d3fa86f49ee462f1ba3ded9a5523e7d9dc374b825b916f
 EBUILD xorg-server-1.15.2-r4.ebuild 6422 SHA256 8241831f37e51808a28c5b1e0b6cc674edb0b787a4b5e33fbfb18f1a760a7fe7 SHA512 c4c4ff0f22a2900f57a716fe9724f47ae629e6a1278bc15cc984071639e3334002c09b375d4871a538f57fae166b397773eba4d08277607f493b197bf695126a WHIRLPOOL 2e43b3ee32a6778d9f8ad678a0b913bf621f14d7e23b1e704afcfe84042f7c7a4c40a7b838557b1c3b5436db67ed736c8e851e448bc019bcc562c578cc6ccbe3
-EBUILD xorg-server-1.18.4.ebuild 6269 SHA256 7e3b05dc5b6e07ccbe18050ea12105339c7046be62900fc76d6a8973f3376e94 SHA512 2e903d0be445154fee0aa0a6f8a5598ddbdc2bc2625a5f0e623125b52ae1d828d9f97af044a45565163c92230cccffb3d9b77f2c0c69f95bb6ef8278d36bd15a WHIRLPOOL a262e7e6aedb7f0c063af59cf5c2d158097c5b46403449a25dcd5276b556e93f8f32f21442aa796e56f04d1150a8c63fe2b5c80d04ef90daa2bd4b961d7950dd
 EBUILD xorg-server-1.19.2.ebuild 6495 SHA256 78089c6a548396c89095fc6beec071f94689c3fb2bfa4f1156cf330fccac400a SHA512 db296b198e270909aa86aa10749031f63d906ebff0bb1f69893a41bb96c9a5b73b929a55815ab23ad0927c7a28d9a2e64e1c5c2ccb09a8f7cb8e340e270ca4a8 WHIRLPOOL f48f9b9d36708b482ddb9c8e9334dc727f5c2759a8ce0305704efe789a2156ce871bb5700648f7b4ba37b60dd9bbcaab0fc39fde615fca57c6ba684071b266a4
 EBUILD xorg-server-1.19.3.ebuild 6512 SHA256 2e83c66c00a67d4e9d9fcf34ec762519f3c9ada917b5762088675b5d0f0cc0fa SHA512 cffa1e80ce0c8f4435384a5f92d2bf2849e2118273ac13d1e7a9eb66bb679bb122861f2ad329f1fc92f9e3ba22dda3b2eb3b91f2f8ab1783ca8f2294d61b9f4e WHIRLPOOL ad0ae175db020297a0cf3d2f9e94402c08ba93265e746e16b9e7efc80b02898db3e628a9c3b8d82f1db3f840f490305cd5ad286fbf23d6d38d8703c6bddf1641
 EBUILD xorg-server-1.19.4.ebuild 6513 SHA256 630a9428b88a39bcbff856e9e925fa2d0c56c22bd9aa7c80bc62968c65b362dd SHA512 3190ae74ad11a042d63981a0393586299e8ebe08c2577725c43afee3d051598554ce44e1129f5e1bdbd89986a20601ce95b5fe60fb8c793466d8264ffcb8876f WHIRLPOOL 72a34fbbffbf7ee3bb8880d976bbd71840c3663d4b0d1e64010349c1da36773d605f0c398f941a71da23a2836e96d59a885b8263d1ed2f9a2354aec3a07531ed
+EBUILD xorg-server-1.19.5-r1.ebuild 6504 SHA256 c27232ccaa69e327c9f49a5ebc875b07750a4dd84896d795587bf36a730a2689 SHA512 76b96cb6cd0be8dd950011612cadc17ce41f764ed68da5df521857ea89b41c0c6d99b9e49e12688ce3fd38fd90255cbf87875de7e551bb772edd42d823f0b27d WHIRLPOOL 99332e9a321c699ed72828653a66b2e8bebd901b5e767bf998db84f3415c5f3d36dc0d5113200ad5849e73af59239e008761cb52fec142698fbb6f919f73c7d6
 EBUILD xorg-server-1.19.5.ebuild 6521 SHA256 0290086de3ed0fb8a8f7abc6dd2e4534a5e15be34bd95bd5a6cd2f87d683d6e8 SHA512 6ce2fbd53263500091c5187c8cecebe95019bbc26b5b2b2c7e9dc4c57e1b5927c18ebddcbb1cdbe49903125a3919e7c08a6269de12c372a8a4fa67a5d2852dd3 WHIRLPOOL 1dd0fe1aba0c06b182b73e08f70375f9cb8f5ca74282df96ad3cc2c3cab9ecbd0f57b28e00a732e2eab74a9a89b534e8c7b21407800d468c9a611e2b8b0a050a
-EBUILD xorg-server-9999.ebuild 6169 SHA256 182dba1e70540b652a44aae356d12c1c26064ed11b508ab540ad41b97d4d3817 SHA512 23d99ad15a01a4d36b0e25869f4c742d2c8138d54e166f46194901315e79953f61da89abfd130459dd18dd7a6a3fd37775fcf4edf429702b33d0989fb31d52c2 WHIRLPOOL c05149abc68024f65edec18f04ea0d78acc50c35737a3ff221862f54737f8ead8b3d245b9a0549d5d9e8a2b68a63b64a18c9147c59fb4e73a33ad74104c3e599
+EBUILD xorg-server-9999.ebuild 6151 SHA256 64e24b5c0cf9890b18aab7f23790437e55d890183e529d1024156200f211f3f5 SHA512 4594ee31ef8511bb16ab92891c6e54c047c03bd1b5ec79a79d7de8a57ef6540bbb3cd28464d90e3c9b62168f21c422c3c10c203417c38ffaa7cc8c860850152e WHIRLPOOL cb97a4dd8f8beaa3054713d19aadc3874031bbba3a3c69d7a66acd19a0d81378167dea8b35dc15b93e42146ce1a1625760a9518480588a32f864f14f323dae24
 MISC ChangeLog 13297 SHA256 1977bc55d2059999337eb7da74854d87df14c185e4385d94996bee3b873acde9 SHA512 71cec7ec907faed0cd6c6d17a1cfe7e239d3ab232886b283ba5d4e96d14ec4f72dab46aae948112cd9df86e5abe7db09ebca8b975dacc0576deff3be2f07c6a0 WHIRLPOOL 35bafac5f84bbb743de840b3019eb6e665925e001af2f8ae8086f9e715e868d554a99e91ed595edd648b4eba84c3ce8a31a1fe6bb8a659606b941ea548671a27
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC ChangeLog-2015 67846 SHA256 1a36cba8faa911f2716c739a85f0a00df9fb898e4aa1d6b5b1289c9f65834448 SHA512 b1d90a0be5f85e7c73938b2e36dce0d8b9d820854541b9953853cd7f01387a598c0a90ea4828470771f1e98ded0939b94e2254de9dd6f7315e83e81a1def5216 WHIRLPOOL 385f495ebdf9fcd9a2f7cd7cc03aada06edc6d050a3da476bfa61c6d8ae23e8018018b5a32a9d047ada8a5e9d1fbc8982d0c27caf8f1b8756bb40efc737289a7
diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
index 71b0bd02cf3a..596d09b80ce1 100644
--- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
@@ -9,10 +9,10 @@ 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 xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland"
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -25,7 +25,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	>=x11-libs/libpciaccess-0.12.901
 	>=x11-libs/libXau-1.0.4
 	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libXfont2-2.0.1
 	>=x11-libs/libxkbfile-1.0.4
 	>=x11-libs/libxshmfence-1.1
 	>=x11-libs/pixman-0.27.2
@@ -55,16 +55,13 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 		x11-libs/libXv
 	)
 	xephyr? (
-		x11-libs/libxcb
+		x11-libs/libxcb[xkb]
 		x11-libs/xcb-util
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
 	)
-	xnest? (
-		x11-libs/xcb-util-keysyms
-	)
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
@@ -76,6 +73,7 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	wayland? (
 		>=dev-libs/wayland-1.3.0
 		media-libs/libepoxy
+		>=dev-libs/wayland-protocols-1.1
 	)
 	>=x11-apps/xinit-1.3.3-r1
 	systemd? (
@@ -106,7 +104,7 @@ DEPEND="${CDEPEND}
 	>=x11-proto/xf86rushproto-1.1.2
 	>=x11-proto/xf86vidmodeproto-2.2.99.1
 	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.28
+	>=x11-proto/xproto-7.0.31
 	>=x11-proto/presentproto-1.0
 	>=x11-proto/dri2proto-2.8
 	>=x11-proto/dri3proto-1.0
@@ -146,7 +144,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
 	# needed for new eselect-opengl, bug #541232
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${PN}-1.18-sysmacros.patch #580044
+	"${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
 )
 
 pkg_pretend() {
@@ -155,6 +153,13 @@ pkg_pretend() {
 		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
 }
 
+pkg_setup() {
+	if use wayland && ! use glamor; then
+		ewarn "glamor is necessary for acceleration under Xwayland."
+		ewarn "Performance may be unacceptable without it."
+	fi
+}
+
 src_configure() {
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
@@ -163,13 +168,13 @@ src_configure() {
 	#	package it somewhere
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
+		$(use_enable debug)
 		$(use_enable dmx)
 		$(use_enable glamor)
 		$(use_enable kdrive)
 		$(use_enable kdrive kdrive-kbd)
 		$(use_enable kdrive kdrive-mouse)
 		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
 		$(use_enable tslib)
 		$(use_enable unwind libunwind)
 		$(use_enable wayland xwayland)
@@ -178,6 +183,7 @@ src_configure() {
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
+		$(use_enable xcsecurity)
 		$(use_enable xephyr)
 		$(use_enable xnest)
 		$(use_enable xorg)
@@ -188,6 +194,7 @@ src_configure() {
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
 		--enable-libdrm
+		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 90f6ef88dff0..adbcb3477a04 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -12,7 +12,7 @@ SLOT="0/${PV}"
 KEYWORDS=""
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
 
 CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 	!libressl? ( dev-libs/openssl:0= )
@@ -170,7 +170,6 @@ src_configure() {
 		$(use_enable dmx)
 		$(use_enable glamor)
 		$(use_enable kdrive)
-		$(use_enable suid install-setuid)
 		$(use_enable unwind libunwind)
 		$(use_enable wayland xwayland)
 		$(use_enable !minimal record)
@@ -189,6 +188,7 @@ src_configure() {
 		$(use_with systemd systemd-daemon)
 		$(use_enable systemd systemd-logind)
 		--enable-libdrm
+		--enable-suid-wrapper
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
 		--with-fontrootdir="${EPREFIX}"/usr/share/fonts