gentoo resync : 10.03.2018

44 files changed, 465 insertions, 0 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 037076cc0009..cd1cd4bc2858 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 8606d7865eca..f123ecfa3f4e 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,3 +1,5 @@
 DIST ico-1.0.4.tar.bz2 127619 BLAKE2B 8e9e161b2f0ae23acc989e7bd8ce70e953ffdb43e9d998d63993504073bc339b5dee85c0e5611e38a6c1b3b98a9a1067b0468c6dc3a1aaef26e38fac76efffa8 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d
+DIST ico-1.0.5.tar.bz2 136727 BLAKE2B 6c6d0a3e9521d9dad9f17f20ca7e1ccb52da31b6a5c5879bbe3d63e58231956cb2ff665b109191185a9af8ee9d2b87f034d349d4d3b33d18dc7b52e0d0640972 SHA512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6
 EBUILD ico-1.0.4.ebuild 315 BLAKE2B a139b435593aed571ca565649f5c92111631e5dd303a89152fc87907401ebde2ac66d0e104a6cd34ab1929fadba69bcf49ae7782192c80d427c332b5b171506b SHA512 3e0b292da26e8d75db91b6addf351389797c34db07fa93ac4688b0b47c1d6c671a0fe27214b33c54d1e2b325a4d53c8cbce787dde19ddf7b605e5d90fa003f34
+EBUILD ico-1.0.5.ebuild 315 BLAKE2B a1a386e35028b812a06e5d617522046b6cfe8c2c961fdf9fd36a60894567a1401f0a79ecf5934df3acf131c0bee1b1566c891c60119436ab58a58909859bb6cb SHA512 0895387f0c21136d1b171edc42ef5235b8ead9240302b91cd1cbc5655bb78e77d9d7c7c9535e1eec16c25868c55833d8b1f41000ca53b8ff2c988bcfa7b16849
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/ico/ico-1.0.5.ebuild b/x11-apps/ico/ico-1.0.5.ebuild
new file mode 100644
index 000000000000..65ce2d36b025
--- /dev/null
+++ b/x11-apps/ico/ico-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="animate an icosahedron or other polyhedron"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index cc60305ea8b7..0a5cd88d8f6c 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,3 +1,5 @@
 DIST transset-1.0.1.tar.bz2 121199 BLAKE2B 1ef56061150993bf870075c5dadf0589dc795750ce9b898a5a39a062fd14693003a4b0ab258140e87a208fb1f560742dc6217bfebaeffce98cc73d677fe015e9 SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d
+DIST transset-1.0.2.tar.bz2 127774 BLAKE2B fba4e8dc6eb3b3ea1285af9fccacc2d46cddbf17a086084c3db395bb5d78e6f13a348e2733c8b42efd2993dc053c01a4e6761c479506ba5d84a8715a956303c0 SHA512 f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874
 EBUILD transset-1.0.1.ebuild 416 BLAKE2B 0a1bbe4c607482213a80ba9d26507d0d8a1131633632b87e2abab122bd0f8684c7678e555ccfad57d179953327b2dd45d1991603a7ea089ee3a35611472b26a4 SHA512 4c94916760170171b98ac82972b069b95b415cc767b16a579424d0fa80d02be7484062d6c5a841dcc74b6cb6e5e50eb399bee543daeee785ddc6caff277b71c8
+EBUILD transset-1.0.2.ebuild 416 BLAKE2B dfb9454b61613fcb03fdf945143eabf79ad3ee7ebc92e0ae903404440544bd121b4d273a6cf130150269aa41f54c08870df03f117190838dfee4625b90fb3b03 SHA512 81494bbcc53b78389ef1731cafb19ec63cefa3de1e986adc6f933204c583bc9dd017836c0c673ded05ca8b85b6bc674746bc3ec2419e8ec964790e95ed802e0c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/transset/transset-1.0.2.ebuild b/x11-apps/transset/transset-1.0.2.ebuild
new file mode 100644
index 000000000000..061b3239cd7b
--- /dev/null
+++ b/x11-apps/transset/transset-1.0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="An utility for setting opacity property"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xapps https://cgit.freedesktop.org/xorg/app/transset/"
+
+LICENSE="SGI-B-2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	>=x11-proto/xproto-7.0.17"
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index ee03214b0ee0..8e6eca1c40b4 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,3 +1,5 @@
 DIST xbacklight-1.2.1.tar.bz2 117607 BLAKE2B 286be7b9f6d0e50ba20bae86aaaa211a7d611df055e3298e8676b52c36168db67e153c13e242089db52b1c7ed2c6872dfe8dd63a7f97b81644269832276bf636 SHA512 9a0afebea2fe155ab7d1ad00ef27566daeb7dc4fd47523511f1b8e8ac30977f938a08783bc0c7443fe92ebff1c17c68c78d44db08b32768d7831128130e0637d
+DIST xbacklight-1.2.2.tar.bz2 124058 BLAKE2B 4ad7b0eaab29bada40ba6b79a538d5dbf6c584226c51004e1488733b5b33a7c3905d21cb5f275010f301241da3eb644b0e66e20a07fe271152905568008c5af7 SHA512 4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec
 EBUILD xbacklight-1.2.1-r1.ebuild 391 BLAKE2B 6a86a10ee2660c92d9806d900f3917d4d5af23894e4f0cc1557601c6613357714217e3009cd1765fd36f18a2e7f77bcb4e267d7e517a2708b489fb370e6f192d SHA512 59a951430d29cd9babbf52e4f29da6bcde296fc6f049632e96838d325a62437b35fbac8110f611842cea3fc457964253b7f4b16d6a1961ac44054e27cb3f6386
+EBUILD xbacklight-1.2.2.ebuild 391 BLAKE2B 6db6547d52d1415f2bf6e923c138979e999c12cbd4cf9fc46fadfc42f8e716e023cd71ae5b19bc74ab90f6eedc5f3f7a0ad1cb4713ad31346ae056764dd60c32 SHA512 da962e2a5e2df95f4af8268efabf243c13e5e0506accd981e8440f00103cb25ea53540a27e96e5fbe5e442e8e418a1cfffabc4dcaedf2fda2efaf3433553196b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xbacklight/xbacklight-1.2.2.ebuild b/x11-apps/xbacklight/xbacklight-1.2.2.ebuild
new file mode 100644
index 000000000000..9cd8da3704a2
--- /dev/null
+++ b/x11-apps/xbacklight/xbacklight-1.2.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb
+	>=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index 560677f4a851..621767a82043 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,3 +1,5 @@
 DIST xeyes-1.1.1.tar.bz2 113757 BLAKE2B eed50677718223be829fed869360dc2ed98252a2e0a335403b8e680bd5a47cb96d92a762899e46a8823a260dda4be7ae98b45208c87c80a833ab8929056df427 SHA512 3cb734239fa3180a9cc0eb2564c5a04f5e5c64ea314079c0604cebdbb821132f95a2c113dab476af8820308f0e6dbd4eac02b5da45dc2ed78a5d3ca010453618
+DIST xeyes-1.1.2.tar.bz2 133160 BLAKE2B c3f31a2df7988517e4f8903fce6b0cbfbaad01e84d89c7b9f7755eccebba95fbb8b75377644ae97f090e9f4a3a245698966e78f738275f7513f5927193b5dd19 SHA512 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0
 EBUILD xeyes-1.1.1.ebuild 456 BLAKE2B c64f5893d0b9446c3083f60ccf24029224097d330194a9ed2417b156073fd051bcddb1086110691912572d273a5a96768514d99b5f060047c8836db7eb5ac2dd SHA512 13b3ac3c8110ddf0f09d7b616e58570c4980a483e3488f3ca154d7c2d565e05e3958f674691acaf906fb87bbe698bf60a6190a007ec4a7a54052f7ba5e8b4d1f
+EBUILD xeyes-1.1.2.ebuild 456 BLAKE2B 47473f928c5540a0c6fee02bca959588b41aeafe3f17f8c4b1d2d3413928346c1bfbabbf04fa37d13bf2d887e7b10207d434ea2aef3e35f11c3a65300828cfb4 SHA512 81e890abc99f40bbca96b05685e5254be65a1f70c060daf6251b75a9729dcfb666fa55d5f6dd330aa5605e96cb6572488564d7eff0b428d815b80bbdfc4440fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xeyes/xeyes-1.1.2.ebuild b/x11-apps/xeyes/xeyes-1.1.2.ebuild
new file mode 100644
index 000000000000..38058856c834
--- /dev/null
+++ b/x11-apps/xeyes/xeyes-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xeyes application"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS="--with-xrender"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index 6e4d2d0e0ab5..d4279ea7dd64 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,3 +1,5 @@
 DIST xfontsel-1.0.5.tar.bz2 139801 BLAKE2B dc3c9f8b893434923f414a9bb2a8608cba1eafc7ad915cbd6231763892608cebcba8147a02250719ed4fb5881389467ab375a7777f904248047d369533949713 SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4
+DIST xfontsel-1.0.6.tar.bz2 146469 BLAKE2B 9773430e51e63d23086403f91fd78f6ed2e7f3abf144fda5bba171d05145026d233474e9d055b31bd498a861994c4f59af52a8101fc1e10b891ea879cb2f0bb9 SHA512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099
 EBUILD xfontsel-1.0.5.ebuild 413 BLAKE2B 5f80640977c7b12e19658007e622057ab7948d615fe4f3417309f3149d1fe940b36cbf6afea7cf4ee02c40d5501e522b486feeb78d8e5c2c3ad24df1f1d3c32a SHA512 2339f388041f89368df82b3915a4e8e1e6023e418b952c55d9bc9787a830f989ad2d649c5a1f53767188664f6465781c9724456a590f13c472e47ff2b3f2040d
+EBUILD xfontsel-1.0.6.ebuild 413 BLAKE2B dfa622475e1faec8e1f966eb2a1d422f812d2de2fdf462abc8560033c1f19b520355a01fc5c466c8412fbbfa1a38d8a9a83256a2ec4911cf5bc514b2336a9b17 SHA512 2f464594ef2c5f185486446fac017fc7de23275e568f59d7b2cb11330470201d72fabb0e4dcdf596efec45c5279a2ed310c62c8e4e6f16b7eb4db4da51cc0b90
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfontsel/xfontsel-1.0.6.ebuild b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
new file mode 100644
index 000000000000..90a64ebd926b
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="point and click selection of X11 font names"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index dad9918e0bb1..21c727e1c225 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -5,9 +5,12 @@ AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba
 AUX startDM.sh 818 BLAKE2B b9ccb2e8dc8c711b6ca550a0e94b15af38df59bb3a508666e5768a9a070c5d4c742f7b88319d5d936956f14f543af5b7c6f0b2fdccebe57a82280fe87fbac5ca SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
 AUX xinit-1.3.4-startx-current-vt.patch 808 BLAKE2B ffcda8d6abc7793afcfd15565de626be4dac60dd494e1bf6579e2eea3eb99fb3787ad2eb698b0594dab58ee1d01026e3ca8503774dea4bb2c75f153b7b00929f SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9
+AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
 AUX xserverrc 45 BLAKE2B 768b6cce44df53b656776acb0c386aade3897e1d117a6673986a18d0cefb22b3ba0dee3b5fa07d8f0e8603852ff66d422cb5dbb725bb44e437d323c25e6d8069 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b
 AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
 DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947aa6026642fbbe6a55eb9c5cb891f079281bb40b460f9b1373259e338dcc0615fbdda64da49b719980017b782 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
+DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
 EBUILD xinit-1.3.4-r3.ebuild 1913 BLAKE2B af34d5eb73f8e99ea509c577c7560d44f11f8151dafd2371d91172c395e564605bd326f8da5610a34e1b2edaad4f58f09f208a38d1d803610b641cbbc651592f SHA512 59712d0dd8ff2e7637bbd3b72a9bc067d860247eb9bb8be603211d265a3c209d59431759cffee408e4104a5d28f07fe18349e7aab1858b18944b5b6ca4467e05
 EBUILD xinit-1.3.4-r4.ebuild 1770 BLAKE2B aff5f95040e5b78e49670178dbf5ba32cf80b437aa91857acd0c6590eb60cf39f4dcc460b16519d86ea05c08e2e0fbd670e49ee4dcb5831ef79cf7cca12ada3d SHA512 bddc5e4776a5b27533fb179aa4102618f8f6a9e9afc1202f962734f5854bd4e60bddac6141fafa297060b544b633be269646a8cb3b4896f0003e2e707d2930b8
+EBUILD xinit-1.4.0.ebuild 1770 BLAKE2B dfc2a356b82f4de24f55d658a8ead26aefee4986b282ac3dd0770f97e7c7ce65799b997a2c3fafd448dac4d3e4920de6e2c71b2d7967084ae1faf96f89fb3f74 SHA512 4f2719c09fcfb06470e8ff12f2ffe13628de4ab7b75897e7592f86a700c3edbc1f32d173d790eecc21923244025fa3263ddf0c6fc552bbe5ba9f7c4f58bdc5ad
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch
new file mode 100644
index 000000000000..ecddd3b369ed
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.4.0-startx-current-vt.patch
@@ -0,0 +1,20 @@
+--- a/startx.cpp
++++ b/startx.cpp
+@@ -200,17 +200,6 @@ XCOMM process server arguments
+ if [ x"$server" = x ]; then
+     server=$defaultserver
+ 
+-#ifdef __linux__
+-    XCOMM When starting the defaultserver start X on the current tty to avoid
+-    XCOMM the startx session being seen as inactive:
+-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+-    tty=$(tty)
+-    if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
+-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+-        vtarg="vt$tty_num -keeptty"
+-    fi
+-#endif
+-
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+     if [ x"$serverargs" = x -a x"$display" = x ]; then
+ 	if [ -f "$userserverrc" ]; then
diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild
new file mode 100644
index 000000000000..c2d2baabb333
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+	!<x11-base/xorg-server-1.8.0
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	!minimal? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.4.0-startx-current-vt.patch"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
+	)
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession
+	exeinto /etc/X11/xinit
+	newexe "${FILESDIR}"/xserverrc.1 xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/00-xhost
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+	ewarn "any executable. When you run startx, it will run this as the login session."
+	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+	ewarn "Here's an example of setting it for the whole system:"
+	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+	ewarn "    env-update && source /etc/profile"
+}
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 2c5c8dc5e354..69568bb94de9 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,3 +1,5 @@
 DIST xkill-1.0.4.tar.bz2 124828 BLAKE2B 4d7484a6e044f2a93d7d54f25619c08f657cc34955cd399e927442d8e8d79f3ad983020f75a3edb57e91371f4693909fae28b1ebf8f1e78189868c79c3ac5e87 SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545
+DIST xkill-1.0.5.tar.bz2 128146 BLAKE2B a01b954872eaad2aefe11335df2c85972abb8d36ae0c00fbca02b5af2d7df57934e3ddc47455f88927a90b0bff5ed707ca6dddbbf5478c89b193c98a86cc0562 SHA512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
 EBUILD xkill-1.0.4.ebuild 388 BLAKE2B 8184d2474096889cbc9bcc5a3ad0b936a88acba8d2f2cc0b6ce796694a00a193348b59fe5f00fe2b6671d16d0e4a49e5738a3461738af2307299c6b7e6c7c90d SHA512 acb71c1ce6a9c25efae92867c70873e3a2b8b9267a914303d773a412e5a126ab29aedbcf6b75f6aa5cdf58dd2ddea5a8a3ed85c0d1cc92c409ea62cfc9e2f794
+EBUILD xkill-1.0.5.ebuild 388 BLAKE2B 021f99facab8c73a5d9f0563753fa462ab1598115570f45358c4f5978e317a57b55252fb7a6be275a862f62078a75825c5e94750f7eaa95617ee0f732f6c09a9 SHA512 7101f4a92f54f9d008e0d3c7d198faea7b5002ef52c331ed6871a23beeb66bec1f18ecf546a2a000244972468adea627c3af6dc41fd2eeb39034ce527114d641
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkill/xkill-1.0.5.ebuild b/x11-apps/xkill/xkill-1.0.5.ebuild
new file mode 100644
index 000000000000..badf428d330a
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="kill a client by its X resource"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 260897050625..ee44012d5d2c 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,3 +1,5 @@
 DIST xload-1.1.2.tar.bz2 136745 BLAKE2B 080c3885ce5ccabd2162cdbb855113a7718978b3d935493851315e682cbc9f6ba7652412130d414698b363aa1b3c74b21144293ab2475e45816ca15387fee925 SHA512 9c83d26bbb135cc0f2b3ef7f25b081cda5d080dd02b1c89195b40825a7d71211965b34336c853eb455472d9748f3edf64108455584b34b81673e2548806f423d
+DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
 EBUILD xload-1.1.2.ebuild 378 BLAKE2B a158e8e28ea20101ee37553ca21f2ec2fa287c15af3aaf39d3b393fd8f8d2a5b16cc39d2fbddecce692ce500c6c19855d06ef9f62fc2104fa52f675aa8d66187 SHA512 445dff6e32ea43292a8a4544d19637326633c2faa96db2a6395d1b9ab50658f389f34f3978e9c23f71f9b20cb93f22d658a2cc8e1854d70864a7d5f4cf0277d8
+EBUILD xload-1.1.3.ebuild 378 BLAKE2B b6f977ddc8815a723f78d80a3821108e224742b464aae8fcfa604a1cd45e7fc89273f04234717d540238754932c6726f08857a9ad8bc5d154b2cc5ee149732d8 SHA512 63223a90185e6684152360b0412ebdd3e2bc1642fe27f3fcc743acc69b4b60a7b496d84c1b0b8ffec8d7e17601b3b7624ef6b0374bec86e34c30a41a3b352934
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
new file mode 100644
index 000000000000..44023c58012b
--- /dev/null
+++ b/x11-apps/xload/xload-1.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="system load average display for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index e9bac1409155..83112dc7a9bb 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,5 +1,7 @@
 DIST xlsclients-1.1.2.tar.bz2 114703 BLAKE2B 68e8d077b26760d14e825cb73724cf4c98f3f429f35e541a0fcc65c5162b00fffb90bcdc5bc8b1f9d8e8f250333756104608d4325f2d1bf1616746c7f4dc3b8a SHA512 c217c17ddd937fd27b11706e6453a6171037bc33f9d108c0bf717dd5f2a0580eb82bb9085342d81d526c75d8aaa0a2d911e6ebcaa12ac8cafce4caa726ac93e8
 DIST xlsclients-1.1.3.tar.bz2 127324 BLAKE2B 03860a7b3e53e371aaa66156029821e4693c720213e64b66f329121823a9ee01ce6e2f37970cdb434ce21a7484285c8df7f4effd1e17b028792131634a9651da SHA512 4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85
+DIST xlsclients-1.1.4.tar.bz2 130586 BLAKE2B 8e13bd29f10035a101cabe2a271fd665618dce12f7047f441bf943e8c4d2743e2385874b8e1cf42b69f6a19b7a3d5c16ec9ecff7e6cb62401888802d6946dd5e SHA512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4
 EBUILD xlsclients-1.1.2.ebuild 359 BLAKE2B 0d8ea6cae585681c224caf70c1d452f7f02e9660430db8cb7db97f50bf1ba8ef23a5f8144c47e9d06611c146233e4f4cefdf1453bc172da7f0f66de9e022aac3 SHA512 f20475c6510d02d85480f2d776ad626b5bb075c1fcf20c3e2341c688b1de868fc4c24f2756802da2147e1b67affd419dbd83ded9bde697e84b6d9b70250a1aad
 EBUILD xlsclients-1.1.3.ebuild 368 BLAKE2B c27f85d6e4530d27f6593b8c752dc9d8effa2b2c8b7065706e1343b76bca0c8ab0f32868920470fcda5c6bb357c596d720f2cbcc465fa004f85793796e8fd3c0 SHA512 dac8507547f2304debe0eb4e1a0184d5b97b5027866a53e22c967b1ce79e5c0c1e318bb55f3b320506de2f557b3363fec7922b7634d7019e6591c1d94791a287
+EBUILD xlsclients-1.1.4.ebuild 368 BLAKE2B a0dad845d6992b8094d64d6d346bec86d8db9dab2c681272d2c3d9ee553207c18b6b64817ca23e5973f977510d88b2ba6db9c18ed291fe6072a7139a220bd4a8 SHA512 7b081c2355561c4498410a86a1149a5d6b460674bdc2f5c2e8ee1d56c81ee2f2400eb85e1a424be7322af595ffaca96e2f8ea48cf1b3f3d418dd736f43ad201f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsclients/xlsclients-1.1.4.ebuild b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
new file mode 100644
index 000000000000..d3359dd6ba5b
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libxcb-1.7
+	>=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 40c2c50d3d11..3a52ac8111e8 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,5 +1,7 @@
 DIST xlsfonts-1.0.4.tar.bz2 124533 BLAKE2B 44f5671b2f63253fd98d0d6a64208916029786c0bfdef700bcc6977f319d3d8525d41438a2f3924f364c61ff81a3ce3fe8a8626af87ea832a74ab2dbc3ecb96a SHA512 e4cc52ce2f677f9a90e0924dac15a732c3bba584e2513fc68a4aadd46c6d2f56401fb1128ac42e8b569b722023053e07933d2d7bc45f18b7c8717c667d260c4e
 DIST xlsfonts-1.0.5.tar.bz2 131072 BLAKE2B 9785b22f25b552454fd7e67f9617b32fa4047dbb72a6f2898444e0930e604705f5ee8683b7df3574a055e210f1c316e03ab942f5d7ff4884b23d9834a4592a4d SHA512 e20f9efa0fa33980486671abd4ef59a82fd3df033d9c1b24db8c5b2b27ada93f03dba1e3ad586a35f3b7893bef5e8f14186f1914ab3507862cce4e104199a490
+DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
 EBUILD xlsfonts-1.0.4.ebuild 351 BLAKE2B 6442bd1727411b36f683e845a170e21efd68ca7f917997ec62ba94be6f8681cde115db4c30c99c993da02f411c9d223c355d557e12b87a0ce01ab471b0e5474c SHA512 61603c2404e6f7331ac51c0b57ec455df9475abe63b16501163ce0680d91f72b45f57ae788b9b382ee40ff35ee09b223f5e7b89466348b30ce39aeb548f485f9
 EBUILD xlsfonts-1.0.5.ebuild 353 BLAKE2B ac1dede047be48a809541e35a300e3a11bf0f43f2ed7af28129251a9b801f675cb3b203be9081f39d44d3e42003bd9487bab6feb701bb2d315957e6817b27718 SHA512 2e49a32fc545cfb8173ef9b5c9d1f6a6012c9ad595f9958d18c36722788b4204b8301b225766304443a4705733b656aeea81ef728c8169b5741fee976482ec32
+EBUILD xlsfonts-1.0.6.ebuild 353 BLAKE2B 0a428203e819410d789160c8f3d36528bc9ceccc88fcbf987daa3f2fbed03f7816ad680ca19bf9738bdf809d3a185c4289fd5e1760884a340009f6fd2f26f753 SHA512 150761d9db5c4b4fdfe1535554f80c9a42ff90de65dd815d0da707b1e7369cd67e0fec218bbe291e0082f92a219da1191dbf616d7729468abf2b7a0b5ae13127
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
new file mode 100644
index 000000000000..694708cb27d6
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsfonts application"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index c2fb5781723b..2095c28b73d3 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,3 +1,5 @@
 DIST xmessage-1.0.4.tar.bz2 125011 BLAKE2B 4b1134ac3dcb6a696ba75dddb3fcd348222763c375067279e4d6af41c3c2c855249cd76b888693a5c0136144071acb628c0e3a653ce0afed70d0e6910d055a4f SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd
+DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
 EBUILD xmessage-1.0.4.ebuild 505 BLAKE2B 117e8b2582f7f9cf5061af4689871d8e02a1f4fb3ed0a60595da073c3bf4ee871f4d3a4a1e1445f0c55ef7a2b71743067a57c3edaf12db002edf5b0b55666681 SHA512 88d5d07f9a3ff8e8f3f270a24f5f49b59d4e03db96df40434ea78c9a061256c33af6acf5c1eb3f136b368ed89c8fc20ce90e1e5233bb23c21793abd4c46b2203
+EBUILD xmessage-1.0.5.ebuild 505 BLAKE2B 3bce699e5bf03ebc9ea89e9f1789d1a43e6deca5d638e91345982cb499b820894949a8eceb9f5ee45f9224089c17e8fc86cb55cf8e9887ad55891b3924b347e6 SHA512 3bfc05202f5d2242256497cce693141c92a1b1a7a208ed0faab92cf3e94bb007f4cae117ab0def75e740fc88e15ca75387be4a9071ede3596d75c4b800e7e011
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmessage/xmessage-1.0.5.ebuild b/x11-apps/xmessage/xmessage-1.0.5.ebuild
new file mode 100644
index 000000000000..64c43ad4fc1d
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index 5044c118c0e2..9b162a1e7deb 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,3 +1,5 @@
 DIST xpr-1.0.4.tar.bz2 143144 BLAKE2B 0c336de348effdd7594e499fd6516c62bb7769f0e8437a446a16433beaf4a8e237f3f054f73dc56bd333579331edf0fead46e158d9c1f401f3c56f2d9957c978 SHA512 4b88b71a6da835b8f27b185510cff6bc6b260e009b31b9118f12d77d37e660606654ff7ebd50014ff13f15ca74011cd3ffc12a417cea5e38d6d29ccc820a2957
+DIST xpr-1.0.5.tar.bz2 150714 BLAKE2B 89d20134a3a9a12e319d343ae20c3aac71d1d2d2cbbffe1ff71375211efb3a4b22c2d99099fb1621fba838778702cca8c088181218c5d2c5fcb6af706d23b359 SHA512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967
 EBUILD xpr-1.0.4.ebuild 338 BLAKE2B 06ffd4e19f34eed52fe1ccace1c93c19b9055512da4bacaedd809ef5dd4bd179542c459cfe4807b8c5a52d16075019381efe5e60f385f04f9b2a6f119e32dee9 SHA512 3ed52e0c001c580d202ac6f824681551f60de13ee2744e3e0c2cebf320eebd14c7b6d467fe10359f4e7965cc79ff89fb8ab949aee29d61e143db1f44a9f06442
+EBUILD xpr-1.0.5.ebuild 338 BLAKE2B 79f2dacbd340edf6eb1c37de1cc99f9195f7688163a5392de1fa115877980e5a41d4adaf3131b9123a1d06a0374fd4770c58f935732ec00b1daf8d1782409974 SHA512 6e4d69ad739d5610999aa1cecef558f6151dcbc21117b908a62cb7ea4c434d0500654e8ed1f12b545bb5977b22874bc0054ecabd9273fa5ed45a2ee587127e5e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xpr/xpr-1.0.5.ebuild b/x11-apps/xpr/xpr-1.0.5.ebuild
new file mode 100644
index 000000000000..06ea06f06277
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.0.5.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 0f6e4c88582d..85732791279c 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,3 +1,5 @@
 DIST xprop-1.2.2.tar.bz2 145556 BLAKE2B f1560f7688b4c9a5c2cc55a29aa15181f09d65883f44f63a3761988cc1b905c768a1cfebe9303b3f5e12d0c84e0e6a0ced79d69e49e2d5ab99087c16157d4c41 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572
+DIST xprop-1.2.3.tar.bz2 149202 BLAKE2B 57c6459b873ecb91adb2bd01c350918abf95b8eb33ad1de05ded1f49350bbf3be2c46f597d9f559d473c9dd41dab2b327ca2c3e8a0fe742498e5a2c94ca1ca22 SHA512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a
 EBUILD xprop-1.2.2.ebuild 432 BLAKE2B f6a64d516beda5fc5e341ddd2ec5c3011f6d4f541fd863693b671b58dca732c7c446add6305fe2c4bd4c3a07ad234aeda87d2e69cd148a339dcda5fec3f499d8 SHA512 f6a30db3566a9b9b8b47968903dd9f863343d986162d2ab585ae24e48036e337d16c2dad6dfc4608efaf2d18076eefaaf72ba4c576b86d0519e861e6f7d7acfb
+EBUILD xprop-1.2.3.ebuild 432 BLAKE2B 5c2739b1a6e4a9a66bcd248f6bdca8d43d385fd18e95a9f5b1f54de07fc3d29a1d21480283f6b65ca69f867c4521c64009f1fb435d783674caf53abeb882192c SHA512 83b7b24f4c0c06fb054fbc488e983da3e05e9cc0c6190c714600fc339e4d44aa890e4d5d48fc7ed039900a420f1facea8959d7de65aeac0adc9be7831e5a99cb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.3.ebuild b/x11-apps/xprop/xprop-1.2.3.ebuild
new file mode 100644
index 000000000000..1e7cac5299be
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.2.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="property displayer for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	>=x11-proto/xproto-7.0.17
+"
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index c2ca706712c3..9f24fd1ff2d0 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,3 +1,5 @@
 DIST xrdb-1.1.0.tar.bz2 138035 BLAKE2B 62cea13d943692cf8be654b53c89751925c0e1b07c84cbe954070c109a5792908bb3642b208ac2da151f8416ab645c05d3d54084424d9fc9d5aba4efc99604e6 SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407
+DIST xrdb-1.1.1.tar.bz2 141950 BLAKE2B bfd0e384e4bdbae3209caf4e729a8151ec174ca1a461d3dd5a357b8a383fcf7da072741e539a8830434b416c894684e20cde8bde11fb211420d5796c2c08298b SHA512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f
 EBUILD xrdb-1.1.0.ebuild 453 BLAKE2B daf0a433a3db3d0806652b2d74763c6463f33cfc6852f18fa09fedb5ee4cd053112bbdf090560ec99bf0d44521ee592d8db568caff4e25120484772cb6077105 SHA512 c04e14cef41a0c133f403b3c4ea3a9c04ac2d49d27541ef558b1cde2a8a5951cf138a411a15712d69fb06006d02f77572bc9d0135974f0051f00f45f216c1c9a
+EBUILD xrdb-1.1.1.ebuild 453 BLAKE2B b19c1f8c0e950c054c23c813b58a8c957193e2c675777617c5aacf9320f924268310c193418dba12e7b9b9cd296f15a2cefe3aabb9a1ede5341a731c0ab0d6b9 SHA512 e8bcb71e092f8d268975bae6de05bec539251843b9bf914df4968449c045adf60309c3327b29a41b2e5873534651aab68e54acb4ebb93fec73c19983a4aeafe8
 MISC metadata.xml 317 BLAKE2B 02ff19551010134a361010ad2647deb4949c46241c2f3ff388fc8fb7aad6194a822c795f8505cb72896229f9702857b29235197675a227a1da9755d051e5930e SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96
diff --git a/x11-apps/xrdb/xrdb-1.1.1.ebuild b/x11-apps/xrdb/xrdb-1.1.1.ebuild
new file mode 100644
index 000000000000..0432cd1c5911
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.1.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X server resource database utility"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index 70013b6c97df..b8ea9abab87e 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,3 +1,5 @@
 DIST xrefresh-1.0.5.tar.bz2 120757 BLAKE2B 5c29df155649998cc18e607267f140e59fc50df063d1ba26440103c71c998050f4a0e940ef87a78ceeb3f350e9340fea3813c204548d5f506cb8c014be9362e0 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014
+DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
 EBUILD xrefresh-1.0.5.ebuild 338 BLAKE2B 9f3562b50696cb553f47a7ac5dd5c2868cb24ecb40f4f024f8f38ca76508edf0475cd16fc8af95ab2a1dac505e3b1f19c477006610a4f9847ee05a6b07df0b2c SHA512 53bb115111882bb7748513f1b72b1568a3ed9780651f15881c163310e83c91caeec3ee7f34ae4d68b852bdae2224a2634c97eb39c7e01f6e4f08a7474b7897c5
+EBUILD xrefresh-1.0.6.ebuild 338 BLAKE2B 2b2699e463ffc1892c102241058bfe6f5a1e0e0821242812fe7422f150028b748bfc822b503543f60d9a4304e4f2fd0c4e0762802e9eea5a34a8ed908ecc4c9c SHA512 b569e83ba7df4e35dd2b10b601e80862c50bae89792c4fba74ac7bbc7f5075a6417f3eec22efd6a89c0ce62d035b2773b1d9877a7ba6b2528d4c9510f26cc85e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xrefresh/xrefresh-1.0.6.ebuild b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
new file mode 100644
index 000000000000..86999d924a4f
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="refresh all or part of an X screen"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index 22beae50d9dd..688a82a8bd2d 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,3 +1,5 @@
 DIST xset-1.2.3.tar.bz2 142286 BLAKE2B 83ba3d7ccc259ae7b244049e558af6db9428b897b340537b75b6c534c7e8a11f36709237982ffe1ab5b523cef5834467bdc85c94fbe07c64d6eab6eef2c930b2 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a
+DIST xset-1.2.4.tar.bz2 145546 BLAKE2B df4ae52046af7f632e2f60386bd3b8d90b27db3e53ceb68f1056c9c5df2ee9c6d83d109a444eb99ddc031e35b91db0249ee56eba3180bc9a8a002935db213605 SHA512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
 EBUILD xset-1.2.3.ebuild 509 BLAKE2B 3c3a14c30dc80f5eed3b371c0db44c44cbab65a381f28cdbbdacaed7b04250f34d47e35d0e8686b4aee7aae43065e7c766a49d0234898dc9a949b3c31a3265ce SHA512 166d07be62cd1c8a4409f634493e8b9fe04f379f32919d7446bd18c22e23c74b7225054bd127d7b5cff2839fa8327254bc6ce6dd885c744c54a60a532d3404dc
+EBUILD xset-1.2.4.ebuild 509 BLAKE2B 7431be080a0bdf846a6ed5797e81257c19f9fddf2e95281b49178ab77667738a1134918db886fa32fa27b03c2ccf33cfd62ef1ef3390d5c4cde0caf3e880f4e1 SHA512 ebe3228f61f051181cf8bc6678531b9c6caf61d031b501429fbd3f1081f2da8be9f1c712d5d60d4d00d91537c05662f82d32a639012fd3562ebfdd8d137ceca9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xset/xset-1.2.4.ebuild b/x11-apps/xset/xset-1.2.4.ebuild
new file mode 100644
index 000000000000..fe81eebb63ef
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xset application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--without-xf86misc
+	--without-fontcache
+)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index 826bddeb6349..bc03fbd6eab2 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,3 +1,5 @@
 DIST xsetroot-1.1.1.tar.bz2 119977 BLAKE2B 7589dc6014c2f905dce4bc72c4a98096eba38354975c307408e1aeb06e27cafcf64ecda7f8e3a470ac25e41108b3aac688fa9d365a3ab41908a52d8044142712 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64
+DIST xsetroot-1.1.2.tar.bz2 129091 BLAKE2B 0bd0615f64c636eaad7ed1b83d49208e9065edf7583bcd7e5d4c5d2f1a1eca4c7692209a540cab823c35497696176f4925afecaaf843610f6e9485cd3724f1cb SHA512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
 EBUILD xsetroot-1.1.1.ebuild 422 BLAKE2B 2d7c2d982295c0ebbded7aafaef63946ec0e6816a9fccca82d55ce2b22f2f36bb0c65645e965bcdd18440035b9685e8a2b3d4c5e252d10435335c2f600e95b6e SHA512 fd9b0cad752ad6a93e40a3acaea9cb3a67c63d815a1f859999f63ebe2d999ab26e9fae91c22741af19b30cbfa05bce3639b5ef1213a3e473fe4b16077f7c3af2
+EBUILD xsetroot-1.1.2.ebuild 422 BLAKE2B abf10f4f472fa6415ba31a12c440b91392e872b6075c330e329e07b7a4e230b086892c627bde3e25eeb70d8bf64b787b33ee041357f194202ee32a561e8ca5ad SHA512 d3691145e0e5524fcd63d51c3258d15fdb2041fcb880639e1b971db3a1c97e3a8c0aefeddc2fc9f63707d011011cd5e83599f13deea2dcfbad9f51412ef855ae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xsetroot/xsetroot-1.1.2.ebuild b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
new file mode 100644
index 000000000000..dd0ecf2d07ca
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-1.1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xsetroot application"
+
+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=""
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11
+	x11-misc/xbitmaps
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 130f9d14ba2c..d2187e5a4245 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,3 +1,5 @@
 DIST xsm-1.0.3.tar.bz2 161012 BLAKE2B 2628e4234b5fed58ebefb35f454c36e268c75cafa784ed709833d5979ee4484ada8f315d75b6204e64a0efd0f1fd7a14662afb430c0e84bc81a40eefda9380cf SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0
+DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
 EBUILD xsm-1.0.3.ebuild 848 BLAKE2B c6834e4bae18e6c7171eb41052853f6d7d0ecb0e17ead1c4d3474c7c3a83d9ca6b2519f58dc72514d73bc258c4224a90bf0ca0721ba5db20bd9e860ad7f4c71e SHA512 fda19eab58e2a49338dbe029e492e4379016a3f165c18eb7032d5e47e24b560f913b69f9e333d58f1880d23b282ff7d4d81b7b9a6b270a3cb2dac0c4657e896c
+EBUILD xsm-1.0.4.ebuild 848 BLAKE2B 3872f28c4e3fcbe68d8b6303d3bae8a85c53f2ec821a2ee9eb5360f884dbaac57f5ca9e481c2ad43782b146f82a43a8d0b0489a19dff638899ee758493c6d6a8 SHA512 2f2eb28d44aa335207732670196e1b9bd3d247c5616ef9e721bcfc66215db3487188154687472af1e8917cb7d2182465330326dc7dd5f3b3c46b7277fe8e4386
 MISC metadata.xml 333 BLAKE2B 0b142d7cf4b255c50a9e616434af7ff1db6a2aa0d3467f43d3e22ce6ce55a1bae7ab18eaf092bd5ca002464dc046bc2de62b3738425cdecf4ad15727b20f2d18 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
new file mode 100644
index 000000000000..cc08af1187c3
--- /dev/null
+++ b/x11-apps/xsm/xsm-1.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Session Manager"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="rsh"
+RDEPEND="x11-libs/libXaw
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	rsh? ( net-misc/netkit-rsh )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
+	local XSMPATH="${EROOT}usr/$(get_libdir)/X11/xsm"
+	if [[ -L ${XSMPATH} ]]; then
+		einfo "Removing symlink ${XSMPATH}"
+		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
+	fi
+	xorg-2_pkg_setup
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS="$(use_with rsh rsh /usr/bin/rsh)"
+	xorg-2_src_configure
+}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 0fcfb90e5084..ee421bc4cc11 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,3 +1,5 @@
 DIST xwd-1.0.6.tar.bz2 144548 BLAKE2B 56560a36931d15f6f59d6c6548325e559534cee10cb13b07722bce5b47d7d2360244b29e88a66a58ffffd2209336f0ffb14cbabb0369c144ceeeabb4eb184b06 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f
+DIST xwd-1.0.7.tar.bz2 148026 BLAKE2B 9088105a07db38418352cccafaee4ecc084940e031416358291e6b5a6f47b2c8972928f0eb3479db4ff93b3a54a24ea4231f4d8196464f14ac4d7a1b5bb7ecce SHA512 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e
 EBUILD xwd-1.0.6.ebuild 462 BLAKE2B bbd6d4ea5a075b8e7dbc84cc14536fe2a3a588706e31954e6569c479f338933813b4fd2be72cbfdab38b9c742f99295af046302421e00e8950760f7bf6032a11 SHA512 9e07413ae79fa875abebfe27c2a820d2c72f263b9ad3e42332605ce8131f2667a5bc3f129fbd6d2838ed4e23d6f5162068f891fa87dcd229592e8c56a3cd6fc1
+EBUILD xwd-1.0.7.ebuild 462 BLAKE2B 0034aa92744d0e295bf7a724ed5fa3d17a5407018b0f173e4fa5c8fbb059677bcf1fffad48519eb3555fbb7aab0ff4488c09cce944da138139fe1a2e9231973d SHA512 8b6c1d53f11a6e5d871048a43f290b5e717d3b744e073605cd73375de49d1e56683794cb7c7a7f8c435080b482b291495363d3d48fb5c74f299432f815935a7c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwd/xwd-1.0.7.ebuild b/x11-apps/xwd/xwd-1.0.7.ebuild
new file mode 100644
index 000000000000..d88f8dfd465c
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.7.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="dump an image of an X window"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-libs/libxkbfile
+	x11-proto/xproto"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index af17bd11dc3c..a2b56cf4d7e9 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,3 +1,5 @@
 DIST xwininfo-1.1.3.tar.bz2 157512 BLAKE2B eba1f98cf8aa8afc68a5bc0f538e1e0588a38bd0022ba0a2bf6da7e2cbcd4459111aed37f88b8d46054f8c3e52e435d0c95a8f7c9b1247580dde812a3bd3715c SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466
+DIST xwininfo-1.1.4.tar.bz2 169159 BLAKE2B 4bdf7321eba8e2cd078c3220e3135ca1b044461ab90b8daa350beed1feb53f02dd9dd4c1192be6dd6b9ef2a9dc028c4a9c464f3124590e6195aca7547ed61830 SHA512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b
 EBUILD xwininfo-1.1.3.ebuild 741 BLAKE2B 376b205354177dec9cd17d1d11f04413b18820608a7c38db078d3a10f888da97c85b4c67d3881185ed609583af26e680692bc2c464cc97c531dc16e9362dd57e SHA512 d48b8bba681614c0e5355c512977455cfde7de628cfaa3fd511dbe30b1eeb3b3e5c2bf950a6d384c2e8d9af9a49dbdf38b65f767a75d2e7692d0ccc666be6d84
+EBUILD xwininfo-1.1.4.ebuild 741 BLAKE2B 6f014028708c38e4f9390ed4678a6882ba9ee3e9fa00ad7cbf5f5d05b82a27002aa0ed52f69ad329e592451245e6ae4e5d76cac1024554eab2591c496b567fa3 SHA512 65041f52214a9171a378b30a87cd92a220d9a6d20776f5b1e3fa61948d67f938d4d1f173ae51769c3d7fe9cf4cfc80a996f2b8369791a4e3a6b4ee5bec302d3a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwininfo/xwininfo-1.1.4.ebuild b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
new file mode 100644
index 000000000000..4e7c0e6044cc
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-1.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="window information utility for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libxcb-1.6"
+DEPEND="${RDEPEND}
+	x11-libs/libX11
+	>=x11-proto/xproto-7.0.17"
+
+pkg_setup() {
+	# interix has a _very_ old iconv in libc, however, including
+	# iconv.h redefines those symbols to libiconv_*, which then
+	# are unresolved, as the configure check is old and dumb.
+	[[ ${CHOST} == *-interix* || ${CHOST} == *-solaris* ]] &&
+		append-libs -liconv
+}
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index 050f936e0dec..7b0d8180d856 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,3 +1,5 @@
 DIST xwud-1.0.4.tar.bz2 124604 BLAKE2B e2c39708777b3f05f4013bf82598d0d33b4a8a69706467e3dad873f996375e9636a9662c9b939855d36c64a9bc03bd7b12e994541da08de8b126e4b170762dfe SHA512 f3ef5fb0dc9c9e3dc3acfa597c1332263f62be5e524c7512600106e9d8eb5733231729853f6b123205367db52cb0a567320dff65d29743bf892e237795ebee57
+DIST xwud-1.0.5.tar.bz2 133376 BLAKE2B 27ce8251ae2a2a87393655e1824121dd54f75839a8066405299e9052bf2c55c6946cd686f285dca1d7339029d8ca8b94e4adb3efb485b42bd347db212b12858d SHA512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184
 EBUILD xwud-1.0.4.ebuild 324 BLAKE2B 8d0f5d1e95f0fda4163597727a922e86856a73c942a8a69c00154116349af9d057bf5f6b562f45306bdeed0367e69a604ead79f3ed839971c3cce239cc035117 SHA512 203269ab64350ee68c3b1f1cbd98401c1da694f4bc92c20ac4321d0c1a28c4800f39c8d3308adca9fc0386a0f78fa4eb8a5c418447bb14d26826e9c59158b8b2
+EBUILD xwud-1.0.5.ebuild 324 BLAKE2B db3bcd404f1a7278169c66d46f988aa190c4ea5d0ef6f077e9ec2d2d51cea5c8ba15ed05e818af678ce4ab42bbb67594f435c00ba7d055b24affc4140c84278f SHA512 e87e43cc386af70fe3883b1f2900233386b2eacf9ad9dbe817cafc83346fe338682c7baa847bc7647f68393246efb7000ce53b957a61fd71723c4303837042e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xwud/xwud-1.0.5.ebuild b/x11-apps/xwud/xwud-1.0.5.ebuild
new file mode 100644
index 000000000000..c7fb0725264b
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="image displayer for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"