gentoo resync : 11.05.2018

12 files changed, 299 insertions, 610 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index ee5fb1ea3b27..7a85b7330ad6 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 99d93aa15e57..9af46a7f8cfb 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,3 +1,4 @@
 EBUILD xorg-drivers-1.19.ebuild 5115 BLAKE2B 6dcb2ee9b7c786ab24cf8fc8e6d342096a0401de2dffd7a5cf5590ba431f409600c10d1cd00cfadb53c9e125dccc627a03a87360d7eb6a5318bfc623f11866c2 SHA512 9cdf04cd5358e865cd92f6f68cda3da795d83c1c213a91e54f04ea0cd340af123bd0f3ffc0ca6b0083ec38b1706fa0ef5ec810178d28f56d5985f72fb5ab5bce
+EBUILD xorg-drivers-1.20.ebuild 5417 BLAKE2B 5dd64197f9b92a98372a5308196cfaadfa1f8544324af7d77503a055cfccf37026d460ddfcf5acdff8db1557beed889d41f3d2bddf09aed4c457bb4363f59a56 SHA512 0aee53cf2fb14cff4088a8e253d8e6f8e2337c0666639b9db6be6221a7803f75e0b6fbc9368dcaaa3f0a4de3a3e4991d4f866720b29ee782157f8070b61d9f3f
 EBUILD xorg-drivers-9999.ebuild 5283 BLAKE2B 2d5a1e822c760a47f90f7d93b41f3853a6b9482b1ccbe1271f20bc2c0791366816382146d21fb02335d19c97856e35e9a5f855cb10f57c67d5a983f8721e2b88 SHA512 13578f42241b47e0aff1b4bde1796ef9b593673f11a4131953ef6869ca9bbe627613ff1336e9689b13b33f782c7363c0c70b8e4721e2e0c058c308d8bfc62cb9
 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
new file mode 100644
index 000000000000..af561b6594c3
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 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_elographics
+	input_devices_evdev
+	input_devices_joystick
+	input_devices_keyboard
+	input_devices_libinput
+	input_devices_mouse
+	input_devices_tslib
+	input_devices_vmmouse
+	input_devices_void
+	input_devices_synaptics
+	input_devices_wacom
+"
+IUSE_VIDEO_CARDS="
+	video_cards_amdgpu
+	video_cards_ast
+	video_cards_dummy
+	video_cards_fbdev
+	video_cards_freedreno
+	video_cards_geode
+	video_cards_glint
+	video_cards_i915
+	video_cards_i965
+	video_cards_intel
+	video_cards_mga
+	video_cards_nouveau
+	video_cards_nv
+	video_cards_omap
+	video_cards_qxl
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonsi
+	video_cards_siliconmotion
+	video_cards_tdfx
+	video_cards_tegra
+	video_cards_vc4
+	video_cards_vesa
+	video_cards_via
+	video_cards_virtualbox
+	video_cards_vmware
+	video_cards_voodoo
+	video_cards_nvidia
+"
+
+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_keyboard?    ( x11-drivers/xf86-input-keyboard )
+	input_devices_libinput?    ( x11-drivers/xf86-input-libinput )
+	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 )
+
+	video_cards_amdgpu?        ( x11-drivers/xf86-video-amdgpu )
+	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_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_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_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_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
+					) )
+	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-apm
+	!x11-drivers/xf86-video-ark
+	!x11-drivers/xf86-video-chips
+	!x11-drivers/xf86-video-cirrus
+	!x11-drivers/xf86-video-cyrix
+	!x11-drivers/xf86-video-i128
+	!x11-drivers/xf86-video-i740
+	!x11-drivers/xf86-video-impact
+	!x11-drivers/xf86-video-mach64
+	!x11-drivers/xf86-video-neomagic
+	!x11-drivers/xf86-video-newport
+	!x11-drivers/xf86-video-nsc
+	!x11-drivers/xf86-video-rendition
+	!x11-drivers/xf86-video-s3
+	!x11-drivers/xf86-video-s3virge
+	!x11-drivers/xf86-video-savage
+	!x11-drivers/xf86-video-sis
+	!x11-drivers/xf86-video-sisusb
+	!x11-drivers/xf86-video-sunbw2
+	!x11-drivers/xf86-video-suncg14
+	!x11-drivers/xf86-video-suncg3
+	!x11-drivers/xf86-video-suncg6
+	!x11-drivers/xf86-video-sunffb
+	!x11-drivers/xf86-video-sunleo
+	!x11-drivers/xf86-video-suntcx
+	!x11-drivers/xf86-video-tga
+	!x11-drivers/xf86-video-trident
+	!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-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.2.1
+"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4f111e88646a..3fc3578d720c 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,15 +5,11 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-1.19.4-sysmacros.patch 986 BLAKE2B 04c111591a6a558913217b24aa2357478e7d931b6cee5185dda31ebd38d68463b4a158a18d8a60ffa7ccc5c65e246f261ebbf7c0ebc81fd3ae31e7579b7adab4 SHA512 858676058779363741901ffbf79666f723f917b49f8627ddd2f31768873adfb416a70bc298e2356861cb5abca8be54a6c64f8fa4fd11a91cce072b93857ad168
 AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch 1555 BLAKE2B ef0a52b2341939f254bdce6b705f0591d0888c8043e5c0da1c4c4e97cdac632c56b27392ac2d7ac63653c7dfe1d381edd619a5e0c1c78f3bf255348c99c30f24 SHA512 66cd27608019557029f15aa81cf1a067e124ec0f854af9e732fef8b12bade4f1797481c86de2437b63ec5364fbeb1e3e05a39aa08df71ad08df79cd7d244e280
-AUX xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch 1501 BLAKE2B 7600b13947bf66e12dd65c2572e56615583f4118995d47d5bd5c87aec82abe37a14c468c3e2e081118af5e19cd56f9e69e9e5ca8af5f58afea145294135e5f88 SHA512 63fb9caa032873dee14b0ce34b615e3fbdf70ccf9e9788e17481ffa8d15290986731694b0f794701649e59c9b0156601e6f9a97146a22f25c62fe1042c0ec568
-AUX xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch 5560 BLAKE2B b0d5420e41417b162a16414ced5b95df046a4612b0064e78e0bc5e1a55551674f86c9083afd581d4a16cb1dd48bfe3721c58fdfc6fd7141a806149be76dc212b SHA512 4193e466cd0fd9c7ef4546cb23e3011e1f6ae671810dfdae5b4950ae7c92bc4abfdc786525626da5c4d922096887ea59b7c0cd2739498cca394f3f9420e09a77
 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.19.99.904.tar.bz2 6083787 BLAKE2B 7b5ba4601494ab7714a977e6fcced12e373f5aaf30d433560a899d4446116cc4a5e22ae21378fea6ab07b68bad1a2544e065fd1d449b3b155b2c0e8a6787e479 SHA512 b9dccc777d0a30c6b40bddffe1f359dde4103539c6598f04bf8cf5f59e6770229221a199c1866b4eba0cf8d2d87fe878985bbd2e3c6ec5b65e3f16195ea8d57e
-DIST xorg-server-1.19.99.905.tar.bz2 6088508 BLAKE2B 592404aebb0e1ee1e6c20a36e08a788331467875f304117711583b892442d4e0cbdd91a999b38ec1d2487f33904cd0913c2cfef37f2e49f6ef5ec9f4725372ab SHA512 9a6f173835989f7562debfbadae0077d75e35bfad5be1f78931fe46ac43df20591162950b27e2c813fd857114f98247be28d357566e45e5d3ac6b60873d94466
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD xorg-server-1.19.5-r1.ebuild 6484 BLAKE2B a8188fbf1974531bfb2aae98e7e43a2c66a70e02456f08e7daf04fdeb2a37d0445d0ab1857be0e560be716634d77c7ef18e932a510bd5c6b781ad5c72fa239bb SHA512 219dd0b969e99d1e96ce61b45c836be8be1050fd02eb7cdbdb42afa78973845df160c9b30bc034b4c15170dc4943775f72170b1a3eb487cd07b8b6c4788eb20d
 EBUILD xorg-server-1.19.5-r2.ebuild 6579 BLAKE2B 98c6ead1d974cad84f88423b17809b21573ef54170526f23e92a034a1ee6b36767523790e17dd7134eff74d89142b2a692d0fcf41c92393bc8db87ea51450eb5 SHA512 8d6762b1b200f58a732ddb9ff0c862a32623a8f449d4ef42eaaa3341e572518457362f045a22491467efc982e2bdaf19156b23f629fd54ff017f3c85ec98bd94
-EBUILD xorg-server-1.19.99.904.ebuild 5793 BLAKE2B 76f42a062c63390d74d36576682786bfc090ba9d297b1aa0ed004f65a04bc6bc89f73a495ef521b973aa4a9b3c145b123a6b3b3c88c3a0c1b9fe92d1d27610ea SHA512 73089210bebaead51c05833149f14681bf37677aeec612757105902b49c85eb64dd08a2788faad2b2cc8bc26e79238596667051cafe3014acbcaa23be43833eb
-EBUILD xorg-server-1.19.99.905.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
+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/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
deleted file mode 100644
index f0c4ed58d33d..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a98a95b798a0062783ae6fd2135ad488af5efcfd Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 15 Apr 2018 23:37:45 -0700
-Subject: [PATCH xserver 2/2] modesetting: Move GBM code inside #ifdef
- GLAMOR_HAS_GBM
-
-Fixes a compilation error without Glamor.
-
-Bugzilla: https://bugs.gentoo.org/653288
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
----
- hw/xfree86/drivers/modesetting/drmmode_display.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
-index 322ef050b..79e91f0f8 100644
---- a/hw/xfree86/drivers/modesetting/drmmode_display.c
-+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
-@@ -998,18 +998,18 @@ static Bool
- drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
-                   unsigned width, unsigned height, unsigned bpp)
- {
--    uint32_t format;
--
--    if (drmmode->scrn->depth == 30)
--        format = GBM_FORMAT_ARGB2101010;
--    else
--        format = GBM_FORMAT_ARGB8888;
--
-     bo->width = width;
-     bo->height = height;
- 
- #ifdef GLAMOR_HAS_GBM
-     if (drmmode->glamor) {
-+        uint32_t format;
-+
-+        if (drmmode->scrn->depth == 30)
-+            format = GBM_FORMAT_ARGB2101010;
-+        else
-+            format = GBM_FORMAT_ARGB8888;
-+
- #ifdef GBM_BO_WITH_MODIFIERS
-         uint32_t num_modifiers;
-         uint64_t *modifiers = NULL;
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch b/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
deleted file mode 100644
index 312a5e05cdc6..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.19.99.904-xwayland-Fix-build-without-glamor.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From c3ae963a7b19e05b8296aae8b6354587756d48fa Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <ofourdan@redhat.com>
-Date: Mon, 16 Apr 2018 09:39:09 +0200
-Subject: [PATCH xserver 1/2] xwayland: Fix build without glamor
-
-Present support in Xwayland relies on glamor, make sure Xwayland can
-be built without glamor by moving references to Present code inside
-the conditional GLAMOR_HAS_GBM.
-
-Reported-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Reviewed-by: Roman Gilg <subdiff@gmail.com>
----
- hw/xwayland/Makefile.am |  4 ++--
- hw/xwayland/meson.build |  3 +--
- hw/xwayland/xwayland.c  | 10 +++++++++-
- hw/xwayland/xwayland.h  |  7 ++++++-
- 4 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
-index 0291afee7..80d3a1f19 100644
---- a/hw/xwayland/Makefile.am
-+++ b/hw/xwayland/Makefile.am
-@@ -11,7 +11,6 @@ Xwayland_CFLAGS =				\
- 
- Xwayland_SOURCES =				\
- 	xwayland.c				\
--	xwayland-present.c			\
- 	xwayland-input.c			\
- 	xwayland-cursor.c			\
- 	xwayland-shm.c				\
-@@ -35,7 +34,8 @@ Xwayland_built_sources =
- 
- if GLAMOR_EGL
- Xwayland_SOURCES += 				\
--	xwayland-glamor.c
-+	xwayland-glamor.c			\
-+	xwayland-present.c
- if XV
- Xwayland_SOURCES += 				\
- 	xwayland-glamor-xv.c
-diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
-index 69a5c819a..8d178825e 100644
---- a/hw/xwayland/meson.build
-+++ b/hw/xwayland/meson.build
-@@ -1,6 +1,5 @@
- srcs = [
-     'xwayland.c',
--    'xwayland-present.c',
-     'xwayland-input.c',
-     'xwayland-cursor.c',
-     'xwayland-shm.c',
-@@ -53,7 +52,7 @@ srcs += code.process(dmabuf_xml)
- 
- xwayland_glamor = []
- if gbm_dep.found()
--    srcs += 'xwayland-glamor.c'
-+    srcs += [ 'xwayland-glamor.c', 'xwayland-present.c' ]
-     if build_xv
-         srcs += 'xwayland-glamor-xv.c'
-     endif
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index dd074c341..44bbc3b18 100644
---- a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -525,6 +525,7 @@ xwl_realize_window(WindowPtr window)
-         wl_region_destroy(region);
-     }
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_screen->present) {
-         xwl_window->present_crtc_fake = RRCrtcCreate(xwl_screen->screen, xwl_window);
-         xwl_window->present_msc = 1;
-@@ -533,6 +534,7 @@ xwl_realize_window(WindowPtr window)
-         xorg_list_init(&xwl_window->present_event_list);
-         xorg_list_init(&xwl_window->present_release_queue);
-     }
-+#endif
- 
-     wl_display_flush(xwl_screen->display);
- 
-@@ -599,9 +601,11 @@ xwl_unrealize_window(WindowPtr window)
- 
-     compUnredirectWindow(serverClient, window, CompositeRedirectManual);
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_screen->present)
-         /* Always cleanup Present (Present might have been active on child window) */
-         xwl_present_cleanup(window);
-+#endif
- 
-     screen->UnrealizeWindow = xwl_screen->UnrealizeWindow;
-     ret = (*screen->UnrealizeWindow) (window);
-@@ -621,8 +625,10 @@ xwl_unrealize_window(WindowPtr window)
-     if (xwl_window->frame_callback)
-         wl_callback_destroy(xwl_window->frame_callback);
- 
-+#ifdef GLAMOR_HAS_GBM
-     if (xwl_window->present_crtc_fake)
-         RRCrtcDestroy(xwl_window->present_crtc_fake);
-+#endif
- 
-     free(xwl_window);
-     dixSetPrivate(&window->devPrivates, &xwl_window_private_key, NULL);
-@@ -709,9 +715,11 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen)
- 
-     xorg_list_for_each_entry_safe(xwl_window, next_xwl_window,
-                                   &xwl_screen->damage_window_list, link_damage) {
-+#ifdef GLAMOR_HAS_GBM
-         /* Present on the main surface. So don't commit here as well. */
-         if (xwl_window->present_window)
-             continue;
-+#endif
-         /* If we're waiting on a frame callback from the server,
-          * don't attach a new buffer. */
-         if (xwl_window->frame_callback)
-@@ -1053,10 +1061,10 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
-         ErrorF("Failed to initialize glamor, falling back to sw\n");
-         xwl_screen->glamor = 0;
-     }
--#endif
- 
-     if (xwl_screen->glamor && xwl_screen->rootless)
-         xwl_screen->present = xwl_present_init(pScreen);
-+#endif
- 
-     if (!xwl_screen->glamor) {
-         xwl_screen->CreateScreenResources = pScreen->CreateScreenResources;
-diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
-index a65559374..cf2551b99 100644
---- a/hw/xwayland/xwayland.h
-+++ b/hw/xwayland/xwayland.h
-@@ -127,7 +127,7 @@ struct xwl_window {
-     struct xorg_list link_damage;
-     struct wl_callback *frame_callback;
-     Bool allow_commits;
--
-+#ifdef GLAMOR_HAS_GBM
-     /* present */
-     RRCrtcPtr present_crtc_fake;
-     struct xorg_list present_link;
-@@ -143,8 +143,10 @@ struct xwl_window {
- 
-     struct xorg_list present_event_list;
-     struct xorg_list present_release_queue;
-+#endif
- };
- 
-+#ifdef GLAMOR_HAS_GBM
- struct xwl_present_event {
-     uint64_t event_id;
-     uint64_t target_msc;
-@@ -159,6 +161,7 @@ struct xwl_present_event {
- 
-     struct xorg_list list;
- };
-+#endif
- 
- #define MODIFIER_META 0x01
- 
-@@ -378,8 +381,10 @@ struct wl_buffer *xwl_glamor_pixmap_get_wl_buffer(PixmapPtr pixmap,
-                                                   unsigned short height,
-                                                   Bool *created);
- 
-+#ifdef GLAMOR_HAS_GBM
- Bool xwl_present_init(ScreenPtr screen);
- void xwl_present_cleanup(WindowPtr window);
-+#endif
- 
- void xwl_screen_release_tablet_manager(struct xwl_screen *xwl_screen);
- 
--- 
-2.16.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild b/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
deleted file mode 100644
index 858fffa92176..000000000000
--- a/x11-base/xorg-server/xorg-server-1.19.99.904.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit autotools xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/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 ~arm-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-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= )
-	libressl? ( dev-libs/libressl:0= )
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy[X]
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		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
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1
-	)
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-		>=dev-libs/wayland-protocols-1.1
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-base/xorg-proto-2018.3
-	dmx? (
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-UPSTREAMED_PATCHES=(
-	"${FILESDIR}"/${P}-modesetting-Move-GBM-code-inside-ifdef-GLAMOR_HAS_GB.patch
-	"${FILESDIR}"/${P}-xwayland-Fix-build-without-glamor.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		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_prepare() {
-	xorg-2_src_prepare
-	# needed because xwayland patch touches hw/xwayland/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		$(use_enable systemd suid-wrapper)
-		$(use_enable !systemd install-setuid)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild b/x11-base/xorg-server/xorg-server-1.20.0.ebuild
index fc971faa6315..fc971faa6315 100644
--- a/x11-base/xorg-server/xorg-server-1.19.99.905.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.0.ebuild
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index e872382f9abb..0e81d6d873ea 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r2.ebuild 3552 BLAKE2B 62c82494ed3fffa9fa00491b4581fd45d506e0b5496bd814d0624aaffc5e476e21454f19e4d7d91a658867fa01148e8b418901488bf62b5d03dc9cec175ec39b SHA512 7347903377e36252b7bb306b3aa8027ee3892a04f3bfca280f8842888601707b526d96ed340fcff434ed8335e1fd0ea776e20b646bdff5a6841ab596c022bed1
-MISC metadata.xml 304 BLAKE2B e3c575d40eade3124105d9e047e2487f02aa8739dd9192a1cc3997905157687b9995f4272fbf4a25e68424c2aae0a82ab8d057022849248636e50e560a374e86 SHA512 23ae82fc7cc9613c7e27dad6461cdcb5098981b67b7b3179de464af1ceeac08efb4dab11c2d578af542e933a77d51ca3f69427ff216d276f92e66d5bab1ae763
+EBUILD xorg-x11-7.4-r3.ebuild 3354 BLAKE2B dfdb3bfd48d040efe82cdeb5e4bd1827d2a1b8364575a3f9c20147d6bcce35b064cb1edf635db9d9026604e3430bd9af224819ad72cf2c5708aa4957b8cb00a5 SHA512 340be90c77b036eed737d222d43a7fec46784591ce4474650df3e27143d37f3edac085a8cbc7e8edaf97cbe461199c2c960c1ebf44846d8af9af4a3e9bba2cd5
+MISC metadata.xml 369 BLAKE2B 36a4c5573e4280020ac40830cae3056197c2eda56c3161265c163a82d18337da4a2efbfaf7dbd08c76f6231c40a19669e1785b84ce6c89ab5bbc2fbb9b2a1970 SHA512 d0aadbeb8260987c487e28e74ec895b5012c23b8422a12d629444ee54afbe8c266ccba1286e5b1b21366a97b4255ae8724148dcf58eefc3e966fdb382e11d467
diff --git a/x11-base/xorg-x11/metadata.xml b/x11-base/xorg-x11/metadata.xml
index 61b88b3e701d..a0d9b5f6d24d 100644
--- a/x11-base/xorg-x11/metadata.xml
+++ b/x11-base/xorg-x11/metadata.xml
@@ -6,4 +6,7 @@
 	<name>X11</name>
 </maintainer>
 <longdescription>X11 implementation by X.Org Foundation</longdescription>
+<use>
+	<flag name="fonts">Install fonts from X.Org</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
deleted file mode 100644
index c10948f48d8d..000000000000
--- a/x11-base/xorg-x11/xorg-x11-7.4-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
-HOMEPAGE="https://www.x.org/wiki/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-# Server
-RDEPEND="${RDEPEND}
-	x11-base/xorg-server[-minimal]"
-
-# Applications
-RDEPEND="${RDEPEND}
-	x11-apps/appres
-	x11-apps/bitmap
-	x11-apps/iceauth
-	x11-apps/luit
-	x11-apps/mkfontdir
-	x11-apps/mkfontscale
-	x11-apps/sessreg
-	x11-apps/setxkbmap
-	x11-apps/smproxy
-	x11-apps/x11perf
-	x11-apps/xauth
-	x11-apps/xbacklight
-	x11-apps/xcmsdb
-	x11-apps/xcursorgen
-	x11-apps/xdpyinfo
-	x11-apps/xdriinfo
-	x11-apps/xev
-	x11-apps/xf86dga
-	x11-apps/xgamma
-	x11-apps/xhost
-	x11-apps/xinput
-	x11-apps/xkbcomp
-	x11-apps/xkbevd
-	x11-apps/xkbutils
-	x11-apps/xkill
-	x11-apps/xlsatoms
-	x11-apps/xlsclients
-	x11-apps/xmodmap
-	x11-apps/xpr
-	x11-apps/xprop
-	x11-apps/xrandr
-	x11-apps/xrdb
-	x11-apps/xrefresh
-	x11-apps/xset
-	x11-apps/xsetroot
-	x11-apps/xvinfo
-	x11-apps/xwd
-	x11-apps/xwininfo
-	x11-apps/xwud
-	"
-
-# Data
-RDEPEND="${RDEPEND}
-	x11-misc/xbitmaps
-	x11-themes/xcursor-themes
-	"
-
-# Utilities
-RDEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-misc/util-macros
-	"
-
-# Fonts
-RDEPEND="${RDEPEND}
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-adobe-utopia-100dpi
-	media-fonts/font-adobe-utopia-75dpi
-	media-fonts/font-adobe-utopia-type1
-	media-fonts/font-alias
-	media-fonts/font-arabic-misc
-	media-fonts/font-bh-100dpi
-	media-fonts/font-bh-75dpi
-	media-fonts/font-bh-lucidatypewriter-100dpi
-	media-fonts/font-bh-lucidatypewriter-75dpi
-	media-fonts/font-bh-ttf
-	media-fonts/font-bh-type1
-	media-fonts/font-bitstream-100dpi
-	media-fonts/font-bitstream-75dpi
-	media-fonts/font-bitstream-speedo
-	media-fonts/font-bitstream-type1
-	media-fonts/font-cronyx-cyrillic
-	media-fonts/font-cursor-misc
-	media-fonts/font-daewoo-misc
-	media-fonts/font-dec-misc
-	media-fonts/font-ibm-type1
-	media-fonts/font-isas-misc
-	media-fonts/font-jis-misc
-	media-fonts/font-micro-misc
-	media-fonts/font-misc-cyrillic
-	media-fonts/font-misc-ethiopic
-	media-fonts/font-misc-meltho
-	media-fonts/font-misc-misc
-	media-fonts/font-mutt-misc
-	media-fonts/font-schumacher-misc
-	media-fonts/font-screen-cyrillic
-	media-fonts/font-sony-misc
-	media-fonts/font-sun-misc
-	media-fonts/font-util
-	media-fonts/font-winitzki-cyrillic
-	media-fonts/font-xfree86-type1
-
-	media-fonts/font-alias
-	media-fonts/font-util
-	media-fonts/encodings
-	"
-
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	# Save xorg.conf because of bug #278268
-	if [[ -f "${ROOT}etc/X11/xorg.conf" ]]; then
-		cp "${ROOT}etc/X11/xorg.conf" "${T}"
-	fi
-}
-
-pkg_postinst() {
-	# Restore saved xorg.conf
-	if [[ -f "${T}/xorg.conf" ]]; then
-		cp "${T}/xorg.conf" "${ROOT}etc/X11/xorg.conf"
-	fi
-
-	elog
-	elog "Please note that the xcursors are in ${ROOT}usr/share/cursors/${PN}."
-	elog "Any custom cursor sets should be placed in that directory."
-	elog
-	elog "If you wish to set system-wide default cursors, please create"
-	elog "${ROOT}usr/local/share/cursors/${PN}/default/index.theme"
-	elog "with content: \"Inherits=theme_name\" so that future"
-	elog "emerges will not overwrite those settings."
-	elog
-	elog "Listening on TCP is disabled by default with startx."
-	elog "To enable it, edit ${ROOT}usr/bin/startx."
-	elog
-
-	# (#76985)
-	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
-	elog "for more information on configuring X."
-	elog
-}
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
new file mode 100644
index 000000000000..bc46011fc15a
--- /dev/null
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta package)"
+HOMEPAGE="https://www.x.org/wiki/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+fonts"
+
+# Server
+RDEPEND="${RDEPEND}
+	x11-base/xorg-server[-minimal]"
+
+# Applications
+RDEPEND="${RDEPEND}
+	x11-apps/appres
+	x11-apps/bitmap
+	x11-apps/iceauth
+	x11-apps/luit
+	x11-apps/mkfontdir
+	x11-apps/mkfontscale
+	x11-apps/sessreg
+	x11-apps/setxkbmap
+	x11-apps/smproxy
+	x11-apps/x11perf
+	x11-apps/xauth
+	|| ( x11-apps/xbacklight sys-power/acpilight )
+	x11-apps/xcmsdb
+	x11-apps/xcursorgen
+	x11-apps/xdpyinfo
+	x11-apps/xdriinfo
+	x11-apps/xev
+	x11-apps/xf86dga
+	x11-apps/xgamma
+	x11-apps/xhost
+	x11-apps/xinput
+	x11-apps/xkbcomp
+	x11-apps/xkbevd
+	x11-apps/xkbutils
+	x11-apps/xkill
+	x11-apps/xlsatoms
+	x11-apps/xlsclients
+	x11-apps/xmodmap
+	x11-apps/xpr
+	x11-apps/xprop
+	x11-apps/xrandr
+	x11-apps/xrdb
+	x11-apps/xrefresh
+	x11-apps/xset
+	x11-apps/xsetroot
+	x11-apps/xvinfo
+	x11-apps/xwd
+	x11-apps/xwininfo
+	x11-apps/xwud
+	"
+
+# Data
+RDEPEND="${RDEPEND}
+	x11-misc/xbitmaps
+	x11-themes/xcursor-themes
+	"
+
+# Utilities
+RDEPEND="${RDEPEND}
+	x11-misc/makedepend
+	x11-misc/util-macros
+	"
+
+# Fonts
+RDEPEND="${RDEPEND}
+	fonts? (
+		media-fonts/font-adobe-100dpi
+		media-fonts/font-adobe-75dpi
+		media-fonts/font-adobe-utopia-100dpi
+		media-fonts/font-adobe-utopia-75dpi
+		media-fonts/font-adobe-utopia-type1
+		media-fonts/font-alias
+		media-fonts/font-arabic-misc
+		media-fonts/font-bh-100dpi
+		media-fonts/font-bh-75dpi
+		media-fonts/font-bh-lucidatypewriter-100dpi
+		media-fonts/font-bh-lucidatypewriter-75dpi
+		media-fonts/font-bh-ttf
+		media-fonts/font-bh-type1
+		media-fonts/font-bitstream-100dpi
+		media-fonts/font-bitstream-75dpi
+		media-fonts/font-bitstream-speedo
+		media-fonts/font-bitstream-type1
+		media-fonts/font-cronyx-cyrillic
+		media-fonts/font-cursor-misc
+		media-fonts/font-daewoo-misc
+		media-fonts/font-dec-misc
+		media-fonts/font-ibm-type1
+		media-fonts/font-isas-misc
+		media-fonts/font-jis-misc
+		media-fonts/font-micro-misc
+		media-fonts/font-misc-cyrillic
+		media-fonts/font-misc-ethiopic
+		media-fonts/font-misc-meltho
+		media-fonts/font-misc-misc
+		media-fonts/font-mutt-misc
+		media-fonts/font-schumacher-misc
+		media-fonts/font-screen-cyrillic
+		media-fonts/font-sony-misc
+		media-fonts/font-sun-misc
+		media-fonts/font-util
+		media-fonts/font-winitzki-cyrillic
+		media-fonts/font-xfree86-type1
+
+		media-fonts/font-alias
+		media-fonts/font-util
+		media-fonts/encodings
+	)
+	"
+
+DEPEND="${RDEPEND}"
+
+pkg_postinst() {
+	elog
+	elog "Please note that the xcursors are in ${EROOT%/}/usr/share/cursors/${PN}."
+	elog "Any custom cursor sets should be placed in that directory."
+	elog
+	elog "If you wish to set system-wide default cursors, please create"
+	elog "${EROOT%/}/usr/local/share/cursors/${PN}/default/index.theme"
+	elog "with content: \"Inherits=theme_name\" so that future"
+	elog "emerges will not overwrite those settings."
+	elog
+	elog "Listening on TCP is disabled by default with startx."
+	elog "To enable it, edit ${EROOT%/}/usr/bin/startx."
+	elog
+
+	elog "Visit https://wiki.gentoo.org/wiki/Category:X.Org"
+	elog "for more information on configuring X."
+	elog
+}