reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-apps
333 files changed, 5125 insertions, 0 deletions
diff --git a/x11-apps/amlc/Manifest b/x11-apps/amlc/Manifest
new file mode 100644
index 000000000000..bdeecfccb774
--- /dev/null
+++ b/x11-apps/amlc/Manifest
@@ -0,0 +1,5 @@
+DIST amlc-0.5.1.cpp 18007 SHA256 25640764341dea2bc259b20bdbc3500aff140528f7e3aff06fe66f06426ee405 SHA512 93fb63fe8b07f1dae16d90ea3995a28329e5e4d98ae28fe8028d65029612b4874824908a63a7898d8bc66568521306843504eb5f54a5c99cb529568e289022c8 WHIRLPOOL 135bc5e92f810f32691b776bf1f01bb9ee2b40cdcd9ab463444cd73980c4f941e2a59ccd1345bf07d8d114ff221aa347f1ba0715fdd72a9dab016b467dd930de
+EBUILD amlc-0.5.1.ebuild 559 SHA256 0242ed9787664dc4062a86b69d3280b766e1b9aef2a290e512134a5d355c6ee8 SHA512 fdb7f16907281ee76aff3ae0004e624145acceb903c40aae99b344c8e87d606b33efad33e85de80f68838357d88b730f811e66c61463db280e4c793836b52d96 WHIRLPOOL dbdaf420513241c839394242dc9af92f301f1e37a90690d0e43a66596a4fc9bf33a596f8dda401f7b6c67a1b68c44704b086b045b0d126598b1588996a799ed8
+MISC ChangeLog 3073 SHA256 aae68df5d1ce81623cdf6eb660f4d47d23882d18b294037bc9333efb676bc524 SHA512 51d10ed557c17dfa84dfb070d8cedcda3857633142d0a567d23bd2f9d695cfbba49d6effd05f0661b17b10ccb5cc9e856c69d9441dfe2bfeb04fe5eefa85e480 WHIRLPOOL 902bd46c86aacd086a6eb4bc6993e42894b513a7aab70e82eab2a76be2fa2de6a57b4c9bf7d12ed19973b7216bbe1e127931b8c5a70a0c2b2ad9b47415213be4
+MISC ChangeLog-2015 1040 SHA256 76f7204347c286bd6a5b3f45e7cd5acf2e712856626087a997316a51724885c3 SHA512 da5b9be2751ac74aea6a7b039f8d844fb18e29610dea88bf62b85ff429e659e5af466da9d7b64fc27079880e69cc4bce7a7aad107c83d34af838b007ef3c8b5c WHIRLPOOL 1cf47de70fcff15fd4daab3285d2fb910f536a369e9f8a9adfc46f14fa1682ea7c4c27f5af93fac9be90201106474e1dc995250dc422c0246e7a98c0782f983d
+MISC metadata.xml 368 SHA256 e28641e716d9cb188f38a5ce4dc1158d6eaae980382a3e0a8b18726c813093ab SHA512 6c92fb131c4ad16ffcb735001161368bd66fe6d0cec63bcacc1d2cad93bcd4a7bb479130c864173c06bff3cf95f74e2f0e807b1b7865074b9e32916bfaed675b WHIRLPOOL 1d34621fdfda8e34c10d79f8bc6f98d4a42ec9ed784bc0bbc99707fd1e9257c2014cab92eefc74a34d521797dc2ba936e0de5d2628383d16b3f68b7b22868c78
diff --git a/x11-apps/amlc/amlc-0.5.1.ebuild b/x11-apps/amlc/amlc-0.5.1.ebuild
new file mode 100644
index 000000000000..661ba99615e1
--- /dev/null
+++ b/x11-apps/amlc/amlc-0.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Another Modeline Calculator, generates quality X11 display configs easily"
+HOMEPAGE="https://sourceforge.net/projects/amlc.berlios/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.cpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}
+
+src_prepare() {
+	cp "${DISTDIR}"/${P}.cpp "${S}"
+}
+
+src_compile() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} ${P}.cpp -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/x11-apps/amlc/metadata.xml b/x11-apps/amlc/metadata.xml
new file mode 100644
index 000000000000..b2bff79fa8af
--- /dev/null
+++ b/x11-apps/amlc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">amlc.berlios</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
new file mode 100644
index 000000000000..73de79610968
--- /dev/null
+++ b/x11-apps/appres/Manifest
@@ -0,0 +1,5 @@
+DIST appres-1.0.4.tar.bz2 117949 SHA256 9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98 WHIRLPOOL 12cecb82f647468473a7e3ef1477255e588e1752dd54d3cf702dbb579cc2024fe52c451e6f6edccf6a274ae0a2035fe0cc05e17657dfd07b1059dd26e1a6a914
+EBUILD appres-1.0.4.ebuild 417 SHA256 e495fdcba190b09f0f242bd14c814667e452e40ef5a1de8d3461f5f9209b64f8 SHA512 06ab50907861b37147cfd96450152e4aef0a38f087b855c0843798e708828552ff3f9155196187f1ab204b38ec4c56a8a00b8ee934d4419abe26385e85f8cfd3 WHIRLPOOL 76fda7e2dc6ff9e4a175ad04ab534629bddef20b52aefd0b050d910ad621be7fdef5c38fc9c37a5d84ebd60d787f6538fd1e7ae60b3f6f3b1b2196e7da89a934
+MISC ChangeLog 2424 SHA256 d2bfb16b32b97fd939ede53cfc597bdd494beb770efb646bb21aa54c6a0daa39 SHA512 363150d3e04542a00e4bc6b5da7770a48629e70cd35d97390ccf44e8bae95b7dcd708f01462168dd95a903e9e0bc0c947e8c74b20883f07d5a127768ddcac45c WHIRLPOOL a3c52773504bc8f23eb5b5f20444eee97baf2a54bb2201f01c11f68271d971487200a53f575fae956feaefa46035250c0b32526c7cc093dfd51e2590257ca167
+MISC ChangeLog-2015 7656 SHA256 f51070db641fdf7944983801c278e18dd61e2aac6a217e3a4bd8f12adabdd5fa SHA512 54ab7bdef723254925305a71bdeb95c45996abd41f58551664c588dbf8ea7941f422b160f9d03a939608adaa64ea05d89cbae394aef0e7fd0a003f8c46ec1b3b WHIRLPOOL e9d7090426f6d0a6052b31e27b5c8da7be157b7a9cbb4806d272a2d48168fd4110ffecf30cd681bd7d4f5475bbcd4eff6c1769b3d769eb8e5f097ab7ae562b36
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
new file mode 100644
index 000000000000..5580e9322e80
--- /dev/null
+++ b/x11-apps/appres/appres-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list X application resource database"
+
+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/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/appres/metadata.xml b/x11-apps/appres/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/appres/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
new file mode 100644
index 000000000000..414ee49b8f1b
--- /dev/null
+++ b/x11-apps/bdftopcf/Manifest
@@ -0,0 +1,7 @@
+DIST bdftopcf-1.0.4.tar.bz2 116380 SHA256 eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798 SHA512 af18bd3a68d4811ab70f69fa7e871ca87650a4a28e13567db5ed40cba6a0c8006928ad5828dcc16a624bc38917f53bcf7470f3b1b3b2fca0379ecf03114a3a52 WHIRLPOOL ce7115361d65d2df657ee134b6090dc7394e54909de93bfc961ce0ab3e63bd73d9321f412f998ab86b04f8416b6d0a2d266c8632047f826b63223f2fc0e6aa74
+DIST bdftopcf-1.0.5.tar.bz2 123291 SHA256 38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026 SHA512 9c6a156c8932579ee37699efaee3b1421d04d55ca0a62ca850a69cc65c21c7d9366b5a090b6a40e927504df16fecfdb484606052adc1038ca25e797f7e8c86c3 WHIRLPOOL 6cc6ac1099a98e35ff1c6ff6d410f6e2c33c812c637517b6e8c32c6f041f56364b5b826d25f7b67bca581c9e8cee408b123dcabb49494556948e822aa7f0376e
+EBUILD bdftopcf-1.0.4.ebuild 441 SHA256 61b808ede8ebf9402d3124bf11f55a1fe8f8fc5a35a044f0a96b48c7b2a4c14f SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350 WHIRLPOOL 413bd3d57814f51642b0539596e32ae31138b29d44a8d9346f96cf3ce6b1c24043721273b228ce9e481386612e5f90fc8bae9494b609bf327b037597021cd487
+EBUILD bdftopcf-1.0.5.ebuild 441 SHA256 61b808ede8ebf9402d3124bf11f55a1fe8f8fc5a35a044f0a96b48c7b2a4c14f SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350 WHIRLPOOL 413bd3d57814f51642b0539596e32ae31138b29d44a8d9346f96cf3ce6b1c24043721273b228ce9e481386612e5f90fc8bae9494b609bf327b037597021cd487
+MISC ChangeLog 2484 SHA256 e307dd01ae4ce38612052196977169ff48d748681f8d38f25c8d3c1e109b5a87 SHA512 b06d0f7c41abba38293b7f3599da7c1117499141d6ca4932a945e261f87d9a2097daf8978b2228f88df16a035ecf2329862f58e9a92b50c9c92d333012301d74 WHIRLPOOL 9bddebe57ab0b4800c3936812dd31718e22df5afa8f98670bb5514e4eefd13389312b103362a6f36d608ef7800682ff335f59158f419b199d00787daae888c72
+MISC ChangeLog-2015 8335 SHA256 d5ba0627f2e1a06c4cfc774f3416bb39c2aa996c1306f05df5b6245d72893cf3 SHA512 cb67116bc5a9ccc2e090b8a2ef5eb2d9a61ca10ca8fea1e7213b02c8b7f62614146885e8e4eeb1513170dde25f58bebd2e783c7d08ff09d9640ea93f53752454 WHIRLPOOL bbbc8d3d577f00cc55060ebedc6436cb7cc04e46c4fff9b7f1129acfefb1fd2b7d47a7e1ff925881133bc258509a09859c78a0981ac33149c8165c5d2d2ba998
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
new file mode 100644
index 000000000000..9a15ad4479bc
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bdftopcf 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libXfont"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
new file mode 100644
index 000000000000..9a15ad4479bc
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bdftopcf 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libXfont"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/metadata.xml b/x11-apps/bdftopcf/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/bdftopcf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
new file mode 100644
index 000000000000..67842ddabd40
--- /dev/null
+++ b/x11-apps/beforelight/Manifest
@@ -0,0 +1,5 @@
+DIST beforelight-1.0.5.tar.bz2 119358 SHA256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968 WHIRLPOOL 85b1df978f3a687c6103d7f02c7353bbe2a7db7793371af293e97929dfe2b0aae325d7fd3a9fda3e1e89eca8ee9f8e788fe4089e22f081a7468cc6c343707a95
+EBUILD beforelight-1.0.5.ebuild 355 SHA256 147a612d694dd0bb4b437f9428b41f100efc793c5eed76d1c3699227a7015b99 SHA512 039d498d9fa7f9ee39eb15131eae32f03a779d426ab02ca1e755ac16553458c72116b3602e363094d5e1139311f2759e2626f73b2a0a6730f60195e2252a62da WHIRLPOOL 5aea9e7e26ed7b7807e46674036c6a1ffdb27e6f249b087923b2d4d2b0a9e7928d137f3c082ecc4d0a00043f1c7acca43e319477fe46e1490514372d3753b34d
+MISC ChangeLog 2439 SHA256 afc737f738e82e34e9c87acc11f7ae648b873a39e1b959e2e13e39bbeb41aed0 SHA512 679f4d97e071dad98d3d40584fbdd6c7295cc5def2f6500d2ba515a1cf2df77d0a9e189d63ddde94d4bd5d5a7f602c5fe96a24aa6812f1db4951d3caa4d544d9 WHIRLPOOL 42be6e2c9e5cb9e4d6319a1816e5806cb7a6173465341a5a970212bfe5a9faca7dae3518709d44a75910fac6d1b791bda3f067586780f33a8c5ad5165dddcd5f
+MISC ChangeLog-2015 3612 SHA256 81d78bc8d97347a1bf7bfeeb1af67b6f1456669131ee086b37f684b21246016d SHA512 5675944e56491ac63327e976e4992ccae37ccf931a182618c14e909fa6831a0794f6772a5f995863a29b46d18b392f8308030943c36bd752b481e0fd64fcf1e7 WHIRLPOOL 3e98154ac4d5fdbbc7c4b10246f59ad370a6a8f82d039d8c1cf13475852ad2a25850fb31659f9e3acc6f771a7ca8fed5f15c8953000c706b21246b0e9f39fbab
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
new file mode 100644
index 000000000000..e4ce3505fc3a
--- /dev/null
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Sample implementation of screen saver"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/beforelight/metadata.xml b/x11-apps/beforelight/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/beforelight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
new file mode 100644
index 000000000000..27b5500d56f9
--- /dev/null
+++ b/x11-apps/bitmap/Manifest
@@ -0,0 +1,7 @@
+DIST bitmap-1.0.7.tar.bz2 169437 SHA256 7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af SHA512 4f445879e301910f3a9503ba1d2a88974848b35a0b66a57061d8d45a5d27441d30fe3c3cdedd9b637cef2f3f77a8b81786c2ecaff3f6884364037f1aaa69cd30 WHIRLPOOL 3fde660525e1cdb111867e255260ca85e13c142295557a35ab863db6e63e3343b4070e0da7af0ae0d9569119f46aaf3b8325794d9859907fc9b4885a441b1970
+DIST bitmap-1.0.8.tar.bz2 177558 SHA256 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d SHA512 caa9f112254d59b3d0ad2d455dd8a896923250984f82135b8b7bf79a8645aff2e1a1c4cae6c8b1ba0cb2fcd89c4a6724091cb8c50b22d6524a53cca64585e303 WHIRLPOOL db828f8daed407313a5d8516173d32d286b05c9428b101904bfddd6d90bb1800032dc98fdb78ac2de8538ace43a513f264f2d7163720e8ee6fe65aa508b5a1ad
+EBUILD bitmap-1.0.7.ebuild 389 SHA256 49b457ad6d9aa26f99ea322a48c82d0a0c343fc84a2f9c261d4a57895902056e SHA512 cff57a9fc9d4dc80fd29273a090a73d40125f3df77107e473ba2269fc2e66a8d4972d761077806c1ebe674a42950024056b27c266a2fc955fa61f3c521f54724 WHIRLPOOL 282aeae495f942c46859cfdc0b1873618c9ec301faa94d061eeb12a0b6479c431fe9ba7001cab66d6dbd963762386252b870caf6943895de82d0f36cab0ac546
+EBUILD bitmap-1.0.8.ebuild 396 SHA256 da55f504ac35e069bbcbc04ee1762c3d3e01ef839a789e0deacd88c3ce9a96d6 SHA512 23d61ece1d7b67bf63a1bdf14f2a67ca457c95c9754e7feb72551a23562a2cfb3fbf523b68e3d3332a5320af802dae8ab946cfc5430a6318b64c97a0e2051c65 WHIRLPOOL e2a4d622d0329d68f8742513548c1271a2e09d424eb610664fb42f3df0378cf729f2d34233a483a0ec8065a370c15804957b625cc68a1f58d36ceee60d2a7abd
+MISC ChangeLog 2635 SHA256 142ca09212eb56e746657288fb980d63eae0406f38fa0b844578930aaea02c96 SHA512 b2a33142a0425bf47fd59fb40aa84ca5b902c0a1d16c6c2e66766705ce32aaa62d0d9063148bac3cb59033c85b5c1315bf28683d0746d53db274e46a2e4bbf2e WHIRLPOOL 366c9675a5156dc3615d44afbb305b13ba230c2726d36073aea1925aa9b33f5aebe0af932bef0471301f12a3d7ccafb834a6a64f3c7f712ccee6620d14a677a9
+MISC ChangeLog-2015 8669 SHA256 50edfff0c8f2eafc459a0123a20216fdb7784c054e4217574163f1f934d57852 SHA512 b208cd1816dd5fdc00bcaf57da11a5b8fe7e2d422da37f2fde2ae2e2d238a30135f5071bd83b815ae599fe90e5e11acd2cfd279ef7a1a7bdd45e8b66ea95cd43 WHIRLPOOL d5805db3dbe36aa861d7023788dcd7e35464702966c2df6d034344dd1e580a93c1b5ef4d8dae205cc036df4686ceeb00bcb32f957ca381b1d71c0fb08e6d47cf
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/bitmap/bitmap-1.0.7.ebuild b/x11-apps/bitmap/bitmap-1.0.7.ebuild
new file mode 100644
index 000000000000..6dc1ef989bdc
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXt
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/bitmap-1.0.8.ebuild b/x11-apps/bitmap/bitmap-1.0.8.ebuild
new file mode 100644
index 000000000000..6bf8a22f37c0
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXaw
+	x11-libs/libXt
+	x11-misc/xbitmaps"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/metadata.xml b/x11-apps/bitmap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/bitmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/copyq/Manifest b/x11-apps/copyq/Manifest
new file mode 100644
index 000000000000..f9b71af59793
--- /dev/null
+++ b/x11-apps/copyq/Manifest
@@ -0,0 +1,4 @@
+DIST copyq-2.8.1.tar.gz 1573991 SHA256 83fffc3451973749e4652d28af28f589c0418d1393a4b9121104736d67466f2d SHA512 77602d39b0cb5fd0c8bd8d6c1ba5079e95ad72dc846c3e273556ffe029732e65bfd0951954de856c894bd7b6ebae816dfe7048040d77f7f3cd07faa922260b57 WHIRLPOOL 5a4bbf38e3ed08abf3290dfd299031cf54ffc99449c8e84c0a6ef0d221031104e21553cb9fb6e67ed7ac330d463a40485f2419a03252e4f64934b9fbc5125375
+EBUILD copyq-2.8.1.ebuild 925 SHA256 5259bdfac72240673fe6ad174ed716fb9d2a5e20f19e066859102e42c62d968d SHA512 bb21cef2e96f855ed3009839aabf56479bcaffb1076d92aadc64f75f025d9de7aeb9b283672441011a48c89306166b7c557a19cacba5fa1ee2c9500e275dad02 WHIRLPOOL 4d0a971deff0c6cc20e167f6e27d02567a419953c0b316edeb3eafc8ae9143d26ca178dcc6af23536060d1648c4b091cd23cd4b3f9c43d46669140c681f6fb17
+MISC ChangeLog 1936 SHA256 d360082ae2a0598264c268e74b67ef2e5b9d6e76157a1d98960a05adc2076930 SHA512 5ce32cccd5275f18663a3d7ae3ec6a1a49a0981536c8c2586e67a7288b4591ca7d220c8dbef2ef5190c7fc49cd3084f4015d32a58ac6a55da5fed3996d49f293 WHIRLPOOL 76808e99ffce21c32cd6f49368fa1113b7ef33b7fee3826c5c88ce362e5b57b55b2ed3243f30c18fbaceaf2a6640eb4bd5ce2e0fdb8f4aa750a0232e3b90d81d
+MISC metadata.xml 389 SHA256 bfd2c4f0a695f3e78b00dd983dfc0947bd1626c4a0c402053e10e7d0bb4f74a9 SHA512 5b69d8afd122ea99dd631fba96cdc0398faa363af9b875b2f0c76315fc3fc9312d728a61d5efe158014c7a2a7fbfc008dd4d5aec2f4582db86225833a3ded888 WHIRLPOOL 9c0bf12531b736eba1da17c3a78748a5a2edc661ca86430dbcdbba99707afc1879da51760f0feca0eda96d34ccbaa7b17d1a65bc5387ee04ece99ea6a9fac21e
diff --git a/x11-apps/copyq/copyq-2.8.1.ebuild b/x11-apps/copyq/copyq-2.8.1.ebuild
new file mode 100644
index 000000000000..128db7ff3459
--- /dev/null
+++ b/x11-apps/copyq/copyq-2.8.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="Clipboard manager with advanced features"
+HOMEPAGE="https://github.com/hluk/CopyQ"
+SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test webkit"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXtst
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )
+"
+
+S=${WORKDIR}/CopyQ-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
+		-DWITH_QT5=ON
+		-DWITH_TESTS=$(usex test)
+		-DWITH_WEBKIT=$(usex webkit)
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-apps/copyq/metadata.xml b/x11-apps/copyq/metadata.xml
new file mode 100644
index 000000000000..9a37e5d24d5c
--- /dev/null
+++ b/x11-apps/copyq/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="webkit">
+	enables the application to use advanced HTML rendering and fetching 
+	remote images and other data
+	</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hluk/CopyQ</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
new file mode 100644
index 000000000000..d2dbda3eaccd
--- /dev/null
+++ b/x11-apps/editres/Manifest
@@ -0,0 +1,5 @@
+DIST editres-1.0.6.tar.bz2 156155 SHA256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510 WHIRLPOOL 434b7520e2474d72ab8a51ebfdaba5bdce3eaf6aee03c44c73ad60b6b4e0a4436687328ad638aa7b7b08464f67b6321a09fb45cddc54710a4867ffa47b428704
+EBUILD editres-1.0.6.ebuild 367 SHA256 dfb5d68b11f45fd232853d915c6cf434df9c6322c794492d793690a9d865abc8 SHA512 5722330943d002690a150b5a93c94f44f28e2bf8b2c06a4ea659c7632a9fa09f6e8eaf6177f62e866773b9ad145ad16239ef1d29b98756412f5ea02d2f5e66f0 WHIRLPOOL 31ffa1c0777c95ce3be10b2904fea19d847589d7d5a100178f11081dc21ba78831ad2ac0f5c31421f126b7dc545052fa9e237d9f8b7bc8452a761df67de2a68c
+MISC ChangeLog 2427 SHA256 627a77c507257afc6909adb9e9cb252401d3881e2deff7b2d290803ffa46eb7d SHA512 c896e0b17273edafbc8840ebc134ae09e72d3a61f549cf727a26880ed4bc66cdbafb6ce1041cb14fec5b68419fe2fe234ad33b8385e7d9c3a0afd802231650b1 WHIRLPOOL 324598cf6e1b8636990af17bc87cefd8cc020638297141ee5279c71ef10777679f78100fc290035cf286c16da66aed9db747427fe7ed7fec3865b627cb1fad31
+MISC ChangeLog-2015 6446 SHA256 6a7ce2559717b7073a3f9a051d75f7674409d8523a4979aecfa7805f06701e00 SHA512 75a5475acd878f9762f414f9cb734bc57c34c31f800bf6d95bce91edbf690412e58eeb349440100809eb9a16f1fa235cbfacbbb63b46226c7d9c161fffeaba52 WHIRLPOOL 5ce313b06aff0ad01e087c78574cdbec8fb25c650fb2b5e526085020fac681391649cf0b5ac355d855c8111109f5f57c645970b44c01d29bbabb1f89dd27a302
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
new file mode 100644
index 000000000000..d81fb1814cff
--- /dev/null
+++ b/x11-apps/editres/editres-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="a dynamic resource editor for X Toolkit applications"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/metadata.xml b/x11-apps/editres/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/editres/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
new file mode 100644
index 000000000000..a711b9d85931
--- /dev/null
+++ b/x11-apps/fonttosfnt/Manifest
@@ -0,0 +1,5 @@
+DIST fonttosfnt-1.0.4.tar.bz2 106121 SHA256 3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594 SHA512 15764d51f581a18c5f25224312a4cf0558bd6b1676d8e5e58f8eb4ae156908bb679726e848b46a316b54a8120e664122f96f7b1233da372b2351923652920b1e WHIRLPOOL bda15dc3296a7d63cd5d2b88be0db6c7e093203cba9b65d26c455426e9a3dbcc78e0fae53ffa1937d8da615f9784de067b33aed66d58e0dfc682fae539d29e0b
+EBUILD fonttosfnt-1.0.4-r1.ebuild 329 SHA256 a54fc9a28834103258d6722e72eb3c3e9955ddf4c202a1e8dd9dfe7115b36c7b SHA512 44e32e04d8fc92970f80a519b43ac0d40e4348f3a84738b4750240acb8de8b53973065a3396108e7286b4fb2a04d9a9db00d81b6f7ec834a0d06c203f53fde93 WHIRLPOOL 470b5680c1555b34d87494818974a3736785b9957f82669828c99593877df7bbb6b819b8d006aaa89ddc07d51d16b9c0c44475c8eb5ed1ef2c374447b23cf814
+MISC ChangeLog 2442 SHA256 4af8d445bfc572ba3b4d1ad3b15326d37c52d18d85f6848aef72858dcc76c901 SHA512 7f1f75cd602a1529dbc35017d052c225fa7d600b5fdd21ae33b83d224ad6a99f5ad9db2860444ee804ec0df9052537d67637720780e61b4f5f266402d181f306 WHIRLPOOL 2160aa64a1c548e79dd4520c6350dfe20319591081fc5c68b25142e1ba5aec2c240046d3f95d1ce8fff04a04a955786e9fb0b4f0dbe31dfa0a73c9a97ec4b476
+MISC ChangeLog-2015 4671 SHA256 3ffccac21cca74fea7cdc2f9d37c1c3a13094d51622b668fd283679cfd6f2690 SHA512 3d452a875e3825cddedbc6fe6e02e5610d7416976dce157deadd4f000d1ac5a192b706ae9f929696a4e04ba387926674ce6ab1cefee7a5b24542b48f5bf5e149 WHIRLPOOL 262e683aa49a82b077fd3fa4805731be0dac2e89be37a70496550978121c42bec77c86737e2f84ef7d5d2e4e662f7867ca9fd55d4da618bce56e9ff45296c5c8
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..61d81756292b
--- /dev/null
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org fonttosfnt application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	=media-libs/freetype-2*
+	x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fonttosfnt/metadata.xml b/x11-apps/fonttosfnt/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/fonttosfnt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
new file mode 100644
index 000000000000..1fde139ed2a2
--- /dev/null
+++ b/x11-apps/fslsfonts/Manifest
@@ -0,0 +1,5 @@
+DIST fslsfonts-1.0.5.tar.bz2 125650 SHA256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2 WHIRLPOOL 4ffc0d78701c81fd0bfd7f58bda98fb840002614fa276c6bf18a1cc03bad1ffc75ecdceecc4c6bc22e0b29c02c1b21fd6e789fe109e6fc7adb8fee4568ca40df
+EBUILD fslsfonts-1.0.5.ebuild 320 SHA256 112c9fff07719601374d9e25fc1aec13e8efe531e06e13f6def245a9f3de0b46 SHA512 525bfe27f28bd109c226bfd07a7cee4b428f117e7ce8fa876b365753dc2d5d7a16b35d0147b323da0b829fa98e6ecc356162cd4a6152f8ec392abb96e8e3bc8c WHIRLPOOL f76c4b383bb84566fe947b79777c067691be9e7cc25919ab1966a38cce32b5b2f643b84bd9b041f36c3c026661a3a6cf5d5655672babfe9d8dcfcbaa79417453
+MISC ChangeLog 2611 SHA256 ea2568961c054a1d78c2e3780d5ffca9f73c606895237ac705cecf26d87aeeb8 SHA512 c60fa4de270b6e8f3b65341e0111a594e38ff8b1421731f3b5a0e054f8f0a205717c6c92191f4635e7947ff7e3aa90f54c9e5a2f506a83fd09a8b29ae150c57c WHIRLPOOL 4232f08bff9702e7f7757a1bfef453b920e28fabd5190ea63e33d8e30c796b47f2babdbb9d795632f7bc2dff844e6677a2622d06ca1e3db8a3c224383faefe6e
+MISC ChangeLog-2015 5760 SHA256 d20072fdd495f8dca1529889b0ae506dd8fc53b0b7786866524262364590bff1 SHA512 8c13cb6d3d114420137bfb779f4de6b233ceae16b06f00d8947d63ced525edec7152bb325f4733e38e64ae05afb4a24bae99d5476392cefad08281722fe220b5 WHIRLPOOL 8678055ab7c47a83f31a21f9bf05b12cc703234fe6ac1accc60338e8bab8c53ced66e2456de44a5e9e7da27d270283eb1a775a4d8df66ab31ee6ef24be2905bc
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
new file mode 100644
index 000000000000..a1aa9814f14e
--- /dev/null
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list fonts served by X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-proto/xproto
+	x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fslsfonts/metadata.xml b/x11-apps/fslsfonts/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/fslsfonts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
new file mode 100644
index 000000000000..d33dd7d2c6ef
--- /dev/null
+++ b/x11-apps/fstobdf/Manifest
@@ -0,0 +1,5 @@
+DIST fstobdf-1.0.6.tar.bz2 127170 SHA256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f WHIRLPOOL 6b435bb348de466da64930bbe41352d38f1054698e955d2d958d214668c8e0f3d7d0c21a0c87d67006f5d0005e004ee9df1e685dd2ef60fe011e23757c2d9be3
+EBUILD fstobdf-1.0.6.ebuild 321 SHA256 81c153c8bd6bedd37f13e79048fb95e2e8a5cc301535cc738b62b8b88b6ae783 SHA512 865e12d6f8cb8c5913a7fef36f5b82f49a4f138d169d1cb3649c64e61f0df6856862aa9f87353a1e7337340d5b93232a72a781a7620b5f1e45bd89ec7c1cf793 WHIRLPOOL 45991c6affb12312127ee6eab18d78b25f092e53db6764fa79d03cda1ac8a84893633f193c16062a6c224be0169512fedb5465ab6521033b0e2280115b956bed
+MISC ChangeLog 2599 SHA256 82e5d1ce4d71629a365135b935deebc843c5a17769cdafe288a352700ea184b1 SHA512 6968ddfb3990c5a6e8aca50df42c1cb1f1b70a81ba62fce55073395573a8e2ef3bbde4deee63baed68120b5e56f6ff45ad1099cfed390c6d4341602360042c5f WHIRLPOOL 79ba42f19e7112b00d8fcf607616ba9f70b39e01435aaac03815a01b3d76e129ce75717549cb29a4cbb58d804d89d9783ce141cdb5bafd4686614854b1dc6cc2
+MISC ChangeLog-2015 6009 SHA256 29d538a0b54143d381c848827307fbb615e4888766d72f3b9abaac3dde59eefa SHA512 43cffef0e4bc809ab9124c8967e103f94341e7a379d46f2caafba47b56526abb1a030dbbf571e7cbae8d35d7ba8a3d11c10de7c8250e88a206c02e15a89366a7 WHIRLPOOL e44e434e61da3bea3ed6981c32d5d5aae9d714cd1ff9a9406760b0ff336483662a431ed27594f924e8f106c35947e95e567b21e3bed684b0c51deffe01ea8c7d
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
new file mode 100644
index 000000000000..f5e7132fdb59
--- /dev/null
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="generate BDF font from X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/metadata.xml b/x11-apps/fstobdf/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/fstobdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/fusion-icon/Manifest b/x11-apps/fusion-icon/Manifest
new file mode 100644
index 000000000000..fb440986dd99
--- /dev/null
+++ b/x11-apps/fusion-icon/Manifest
@@ -0,0 +1,8 @@
+AUX fusion-icon-0.1-qt4-interface-subprocess-call.patch 1078 SHA256 24460447499d9236f35b8d5fdcdcdb19e0fd2d8020e3f37aae250b7e51403ad8 SHA512 f144178a25dc3d22a6e5d43f939a77215f8b6b9be99366043567e3e9a1b1969fc7d45f376d8879fc6636295b8a2a090068ffcac56150bc0309c79b2c762326e7 WHIRLPOOL 17721dcde13e5fa0403ed34b51917b0519e15969eb0716ea5bf2be713794c72acdb342dc70e1605acc371b0751625e14d76b6646653cc311550303a8a3864c6b
+DIST fusion-icon-0.1.tar.gz 30508 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79 SHA512 0c22d0c7a22a9c20f1285114f8b785aff6cf863d4fe3ea1198618b13d7144f459f131dccf885442908fcd82ab4ff69e5fc42e95314836725b0e51fa3190c2bcc WHIRLPOOL 7534f46df3965aa963a95b4ec796c5ef99980c9640a6d0ced6a542d5b22430b9c996d11236bbdf1c8f9f9b00bcf4346e9aaca85da571a81c16777c4e33b3b719
+DIST fusion-icon-0.2.4.tar.xz 29264 SHA256 0ebc6df6a9e839a50073221bb051400b3f472b707cac094766ccee8787812297 SHA512 dbdc68abef3ed243db30a72f367dc0ed8f875fa614c85e24235cbf06a8e1433bc30b175d43abbd8b5adf3150275f619a992602f1475cbdf235ae9cd9e1545848 WHIRLPOOL b618d49e676c941117ee48800ee51c79c2123eb5c77537dd960f516f4fc70c52b491a17b4cac18a10454c8cf3944dad44b24189a95b312a7127ef65b59fbb927
+EBUILD fusion-icon-0.1-r4.ebuild 1093 SHA256 6413494f3a949cfdb1f9066cdd187afcf441e2f0aac07097a25476101804679f SHA512 418c2b7deb6763b860b59e24b6929f2034b74a1286cce17b4b5139b0c9872cdb7069271ea4d72b3a6a30d4e5b5b382ae38910fc28922516ce65b59a5dc6af276 WHIRLPOOL 7713973c8802411f800bc3342918eae7cbb85315e0ef643ac7e161d8ea741a24b2b5f1780b563d1b41928d0d95f5f2083830f1ecb28fe24879373a509f4aa000
+EBUILD fusion-icon-0.2.4.ebuild 873 SHA256 e01a2b403c73f6ab94df9bdad6e99ed76e15e124e70bc1dc458b0c1c8b1ebc2c SHA512 536d31f6f401c27621c31342b4fca5f7282357099ac635dd47259badc197564f4d3755766f74fd4d8a6eb6f0e409315162937148117d18e557720b3e3442ff82 WHIRLPOOL b851bd371388e912508879c41d0c4522fc0d03f21ebcdddce526823738653208d5ccb2e496524415c2effaaff5c2de66f9bdbd64cd472e9275dea82bd0e58bee
+MISC ChangeLog 2844 SHA256 c1e6d423c25d58710fe3bdae04794e68a30a96e9dea3243357d02283e8ebc7d5 SHA512 9d7d923204a2e52739bc16d9b925fb1afaf89c94aab3ae83bf4f4a1e6e8276fed820fe167593b6a860cd37c054e1b0c516796eaefa497baeb0270fc767d1136e WHIRLPOOL d17befca3a167933088494cff1038bb75c3940a6dd1cae890d2678c881055ad08827f798613f756b8c9124e2da45fdc36473f96ef509d02045c59726ee3908c7
+MISC ChangeLog-2015 3015 SHA256 233f2ffaf2928fa0e604b07582a817908a1291f291964420752261ae87dbeabc SHA512 708924ea75b6b26b5eb58f205e5c66ab8acd673ca39a0afdf2a9e240c4658e17dfc9890d0905ae6f08ef63cddc462ca89bc3a8f128f8bbb3e2bef57698ce0417 WHIRLPOOL 397482db3ffbe896624d7fa1247b4c9be61b658b9823809922a74935ffc379c9ce16b576a94a080f5190d9d519fb92a5a9c93a6854930d0b6b72f40adb06f368
+MISC metadata.xml 167 SHA256 5fe493e76bba84455c54b3a46adfae5a1bfe01c764ef0d9e5f6d3e8a1d142188 SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 WHIRLPOOL dc6c3dfc7fd7f0d76c97f0786cb76a55b8564f8437f96d4ccebf985817b9f6dcc4c61830aa5df80d725e4a54b281ea2e03d6b0859214af081112cba15025e64b
diff --git a/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
new file mode 100644
index 000000000000..4829e18e60e6
--- /dev/null
+++ b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
@@ -0,0 +1,22 @@
+--- FusionIcon/interface_qt4/main.py.orig	2012-06-05 17:54:13.000000000 +0400
++++ FusionIcon/interface_qt4/main.py		2012-06-05 18:01:13.000000000 +0400
+@@ -19,6 +19,7 @@
+ import sys, os, time
+ from PyQt4 import QtGui, QtCore
+ from FusionIcon.start import wms, apps, options, decorators, init
++import subprocess
+ 
+ class Build(QtGui.QApplication):
+ 	def reload_wm(self):
+@@ -63,9 +64,9 @@
+ 				actionWD.setChecked(True)
+ 		self.Tray.menu = QtGui.QMenu()
+ 		if 'ccsm' in apps:
+-			self.Tray.menu.addAction(apps['ccsm'].label, lambda: run(['ccsm']))
++			self.Tray.menu.addAction(apps['ccsm'].label, lambda: subprocess.call(['ccsm']))
+ 		if 'emerald theme manager' in apps:
+-			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: run(apps['emerald theme manager'].command))
++			self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: subprocess.call(apps['emerald theme manager'].command))
+ 		if 'ccsm' in apps or 'emerald theme manager' in apps:
+ 			self.Tray.menu.addSeparator()
+ 		self.Tray.menu.addAction("Reload Window Manager", self.reload_wm)
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
new file mode 100644
index 000000000000..d781541f333d
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils gnome2-utils
+
+MINIMUM_COMPIZ_RELEASE=0.6.0
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt4"
+
+REQUIRED_USE="|| ( gtk qt4 )"
+
+RDEPEND="
+	>=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
+	>=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
+	x11-apps/xvinfo
+	gtk? ( >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] )
+	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch )
+
+python_install() {
+	distutils-r1_python_install
+	use gtk || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_gtk" || die
+	use qt4 || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_qt4" || die
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild b/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild
new file mode 100644
index 000000000000..16d202465323
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz.org"
+SRC_URI="https://github.com/compiz-reloaded/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt5"
+
+REQUIRED_USE="|| ( gtk qt5 )"
+
+RDEPEND="
+	dev-python/compizconfig-python[${PYTHON_USEDEP}]
+	x11-apps/xvinfo
+	x11-wm/compiz
+	gtk? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+python_configure_all() {
+	esetup.py build \
+		$(use gtk && echo --with-gtk=3) \
+		$(use qt5 && echo --with-qt=5)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
new file mode 100644
index 000000000000..7a38bb900964
--- /dev/null
+++ b/x11-apps/fusion-icon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
new file mode 100644
index 000000000000..9d8d3ed2e2dc
--- /dev/null
+++ b/x11-apps/iceauth/Manifest
@@ -0,0 +1,7 @@
+DIST iceauth-1.0.6.tar.bz2 133531 SHA256 bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4 SHA512 45a89d9742570f837225313032a63d66e658c379e7f6b776836e5aeed17443b26faa48ff23645517bf32353fb346de13b62c61d43f1fb1b044686d9fd4c4578d WHIRLPOOL 55782babd470118313617f0658ab0e97809a6135e6fdbf0d74671b797eccf65ece8bb1d4119fe2e280c83ba1a67fe6eaaeb3ac4523e13c22d47fb03553e0e494
+DIST iceauth-1.0.7.tar.bz2 135656 SHA256 1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a SHA512 4fe08b3137904c99219456716879cbdf5b49ca9bf390011ffb44b1e896f9a6e008b5f761346a533e682f5cfbf18d18a859c74ad4268ec8d40002ffb79c33bcd7 WHIRLPOOL d52d4b027f0590f7435457b1e2930575f3b2344a589a1f57a5db81549267cae93f68d09a1f362bf9ba4c1b7d9b1d8dd39a921c245d5f1178090862b421b3074e
+EBUILD iceauth-1.0.6.ebuild 434 SHA256 dea017bcfd60d2ed48981423fd39d635e9f28ff1318de432abeb15c620a05fb7 SHA512 ee373963f28ab08c1c477ddb3947e6b7d184df9718648d8d2d51b7832830ce2644462a8cef6efefd91951750209c724cf457d092f1a12892a6eec35fbd473a1a WHIRLPOOL c9c4bf42c087a4896810acb77db7feba8567c0a42b59badea78a94cf4546e3f442b0007072c27f46f3cba7d7201ebec7fb20d3633eb69ae0bae29ca1ce096758
+EBUILD iceauth-1.0.7.ebuild 427 SHA256 2967f1372aa6a7824d753c94f79c0573e5d2005865fc47e604afc9f61fd10110 SHA512 736552cd21600a814d3b880e9b145db70df5e955dd0e34c6e44e408d75f7f1f7528c742d53ebe72ee8703004a02d6c495aa1a86e599af28c3b82cbf6d3811642 WHIRLPOOL fcef9328a1e4fb5d756a824ea9169247fd5fbc8a3a98e081e5568c26cfb785b8f75ba1247ec428efb262d00545f2822197748e98746c2699b85fd88277f7ae9d
+MISC ChangeLog 2479 SHA256 2a274bea25b7d5e24e578ad4845db69b7af12e8dcd5287cf8e1c8a777e283998 SHA512 797d2f80c6bc584b880605f8a881fb03b380adc9f43dbec0afd45fad029ab88ea86633ccaaf8ea60197e54bc5f86957f051de8d473d6d051b370da9f1b8c5b1e WHIRLPOOL 3a7fd1d74674625aa0ee9c308e11fbca13082adff5e94da05537c0c3521b5e3e89322c9bb69ad6ebd5fa91426891ccebc1010f87ce48cf2c488b0b730ab8c3eb
+MISC ChangeLog-2015 9596 SHA256 4c513febf25a8ff700df74d1863759c92f2a3f3178adf216d6510e21bd5efc10 SHA512 f1c8c92e16d27546f52eebca5560ee18fe338da8e560b97b9237c75fd7600540cb6ee2facbc2b689296cf06ddacd806333bb2dc587d29bd93c2a5543507fc96c WHIRLPOOL b9e7ad8d9e4cb15f66c5b66e8a1d45e67a3242eeb8e07e14b603175188ef2ee5e3b054be65a0abfe8c9fd4d59ed7d01fd1dbf92dc2095daceb762e2feb43c367
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/iceauth/iceauth-1.0.6.ebuild b/x11-apps/iceauth/iceauth-1.0.6.ebuild
new file mode 100644
index 000000000000..a9c41f4f9f7f
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+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 ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libICE"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/iceauth/iceauth-1.0.7.ebuild b/x11-apps/iceauth/iceauth-1.0.7.ebuild
new file mode 100644
index 000000000000..2d87cb33677e
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-1.0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libICE"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/iceauth/metadata.xml b/x11-apps/iceauth/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/iceauth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
new file mode 100644
index 000000000000..9e7a1f969653
--- /dev/null
+++ b/x11-apps/ico/Manifest
@@ -0,0 +1,5 @@
+DIST ico-1.0.4.tar.bz2 127619 SHA256 2932767098f95ca129a0c7f0fecb0a18c789a79c1747f7423fdfe9f4e0c53590 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d WHIRLPOOL 26dc20e91710a583cdb0963639402cd63f4726492b951a10f5ec6299ec014a72cb11ce18a7aab7fbf0dd36b2b3ae998bf85d28461c5bc98208591a5f4e559627
+EBUILD ico-1.0.4.ebuild 315 SHA256 94e87f5707a08754f295c1ffc1ca2c4f954da6723a8ab2c89e28a3b81a99d1b3 SHA512 3e0b292da26e8d75db91b6addf351389797c34db07fa93ac4688b0b47c1d6c671a0fe27214b33c54d1e2b325a4d53c8cbce787dde19ddf7b605e5d90fa003f34 WHIRLPOOL 6c47772007d5a2027b66a44d79d4ea39f4ba66592cf3f2aabed2e3b1045863249d61251a6440283a08fd66d3e849554deab7ea7c3b1ba022272fbb47b1b56196
+MISC ChangeLog 2415 SHA256 b37179af90684b59a86ca55b100f83e7b9df5b5d722879199ec665dbc0b12d93 SHA512 01de573d4a054d89465e9f423718285643b7147cbd6513bc3f6bc5b9c0e0b1dc4b5657105f657d93828f33886e4cae4676c557952604616cd985f92439bc0a28 WHIRLPOOL efb46ebc37565cc429280e60dff5fc6877c535a3cd20416e7606172e944d9c20a04a5fa7fdc5718a831e9fc4130f9243e76a4d2d7706ddb2a4db6e051d6af607
+MISC ChangeLog-2015 4043 SHA256 6610e378dcab9fa42baf7cd05e205a21a1980fa453a7aeef63adb4c450d425d8 SHA512 95f89d74766f81e83569f9b4f8d576653f39c73dc38fdc7ada0c2a6e066b64f59f8c5a4e3dfe4d2c75d40fbbe9be3e2ba249b1d63515b57e1d2a38a9ac53cf00 WHIRLPOOL 7c2d9ec0a7a7dac166271b0b3347d1210d5c2110ae66a15bd204f3c3f3342615effdd084f95110bea9e5a45c549df5df9466d1861882c7810bcc47ba20011142
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
new file mode 100644
index 000000000000..beaa0842648d
--- /dev/null
+++ b/x11-apps/ico/ico-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 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/ico/metadata.xml b/x11-apps/ico/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/ico/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
new file mode 100644
index 000000000000..3037f5218967
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -0,0 +1,7 @@
+AUX intel-gpu-tools-1.12-inttypes.patch 679 SHA256 c4f68517ca729cbde4659fed2bb612d73fe147146d34f2187db677d19df6c7b9 SHA512 d7344bee96c706b077b51e0f01af6de10b0a02ed476919b0dd1383bee703ff97d6bd608a9e731b6f572312745c2484f4039fe8629b9c6cc6cd96abeafbd57e3a WHIRLPOOL dbce703192af55d7f0fb82db55fbcd3ee5026a507173fba4494a05ddff61a9b36f72251d7c0490b06273004b835ae64fe572eac89915cde95a26afbeb21249ef
+AUX intel-gpu-tools-1.12-sysmacros.patch 981 SHA256 4a2fe8fb8e360032ed68f11de040962595e7f511aac3fc13c7a2a2f8adaf6a9a SHA512 382094cdf8b3303f0691820e8937c15b978d34cd5c99eb43563ad2556eea261085a052bc3e8f8698b22537981a386ca30c824f80e480548a3b20f45a9e533e7a WHIRLPOOL 409c79bdfe16bc5fe7bc2dbedcb01f0297b7cc805238e0c6db42f72a9a0b60f50927ee75e2741c1e650aa59f3383c9119eba4edfa083b4d6f0d46a84dc4805c8
+DIST intel-gpu-tools-1.15.tar.bz2 1827851 SHA256 dcf256112d2692aa49ce6c6d17a898f60b3709b98c2f1c4592b23d22371462bd SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559 WHIRLPOOL f06c522587cb389f519939e2a2bcfe832f6b5f59f440722443fe0098fe15d9a2a7b83c3a92c330890c5bfc24a5c75f3cb963a39e9b58f9bde926e4448bf9fc6e
+EBUILD intel-gpu-tools-1.15.ebuild 1310 SHA256 6075600a37e625b95563c337dd82070aebd23190cd817aab7a98ce2dcf8f403c SHA512 aab618d20956444222de42e8bb27130e6a6f76e2d83555da0fc6e450ed8f8304778366d9533e519e3c01760ec5027d1e83faf55de4de77e373bdf3d90503abc4 WHIRLPOOL 1d0f3a0754ef9fb00d4dc4fbdb7cf890d2731fd4cc6e606a533194e28f212d6a581e4939b53cbeb89b5474e2efa33142a5bd31cf89363e40ca5b4e25fa3578c5
+MISC ChangeLog 4681 SHA256 557dd61c5c127ee266bcd1606a74241aa90b29b3b890878fa1c7908332e4a5ae SHA512 1434763661882bbb15c50d6adbbea31e34d649e2ccb56daa671c69a1217bf3c9495fe33b8560612b2ea836bd8dc893accf1be7a807c85cb609e29ea870a8e66e WHIRLPOOL 564bb1069d9f08bd8dcedd440c3c74dd8ed9526b9a04b9f9773e54c25f98a26bd6720f40cf5f3ee066658c56ba1518d0e4883e35d38b0c09face5055b9b67813
+MISC ChangeLog-2015 4437 SHA256 9a2d40fdd72185d44e8ffbad3ccfa6da7bba346bdc159339dcaf975a5595a03f SHA512 91f716186ff89714874c297d7482a355d41b64a1a0e1a7b44b03dbb064f263dbe68f3180f65de6d03ac9ffb83f9e0a1184ff141e85094530c35d3629da81c048 WHIRLPOOL 0521b08ec3b02017937c16f3342d4dcd77c8137bdf7a3d37d9a28bb5e141cd6dfed963d22083592292c4e0f979643b839fb1a16ec8a62ea3be9d89e4170b4b6b
+MISC metadata.xml 403 SHA256 c5933c2c78db44671949f9befb68ecfb08c9543e5a1a698c49572de3d334354a SHA512 a4a315caf4f2ac38b6cfb0bac96776bddc4be6c79abe3a9dff8473a2443fbca7dd569df04abc9557160951e4894ac49f83f925a2fbc7f0a0e1df7924169a2a0a WHIRLPOOL 0fff29c117a4299ee1c4faa2540947c168e16fa0d0b4d48b04076935368497e68115faa7d30d1bd4f421f84a02cbca076cc92efe92b7aa16b3a98f4c583b01d8
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
new file mode 100644
index 000000000000..02a97c48d121
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/582430
+
+From d24f4a5c5fe45e2fad8942acc137f87cd8f35ea5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 14:37:38 -0400
+Subject: [PATCH] include inttypes.h for PRI defines
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96620
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/igt_fb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/igt_fb.c b/lib/igt_fb.c
+index 61205f345707..ba29eae5cabd 100644
+--- a/lib/igt_fb.c
++++ b/lib/igt_fb.c
+@@ -28,6 +28,7 @@
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <math.h>
++#include <inttypes.h>
+ 
+ #include "drmtest.h"
+ #include "igt_fb.h"
+-- 
+2.8.2
+
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
new file mode 100644
index 000000000000..c805c120f552
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/581080
+
+From 3e8cc82d371b23303cd4f30e4bcc9c5ecb10ad11 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 14:24:42 -0400
+Subject: [PATCH] pull in headers for major/minor/makedev funcs
+
+Use the portable autoconf helper to figure out which header to include
+for these funcs.  Linux C libs are moving to not implicitly include them
+via sys/types.h anymore, and other OS's have long required you to pull
+in the right header directly.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96618
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac    | 1 +
+ lib/igt_sysfs.c | 9 +++++++++
+ tools/aubdump.c | 8 +++++++-
+ 3 files changed, 17 insertions(+), 1 deletion(-)
+
+--- a/tools/aubdump.c
++++ b/tools/aubdump.c
+@@ -38,6 +38,9 @@
+ #include <errno.h>
+ #include <sys/mman.h>
+ #include <dlfcn.h>
++#ifdef __linux__
++#include <sys/sysmacros.h>
++#endif
+ #include <i915_drm.h>
+ 
+ #include "intel_aub.h"
+-- 
+2.8.2
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
new file mode 100644
index 000000000000..75ee7a50d996
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="amd64 x86"
+IUSE="test-programs unwind video_cards_nouveau"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+	>=x11-libs/cairo-1.12.0
+	>=x11-libs/libdrm-2.4.64[video_cards_intel,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	unwind? ( sys-libs/libunwind )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12-inttypes.patch #582430
+	"${FILESDIR}"/${PN}-1.12-sysmacros.patch #581080
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable test-programs tests)
+		$(use_with unwind libunwind)
+	)
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+	if use test-programs; then
+		local testprogram
+		pushd "${AUTOTOOLS_BUILD_DIR}"/tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null
+	fi
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if use test-programs; then
+		elog "Test programs for DRM driver development were installed. These are not"
+		elog "designed to run outside their source tree, so may or may not work as"
+		elog "intended."
+	fi
+}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
new file mode 100644
index 000000000000..49b36752d733
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<use>
+ <flag name="test-programs">Install test programs for DRM driver development</flag>
+ <flag name="unwind">Provide automatic stack traces on test failures</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
new file mode 100644
index 000000000000..b535cb35aee6
--- /dev/null
+++ b/x11-apps/listres/Manifest
@@ -0,0 +1,5 @@
+DIST listres-1.0.3.tar.bz2 115429 SHA256 c3d71e9a01650e3fd470189a749cd0202ef03d9e399350a7a7443d7595ed478e SHA512 999156e9fcf1636fd4a398dc3940749eeab3b514141b9dc5125bbbb4c611c0fca9d4afa7e3b127bd9e7d3e3f94b942ef3be6aa79636eaf89bef75353c8203c22 WHIRLPOOL a59694c0dbf2b8286eb3c9e9855f4b1f6193fb19f2c068a2b951abba9bea576636ac2f7d2d02126bc7cc0f7aadb61df0da3b3462ad65faaf03b83d4ff22a6778
+EBUILD listres-1.0.3.ebuild 336 SHA256 175e5bbc8731170c0f1028195969a053579d357da57709f30466f2e5ba405b07 SHA512 8a40929741355112ea57e33a6b67c2538a01536ba56d6e65869a4c8900a8b08c7f58bcf29a73432b2559e4db9d8c2e4d4f6632b3ab2482162434c46ec1ed90cf WHIRLPOOL d352c43943f803998da75e3a9827bf7d37a277d99283cd6c4a3c08bfdf4f851feb1d365bbc49a6a636e446853e81122ca204e407a88f956d360b408632c21674
+MISC ChangeLog 2427 SHA256 5325084ed70b164eb02f2b56c40ac37c92f04436a53ef330c34486e05a15fa5c SHA512 1e456d1797aaa30d985efaaf73831517ca4ee313ef699195b4749dd236248249f18b265e7cffc200c3905671d328e96c4adbd25d7a215094b230c61190566a1f WHIRLPOOL b8b703675ae7b1e3df6d54eb9f8a971c7881eede23450cca03756af0cd9e5db7012e08c73cb40671e38bec1b43565ac33ea9dbda8f6a1197ac7dd35a4944cdab
+MISC ChangeLog-2015 4770 SHA256 ad2cbbcaa9cc3805ddcca795ad2f9e411935535870e13725183efc6931448514 SHA512 18435c7bb09011291587b36170e76ac95aa116aad86001e2a148125cdf4faa33d76549887d98262d78596fa38ff62f516e805800426e6f871a0a16d5d6a230b3 WHIRLPOOL 86e4d461debe023a228c18e5e89f296994d17bd8254fcdfd6df7dbeff3cea356a42005a383e8619abcee7746591947aa8ad76abff0924451e74a9d81caa7e52a
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/listres/listres-1.0.3.ebuild b/x11-apps/listres/listres-1.0.3.ebuild
new file mode 100644
index 000000000000..f3b647b0af7d
--- /dev/null
+++ b/x11-apps/listres/listres-1.0.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list resources in widgets"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/listres/metadata.xml b/x11-apps/listres/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/listres/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
new file mode 100644
index 000000000000..cd318759a1cc
--- /dev/null
+++ b/x11-apps/luit/Manifest
@@ -0,0 +1,5 @@
+DIST luit-1.1.1.tar.bz2 140044 SHA256 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6 WHIRLPOOL 66d850ba9f13cfe88c0c619dbdc77554fdce7e078fdc62d936b858b879e8d4ce65f1538079e0fd70ab01c254d3fbb3da4c2291b9588763ddb546a6d9d398893c
+EBUILD luit-1.1.1.ebuild 682 SHA256 8423e72ef651a1640febe4737cdfa9e4f8476291f32337a6cbd45cd9fa1955ee SHA512 4d4322d2c0863d8b82c1a8ea300bc7deba2a6ebc70d8dd9ea4fcc9b12e5a14744b3bbe17034d9d1403dfa69ab40840c4f980356704abcab37ffe57725e5bdb55 WHIRLPOOL f29f9d0ac889714aebb7d6ac7cf57ff81669d850dd986ac1b98f54fd644e1135bdf55eba7b5df8538e910aa5a0ca94b144ebc7257275b038dd2213d354cb13b2
+MISC ChangeLog 2577 SHA256 ede03e433b2d19d1e9720f194ed968985833ad6b35f219e40a4a21f010561cc8 SHA512 8f3ad22919a9af39f145051d4de5b3d6c507c5da1052d3f1dba9437c1bd5094087568a47ece54b0f61b22bb7cc887d0769ecff546a34b1dc16b219c3a3c8c178 WHIRLPOOL 0cdad9f7377eddbc1ea1bfb4dc30619e03ea796fc9b6e10b4e2405f54007c73e6e704ac2b4f554f6885fd2947eb592c8821907076fe50fcf69a73a38823baffe
+MISC ChangeLog-2015 9271 SHA256 76a5e45f3ee207dfc7cbd8ab7e80ba1c46c9a7ae74087394506677ec534e5dce SHA512 660e1b0752abd3131a7c6af5218cfc3d529de28f2574addae371229bd0d9de153acf2040040cc301e49e0698bf1c80d468b5d0657ebb92562f00a75b9f540046 WHIRLPOOL d4bc8abffeae25610d781e1f115c09110f16e1ab4452b154278f669993c6dcbc8eb7a1bb00eb72638697d16df9fef666b01651c24b771b8c68bd3a26ea7c491c
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/luit/luit-1.1.1.ebuild b/x11-apps/luit/luit-1.1.1.ebuild
new file mode 100644
index 000000000000..fbbfbcd6fd9c
--- /dev/null
+++ b/x11-apps/luit/luit-1.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# posix_openpt() call needs POSIX 2004, bug #415949
+	sed -i 's/-D_XOPEN_SOURCE=500/-D_XOPEN_SOURCE=600/' configure.ac || die
+	xorg-2_src_prepare
+}
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/luit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
new file mode 100644
index 000000000000..988deadb982f
--- /dev/null
+++ b/x11-apps/mesa-progs/Manifest
@@ -0,0 +1,9 @@
+AUX mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 1182 SHA256 607d50474746e71102ce008cb20baac09dc913dd4b07245de35998851cd786ff SHA512 0c2c5bf3b938215ab433e698c253b35a535562ebf8f8be0dc903b4e916224b298d0381e19bae462c75733a078b929173f3074230e1953d5135b7e0721cb5117e WHIRLPOOL 06bc061aff830a261786e65f2c9c68e794244d6b3918204862effb8d44c9480cbafde9afe03b62580c7f09de969259234d4723bebfdb27c313fea109fab53a13
+DIST mesa-demos-8.2.0.tar.bz2 10071635 SHA256 e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de WHIRLPOOL faa4dfb6ee32d81a4569f883d587ea96e76da1c97df26effaff1fc2827b359de40bb61a5b87f46e13993bada2d37ca333cfb1f2023f953829c4d6fb886553899
+DIST mesa-demos-8.3.0.tar.bz2 10044647 SHA256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f WHIRLPOOL 90eaece4019da0d7ee95dc587650d8ec889aaafbbbbf59808ddbe85cf626a05a2af62ce55a3184895aac8de6a4032e58d99aae3a4f38f07ec9c71c0f22f88dfc
+EBUILD mesa-progs-8.2.0.ebuild 1783 SHA256 ed6d0b3a9ed779a99c32673d4b3338b2f193b1a5159a29238c4d905421f640be SHA512 925ee6661e7dfbc02b901a6b3ae43099b6e78066ad2de269bef931be76c9ef728a5a9a0e7de00d681cbacc904694c831b297d17de8dea0a32717a206b176238e WHIRLPOOL 053d5f2a33af3f93752b072b2064ad37cef6b2e2fbaf72ca27c4550ab88a436a0be63076aff6f4256ab4b72346404086e1e63fbec8ab959fc02465e242d896a9
+EBUILD mesa-progs-8.3.0.ebuild 1762 SHA256 996d5e21dce9d3256a561fce615eb28fe9490e344c9a3f896fb8941b48e85863 SHA512 d66ef4b3b89275b12721bd0b0f2eefe400b22c8820ad155c0fed19828a48441ee6feb6f6ed26a9b2ce16735d8e4ba5e0d0590bc478ae2a63917cdafa65e76126 WHIRLPOOL c1a4e37cae80b6cff015da61f416d31dba73975e8aeaeed8311a17138bef4ab89336217f1327cdb4d19bd84ad88a0b20e58de69510031cdca762c849599fee3d
+EBUILD mesa-progs-9999.ebuild 1726 SHA256 95d5c355ce84cce13410099fc2cf26cd1165d0c18f6b9a2c33c96fe3c08231ec SHA512 97e37c0f755302606ba7ebe3532df29bfcbd9eb46733d6b59e7fc3f86e134633b581b0ad058a3fdb6507213f47a5db1f0ebaf50222464562dcf4efc0bce86632 WHIRLPOOL 4ac1303c53779db814ce012e623b41d02202e43d58b039176f5dad158b44cb95d4f06561c43401137fe4e8ccc25ac1be042959ec813a0f9350f5ad92c7e91d39
+MISC ChangeLog 5760 SHA256 210a34c21f672b6e78c08e4f27d0a9e4a5c9edb9091d8575b007df49a40980cd SHA512 68a9f7ff5174c5725f03c0628eb40f380bf7c53d9de76cc21705882fbcc9b595aa4932e06a7d79934c57a4deffb041a18a7d98d6bb72f3578814d7512a2bb64c WHIRLPOOL df39141860f8f3c9df3cb3ae6e644123142b9da796001b9400e6cec1918f7b8609c7b0aa169467cffaefae06b5c047424bfc27c6ccd91b8bee695acf00af67b3
+MISC ChangeLog-2015 14735 SHA256 aed7618ec0d20e6e417f1ca888d340c1c0ac60f7e8679ce1ead92fcfbe467d35 SHA512 16b38165d950e84099e3f5aeecf4acce338b3cc4aa0378d0a42ce2bdc29dc2446df779b78ba86279326c3f5d9761db4911a14fc08f04b85b2ac65e81f3ca1e86 WHIRLPOOL 2275d022288aeae78c75154227db0905b7a01e11cfd9acc642f1096dc5068eab780b73f53449a2b3caa8d246e7eee5196bb4ebc651bc2e5928fcaa7fd59b2b58
+MISC metadata.xml 475 SHA256 3cf259da0559db33e97412909769f94cf6eb6cce356878efa4830e22890c7d47 SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675 WHIRLPOOL 76ff4e504e7d4481f960ac938e15c698bf777de105cd650386b201f01554af61926ec8760e834aaaab5035113119e275c0af0a4926b8067f7fea3278e7689a99
diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
new file mode 100644
index 000000000000..f0389cb8d9c7
--- /dev/null
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
@@ -0,0 +1,33 @@
+diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
+index 2ee6f15..9921746 100644
+--- a/src/egl/eglut/eglut.c
++++ b/src/egl/eglut/eglut.c
+@@ -76,8 +76,7 @@ _eglutNow(void)
+ static void
+ _eglutDestroyWindow(struct eglut_window *win)
+ {
+-   if (_eglut->surface_type != EGL_PBUFFER_BIT &&
+-       _eglut->surface_type != EGL_SCREEN_BIT_MESA)
++   if (_eglut->surface_type != EGL_PBUFFER_BIT)
+       eglDestroySurface(_eglut->dpy, win->surface);
+ 
+    _eglutNativeFiniWindow(win);
+@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h)
+             win->config, win->native.u.pixmap, NULL);
+       break;
+    case EGL_PBUFFER_BIT:
+-   case EGL_SCREEN_BIT_MESA:
+       win->surface = win->native.u.surface;
+       break;
+    default:
+@@ -289,9 +287,7 @@ eglutDestroyWindow(int win)
+    if (window->index != win)
+       return;
+ 
+-   /* XXX it causes some bug in st/egl KMS backend */
+-   if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA)
+-      eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
++   eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ 
+    _eglutDestroyWindow(_eglut->current);
+ }
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
new file mode 100644
index 000000000000..1e807c1632f6
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-EGL_SCREEN_BIT_MESA.patch
+)
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
new file mode 100644
index 000000000000..d999d44c52e5
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
new file mode 100644
index 000000000000..3765af34344b
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+	media-libs/mesa[egl?,gles2?]
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	media-libs/glew
+	virtual/glu
+	x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+	base_src_prepare
+
+	[[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+	emake -C src/xdemos glxgears glxinfo
+
+	if use egl; then
+		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+		emake -C src/egl/eglut/ libeglut_x11.la
+		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+		if use gles2; then
+			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+		fi
+	fi
+}
+
+src_install() {
+	dobin src/xdemos/{glxgears,glxinfo}
+	if use egl; then
+		dobin src/egl/opengl/egl{info,gears_x11}
+
+		use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+	fi
+}
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
new file mode 100644
index 000000000000..733cce5b7dfb
--- /dev/null
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="project">
+        <email>x11@gentoo.org</email>
+        <name>X11</name>
+    </maintainer>
+    <use>
+        <flag name="egl">Build EGL utilities</flag>
+        <flag name="gles2">Build OpenGL ES 2 utilities</flag>
+    </use>
+    <upstream>
+        <remote-id type="sourceforge">mesa3d</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/x11-apps/metadata.xml b/x11-apps/metadata.xml
new file mode 100644
index 000000000000..acb438fa4def
--- /dev/null
+++ b/x11-apps/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		x11-apps contains applications distributed as part of X.Org X11.
+	</longdescription>
+	<longdescription lang="ja">
+		x11-appsカテゴリにはX.Org X11のパッケージソフトが含まれます。
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-apps enthält Applikationen welche mit X.Org 
+		X11 ausgeliefert werden.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria x11-apps contém aplicações distribuídas como parte
+		do X.Org X11.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria x11-apps zawiera programy wchodzące w skład środowiska
+		graficznego X.Org X11.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría x11-apps contiene aplicaciones que se distribuyen como
+		parte de X.Org X11.
+	</longdescription>
+</catmetadata>
+
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
new file mode 100644
index 000000000000..1fce8907cf81
--- /dev/null
+++ b/x11-apps/mkfontdir/Manifest
@@ -0,0 +1,5 @@
+DIST mkfontdir-1.0.7.tar.bz2 108195 SHA256 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530 SHA512 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f WHIRLPOOL 3f6ee8424bc57c2d3ccc7b293402124a3823697bd37438601eb17b7675b72b6b9531432d07bef137e28bf6d40c89fa6b8e08970d7338b942a579b9eecfce965f
+EBUILD mkfontdir-1.0.7.ebuild 461 SHA256 33f189f1c7903393ff109b4a00a76ebbabd9dbaa3509ab836bad4f205a23571c SHA512 085c9bc495b4178501c3ccf00063c3a5edd21d85a919bd99645bbfa49776c8a9e1d5346a97ad825197189447d057159bd1b01385c15de17b60688944afa00793 WHIRLPOOL 5aa855db0d9fd742016e117cea2197be974f80f4d092649a89e7704ef164b759e58ac3327ee2dd1133603225e10cc4a7ad01b828edcf16768298fcc551d83137
+MISC ChangeLog 2433 SHA256 d274b4111a7c41e03b0672e72653e6ec69d3baf1e3a14ab0c0dc7916e5053c1b SHA512 67575e635fe439e08e5b0c4b2a9b9987f766fec6875253c9b1c23f848361b21249c3f68a679544fee6ea8380672e7db687be95d1e29aac4a08fbb2ec7b847d18 WHIRLPOOL d113cbd76957af2185b3143b1e0ce5a15f1682f5fe6d8785cc3ed0333bfef8e29b398eb23a1fde2e5c6e70cc91498363bfa2d9ce167dc56bdf8a6e478314ea61
+MISC ChangeLog-2015 9516 SHA256 5442351493e6784c271f14cf053138cd8e7f130f12acd6c677ec9cc69ffa5ab5 SHA512 cc7c141e793de9e73893db16af0ecaf3ed289659bfb06aa059b663657ac342c019073cd7a3b6ff41d7bbe767040b5f3ff57289ceff815322f6e6617c6527c530 WHIRLPOOL 5337978d970561409ed544c8e0b39d326c90b5b1d4cb0c9ef216b85393332c5a463e74a11dc789bfd03862b6a7affac71cb7aa545b3f330fa058f0963cc9c884
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/mkfontdir/metadata.xml b/x11-apps/mkfontdir/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/mkfontdir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
new file mode 100644
index 000000000000..5dc5f74d68ae
--- /dev/null
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="create an index of X font files in a directory"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-apps/mkfontscale"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
new file mode 100644
index 000000000000..3e51bd1a46e2
--- /dev/null
+++ b/x11-apps/mkfontscale/Manifest
@@ -0,0 +1,7 @@
+DIST mkfontscale-1.1.1.tar.bz2 139923 SHA256 244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731 SHA512 7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220 WHIRLPOOL 36584d969899c135b5efe3c8323a721bde5ff7b7909741d94f1548b8d9f6b8e57527a522edcf34ba2c5f076f01fed454e7d12bee39d345e0513b76fcec29c4d8
+DIST mkfontscale-1.1.2.tar.bz2 141728 SHA256 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20 SHA512 5c3331f66cd523afe95347aa36440655ba8fdbc716c5987a24ad624c1fbd718c4a8d67aa36330f6d5ab2eb5a6195a409a041954568c0a3375c0e2aeb6a955601 WHIRLPOOL 0a915e4915250bac3d057e8d997188c2955c6e4d6d0ef0299b53d39afdd2ae55e5958fd32de721178520b5533e4452f43c29ed4aba869eaba8408ca730578045
+EBUILD mkfontscale-1.1.1.ebuild 573 SHA256 0440bb08eee1c047f3e73a2acc910addd410e9c9bf98affa303920a2619f9ba5 SHA512 524a44269125f2b1ee9a0a03cad546a80518c2e10e92a7e26010d2f519ee71dbe26b34fb3b06c8f7f21b2ad1302c2a7a6ca4e3b4e127383d33e8b0ac7a25c561 WHIRLPOOL 6414086e0072b3fdcd12a9c8bc0283a2225591718b7342ba169192aa50de1fa2e6ec4dc16c6c2cee4b24f762c5537754a10b27271a231dc4e85280e21a4ccbb3
+EBUILD mkfontscale-1.1.2.ebuild 613 SHA256 34ea103e764af9c8936bf8f811bbfced605cfca2fea73272048c758d0a4249d9 SHA512 f00fccba5d5635ecc6b7002f03c706600109e21a5df4c82266e823445a2c9418d4ae457f167450df2e72856a6e56c0faabfecadeee87a861271d7d1a8ab03775 WHIRLPOOL 15095884b75769cafae0b5bec2f431c4967d83b6263eb61131ae4a5acdb313a6fead34b93e9744ed3c5298eda04feaf09932b71312e5c8ded5d1ab2cc6941dfe
+MISC ChangeLog 2648 SHA256 00cf768a84c2950f9a222008fb338d0f9efd49d1fa4cb084032aea48d4825b8e SHA512 7dba2193bc18499a19da7bfeae8e5e98bb6d473b2fb6cf5749aa2d7c4d671f26f78ce3435a259c650d173184106c4a58ede75b3e0a044c9935a1404be822f947 WHIRLPOOL 96f9d6eec7b180292ce923ef7b73ef5ffb28aae4ef1996dfa90b943de25b9d586315fdb5f6b7ef640d35ef9f2b2aa42978f845d10185b812c2a31c377bc61d38
+MISC ChangeLog-2015 14966 SHA256 b8086e4bed1d1fab5c78b5fa05a043148370366cb34cfaaaf001d448ebf21161 SHA512 d991c1126e298f5d5fdf30e5af8423dc66f5d9cac45b6111b18bd97f2f70ae1b494cd9120f30e92d44360c92061e92f3f4f1d8df7b4ff7e1b351b7a61e13ba8d WHIRLPOOL 50187ec00717766aee9e82e32df7bb054cbb5bc5d35e686b2b0bebb2311c016d10d75fd080421a2386faced9085aa53c4eb26f5efdba9ddd34653f4d9fd3808a
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/mkfontscale/metadata.xml b/x11-apps/mkfontscale/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/mkfontscale/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
new file mode 100644
index 000000000000..c95b6737e415
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="create an index of scalable font files for X"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libfontenc
+	media-libs/freetype:2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	app-arch/gzip
+	app-arch/bzip2"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-bzip2
+)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
new file mode 100644
index 000000000000..17fd24b91e3a
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="create an index of scalable font files for X"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libfontenc
+	media-libs/freetype:2
+	sys-libs/zlib
+	app-arch/bzip2"
+DEPEND="${RDEPEND}
+	x11-misc/util-macros
+	x11-proto/xproto
+	app-arch/gzip"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-bzip2
+)
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
new file mode 100644
index 000000000000..1c8c4b6e0901
--- /dev/null
+++ b/x11-apps/oclock/Manifest
@@ -0,0 +1,5 @@
+DIST oclock-1.0.3.tar.bz2 122758 SHA256 54f5fb85f5828705683f457e559fb18753332db15ae82da561b0ae5a63915091 SHA512 438e92c3ce79c4147dac687c7310f86e0839bff975eed9f19a75c0979e4d26f782a53af930dedc7c42b1f9ad5a37e853e3f10da0ab63d30526c0a23152825a62 WHIRLPOOL b9bcc88135501f24e74fec7b2d750611d495bef6c197d294a94306d8868aa73829a6fc48be783bec920862cee9c434d310c5ebb4c77366eed9223254e0270a56
+EBUILD oclock-1.0.3.ebuild 378 SHA256 264b82835f5f20781ecc4fc17f896bff21b923b9d95925d331560b9739f944b0 SHA512 0af6c397b9f3380a4413c704fdd895c71ab918d69c41ec224c9dfc9d46e677dae2bf0b31053e115022a5526c3e46f892c3ee09a1328516b4c2daf50a26399d07 WHIRLPOOL 4c27b38d234ffbdb72eb42240948cebe8296026ddada6c665fee8ae648b9b2673626f6ba220298c5b5315d7808904c5d77f7ad2553a4eb71e57fc960f81ec1f2
+MISC ChangeLog 2424 SHA256 26b030e623a893fe8d1cfb44d4f37a8af5c4ebe9b2ed49298e1fbc426b227d10 SHA512 469370e5894ae4b6a9587ad0d2b3bf952b6b0363811960e43f7cad46dce91a748bdd6cd7f3b5fa5190eeac182122dd61def234eb7c0a79167bef0ba07306c54f WHIRLPOOL 034f058cf2191bcf10f12a0616aade052ae13606bb22a2c0cbdce553c25917fdcdd07c98d431216fc57b86e2bd879f9c7b25a701598289c569dba2a7b9b9b4dd
+MISC ChangeLog-2015 4111 SHA256 1b22fe66a04c3687ab5fae3b9be74591c83612b17f0296708337313a5a487dc2 SHA512 f4f3e388abbf19eef4ce48b591dcdc080050ab5c5149cef00e3292f13bdd87e43f377b5a8786486e22b1a80f18d490b39950f166dc3ddbba29bff6e9eca50f7b WHIRLPOOL d44071dc7b665c54203fefe971ede4f131724983d0949084c8d09e840a0c59a71336194748e11ed00c65002e660aa6f8d5ee457d70a943fc3d68194ab0edb51b
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/oclock/metadata.xml b/x11-apps/oclock/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/oclock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/oclock/oclock-1.0.3.ebuild b/x11-apps/oclock/oclock-1.0.3.ebuild
new file mode 100644
index 000000000000..27a2d3042bc0
--- /dev/null
+++ b/x11-apps/oclock/oclock-1.0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="round X clock"
+
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/python-whiteboard/Manifest b/x11-apps/python-whiteboard/Manifest
new file mode 100644
index 000000000000..3bd59bdbc3cb
--- /dev/null
+++ b/x11-apps/python-whiteboard/Manifest
@@ -0,0 +1,6 @@
+AUX python-whiteboard-20101012-fix-desktop-qa.patch 333 SHA256 484f9c35b940674a0e56b911ee40a467a8e51cb711d38f888a5b163d1b6f015d SHA512 60a82220177c3f144c74d99da9f71641adb8672c3b12cbfbef3198eacdd90438726de21444372a7a5bdcc627fa2cfac2dddd3f1c21f3d21a74f9fd0de0cd9e6d WHIRLPOOL e633ac0b59c60e334cce7e0a39a66fcb36f57e9afda629bbb4c48f7afbeed9ed335e05739c851d6d4280aa52e4a9987a0bfd57d0c43208a4a1abb02e4fd9f94f
+DIST python-whiteboard-20101012.tar.bz2 131944 SHA256 0270ab3f636ba079261a6e9e093fd5f622e91b07399d4773c050c8904db61630 SHA512 8ed31e7996df2562ae3931aeb822afa477079ff04d545eae145938535c988ed32ccc616eb93c2cfeb21b585cc1bf8914bbdf0be5755b0660183411c6b2a8d33a WHIRLPOOL da68f4ac6501e6f578b2dfb6bd548acc67f97cc5512c58ee9466ba84303e6cc9fad74458c43fa526eac5839fc7cb17904f36d7f4cf8815873a11451a9119c34c
+EBUILD python-whiteboard-20101012-r1.ebuild 910 SHA256 f27ea4c249b1a30ab508b92dba6fc80c4a1eadbab6ed03c7ac7e47335735ae38 SHA512 75288e1270357fdcdf32fa27e7252936c271e5d4a1a5a04526ddc8480cbe567e0546862677e8c4c7efd5ffc2222ad9b71d44ea98ca57c934b526f46596aa4322 WHIRLPOOL 585601306ea8dfa6c015f33bfcd015fc37ff640d221d9e005c8658da2e1c282b560419819dced47e65f8a8abf386db8ac748b24464aa3b6ac3e2c7aac37c755c
+MISC ChangeLog 3536 SHA256 4a1647ba700c2dd7050b0bf753bcf345b4cecaf9573ac2d95bdeeb48a5765ce3 SHA512 d30355a1f9bf2c5729113f5f98bf3c425f0057e49c04287f1bf0ed52274f880089ce2f3ade6c25f65662e67948739a8b277591601b41808e4fa7fd727f102a8c WHIRLPOOL 17f3634ec8611f57a01ebcd44df4be68411a4d9e1342a9e0bce788303cf0df81e39efaf7f5b71db078a4e39eecf67c77d8caad0df9c4097f819c3676d37ac5cd
+MISC ChangeLog-2015 660 SHA256 161e93606528f675e1d5275c75eeb19ba014e96d96241f10817cce674f4299bc SHA512 f67178ea3dc8e258a6a5dd8b5ca8670c543e8698fdedf652b1b7ba20548928170cef460f593c42e7c844f6960364090f44cee03958922e185fdc0759a38d6dc9 WHIRLPOOL d24f41c8de356d52d338b2971bd6bcb0422dac8c71056f6076166849f9f50919b5f7fecea8bbebfb3e4f7626a3abb7487b1ffc44c9721e134404fbef0a50197a
+MISC metadata.xml 686 SHA256 a0db068228441b1951b3aba3ac470414fd00925a51a941e14cfb573d5a036fe8 SHA512 3566dd12d3cce288c8d8f2a5dfc43837dedc52ac179293686da56bc464f461e13ad6bfebd8e9b5bd3e32c35734b59040941a8d31f77e1f6d69618be029e4f3c6 WHIRLPOOL aa04efb90f8d40f2b4d917ddd21e55f4670e7fb0ef2b4f0770bc08857c0ee0c916b8f091535b8d5a9b6d59ff264f6fb009208a3ba901e129ab15aec338457245
diff --git a/x11-apps/python-whiteboard/files/python-whiteboard-20101012-fix-desktop-qa.patch b/x11-apps/python-whiteboard/files/python-whiteboard-20101012-fix-desktop-qa.patch
new file mode 100644
index 000000000000..c27b88b767ec
--- /dev/null
+++ b/x11-apps/python-whiteboard/files/python-whiteboard-20101012-fix-desktop-qa.patch
@@ -0,0 +1,14 @@
+Fix .desktop file to adhere to modern FDO standards.
+
+--- a/dist/python-whiteboard.desktop
++++ b/dist/python-whiteboard.desktop
+@@ -3,7 +3,7 @@
+ Type=Application
+ Encoding=UTF-8
+ Name=python-whiteboard
+-Icon=pywb_pixmap.xpm
++Icon=pywb_pixmap
+ Exec=/usr/bin/python-whiteboard
+-Categories=Application;Education
++Categories=Education
+ 
diff --git a/x11-apps/python-whiteboard/metadata.xml b/x11-apps/python-whiteboard/metadata.xml
new file mode 100644
index 000000000000..c92a76cc49be
--- /dev/null
+++ b/x11-apps/python-whiteboard/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	Build and operate an electronic whiteboard using gnu/linux, a wiimote and an IR pen.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<name>Pietro Pilloli</name>
+		</maintainer>
+		<changelog>https://github.com/pnegre/python-whiteboard/commits/master</changelog>
+		<doc>https://github.com/pnegre/python-whiteboard/wiki</doc>
+		<bugs-to>https://groups.google.com/group/python-whiteboard</bugs-to>
+		<remote-id type="github">pnegre/python-whiteboard</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/python-whiteboard/python-whiteboard-20101012-r1.ebuild b/x11-apps/python-whiteboard/python-whiteboard-20101012-r1.ebuild
new file mode 100644
index 000000000000..4b51a6b45165
--- /dev/null
+++ b/x11-apps/python-whiteboard/python-whiteboard-20101012-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Build and operate a electronic whiteboard Wiimote and IR Pen"
+HOMEPAGE="https://github.com/pnegre/python-whiteboard"
+SRC_URI="https://dev.gentoo.org/~lxnay/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-misc/cwiid[python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pybluez[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-20101012-fix-desktop-qa.patch )
+
+src_install() {
+	default
+
+	# install correctly in python sitedir
+	python_domodule "${ED%/}"/usr/lib/python-whiteboard
+	rm -r "${ED%/}"/usr/lib || die
+}
diff --git a/x11-apps/radeontop/Manifest b/x11-apps/radeontop/Manifest
new file mode 100644
index 000000000000..c5358a5fa092
--- /dev/null
+++ b/x11-apps/radeontop/Manifest
@@ -0,0 +1,6 @@
+DIST radeontop-1.0.tar.gz 32677 SHA256 a997ea92f38a53d59db4d8e846aec4cc04cee8b79939e89d5eb9e31c57b468fc SHA512 bd7e8ecff962d8ac3072f3f1fa7a5d9981e2da28b38a1f234f6fe550511c3fbda2c1c6e9a6d1120bf99ef3ae621a91ff67c451eaf98dfa1264e9e6a59ae55e08 WHIRLPOOL 0813d44cf0801e7ace48704cf6f68d7a0d26cbb2dd6a4d47b2854c4ccbdce409dec45f4acc40678f7d1aca452989a90e7a886bc05cf8e62be5285ad97ae7b9ad
+EBUILD radeontop-1.0-r1.ebuild 946 SHA256 f2af3eb3014a2681650567213ad45c38d32ad3325eeb2b10ebe8e6f8ac4f661b SHA512 2d129777b521aee7510afb4dd4768e289e85358cf459113b0fbdee379f0075fdb1b5000ded11ed50330564e91863d1fa60ee4e856bb0796135f31e1464cac611 WHIRLPOOL 0a583611954d2e62652f88891edc7cc268277c22cfd4182277e5ecaf9f4be27f1c013dcd824955b8406f74ddc265c0367b480d8837c6a0d487f8091921dfa11d
+EBUILD radeontop-9999.ebuild 739 SHA256 ca6e216d104081fa4d814b43a461d3dd28b497503ac24824cef55ccbd4d74cb9 SHA512 2d9ad6242ac7e7e4cb53db8a041b4494009163e7b6b9d299bbebd20aaccbcda4978b31227f44842904a4e65ac499d2ab2ff8fc58325b185d7ab156d8d6875202 WHIRLPOOL 9f63d122c031b103dc008157d3de8825172ff66e6071dd7b476408c7b996ce6831e6ed832c9a2d2f5e67f34cb9f8827d763768c0fe9a6304bba9339fc76296f5
+MISC ChangeLog 2940 SHA256 732fb8cf54a6d68d76aa949f414260330e140fa6558bd3b63f177160525d755c SHA512 20e44b74b3e1adb4f22e227d3e7e91327e000ac76616676823c795574ad0d24d8ab4fa87c8de9d4c45313c878130e6c339c5ffecbf400c35b89e639e5fd7e007 WHIRLPOOL 10114a1d92d5e1a2194e4c20cf2a6cfa2910b0dbd30e294958270b5a0d6ae6ec8bc467c6d0deaae36198a5464ca7ae3bc90d8a9c20c29dd78383b22fd0c37a80
+MISC ChangeLog-2015 907 SHA256 91d66ff0a99d263bd51a2cfaf5722058dbae2074031520963dbf99ce93b8cf12 SHA512 86e97bbb406e7e3ed8558f8ef1a47eb2af2dc3a20a4a2180232d1d1c6f02e6715fbe75b3b1ada2f53dd5768cd7325c7dcf1dcfbd973b2431c53ffbaeb2bb38fc WHIRLPOOL d9b6b30fa39227639e9e3d9812bb1d69f0a5318b25160527eb5a56af83bc2401f5788555592f1fd47682b289e9e9e7b7af115d887c14b4c6409606a4723919f4
+MISC metadata.xml 245 SHA256 5a9e9476a5c6ff9c85519b4862a65a7da5fe88c27e0b953426f3a959e7dc8004 SHA512 49b8c90c9dde8331133ea5d9c026880dd1915a514d04f516d79c73b4c270e0b90f4fc36e654e0f9b508dcee5fc58c49c3dd060989f4ca0e3187b5f6800d2504a WHIRLPOOL 7637920994f5414c83c14cfd2d1ca3062b8509e3389f28df971b716e8bfe4f2248000458a97cef183ada814ca7452ffde3656f2bea5dc13d64e5c1eee624aefe
diff --git a/x11-apps/radeontop/metadata.xml b/x11-apps/radeontop/metadata.xml
new file mode 100644
index 000000000000..0fad074d0738
--- /dev/null
+++ b/x11-apps/radeontop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">clbr/radeontop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/radeontop/radeontop-1.0-r1.ebuild b/x11-apps/radeontop/radeontop-1.0-r1.ebuild
new file mode 100644
index 000000000000..dbe582980fc9
--- /dev/null
+++ b/x11-apps/radeontop/radeontop-1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libdrm
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:0=[unicode]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	cat > include/version.h <<-EOF || die
+	#ifndef VER_H
+	#define VER_H
+
+	#define VERSION "${PV}"
+
+	#endif
+	EOF
+	>getver.sh || die
+	touch .git || die
+}
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=1
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/x11-apps/radeontop/radeontop-9999.ebuild b/x11-apps/radeontop/radeontop-9999.ebuild
new file mode 100644
index 000000000000..4c1bafa1eb80
--- /dev/null
+++ b/x11-apps/radeontop/radeontop-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs git-r3
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+EGIT_REPO_URI="https://github.com/clbr/radeontop.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	x11-libs/libdrm
+	x11-libs/libpciaccess
+	x11-libs/libxcb
+	nls? (
+		sys-libs/ncurses:0=[unicode]
+		virtual/libintl
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	tc-export CC
+	export LIBDIR=$(get_libdir)
+	export nls=$(usex nls 1 0)
+	export amdgpu=1
+	export xcb=1
+	# Do not add -g or -s to CFLAGS
+	export plain=1
+}
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
new file mode 100644
index 000000000000..af321a2ddab5
--- /dev/null
+++ b/x11-apps/rgb/Manifest
@@ -0,0 +1,7 @@
+DIST rgb-1.0.5.tar.bz2 130900 SHA256 8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857 SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43 WHIRLPOOL 46f2947696bcebecd36880808388260dba562b11b007508d59a9fd1cfbb730d9cfea57e49cbcfc84115ffe58ef6db0a8f25dcb10607b105e7e8f90f6bbbfe3ff
+DIST rgb-1.0.6.tar.bz2 139225 SHA256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e WHIRLPOOL 285913c14d8405402b407172721e54f4cee142bfbb8d54ccf7d1616b5ec30935967b82de249013064c73b105c5256a71fc008f4caadc2dd0275ee2e1dacc3a89
+EBUILD rgb-1.0.5.ebuild 456 SHA256 e763d9c3b5d6be1ab711921cd9319f10a6dd862db138d4fa6ea2156d6535bd2b SHA512 38c3c67cf17944e9314952142354fa0ea3cb72f6d3c58628b787497e38edf14d74c72a624d35e535e7e10a7aa7d7e39b65de0a6624d88659e066cf8cce91febd WHIRLPOOL 633cf93d3f27a28db6eee7a2fc9832c7c3d187ddf20df63d1e355e1142914b8bdc8d92fc0ec50c61683a26825a417979785cb4a07142368ad6e345c956d1c19c
+EBUILD rgb-1.0.6.ebuild 485 SHA256 2d4c730b0534a396722fdaa70fdcafad859da472a302186f961e41c9f47e2215 SHA512 bf9d8f72d44ef7001dec6251198b2fc8125e9940b09601dd1ff226aef2fde7feaf975f4a813a9b4b12141c0287935e1363dd91e4b2482ab72677307eedaa01d4 WHIRLPOOL 4e7391bab5b599027553ddbc1d5792d8ee69a58ddaec674e630fd4a9c629e46a8dcbe5b5c596ac9ba053f509355ff3bbc125415dc21e1ab591065cfc950f3adc
+MISC ChangeLog 2600 SHA256 64dba3607bfbf3874a6de2d5f4623a6e79ad0dd06294c5270b0d63846ecbbb65 SHA512 22494bb0755984372b60ea74e9402526f3bd02b061900dc57b85969dbfc76196a02686efbd27127745bb559d555639a862cc038a830a7ebc81d3ee151ac4bf70 WHIRLPOOL 16870a7b71d137f585d389de4226a26f7216f1442b084208f577d4e55c2ab3d488f2ee9c1e8e4fdab1bb00e675001640575dd480bd4828efd207aed79b69c0e1
+MISC ChangeLog-2015 8714 SHA256 7724dda7f181f2f14e1a243cfa3a00d9fe61c7be9d6547ae4f32bb0741a322c9 SHA512 583184bdd082c91eaa5ff579f77eea38341e59ab96baf72f4af8152ea7d6cbe98786f2fa4dcb05b214c21a6e69ee91d01337180f3155552fc1cc0de77dd44c14 WHIRLPOOL 7b3637fba611dea563de773f66e4289037b1f63cb8ab44dd8f30e1306bdbf569fe8b247bb9f924e52fe75391e526c4e67d70984e94c0bedb79a9aa11c5b1e987
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/rgb/metadata.xml b/x11-apps/rgb/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/rgb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
new file mode 100644
index 000000000000..cdc6a73115a2
--- /dev/null
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="uncompile an rgb color-name database"
+
+KEYWORDS="alpha amd64 arm 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 ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
new file mode 100644
index 000000000000..8dc4a3f076f2
--- /dev/null
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="uncompile an rgb color-name database"
+
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-misc/util-macros
+	x11-proto/xproto"
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
new file mode 100644
index 000000000000..3bff16df499e
--- /dev/null
+++ b/x11-apps/rstart/Manifest
@@ -0,0 +1,5 @@
+DIST rstart-1.0.5.tar.bz2 144607 SHA256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a WHIRLPOOL 72bcb0f72311949edeb91cccb904061cbff2faacc957874e8d422d636f530d9ad95171a931438d2e04be736c27f60160b5598e8d08d97d355f223199d26d6615
+EBUILD rstart-1.0.5.ebuild 285 SHA256 65aecf294736ca9eb27e32935785223eee204274dd6505e6dbe975e62a0453bd SHA512 0dbbc642253f7f6ef0a2fdc9091fe11fa54f769861261b352bd74f7898d266a8e843655e56ec96314a5372b9350de7a42eaf227d38b2698e42d06800f2003815 WHIRLPOOL 407448d1e825363bb3ba489ca0a1349a1dc2cb43c8a35cf7b68e8feebf10418474dc47ef6df8cb2d84f5bd7d570ad4a054f9699d0e9a3591c725dc71c424cc08
+MISC ChangeLog 2424 SHA256 9b76f6484e1537cd77e9bf2a1f595a1f4fe9c0a1f4afc26b75bbe51a26fb77cf SHA512 13860b6b450a3b7b51a56015281f0bbe1dd5eaeb8922792ac04ce116b7d0126f40eeebeabb033a7e605478e86d008896068b42bf4196a4a15b4fd9f7ffac6c90 WHIRLPOOL 602dfd55bb9219d7bf3bc1f1ae227472f6511885fef0ed87c59df2ec9e12366f6de3d5fa5e773b85481f95bf386e473e74e1d91782856dd71e61602e79075e44
+MISC ChangeLog-2015 4652 SHA256 445a6c91104fd402837ed559163fc9d268c62217fe70dfebbe34b86cf5738f08 SHA512 d5de8ef1354023b985f6dbf781032b71d5f8f1caa350b3450eaccda8974b70b1cc8277f4532a7a2e3477b1d44bdac77f2a0e6b6785873d42b0690715bb7896b0 WHIRLPOOL fcb84a634ae9877454f31376995f9b98d47bb9d8793054646e1a89ad7885f2fa4f0ed231c8294492d20e13ebf872e89e234b60a9eca0f7fe7b9b042811e7fcc3
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/rstart/metadata.xml b/x11-apps/rstart/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/rstart/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/rstart/rstart-1.0.5.ebuild b/x11-apps/rstart/rstart-1.0.5.ebuild
new file mode 100644
index 000000000000..e74a26a102a1
--- /dev/null
+++ b/x11-apps/rstart/rstart-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org rstart application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
new file mode 100644
index 000000000000..48ba03371bfe
--- /dev/null
+++ b/x11-apps/scripts/Manifest
@@ -0,0 +1,5 @@
+DIST scripts-1.0.1.tar.bz2 72301 SHA256 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226 WHIRLPOOL 90fe1e07db105ea8388d109a15927795af842fe408d8803298af901ade20922cc22e466ee1a86d2a3f24a855f8df0a825515c0ce4592c7bbbdd8977bc9d42656
+EBUILD scripts-1.0.1-r1.ebuild 491 SHA256 72fff3bcbb1c936c74416f2356ec7717dfba95c74c1256a2cb624353f57607be SHA512 3fb275411ddaa3ad7549a2baa1bbbe0524dd3ddaa4460dbe8cdcc6458c521382bc5c1151321df38c9446338a886d702badea406888d34df1d2d17ce95fbb9edd WHIRLPOOL ee47f747eaac358de1a7658114c68d599d1162a016441794e0aaf1b4468762bbdf3f8a821d69aecb1ae4492d4b4c40800be5bc95b70b0541afc3a60f5ce84a13
+MISC ChangeLog 2433 SHA256 48fc730f456a91ab6f1f421bf78ebfbb7cf6537731ed4d536037cab0d1983893 SHA512 fe696ad17f7a8b4facabde53da5e012ca67aad469b9eefe77dc5b0d238f04dbccb8d87735caf7d2bdcd17adcfb2ddb2e1f62ee7f91b09df4e654074d8d810be1 WHIRLPOOL e90517272ae0d5a7dc40a23d89224e7271d372befb77237b95face9e7f8da3d52eed3d36068b82c601d661c405acc06146d31e7078f60266ca021a9d73312bd7
+MISC ChangeLog-2015 3123 SHA256 04c08d7fdfea29a3ebb350a25413691a58f02409067bf6b01d6e217ad888ebff SHA512 7ae07a2029f14ce97c662f03a785bf9d5ec43b94f4f294a5a3164a20addb5942fa700f9f98a93d2293c149e8cf14cc04be1e8e011ece6a610854860411946827 WHIRLPOOL 0d9de7fae35d9c85b64a8ca8305bf92d3492c8adcec8b3716de0d0c12e4633e962422a0c20b690f390f815dc353475a597c312901e941debd1c342225747c5fa
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/scripts/metadata.xml b/x11-apps/scripts/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/scripts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..064806f4a2fe
--- /dev/null
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_STATIC="no"
+inherit xorg-2
+
+DESCRIPTION="start an X program on a remote machine"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	xorg-2_src_install
+
+	# Requires ksh, assumes hostname(1) is in /usr/bin
+	rm "${ED%/}"/usr/bin/xauth_switch_to_sun-des-1 || die
+}
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
new file mode 100644
index 000000000000..5afcf5d4e808
--- /dev/null
+++ b/x11-apps/sessreg/Manifest
@@ -0,0 +1,5 @@
+DIST sessreg-1.1.1.tar.bz2 136044 SHA256 78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1 SHA512 92a21d31c5698212fa3d04360f4e931e018156ffed70ba03bee3f1ecd8540d5d54f07a0c7661e1077b73255eee4cc1afd1dda6907df109d3556626495ec08193 WHIRLPOOL 016a7a623038af8d6ed8a8d58cfe5e1fa9355b2de6bf061a2697548962791e64e1dc55a28d751db2fc89cb20151c166fa3f7d51e7a49c63fe886285cf1a34451
+EBUILD sessreg-1.1.1.ebuild 352 SHA256 b9e886663d25444a08d523a323a7684b5615228c5656301394476716021fc5f1 SHA512 cef7e0568245b41cc121d18196636bba5f9ca74762fa8f7aaebef5640b082d47621cad5fbd4ad5067701df0c13584ea2d54616e3e53f5a8620639b14fc5aa6c2 WHIRLPOOL 461a344d343e9f2946f49482f65e8c0abc4d9b5edf3ed0fcd0963a2fd4b10969ced93178879d4504cb5061cafb11b5493d0ed4edc474d97da54ac123377a463a
+MISC ChangeLog 2616 SHA256 3414e63b5253fc2e6bd1fbe4f62263d090c1306236f82e6e017548e106144f29 SHA512 cfb31b5ad74062d2c7a05de1fc9c5860472030ecbd3285bfbc6fddf16772bdac10ac7b6c9c845a4e21c95adb7b20079fafd46860f41e817b4090c0eb01641717 WHIRLPOOL 60e464c8755e61ad2c101289089d434e290a6b96755edd38fcb69066d143cf8978cf74283341fb4c8deb3ea8561441184c54d5919ed97675ee2c21b6bc0c700a
+MISC ChangeLog-2015 12738 SHA256 553eeb1f63334bd872224820eee70f2cc4dbdae8d5a318bccd6461e3e335e79e SHA512 d8937ab8b74f17dc935ab7c7496ccd4963ba210580a686398efdd219e762f3250a13772ddf523fd61b6b3693761c37e993b748b1c56914c6829263b2bf22ff69 WHIRLPOOL d5b58895b8e47a0b5108dd12f8abd360e8c53e4e0c13c6b7bf7f182e80b45b0ce5f9ecb196e3da0738f22fa1d747b427f97f2edda9dd3078256ad2439acc1a54
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/sessreg/metadata.xml b/x11-apps/sessreg/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/sessreg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/sessreg/sessreg-1.1.1.ebuild b/x11-apps/sessreg/sessreg-1.1.1.ebuild
new file mode 100644
index 000000000000..2193ff0538aa
--- /dev/null
+++ b/x11-apps/sessreg/sessreg-1.1.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="manage utmp/wtmp entries for non-init clients"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
new file mode 100644
index 000000000000..ae1391488eec
--- /dev/null
+++ b/x11-apps/setxkbmap/Manifest
@@ -0,0 +1,7 @@
+DIST setxkbmap-1.3.0.tar.bz2 125844 SHA256 3d305c9d1f38224169b2e501ef0665cc3ab52d4dbc2b9a60c9dbb047f77ddec6 SHA512 d4843485f44a9204d1aa8bf16b3ad661747be119b0b5f38ced74dc35773519765af07fd290ab0265766de6206138e085a775bfc6edae6a232f2da9c260c0b581 WHIRLPOOL cbe29496b115c0963cd44634640659921136f3a6372f1c7bc7cffebf67ee7be86471afaa4d80475eb9e12921a6ebfd3250b509cba4e5c0a1dd560105d06e5e20
+DIST setxkbmap-1.3.1.tar.bz2 133817 SHA256 a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1 SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee WHIRLPOOL 994958e2b0ce773a274897056a13a5461856e68c101b93c8e4650d598ea8f401e4e57e2f18ef3ada0194a4d7fa94020915b6aec84bdf958359b3fff55b966f2d
+EBUILD setxkbmap-1.3.0.ebuild 424 SHA256 d5c83c80364637334a901a778792ff600d20759f7bc9ca9b4cfc1513bbb6bdcd SHA512 5bf64b3965a15373fd65ae41babd047dbe66013b2a2ebe95bd8b2896de469c3bc595d3c04a6658cdc24ce407dacea0926b700426f78ce858db42d98211f5c95a WHIRLPOOL 7f1c992b7bea0f43672c6959403d40cd7cc6c8395ba7c520bad2a5cb3764789637faa64a1d26df7ebe04a2f99359013ff99ad5f7eca5c3f679a29f6c91db86bd
+EBUILD setxkbmap-1.3.1.ebuild 426 SHA256 c9eaafd5dd460a5e0b873989195482e8c0a55f49abf20cadda72a55dcf26cbc2 SHA512 138143d0b8220f34996ac218a43b20b92ec2de0d4954ff592bb63354da39a4de9d1e2c980c6e59356c8d1b27b4e443911721e1e8fd0c48e13e03aff3ff1e32a1 WHIRLPOOL b88c8a9ee6052865fba54081476f7e86d231ac05218a4f26bb4f4ebf45fb6e60a2b73b69c42a2742682da98db3611c674c3561fb4090be9873384699f29e5472
+MISC ChangeLog 4031 SHA256 d3defb861e7629fb40bdf72ea218526320862c39aa143ac6302244b683fb826b SHA512 fadb226ca1741007608ee73937d9fe381f799fe70141ea46b2a599b7007695bcfda3af00e4e98a1af432ecb8e70d3bfb7062200de917264393728ec2fc1e8af6 WHIRLPOOL 1a925a7a6b624da41e94211a327e8718039624db68a70f296a839b123e44bf1ca2a800e3355ee237ed04809a61f76668629c5d681f254542e1276f85ec635467
+MISC ChangeLog-2015 8570 SHA256 e11e448c403300994e81b9a0cd9d97d7276dc25d60614269f2ad22b702222a72 SHA512 c6f69d515fff10d27e30de26cad973639ca383d9ca7d2bed80ac4e4449c3ce0f9146dd5692389c129c7a41567e511011a7ac5074b107406b821aa23fd977dc59 WHIRLPOOL de9a5481c5d5fd4a954203f49beaccde9dde280f3ba6d070ffae5fdf13ddc6f8b38d463aba0ffaf31de3e0d1e5fc2c86661746ff3a17448d2835f03959a5c00a
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/setxkbmap/metadata.xml b/x11-apps/setxkbmap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/setxkbmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
new file mode 100644
index 000000000000..0405a28de6fa
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="x11-libs/libxkbfile
+	x11-libs/libX11"
+RDEPEND="${RDEPEND}
+	x11-misc/xkeyboard-config"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
new file mode 100644
index 000000000000..b2db0b26cbe4
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="x11-libs/libxkbfile
+	x11-libs/libX11"
+RDEPEND="${RDEPEND}
+	x11-misc/xkeyboard-config"
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
new file mode 100644
index 000000000000..064544a170b2
--- /dev/null
+++ b/x11-apps/showfont/Manifest
@@ -0,0 +1,7 @@
+DIST showfont-1.0.4.tar.bz2 118199 SHA256 36b63fcc1d7a02211146a4875425abca0a6db0d508f6144f6c7b1602077b22a1 SHA512 5514aec3eca18f714b14b60a085e7f6edafa6f661567876cbcf965d67e90f031dd02d60cc71f8f1889b8e94c99a7f4f8adc8cb3acc1054a83dc8bc36656be0cb WHIRLPOOL 37d2992d051fb1a62b5e4ae87482e59e7f574fe31b7f7b2959d422dcaf21d1318f05067f413ee6a714c51fcef7a5297e5a7f20227f3af1ab4edc9ee66f59aff3
+DIST showfont-1.0.5.tar.bz2 125618 SHA256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd WHIRLPOOL c70ea8f004513b4f90d1c15949405d3f13a0239e51ac83aba94001fa0cc07390c6e7e6b4ab75797d24662d7793bad2766bedb836d37d63da15bfc0def031fbff
+EBUILD showfont-1.0.4.ebuild 287 SHA256 bb151982c7ab0a579cc79b35962a39b63839a042f0efd42da000b6776d91d6f0 SHA512 81eb2db670742a148c17c1c93ebc0701dfc70e89fd82a5d22b8f52dbdfd22e343b38bbbbbf9f54ba63d0b177236eced7b9ef5f6278b3d5695b505e64bacb1d95 WHIRLPOOL 01159ee13108378296e27b44b37953d096d5df34b601c622635b4bb209bf67a3bdc18340c3746b45813705ddfd89142230baf1da6d2ded417e7794b807f0ab11
+EBUILD showfont-1.0.5.ebuild 287 SHA256 82c84d61a34d11b38eff2129afef1b16f385b6c8fb7357401c82b5f32dc427e4 SHA512 d986bfc2c25772d1a51907d9e28d06b6a47e17f528f2263a0a8d22e7b0d9fa8d161f7eaacfb3d03f56c7ae1943372060e57c048819ea76ea0f57f9e5c2f3ed42 WHIRLPOOL 39e72c7fe03743a0bf8c146b164d2c33f5d5b32d554d611a9c8aeb4a3b70dc2ce4703132f918edb6b2bda1b14bbedf48b324a4d21934943f60bcc716ff158332
+MISC ChangeLog 3614 SHA256 4c9d7ad412856ab203bfe036e362dc25328b8a747afd8bfd4fa6e4afed5f314c SHA512 62bcf521fe6797103925148406a910d96327852ee651bdb86c7a76ac7086c167a8cebbe68ccf885b84cbe0ab7bd2cd620bcf1425b36928f77d33a2ddcb6e77c5 WHIRLPOOL be825e14d4466866bf002560b85e87d2187b5dceecabaf773dd15ec4870b98679322e40919a2ea7bb9d88f9508b4dc5e919cc91844a72bd091a8810ab19b0f33
+MISC ChangeLog-2015 4945 SHA256 44b1ef5abac0d73f34af17c06225531a5245357f680bd76bb1bedb33c696370c SHA512 19c56f25caf1d87b026096c43fd18cb8e0557fae1ebada8d13c30430b3d539ca3206a67e47d1e608627e9ffa4a6627d18d293f55b3ed6d42aa714425826e8887 WHIRLPOOL 15c8da7c8d3cfbc0fdda6969c376b87cac5b9c168f64967a9267b35bf87761391dbaddab793a155ea60514627f9a9d2ef454bac6e4d382cf2f96192989c91400
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/showfont/metadata.xml b/x11-apps/showfont/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/showfont/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
new file mode 100644
index 000000000000..f56371f798c3
--- /dev/null
+++ b/x11-apps/showfont/showfont-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="font dumper for X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
new file mode 100644
index 000000000000..243b228fcca3
--- /dev/null
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="font dumper for X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
new file mode 100644
index 000000000000..42552f2aae2b
--- /dev/null
+++ b/x11-apps/smproxy/Manifest
@@ -0,0 +1,7 @@
+DIST smproxy-1.0.5.tar.bz2 118207 SHA256 c72ccb094e4971ec2339ee06439114e86ffdcdf449a6accd5552e817142fd609 SHA512 88ea92d468e1e46e473bda5bf355f0b2a98b178c5aa54e1fd29d9038a39fe843a7122a853e983034ffe6f5be3ed7b85f8b51266e4a4d1677a755ab6d4c30040e WHIRLPOOL 812b8f0a85a4354ad40745628786406ae14958b5bf0ed35d29b97ac7d4c0f9e1645996a02997a46d3d3023eb34e32849a0f4facd5e0afbfe0d3eb3481b13e714
+DIST smproxy-1.0.6.tar.bz2 132046 SHA256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7 WHIRLPOOL 479934d50d30d4d54ea05dccda74f791492abe5f1dd786e6d574d4c8ee40c3f244146cac95f2a24227f602a88c9a3e1560e5cc26da0189f097b8cf46d70ca205
+EBUILD smproxy-1.0.5.ebuild 332 SHA256 4c2ddda83ebad77196469950d21afaf7c5fbaccb004d2b5aefe5ce69318844c4 SHA512 388a359defde84414176670ab68172f2fc51beb56092065b8cd8655ed43f090b07391478fc2ed59a90283ebe89d0c89ddafbba6bdb636c8f7d54188838e82016 WHIRLPOOL 3f724276e615f5b8dcac478ad883ddd48834accc219ff67794c0c49336df25b6093981b8f7993f1ec00a18e22e1c6b47211b3b542d24cbb8201b96065e3a64cb
+EBUILD smproxy-1.0.6.ebuild 341 SHA256 5a69bd4780e8490b04d151638be8f793ad2764e42bb43cb15095bf21f737c115 SHA512 4e5ea3632faad5fdbdfd9301e35d6fface36ae0b851c814a76661d59490522b865be062556bd6d0019e0b8ea222ca4c541ba04ca5aef6a9571af59722267b664 WHIRLPOOL 187df7907b1223a478c805b68bd6146845fe04bb9e298f71d16edee0274f3dc4baf4f8aaa4f322b6391e3460460fedc1ec0ac0c347a1288b09473a72b10751fc
+MISC ChangeLog 4167 SHA256 a2383e0a2fdf16f8374ae39d89020ac00ac45c96edc37d23444a53bf59f17396 SHA512 e260b922a19a894cf2d97450faeaff6d98119210e7cc235ed456c6f4f094c6da110be9f2530263f38da040b459a8647529c28c9e56b6c1f589ffdad4f2994d1d WHIRLPOOL 4c7e7b0e8fa4fada43b4825e3d6e62c48e5d1830ec9b99c29fecae02d29b8b350e89ab17a0e88152d649e593f10fe17666bd16a88f7211730f932e40663ee6e4
+MISC ChangeLog-2015 6168 SHA256 6ad9f9a4fc0d64ee97387793772d910a7a95db2446664d57c2cb0bfe5382cd37 SHA512 1964b632795efb3dc0cc5a6016c0292b89a62954849a9936952403b65ca0e44c05e8fce1fb6d4bcf456d718e50ddf3ae4c0e697800d3003ce12fa755af7276da WHIRLPOOL 4399a8ca61193f538ed3262f1811adbe83b49edaa363d182ed7867a4232a3d7b814bed559ca7b1e369c5552afef6d0f81fcf2d7f2d95ca9739cf4f77613482af
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/smproxy/metadata.xml b/x11-apps/smproxy/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/smproxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/smproxy/smproxy-1.0.5.ebuild b/x11-apps/smproxy/smproxy-1.0.5.ebuild
new file mode 100644
index 000000000000..491d36494d88
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
new file mode 100644
index 000000000000..08594c147b0c
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
new file mode 100644
index 000000000000..755ff3e546f1
--- /dev/null
+++ b/x11-apps/transset/Manifest
@@ -0,0 +1,5 @@
+DIST transset-1.0.1.tar.bz2 121199 SHA256 70c3d033874fe48286bc4971d5de9027f2e8ccd0f21b7506fe1bb4472218036d SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d WHIRLPOOL 86cdc0ad3d82e51ca568e2324ed4a96e92dd6c802e345e98a34804065576b3e8a815084ab5aa423c253275c3d16889c14fd8f5e3b04aeb46d360910a247e3dd3
+EBUILD transset-1.0.1.ebuild 416 SHA256 12766c4498f2d09c6857a8d90f57cda93a4a94276f3d177063bb814b40b1b48d SHA512 4c94916760170171b98ac82972b069b95b415cc767b16a579424d0fa80d02be7484062d6c5a841dcc74b6cb6e5e50eb399bee543daeee785ddc6caff277b71c8 WHIRLPOOL 620c67b4125cd633ee000d310627efeb31c022b07e8af9da973e82212f59bb6e27bc9955527a87d6ce39ea1f330888a317f2194600ec148c49ec38cbee78dfe1
+MISC ChangeLog 3487 SHA256 050dad8e45ee9a9f122882a94ee635144a65399727545c85ddfe117cd4c23010 SHA512 2485c90a28d19d9d65cf4783a3b49655bfb902bdd126d20a19aadc17f0fbff12e9ffefd8a53d7f15f5f6cc2d53c46b221db691d5111f823ae6c994d5270d8805 WHIRLPOOL 0e559f913ab933f63be4ce1c9d34b9229e378d8da962340e4a21dec46f0e956f6e113690776c631dec1e1ea0050845680521970f76a9cebd1cde934c820e86c4
+MISC ChangeLog-2015 1098 SHA256 19d9307b52d6fe5bfbaecd65ed488f986256dff1b5d7ad1d42792748184aa032 SHA512 9905ff122657d6caebbc12429601afbd1b80d6d8322f76485ae65034192118e1f2879bfea71e5d9e5f8f70f00977b08655264668ba7eecc9440391ed2d9bb836 WHIRLPOOL b39a8cd7ff2ac133658f2b4010cee7044a3400dbb30619a5e1408116e3470b1957f651f5a60983773f40d08fed9d2e467e6e204020c46b7f9aec45f364f88402
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/transset/metadata.xml b/x11-apps/transset/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/transset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
new file mode 100644
index 000000000000..a2f14e270867
--- /dev/null
+++ b/x11-apps/transset/transset-1.0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 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/viewres/Manifest b/x11-apps/viewres/Manifest
new file mode 100644
index 000000000000..277c10a782ed
--- /dev/null
+++ b/x11-apps/viewres/Manifest
@@ -0,0 +1,5 @@
+DIST viewres-1.0.4.tar.bz2 126186 SHA256 d9c11b44908d91926df8b33428ae04c86c85e4f8380e9b5e68326a651c872e59 SHA512 79edf987cb6232f604e31320fd6737325d2559dd6f0eaef667731b5790a709c81519b41ff5dc8f9aabb49a2a245b10584ed85c94c24ab82f466c776c182aa9f0 WHIRLPOOL 526e03fd7da8b83905040d2948657e5a0f852ee9e15b1e5f08757e1ab8626cf7b0153c2a020fa89729a74a5871551372afb9feef723145574e149214d387dee5
+EBUILD viewres-1.0.4.ebuild 328 SHA256 30fd7c73185b9649a761d15858ac746c6ee4996814f1224a3e706005ea14db4a SHA512 36eba34a20fb8ce00d385f7b5ed29127efa24fae58e6e1b0dd1e6e63515ecfb5ab100ee65ee76cc229686a45eb36032c26f6bf76a25ead78fcec743d5bd65cfd WHIRLPOOL 0678fd88edd1344198f43163806e75b797032b6dd0aa95d5d622cff77f4328db4cf11b97e9e2e38255e3b61219b1f86a34ea56fa141ae1d9abc1f8b56f1fe01d
+MISC ChangeLog 2427 SHA256 8183ca322afd8a9641b1ca4a079b7efd71a5078cd0778c29404b14b8bee8446f SHA512 56722df6a3697f1329c03c60699df18df963670c86dd20af42cd2314aeb75d33d9ac7b295604d7603952f5dc6bbe6d9959e5ddc43cc342e3b2894f37d7cbf9a4 WHIRLPOOL a1711bf6062a80672afa8ef8760b9371dfdb45089ae1191170b218b87a60c68e385cb705c22474d8f27dc2fc9135f399fbcad072b2b01720dbd93dee48259c75
+MISC ChangeLog-2015 4625 SHA256 756458e0e3581ce6485cde817b8ff5cc0def57f1aeaae2b8d8427217c8849f92 SHA512 1e2d70047b485663d27dd65ccc7a096192c7faefa31d1aa7637a47522da6dd4d14e62d367fb4db90f42461da74dc7ea4fda6f0de5ee6b3732e460db0f570d7ae WHIRLPOOL e300ce7c04ddffd1e008fbdba02c3f9b7818244e7a9f5c99a863aee3f6b72472fa7998ea2ea020e04924d130f30da36026b3256654a7a55dfe16d7abbd7ae94e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/viewres/metadata.xml b/x11-apps/viewres/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/viewres/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/viewres/viewres-1.0.4.ebuild b/x11-apps/viewres/viewres-1.0.4.ebuild
new file mode 100644
index 000000000000..72df6e60215c
--- /dev/null
+++ b/x11-apps/viewres/viewres-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="graphical class browser for Xt"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/whyteboard/Manifest b/x11-apps/whyteboard/Manifest
new file mode 100644
index 000000000000..2cc320698a37
--- /dev/null
+++ b/x11-apps/whyteboard/Manifest
@@ -0,0 +1,7 @@
+AUX whyteboard.desktop 316 SHA256 cb23a02f01c4efd79d76bd027c0bfcc3218632e125ab2273ecf75c7bc4b9625c SHA512 0caa79de89d7e82635165074695c19a8b860691db71a96f47329cd3d0d0ba90d4ce53041f72a066464da8c163bc8ac7d5f178835a1a829d4a0514df388f7d802 WHIRLPOOL 02d43ee35eee9801478fbe3be960e2bea03e4d6574e18c087b875cbbee7b592720e5133da8fe2b4db85715beb2071f5c2f8384ccd0f4c8aeab78784b1aa4c65b
+DIST whyteboard-0.41.1.tar.gz 372110 SHA256 2d054981736f905a5c690b73bf2eedbb32337e61e099e87aeae52681f9d83125 SHA512 c2f789846c5c611047b590109a49b6c28c51e5c84a7d2399f025b5b79d3c633577106aba79f76f0244bc175cbd3169cd8a53221d08ca94ddf39be01406fd429e WHIRLPOOL fd24754077f07f12c9401878b7ecf34a30e0539b36ae97216386f8b68989241316f7c9705b5e8296685bd28d9ace4c2cb96baa5f22cb6102f42aa1ccea9642f4
+DIST whyteboard.png 7601 SHA256 cd1188ebc24c7fc139052269a528e12c4cb4943195c626a73604ea9b2cf042af SHA512 384b0e6de138d3d193c3fbf02dbfe53273d24d88e9665b04cbc8b826d29b7aa7ff8ad916a39cfb6e44d0518da1229546a230369d55b1ae86cab5152ceb33f4fe WHIRLPOOL 5894486aff445929558f494e71cab58cf3f7ceb3c4a0d43ff8524bca47ac69532a2fd044bcbb938ac0edae268439b422809be8e66e840dfccdd9074a7129367b
+EBUILD whyteboard-0.41.1.ebuild 1085 SHA256 03e192e2c1302ee75cbf9d167dd52bb8933bcb9fe117292304511fe4eca23c0e SHA512 7aa24d6bb2dd3a114a67c20b7fdade09f1c4cdf25440df781cdc819985bfa58a722e71ea7d25be1c9f73b5b3f1c379c15ab043d29a587345ba14d57b8f27bca3 WHIRLPOOL f1d5115947d9db8aaa01bbc5edccc076af2e0dca78e8eee4ad9b96958ccc2425e614dbf990cf9c683d8f41f2aee4da7b3e006a30360f73569bb04446a0f8b096
+MISC ChangeLog 3873 SHA256 da45fbc56c1d68cf7dbcda96df49f3bc27bedc0ead7c401d6dc04e43bf62af21 SHA512 e8f14b2085a5a43b712e3b60b02b6c8e498f6084833d614321afe0e4af97f5f57b5929a2d33f29a3385c3edaddbdc5589b7228c2dfd0d7243205f1dea4e63c82 WHIRLPOOL b07a68ebf1177b9a955f5883be6c7f815597e61801e9f79099b74bd770e09069a94889aaed81f0e867f726e843355dcfa0997c5b732859eaac1543b5a708d567
+MISC ChangeLog-2015 1180 SHA256 5a7adb3f88918f98eb62484aab62486ff475da20eaeaed7e979c9f25a7fb4fda SHA512 c2786e5c8d2bda5806f66c66973205c2cb18d0f100a4ffdd60b98eb711f93b39467e25616436f2f74e95c16555d12007468d08af828d8da60ea509faa1baafea WHIRLPOOL 4ccac8077a0dafe2032ccbe0c569c537e818a6913969403018e84e2fc9c677b2a8aacb7c58a345ce795d37848f3dbc27765ccd38521ec1ec1a3c8f0316d500a9
+MISC metadata.xml 434 SHA256 d2deda67f56300c1a38d06289a2b6f74c9ab575c1db90b08f0a08bf42c432957 SHA512 49250b347b4c0e66a67394259c333c5d840830cdfe2969830b4f97735ce3e545b579ea749c9151d0a3579cd9621935283ce16a22330dc195c91e47900458b6e9 WHIRLPOOL e298170c99c983a999a933dc7ba61b915eea81270112eb0046cd67679684239ee778426678ccaaf5fbd99fb92ad6c1d1136f72a57d2b5f42f6f542695c93b856
diff --git a/x11-apps/whyteboard/files/whyteboard.desktop b/x11-apps/whyteboard/files/whyteboard.desktop
new file mode 100644
index 000000000000..958e63690082
--- /dev/null
+++ b/x11-apps/whyteboard/files/whyteboard.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Name=Whyteboard
+GenericName=Panting App
+GenericName[it]=lavagna
+Comment=Simple whiteboard and PDF annotator
+Exec=whyteboard %U
+TryExec=whyteboard
+Icon=/usr/share/pixmaps/whyteboard.png
+Terminal=false
+Categories=GNOME;GTK;Utility;
+StartupNotify=true
+MimeType=image/png;image/svg+xml;
diff --git a/x11-apps/whyteboard/metadata.xml b/x11-apps/whyteboard/metadata.xml
new file mode 100644
index 000000000000..32a83e0a9fc5
--- /dev/null
+++ b/x11-apps/whyteboard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">A simple image, PDF and postscript file annotator.</longdescription>
+  <upstream>
+    <maintainer status="active">
+      <name>Steven Sproat</name>
+    </maintainer>
+    <remote-id type="sourceforge">whyteboard</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
new file mode 100644
index 000000000000..b37dbb1d85d8
--- /dev/null
+++ b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib
+
+DESCRIPTION="A simple image, PDF and postscript file annotator"
+HOMEPAGE="http://whyteboard.org/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/wxpython:*[${PYTHON_USEDEP}]
+	media-gfx/imagemagick"
+
+src_install() {
+	doicon "${DISTDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt
+
+	python_domodule images locale ${PN} ${PN}-help ${PN}.py
+
+	cat >> "${T}/${PN}" <<- EOF
+	#!/bin/sh
+	exec ${PYTHON} -O "$(python_get_sitedir)/${PN}/${PN}.py"
+	EOF
+	dobin "${T}/${PN}"
+
+	python_optimize
+}
+
+pkg_preinst() {
+	echo
+	elog "This application is very experimental and some features"
+	elog "are not yet implemented, however you can live with it"
+	echo
+}
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
new file mode 100644
index 000000000000..053e54becfeb
--- /dev/null
+++ b/x11-apps/x11perf/Manifest
@@ -0,0 +1,7 @@
+DIST x11perf-1.5.4.tar.bz2 167655 SHA256 24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184 SHA512 5ffb9f2ed87a07f0596c60532666c1887d0fcef8da4554d6baac2ae61030af8c12e8146d7daf6dbed40f33d8d9700521794b2b89827fe19ccbfed77c39f064b9 WHIRLPOOL 36b10a75af590abc7ee5fee94d544e2542c0f8d318fac624534ef71f7cf41f7c00a434f207a77ad3dc4012079d18f1b9e5880f35ae692585280f812e3189aaae
+DIST x11perf-1.6.0.tar.bz2 191086 SHA256 e87098dec1947572d70c62697a7b70bde1ab5668237d4660080eade6bc096751 SHA512 a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 WHIRLPOOL f533fea45a31a70a76ce6e02d0bbd0a33e1fc8fa622b501abfda45a41899c767bba6320745590f1922983b1a137c4b9f8e132746ec0993e819dae90f41783c86
+EBUILD x11perf-1.5.4.ebuild 409 SHA256 045b4d0516c1013e3be6fcb674309c48ecf3d7535dec1285975bfb80e2a18010 SHA512 90a7cec6a014c24baf20c0652a129856721e82e145753e26b83a1f58be55c7148565467bd35422e24f92ea710bce201e5d296c3fa3835409cd5804ca687c08c6 WHIRLPOOL 29fba0d8b3c611d67ffaae544fda0b8a4013790202ec394ea44faf9f843f26bddee0d3fcb7ecd584ab8462f950e2d8e72faba1aadf112dd327efad79d818541a
+EBUILD x11perf-1.6.0.ebuild 418 SHA256 54a99cf89282460176b4e6a439d6086f5163f282fe4ba74f9398897500d3e3fd SHA512 6e2adbd3d46ea817008f6a06367d287a6165f55fff4f98486ac471ef3b86916cff6e299b77f48a4bdf781f6a1b350deebfdd86d3019e9a9302cd6e32aafa6877 WHIRLPOOL 83e3e591b4aa96261d6009be46655ae87b832cb52c49edb926a3b7de791055a3f12cc9c07517ddd6453efd31e3fd925efbd9d972e9eba47b8d8a0312b221f1bf
+MISC ChangeLog 4167 SHA256 3129934be9daf66e4bddeab0a6e8039f1e3292794ef0720a00d93470fae9fdff SHA512 9a3247175badcbcf750f0e1d0750c7656648de0315f1da2cfb1cb53bfa74c395ff146ee35648bd3670228d213d6b46f033b70fb4cd1a28c2ecb7086060378e50 WHIRLPOOL e3a1942d3b1048bc861dc3efff5b6ed0a7ad71cd24d57bea73b13ebf50362195ea2d5ad1e88ed4d9bf003ef8f3c9e58397771636034972efebd18e30ce7c40ed
+MISC ChangeLog-2015 8627 SHA256 3f2f2bb7784b01da4c0882ca8d3484a09147206830fd3317e38bebf5bddd3fb4 SHA512 074d25861806adf97ca3687cc79c7e6e5831f3cfc5ed86cde96a174012cc3141cd31f4199410b14805485f3e1e71114109921e948ef6f8bb09788bbb5199f9ea WHIRLPOOL 5c25a9817a444f9e263b9b53b724ca9fcdd61cc23654fe48fc428504953d4c15133d1e44aab572b65b509da9b6790408d3b81f42a11976e3ef7de731aa2312ea
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/x11perf/metadata.xml b/x11-apps/x11perf/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/x11perf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/x11perf/x11perf-1.5.4.ebuild b/x11-apps/x11perf/x11perf-1.5.4.ebuild
new file mode 100644
index 000000000000..23a057110073
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.5.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X rendering operation stress test utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/x11perf-1.6.0.ebuild b/x11-apps/x11perf/x11perf-1.6.0.ebuild
new file mode 100644
index 000000000000..1ce4d3573d1c
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X rendering operation stress test utility"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
new file mode 100644
index 000000000000..4bdc56df38f1
--- /dev/null
+++ b/x11-apps/xauth/Manifest
@@ -0,0 +1,6 @@
+DIST xauth-1.0.10.tar.bz2 162176 SHA256 5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f WHIRLPOOL 9ed291e2699fa34b49cb05c9ea2934cbe6b4361b0eec138734cadd741551b299f266ee50827b86f558beba47ff5c5c2f695279000f00fc720125e915f7e8e26b
+EBUILD xauth-1.0.10.ebuild 620 SHA256 1491ec0d6ac862ff7810db5baa4ef65642c4ea7359a9bacf0be724eb29cf03a0 SHA512 5d968ea664a7ebbcfc709ab023dedb0e39c7c5bc4de953f6c13cebd6fab2ba3800eff576a76790979deec8bd0715575b7e4225fe4718f7253b84963dd8f54d05 WHIRLPOOL 71e760939281cea85c3ae2ae6baea08f3a60a56f242b1ec2af5b561220809f55f253559a447cda7070c7089f93bfd7c957205b81afd5030e3c30d7001ca61e75
+EBUILD xauth-9999.ebuild 545 SHA256 44791e8d696f24420f6c5c09987b2e47ebec7bf9b759975c011284f57e1b37e9 SHA512 99b1c10111900c48a7debdef3020905899018844fcc9b52b72e304e6a7f9702145565e2363bc8a7908cb7feb13e2bba0a62fd9afe64616ad14400e8e9c3c4c81 WHIRLPOOL ced69574313658c275e0dc64beaecac70687a31f49e6ff1abff7448f54274f3ea153d0c89bea24d5b5f6aefbcbe1f1a4faa95b301e7ba6e85589205ff20df1b2
+MISC ChangeLog 4523 SHA256 a0cea8d07a85def51b2877a8128d713c2dba24cde41aa10cbbc1fc983b21b395 SHA512 121c8bb64dbd90adcf53c6f60d65ee2188138691ed5488494f8af0f9b4e2452388fa109a7f4127dae8d22efb75266b4eba8de2902f0e7cca1111738373a77838 WHIRLPOOL 27cfc0287c40d3263a55b2978f6880f3b51392cd6116e8430fc6b38056911b4ac6b3fbacbfcc482978cbeacb9783addf549d10a1cb75c9eac96bf19783f4d976
+MISC ChangeLog-2015 12335 SHA256 372f05e67263676420273972009ee0d42a152c8f24003845165165d4b70c9dc0 SHA512 3079793c0ea14b7c82e6aae97ac807a54b1dac1e2b15c2b8f57e0037bdf80b2ca38d9d8e8b94c6da456a5a5574c0e45983ebd874dfd8a081351921d248f1e33f WHIRLPOOL cd0cd294aa7ed6dad4038a3590457f9f97d8c922d771b3419a16009e3f899efce626211e4da60eed5c24b295d0b4ad92e8bc06e84bba0c13b09605e7bfdbd328
+MISC metadata.xml 234 SHA256 900f23c261ef4bbc25ef3d591263a70142c3c6f1cf833d1e66301936532399e7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b WHIRLPOOL 362d1afca87746963dbde2f7b3a6d4cfdf0948f9347fef9eca5510c04e2c6c9b9e6f5f9a934ba0939e261f472a1a74111d70a4cc87a8590f38ceff7692fdca79
diff --git a/x11-apps/xauth/metadata.xml b/x11-apps/xauth/metadata.xml
new file mode 100644
index 000000000000..7a7bbf810544
--- /dev/null
+++ b/x11-apps/xauth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xauth/xauth-1.0.10.ebuild b/x11-apps/xauth/xauth-1.0.10.ebuild
new file mode 100644
index 000000000000..d50c326ce53f
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils xorg-2
+
+DESCRIPTION="X authority file utility"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+
+IUSE="ipv6 test"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmdtest )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+	xorg-2_src_configure
+}
+
+src_test() {
+	# Address sandbox failure, bug #527574
+	addwrite /proc/self/comm
+	autotools-utils_src_test
+}
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
new file mode 100644
index 000000000000..aa5cc700c661
--- /dev/null
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils xorg-2
+
+DESCRIPTION="X authority file utility"
+
+KEYWORDS=""
+IUSE="ipv6 test"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmdtest )"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+	xorg-2_src_configure
+}
+
+src_test() {
+	# Address sandbox failure, bug #527574
+	addwrite /proc/self/comm
+	autotools-utils_src_test
+}
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
new file mode 100644
index 000000000000..cfb1a9f4b486
--- /dev/null
+++ b/x11-apps/xbacklight/Manifest
@@ -0,0 +1,5 @@
+DIST xbacklight-1.2.1.tar.bz2 117607 SHA256 17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b SHA512 9a0afebea2fe155ab7d1ad00ef27566daeb7dc4fd47523511f1b8e8ac30977f938a08783bc0c7443fe92ebff1c17c68c78d44db08b32768d7831128130e0637d WHIRLPOOL fa72995cf28828226fc5d132da854ca9029a6654b160c2de500d5f6903e9267af460f4ee5a7c5ca1e7a71e096cb12f091556002b9dbc49001ea37c3c8d57c455
+EBUILD xbacklight-1.2.1-r1.ebuild 391 SHA256 0b13dba19ce9adaba20d5f3d5e593fe02f0e90e5bbf3fb5e2e8bd8ade9232408 SHA512 59a951430d29cd9babbf52e4f29da6bcde296fc6f049632e96838d325a62437b35fbac8110f611842cea3fc457964253b7f4b16d6a1961ac44054e27cb3f6386 WHIRLPOOL 8ddeebe0fc7126f0629bc7e221a30be0048b7c2076e8b0f7de74b36511d4616229e967c5908b2213919d535ae4f0c2bbdd3693c9fd40b8cc96662c5aa6745977
+MISC ChangeLog 2938 SHA256 e23fd6024a20e59d49fbf581c0bac80d7f47a375e6ea4d07f670765d40bde50c SHA512 71952b175ce7ade060ddf319eefc5e6dda1722e16b10876afcaf46312e527bff34f7066fb260bd5d10cf0c695ce8f9ba6e12c3810477b50e3bf5f1294f3818b7 WHIRLPOOL 791b21101e57ac225cf196c568a34568710d2898ee92914a2d83e2ae2316690fa613dd8a6c87d287b4850e561865787dba6ad3fd72b02e3b6f167ce6bf22e940
+MISC ChangeLog-2015 6915 SHA256 d71eea9ab7c97ca24842d5a214e7d272ee6d5141ef3a3f1ad1029744387a2fed SHA512 78a40ca5a3e2ef962a881a6b6af3c7be54c5cbc0ed7c9f4f48039ee5462a42328b6a7914280807f3bf7faea488df727080c66c7f5e8b2786d7e2df72bc22d8b0 WHIRLPOOL 3a58ca660eeac4d4c9c5838527a1741689d9e3c8543b5c32f5f3fab1ee2de32fdda6c1389b9c9cd9c07dee31247f7e391deaf1a4a6eb43b2665e3c29029d563d
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xbacklight/metadata.xml b/x11-apps/xbacklight/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xbacklight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild b/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..f16788f4e560
--- /dev/null
+++ b/x11-apps/xbacklight/xbacklight-1.2.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 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/xbiff/Manifest b/x11-apps/xbiff/Manifest
new file mode 100644
index 000000000000..e95ec7f97dd5
--- /dev/null
+++ b/x11-apps/xbiff/Manifest
@@ -0,0 +1,5 @@
+DIST xbiff-1.0.3.tar.bz2 116043 SHA256 aa1db4f31f7afcfe131bda7ff6e380ff7de41cf1a7009464783043c817c47ce8 SHA512 e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9 WHIRLPOOL 8bf8aef0c9348cc1aabeacccae2334cf7e8f44649ea567a0046714102ecbe57f3ca9ee7c679fd8710e82187db1f7560da9709103bef72862ad9bbc699b265c46
+EBUILD xbiff-1.0.3.ebuild 352 SHA256 e2345f65965fa61b7fafe0acf7615a3d9d1017e59b64c2932724aff00e8cfd20 SHA512 f3589db90e311ab020cda6858b6e258ae26fbb4779dd5dee1cee054c386e9c272a9075369eef8c4de3e251269eb5ccc07663b10a58e4c955d63e08a9c5a3a7b4 WHIRLPOOL d7a0b937e73427a6e7e0bb89d999183179052022640da4cc87e4ad461c50dde7e03b879a7cbd3d5faecc2ae2c653d63ba97848df1f5308c953207a10651a975e
+MISC ChangeLog 2421 SHA256 94e4e4484d75c8cb12b872654a3d7640a2a8e71565c837c2514e56f28a1a099e SHA512 03bf5b841baf36012098e53fd269911a11a2b17d0d102e35ee901637de8e3986b03749e9fdeba056be426b170ff99a163c1e8a9dba3a250e6b7560bddad40f43 WHIRLPOOL e44e61b77c8673d6c5b52e1593961e7a9f18b2dc075cd930af4866a991f5c761c834ccf2d0cd24484a8c3a0ff76998bcd3d2351c266d7756edd9b92ccf5d5f15
+MISC ChangeLog-2015 4756 SHA256 2caa5b970c4037d6c06f673dc5c0070142f4f07b89c8e4b8a041eaabe6d7f960 SHA512 c255f825d32d3c2a2ce9a310168114b5d0c5972bf66a6c026fc55898d33a2b0e84e26565cd87f59073b90ba101e56e42942726f037ddf3c139981eda23025b32 WHIRLPOOL 5a7008a1659f8bd01654c9bbd2f4d9cc3f504b02cc7aee9731181498d1500dd15275482ce87647ddfce726d09e1c65a52f5da16deec82470e0d3b0119e835655
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xbiff/metadata.xml b/x11-apps/xbiff/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xbiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xbiff/xbiff-1.0.3.ebuild b/x11-apps/xbiff/xbiff-1.0.3.ebuild
new file mode 100644
index 000000000000..cad12b2223e5
--- /dev/null
+++ b/x11-apps/xbiff/xbiff-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="mailbox flag for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-misc/xbitmaps
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
new file mode 100644
index 000000000000..ec99458f85e8
--- /dev/null
+++ b/x11-apps/xcalc/Manifest
@@ -0,0 +1,7 @@
+DIST xcalc-1.0.5.tar.bz2 135451 SHA256 448f3aca106e86fbc051172cc4ea51eebce2fac096a7a971b8561b9b85697ae4 SHA512 8ca9cc8fda4cc0b4578342311e3cfa7ce69084f10bec7eca4b0cf6d2ad11bb7f188d89ad15b12b17a514fb02eb9758df96d514e605aa4bfe7e23fa028591a7ea WHIRLPOOL 31ad6759b674811351a554950621da010a41de11b763257d153ecd3c052a4eb6ca341371a7bc3ad241074ec7845bea327670b144369301e6a02255a899b29585
+DIST xcalc-1.0.6.tar.bz2 142808 SHA256 2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8 SHA512 61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 WHIRLPOOL 57436e9fc64f9365b038a1e047379fa9f5bd74eb56e1a150bfedf8a38ab1bb35c8372997ddb3f3350b2fc1efdea4528ed11861949899caef5de8a07828979b9f
+EBUILD xcalc-1.0.5.ebuild 388 SHA256 f4b4d3b42242f35eb398993a5e355b64b6e69f2db7cb934e17a205f0231c336b SHA512 798f3ca4543c26bb96eec4a325ba873249d73bbcf6e55347f7fbb974befbef208180a98c97e9b975c788cdb8e036e429f05e1182a8a04f6409c959c249e7091c WHIRLPOOL 5ca402af16ab0f69f7cdda3d33e7bd2d336099172b717e6880d332a02dd7349188746aa951027afebec55ea499ec2af2823105259e8d068768e2f990130f6dcc
+EBUILD xcalc-1.0.6.ebuild 388 SHA256 f4b4d3b42242f35eb398993a5e355b64b6e69f2db7cb934e17a205f0231c336b SHA512 798f3ca4543c26bb96eec4a325ba873249d73bbcf6e55347f7fbb974befbef208180a98c97e9b975c788cdb8e036e429f05e1182a8a04f6409c959c249e7091c WHIRLPOOL 5ca402af16ab0f69f7cdda3d33e7bd2d336099172b717e6880d332a02dd7349188746aa951027afebec55ea499ec2af2823105259e8d068768e2f990130f6dcc
+MISC ChangeLog 2469 SHA256 ec64a2678d072b37a2e1ab70ac977de06712fd9103a0956b5e1b79253c60ab65 SHA512 b7949ab846e44b04b8d61e0112d82d979458dc14b87772fb53180b0239f53011d947e77b498e45de009063b39a14f61c71a7c5e0c5827ac6934cd49e303bbaf0 WHIRLPOOL ea8a2003d67f2fc3f4424a1a38a56b1722856eb873397d3302abd5a40eb48ea6e58a2c794cd9ae2aae9cda594e2d9f1c31b2fa4b9fc688c58a8d11fb54786365
+MISC ChangeLog-2015 6837 SHA256 251eec2c337c62729af75ce2eea3a18bec732335cd6910866896ef8a31110858 SHA512 aaf5dd8f45c0d5fae05f62b01a31adf7d1c7a453127fa0f6b95d12819e424f1a9c21fcdf24f9083aff481bd4191452379649a80c76179fb3cc78a671537dbad9 WHIRLPOOL 0b47bcf82a703e221ed37affcb49f4ffeafbbef3ecb7d2e305147c858b684a922fa8733a05dafa8e14da9e445dec92f3409a109d28722c5fe4d303f09d0d2bbe
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xcalc/metadata.xml b/x11-apps/xcalc/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xcalc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xcalc/xcalc-1.0.5.ebuild b/x11-apps/xcalc/xcalc-1.0.5.ebuild
new file mode 100644
index 000000000000..b71000cea058
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="scientific calculator for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/xcalc-1.0.6.ebuild b/x11-apps/xcalc/xcalc-1.0.6.ebuild
new file mode 100644
index 000000000000..b71000cea058
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.0.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="scientific calculator for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
new file mode 100644
index 000000000000..7c51c61c8568
--- /dev/null
+++ b/x11-apps/xclipboard/Manifest
@@ -0,0 +1,5 @@
+DIST xclipboard-1.1.3.tar.bz2 132406 SHA256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e WHIRLPOOL 69741b7c43075dadb50a89d094afa13f24a14ac17fbc93232899739a7f97a829f1992b08600d99f967c2246c409b0b8c37c311f211c119c8c77c170ec3e31dfb
+EBUILD xclipboard-1.1.3.ebuild 384 SHA256 9a36da1e6dda32657fa45022954fb200e9fee65f89a9d35da0d319961c4759c9 SHA512 d21cd259cf4d9cfab13ad5f0427524fceab1dad3bc2e053d86d63db8beeea5b25daca0c4d20d388b7fb15442229e34852d2508e1e04d3458fb9b86339a0679b4 WHIRLPOOL 9e63b92765fc5f374a9cb5bb2f1a54004405711921d3536f41930b9b1995d9590c0dfc7abed19a4e0894be7ace3aa2d8b96083d3ca4750a9d5e075f4174b37fd
+MISC ChangeLog 2617 SHA256 a10c07c2140628ed0a683919b15dda58d27f6ee46ccec5d74fe8e5cf1f8673e8 SHA512 adfb2fe9d5253cb66fcb4b9a7a2debb9e02430dd6b64f0ccf881056b16d2f3746b4f7fbed104a89a99e4057db18fc9b38e3af920f9652aa731d305c5bc75fdb7 WHIRLPOOL eeaa59b1961ff17b9e3d42e65dd38ef801af8846878d0ff54309ce434d88fdc9227514db312126a945a582c1b2ecd51d936d3295edb5773b541d17c3f3cb7721
+MISC ChangeLog-2015 7188 SHA256 609a8969664da6515a3d5eefeaa7e94abf6bbe86a311f9ef4404ade09d96e1e9 SHA512 586ad6da9b725e1794f2c3790312ff0a45600f92c51ff0721a5dd52b42f02b69b0dd9d08289d41ed4aeeb65489c9ed6367511ddda078159751462209f6120cf9 WHIRLPOOL 46ef213085a75bbd4d6c52adb1404e12295e943d466f3ca668b4707d8dc6f44d5828aa607e0a80e2d508bdad5e4f1b659a13d583f3faa16587c8eea685918fcd
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xclipboard/metadata.xml b/x11-apps/xclipboard/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xclipboard/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
new file mode 100644
index 000000000000..ea1227fbb323
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="interchange between cut buffer and selection"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	>=x11-libs/libXt-1.1
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
new file mode 100644
index 000000000000..5dd559043a4c
--- /dev/null
+++ b/x11-apps/xclock/Manifest
@@ -0,0 +1,5 @@
+DIST xclock-1.0.7.tar.bz2 164035 SHA256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 WHIRLPOOL ebcc870b133d6ae03e39f3bc8f8eb65775ab9dda60fafa91d8609a002e0e797c2dda0879bd5a8c36fb5e2dbcc921defb2a35633fd902700c773a6c402baf7355
+EBUILD xclock-1.0.7.ebuild 487 SHA256 92f9fca98202e78cce9569407ef4828a4c8c37edb8e2cf1c289578c8ffef683a SHA512 4ad0e705bc67bb3d0951ef6bcd93ec008d1799f31fd7c5b5795c14f483e4c79a79440d955ff2fe9a44d4adad2e51dfec9a6d56a92be9e25c9467c36276f4d0a7 WHIRLPOOL cb22fb370c9ce4270d653152bf1a915e6a5f7103bef6a30c31c560a1040f7be9b7279efb2cd8900454088b66c0f2967ea16e0facdb2417f897d9ac64be60e1fa
+MISC ChangeLog 2730 SHA256 411036c12cb965db36753e99bba9f8dc2f13f01899997f4269ec8cf89b660822 SHA512 5d1b62724da7f83941c8eeb242101472586ee3662edaaf4a119f19e641feb85ff05da7e7eadd0c39b708c9c7cf0254f5bd01d7d3a8d733bbdd325cc8a4a0de4d WHIRLPOOL 91418534d183684e63efe07b7fc2d4e38cf5d8e7575b3d62d42d8fb09adff0de085b6eab5e0d9a1b8229430b8c12d0205d1970da7ee7991f8051e94a6250271d
+MISC ChangeLog-2015 8875 SHA256 8a0c35b4bbf5a5b4ca04c7ffaf86c42913982ea6aac06bb7729ca60e420c7dcc SHA512 f974416c8f170e5dd3dde642f1acd3f7557220add811acb0ddaf280b25fc98ceb10954ae9c06727e5b101e4fca7331d6b52ccbe8668dd361923e43ccaf3d7e0e WHIRLPOOL a5c900b09373e58208285e625f7a8a255f70d5dafb9e33b6046bf9e4b947f3e201706f6099897703c61d2f864a9b8050d30a1c4ddced2d70b5b9ceb21c91d4a3
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xclock/metadata.xml b/x11-apps/xclock/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xclock/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xclock/xclock-1.0.7.ebuild b/x11-apps/xclock/xclock-1.0.7.ebuild
new file mode 100644
index 000000000000..420604425ebe
--- /dev/null
+++ b/x11-apps/xclock/xclock-1.0.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="analog / digital clock for X"
+
+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 ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
new file mode 100644
index 000000000000..5df10dee8295
--- /dev/null
+++ b/x11-apps/xcmsdb/Manifest
@@ -0,0 +1,7 @@
+DIST xcmsdb-1.0.4.tar.bz2 136502 SHA256 e460b9bee74200fac42294ae3762308b8c6024186d317f70a36acf41c338ba0e SHA512 ddbcc10846ac8ec1b74373d0bf1944ca03f2a5ff775861fb39cad6d53828412b4fadc1d9e6ca8f79b22188e2d16b127496a85c243e347b84b2bef1ff82330702 WHIRLPOOL 99dd27b8a2f5f800881c416fcd9929618db62a2b41ee6ccb6944c89e854354285a326793335b4356d05d92268c3c31c6dc3093159250f1b0884bd943ce139317
+DIST xcmsdb-1.0.5.tar.bz2 145419 SHA256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4 WHIRLPOOL 46acb8bed2eaf99e434e8af342b4f799df5388541983a99ab5d3f958a01a0a89e20e8e1494c7a32cd16bc4217a1c4fb10d7954f3af69cb5768aafeed8d62886b
+EBUILD xcmsdb-1.0.4.ebuild 362 SHA256 bb281caf48a70c893b5fdf6267f003940851358c2d77ae658fc92954b46b38e2 SHA512 b2624761495a4fa1d638e9ec56807b2396a113912899452641a0f10899f188fdabd201cdb8b6acf2d6d07ad871a47f17b62d031fe0134cb45e877b14910a39de WHIRLPOOL bf1d1f963679bf86be24993ccdfa10538ce0c3b3e81258e4be0a6e4d406485f98cb418b085b27e4e089c3eb4aa89781535e3597910bb354285c0a6971a8777dc
+EBUILD xcmsdb-1.0.5.ebuild 371 SHA256 e7c905442124df2801138133c9600a8688cff820af08531554aa1a99cc0a7398 SHA512 2128d5e1f203a7275aa1c23803b6ba3de13dc7abae716ccca7da57da0d2f38b75ba9a9afea4feaf4121bb430a1f0f14a5eabfda142b261678bc480cdcf58f238 WHIRLPOOL 0d02f9f3ebca832dd789ab6b9eeddf48b1b82dcd01b5fa8373a2d53ad069a7665a464a0843ef058f5f606ea28ad1978da18497ee11ebaf793bfce8b004d8d028
+MISC ChangeLog 4129 SHA256 6cc49a0fa550625c59148c9dab1ff44c3a5045f1e64cd3aea153378f9ac14e15 SHA512 c140524f16898295779c7c333c4e43a548d4c2dd76143f4ed6d25624afbb23d8df3525d74f74f39357737b5e1aec0007dafe02c1a5d22056664d494c70cba74d WHIRLPOOL 380ee667411aadf568c5c43237219c8e71cde90e680546302b24559a2191d76b659e8812284110c0f0cfab889edc5eade1df137e423d72646f90893740265192
+MISC ChangeLog-2015 5978 SHA256 5ed18bc11f68849510d7f1f04d546cdcf21a24e8e63cf8486aa9d6338c9cffc1 SHA512 bf291ffe524e83e7271f51ac98703b5ea7a4f4ab9c92d6fc9003ff99745a2d5d01e814ed8d31e9359f5df77014d43820e0d0382b11446c35dc4740c144040c3d WHIRLPOOL 4eb552c2cd2be14370cf0e144ae7750bd8d9c05fb0aa168d4c0349961b112cd63596417b6ff962a5a3b64c7a3e1d0a6b53220a0c2055cce38ddb5c49f3711e85
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xcmsdb/metadata.xml b/x11-apps/xcmsdb/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xcmsdb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
new file mode 100644
index 000000000000..90ba5e466e4d
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+KEYWORDS="alpha amd64 arm 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/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
new file mode 100644
index 000000000000..a12268d39b20
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+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/xconsole/Manifest b/x11-apps/xconsole/Manifest
new file mode 100644
index 000000000000..9be22e1f97cb
--- /dev/null
+++ b/x11-apps/xconsole/Manifest
@@ -0,0 +1,5 @@
+DIST xconsole-1.0.7.tar.bz2 134832 SHA256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 SHA512 89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9 WHIRLPOOL 5acd8714444e3e3ec911f562fc6f4004891e8c39a4435d3e7dba04d02439a85883e6bed034dbc90e6d6cb8cffb2494d948941f6e3720635e4aa09957cb768087
+EBUILD xconsole-1.0.7.ebuild 379 SHA256 e6e717952c6b46eb3eb7d2678c53b777cabd947a5196c21a1d92c872ab70413c SHA512 cf8503622080ce051d32267a2075c1fe008dc12c143b14ca7e364e9a843b585cd4c5b4c324d3553474a817f376cf9818ae109bfb61350a0baca7fbad46174258 WHIRLPOOL 8052225a0d8107715916fc512c503e1763a29cce02e927aa175770a01ee406b3e75fc4b917e92e9b2d1e6502697e5d556d7cd19636e7955b0fac85ce02d2173b
+MISC ChangeLog 2430 SHA256 99b63dcda40d8907ac1f000ea3b76787d5ae4f277709704f791a6d2a0c57a602 SHA512 e2d1f948ae670abd936af18660631973b6a85ebf623584fa6bd7d7c81c90c26e48442d5d8e2ee2fe5919a1a74f3c2395ae3cab77bd694006d8fa40553f2e32cb WHIRLPOOL 686f06ffe3c65ef53b85d017b39d43a5b2095729638301f62e0c9f57f5c1a95d0c486796dc33901a3fcdedc3db5a7cefc051402a4305afe459147e4937395e93
+MISC ChangeLog-2015 6478 SHA256 2dff2158f4c1f4eb24108ad16d3ae170616353c5e450232e91ae160387f8b008 SHA512 19e9756ac04644ebb54d6f404c2ba1d3013f841f7b5244309f614ca6942d39635cf09d290bee562fe72fbf69e9f76776c3cf9cf8398ac3d6b035d0cc2d3bf225 WHIRLPOOL 3da6cb95224d535477b0388cab9e3ca93f5111689a3ede39090095a5fc8f728ef89d9f842a878fca879b55966c5dec64855a558b79dc359a556cf957e4cd2ffc
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xconsole/metadata.xml b/x11-apps/xconsole/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xconsole/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xconsole/xconsole-1.0.7.ebuild b/x11-apps/xconsole/xconsole-1.0.7.ebuild
new file mode 100644
index 000000000000..7c43b2c2694b
--- /dev/null
+++ b/x11-apps/xconsole/xconsole-1.0.7.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="monitor system console messages with X"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
new file mode 100644
index 000000000000..c8f1347dd358
--- /dev/null
+++ b/x11-apps/xcursorgen/Manifest
@@ -0,0 +1,5 @@
+DIST xcursorgen-1.0.6.tar.bz2 124545 SHA256 31c8910f54eb175a8a74a60e7662697467e21a8bf948220a6048a93924b3f66c SHA512 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 WHIRLPOOL ecccd46753d23dc4bcc5370b7f4c8ca0ca3e4928ede49b6d3486e73ea45cfcaaaa19eaa72c1d7be25d35a64dacdc7812a7bcd5e7db665d7cde9219c5b710facf
+EBUILD xcursorgen-1.0.6.ebuild 402 SHA256 9553d0de148d0af718d038ceb878170d58f339601d27301bf8e1461fc2fea7c9 SHA512 4b56cd4644b7cf7ee066b6e18e9db6d61e7721cd67651464422d3dcd8c46db97fbb3a6848fa0d91c6baae3643da0fe1b06b74bf17582b093f10325afe14a236c WHIRLPOOL fea4687c90127cbfd58396be0fcf3ef6edd8b4ac5c1649eeb4bb20f0c7903d717d21e916ca846d6284cb70c514b930e951852f88ae427b6d3455650a8272fde1
+MISC ChangeLog 2782 SHA256 d5fba3310c4b9b670a2f080b8cad48d2a3ebb41dd7931ba9b1b2737fbbdec769 SHA512 c514e2585ba058454d840214b1e1a62c1fcac36df3afad53799cf6be9cd3373378492c1a043c832e6fb8f7daab5c3358e62d27fa0bf84acdc9e88a27cd72f35d WHIRLPOOL b55a547d63b561b0a413961272af620b2649cb593722350b6e022cd81f1b2d7d2a4879a8c1463bd03704a663e96ccfc92bc6b682ca525216b7d4abf2a2505016
+MISC ChangeLog-2015 8918 SHA256 a1f6015c431d145b17281e5368b4239c57586ccf4efdcb65c7897dc3a6602437 SHA512 7ab22f0ec7f17167828ac15ba2370eadf9e64f783b6e0102625033b770f951480b29ed04e78fee43d268a795c661e45fc8484d38c9b910eee943e05b601cdb30 WHIRLPOOL 1a7bb172dd6ec140abf7310ad0218fa76883ccaf545b9c22f94c7e7cdcf1127b5a55b615ad9e4f81b6fb004246a6f6c4f1a0f927b9ed7c5bdebe94b6f64c0a81
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xcursorgen/metadata.xml b/x11-apps/xcursorgen/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xcursorgen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
new file mode 100644
index 000000000000..d82407186aaf
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="create an X cursor file from a collection of PNG images"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXcursor
+	media-libs/libpng:0="
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
new file mode 100644
index 000000000000..626d52a3eefd
--- /dev/null
+++ b/x11-apps/xdbedizzy/Manifest
@@ -0,0 +1,5 @@
+DIST xdbedizzy-1.1.0.tar.bz2 110340 SHA256 66507b359eb87a7649c9f78aadb7b11efc0a5ffacf9b259392ed54be42cc0d09 SHA512 58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa WHIRLPOOL 40762c938397f0f4b572ab56b93814c057dd037764e0a6982a369a8acdbeaa73552d83767003d0e07efae41a121a2573bb4b1dafd1f84f9a2bd550721a7a243e
+EBUILD xdbedizzy-1.1.0.ebuild 346 SHA256 1dffd19657d3cbfd23153b521989617ac3320f472585af366fcf7eb7b75a3842 SHA512 798326ef1a72507a4f6538556130f28441641978d1f8c76fc2293a01bb0033ba73c84ce9c4085e6f3c3ff130e4b2f4b5cce3b84e4d5411275995428bd1c75b2a WHIRLPOOL aba32abc11bfc72c72ac7178c07bbe84659d384fd9a26901c9ff59b55cd035ca399da3043506cd9fb4c33c693f7651b174f11bf7e1ff73dec5c1305dd4d15fd4
+MISC ChangeLog 2433 SHA256 6eeed9a6ac05eec2980e084e8c6fa67aa3debdaccc279ea67d66257b31ed21a9 SHA512 e506fe7f86d35c59338413360fb58cc564106c6fd5201a3268f5630f69d4e928ad85deeb86c38d039c0f840953f09b642a91832268d4c88af0e3d378361b7c33 WHIRLPOOL ad39615cfbf11725ca8ec571dae575100960a0aaa7c485cc6c852530e1029b6999468955728cfb921ec9fadbed035808fe1ca44fbb9ca47e83f2fbc8455882bd
+MISC ChangeLog-2015 3439 SHA256 f98e681af7d23bb1fbcc0a5d88af1c259c2d6bf63a9a867819a7eb9da4a4c702 SHA512 b9eaaa63f813e5b92f9ebd4889d0cde9c9d85044345c4b73f95abb024f19d7b7098d3fc8262bc64cc8d45eca8461d2fb5b9dfc6abcc9bef10a27061f8b932a64 WHIRLPOOL 1be2da883ecc75330b1d7e57eb5bfa5b5693706329135d619b9d260f908e1eff84657d5b37bdebbff9dd7a995f323c1526f2ea261f5e654437ee18e666f967eb
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xdbedizzy/metadata.xml b/x11-apps/xdbedizzy/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xdbedizzy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
new file mode 100644
index 000000000000..aa93c76e2183
--- /dev/null
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xdbedizzy application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto
+"
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
new file mode 100644
index 000000000000..9996dc24df41
--- /dev/null
+++ b/x11-apps/xditview/Manifest
@@ -0,0 +1,7 @@
+DIST xditview-1.0.3.tar.bz2 143012 SHA256 30f0eaee7e740a080cfb29e3f57a1202e6a5a19a0bfb099c89060cc2986e0328 SHA512 74b7a7a483eda731840d2150bfab75628b91407f176b6cb64b03b992c05b6ff2426837489a12b12566b05450fc446e7433a541a4d0c52e27f843bef06fc91f67 WHIRLPOOL ae92a79218d3f2fd836926cb9131b159ba5666617e7b134b3eb100acae85f79a8007cfa14870fc581b158728b99181bf9622be7462dd5d252377a2831dc41b2c
+DIST xditview-1.0.4.tar.bz2 148842 SHA256 307f8df1bc3e90a7fba74dfe16840891c365abc027fbd556027eb057e5d1ff73 SHA512 7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 WHIRLPOOL bab763ebce0bff923e62afb761ad62edae3c22e36229c8dfbedccbb02eb31705ccd03068975f789ac6d316ba4e5fd7a384fd985da4fa282ac211c5e62440c16a
+EBUILD xditview-1.0.3.ebuild 336 SHA256 ddf7faea887fbd84465514c0dcf680da6805629f641a81a62b20cbaf9a394c40 SHA512 75d962edbd5ffb82571c0793f4a7a715764d05c2fa38f24297e10c7a42d7b8dff02cbcbc7ccff995413b60a927e7ea4fb456e3422c55c3bb6365cb3095d56e3f WHIRLPOOL c20eef2d096950504f88cfe7b4a6f0a56a5673d6cd2b1a4f44fbe69f514506e9f7bc22bb1f7e28015c189e33a563f6bce17423588036c16f5b970ae81969d13f
+EBUILD xditview-1.0.4.ebuild 336 SHA256 e4b36cd00b5b095d26cf74914e345ba49f0ef7fee9be19a18deb77145d27c4eb SHA512 ff0ad2ea95412ccf84a575978295395b0ecb9ecb1220f3c8e047a39e04477e4d4092594410cc6479147c012b2b25acec13cb4d2ff89c59f51cb209c1e8241053 WHIRLPOOL 6bc4ce5f3e422d22b1c1a4b22343687346741daafaad30705cabed2290daeefe2990d575608ad94306eb27060053d4da66cedb36df1a9aa8a99e88ad8ba442a1
+MISC ChangeLog 3619 SHA256 08f4cbd72bd895666edbd868acf3c30bf0df8bd95988cc6dc458e63b5943db7f SHA512 d7c4c310dd5fd8afb1bb704d372270155fc31d9c8af355d28872a4bf3795f8b88127e344704ebd4a313cfd2cb754988225ea99bdae36c3f6a84060a25673df4e WHIRLPOOL 55723ecbe24d05d40a01f985df110cca23c97b4c185fb097dec73736ddad89ca4136c2684f43e3c4b993718e154da0681d38bdb193b1046786637789cf0ec5a9
+MISC ChangeLog-2015 4703 SHA256 d5a5c39364af61095456fa6bc4e236eafeedc1c7439d1d131854f7645808e7d6 SHA512 5f8112900655ccdb38c2e2e9b3a66895c327cdcb4a81dba2ead74391976e0404fe7e04c4c099839e09cc8a70cea575637bd5cf711cb59454153855411ac166ff WHIRLPOOL 285358289bbf39be0af0edcfc0492093bb22b61d036e94780809cfee03f8258e69b4cfb8af0ea7ee011ea64705a71ef63b5c3ba8a0748b2d9d6f1a908884954c
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xditview/metadata.xml b/x11-apps/xditview/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xditview/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xditview/xditview-1.0.3.ebuild b/x11-apps/xditview/xditview-1.0.3.ebuild
new file mode 100644
index 000000000000..42a91fa142de
--- /dev/null
+++ b/x11-apps/xditview/xditview-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display ditroff output"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xditview/xditview-1.0.4.ebuild b/x11-apps/xditview/xditview-1.0.4.ebuild
new file mode 100644
index 000000000000..42c8782a1ac6
--- /dev/null
+++ b/x11-apps/xditview/xditview-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display ditroff output"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
new file mode 100644
index 000000000000..07752820b529
--- /dev/null
+++ b/x11-apps/xdm/Manifest
@@ -0,0 +1,10 @@
+AUX Xsession 1521 SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 WHIRLPOOL 079887cd7f29fe11e3306da145d4279e99d93c131850a03d49c35befd6d001d8c69a53b9b528a7808ff5913f8787adc90d6fb0f041234462d8f6204a9be0d127
+AUX xdm-1.1.11-arc4random-include.patch 360 SHA256 01a1d04642b04e75ffc6d2433200a3dbe3970b853ab1fbea19add6fa59f3adae SHA512 2da1c4972c7edcd6c3fc42f29c15ce875888cc582a18e1932a60c3d0881a5a96991129bf5bb8c6649f0731e2102c0a163928c089d7ff9fe19ef82d470f86882f WHIRLPOOL d6b41c6f64ba1a7de3725c4737331d419a3eddeeb325c9e13f540443f5c178f08eed73f685b0714e64914ba416a3d3b44a864d207cf3d991500ee6e757b55980
+AUX xdm-1.1.11-cve-2013-2179.patch 1519 SHA256 92307af6fe30116f520798425a7356c8690e837430a5d1b4674243ac16cad6cd SHA512 5890051b134f1ed8f68846ee47d38375fbd0b4c639b9ae834b27d5b1749456aba4e1000a16a16d387072845887685375b1d87c4ce3870cc2acda58c4f17d45ae WHIRLPOOL fdc7a9e75afe5690f3b37e94385afe780185363e7923a5b5fba66a9f272146bc82a690a0b853d10ec614168791a69dded862518d879546ebc9582a7a14efd1be
+AUX xdm-1.1.11-setproctitle-include.patch 849 SHA256 d00a803b87bdc4e84a17d2f9a3e4f147355cc0eb9bc71a860f2396fd1c642b34 SHA512 496ad42ee35ce6d25f87b349330394f65cc8979b388759d7e03636f96bc2272068a999a9f7ac3b2e0486099b7678ef1c0e30505c3e0a08cc3041121936f1abb0 WHIRLPOOL d206fc35eb18458f17aaad9938994a157adfd92f5357ef74e00003bdef9edcd7aa135fa1bd5b7b36dfeb9d0b56ea4b169ec5280c37c180538a01568840f57835
+AUX xdm-consolekit.patch 5712 SHA256 902bf08f10244325897bc410e7fb81178e47dcae9d96c115992ece860c1b211d SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a WHIRLPOOL 89d80047bf95de606a0fd87cb6ce26b6aad755c8ea1e83db7adf0d3751e655be271ae4db5dd2097226e79359a3d85e7b485d4bedcf5bf800c2add4552429ec23
+DIST xdm-1.1.11.tar.bz2 446612 SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5 WHIRLPOOL e505cfc5615d93ce8911f30b10b99698b38fa71dd468770616b95d34a0da2212f080f12a1457c715fc58beea56f4d9adc2f41dd63e3bf431b8d85182f0c250d8
+EBUILD xdm-1.1.11-r3.ebuild 1829 SHA256 39e7b8a0ad8ed0c9ef5ca5996028277ff4187f98a298338d5e159c54815d7557 SHA512 c8b901047ff6c1c999281ea565790ea81086b6681c46fbfdf1e4dc2e1f84faf3b4649f4e6054e31b6fb644eb0ac746914103868085ad15c587b3fdc0c4b44f09 WHIRLPOOL cf4532fe5d1c211775fdf55e5da3e49a9d68b4615bc40debb1c1f77d823a28c5978d23bfd0a37dcab3879cb268b1ee46de8e76effdceb36a41b63c5d36572bc7
+MISC ChangeLog 3248 SHA256 0c495c0c049d86198b8923be7f18f6089d4dd7ba7c758767ed0380779fdfc779 SHA512 de707cde9aeb847b4e819cf95bef188ce9eae74c5999044f9a518913f4533017cfa912115568e851624df6f915f72c8418523bd40b33dd0b5ea7d097b15666ce WHIRLPOOL 2903430140282f3d47becbf465900bfc0217696327ebfc2443e123dd83a80db768435ac08bb8ea53eaed286573014e7af7be93e4601d1c928fa1f68d9dd7329c
+MISC ChangeLog-2015 22628 SHA256 1b8c497a067c8a7e4b04a43de9bf72dceac11c9762401357ab98b2bda82c10ce SHA512 7eccd0322620b071d28e2c8d40fc69f4ceebeaf2e4f9d20243dcd8174e73ab1351e9866de08c8c5d7ed94ced40d4fd730a37e2bb84cb1f446946af51557c2f6f WHIRLPOOL 5a93e11de5afdb594e2bf88c9a20de5fe6673e7bc285edbf621bfa93442471673c89f73a4a9a61f7e00d75ae8dfcbac1cb0d09041e9fbf391f307c2381c49a61
+MISC metadata.xml 414 SHA256 9a7f96b96e6c7e681b90986933fbe2de6ca02d20ab701d72aa6b779b57d78389 SHA512 f3acd7a9e8f8e1d93ca5c657409efbaeb5695dc81528926d9ecdc517cff8a7c2f597b9ac8b856cb81246ff39c2ceaac5bd72587db68a5d260c3117599e24c38c WHIRLPOOL ac17b35b0fe3b09840c934ddbe69945ab953ca648d89978c3811f0ceb599c007bd46644538801c44ad7c04cae67dbd3b43b2735938f5d69933e9fca5fd521caf
diff --git a/x11-apps/xdm/files/Xsession b/x11-apps/xdm/files/Xsession
new file mode 100644
index 000000000000..ffeef4c87420
--- /dev/null
+++ b/x11-apps/xdm/files/Xsession
@@ -0,0 +1,73 @@
+#!/bin/bash --login
+#
+# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# handle KDM
+if [ -n "$1" ]; then
+	export XSESSION="$1"
+fi
+
+xinitdir=/usr/X11R6/lib/X11/xinit
+startup=$HOME/.xsession
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=$xinitdir/.Xresources
+sysmodmap=$xinitdir/.Xmodmap
+
+# First run the system default.  Because KDE uses this
+# to switch sessions, we MUST first check the system
+# default, and then ~/.xsession.  If the user Do not
+# want this, he should override XSESSION, or at least
+# clear it.
+if [ -n "`/etc/X11/chooser.sh`" ]; then
+	exec "`/etc/X11/chooser.sh`"
+# If not defined, try the user's ~/.xsession
+elif [ -s "$startup" ]; then
+
+	# merge in defaults and keymaps
+
+	if [ -f $sysresources ]; then
+		xrdb -merge $sysresources
+	fi
+
+	if [ -f $sysmodmap ]; then
+		xmodmap $sysmodmap
+	fi
+
+	if [ -f $userresources ]; then
+		xrdb -merge $userresources
+	fi
+
+	if [ -f $usermodmap ]; then
+		xmodmap $usermodmap
+	fi
+
+	if [ -x "$startup" ]; then
+		exec "$startup"
+	else
+		exec /bin/sh "$startup"
+	fi
+# Lastly, xsm as failsafe
+else
+	if [ -r "$userresources" ]; then
+		xrdb -load "$userresources"
+	fi
+	exec xsm
+fi
+
diff --git a/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
new file mode 100644
index 000000000000..db948094b755
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
@@ -0,0 +1,18 @@
+diff -ur a/xdm/genauth.c b/xdm/genauth.c
+--- a/xdm/genauth.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/genauth.c	2014-01-06 16:28:09.664060603 +0100
+@@ -40,6 +40,14 @@
+ 
+ #include <errno.h>
+ 
++#ifdef HAVE_ARC4RANDOM
++# ifdef __linux__
++#  include <bsd/stdlib.h>
++# else
++#  include <stdlib.h>
++# endif
++#endif
++
+ #include <time.h>
+ #define Time_t time_t
+ 
diff --git a/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch b/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
new file mode 100644
index 000000000000..34ae7ceb3cd6
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
@@ -0,0 +1,41 @@
+From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Wed, 22 May 2013 14:20:26 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt().
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+If using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/greeter/verify.c b/greeter/verify.c
+index db3cb7d..b009e2b 100644
+--- a/greeter/verify.c
++++ b/greeter/verify.c
+@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
+ 	struct spwd	*sp;
+ #  endif
+ 	char		*user_pass = NULL;
++	char		*crypted_pass = NULL;
+ # endif
+ # ifdef __OpenBSD__
+ 	char            *s;
+@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
+ #  if defined(ultrix) || defined(__ultrix__)
+ 	if (authenticate_user(p, greet->password, NULL) < 0)
+ #  else
+-	if (strcmp (crypt (greet->password, user_pass), user_pass))
++	crypted_pass = crypt (greet->password, user_pass);
++	if ((crypted_pass == NULL)
++	    || (strcmp (crypted_pass, user_pass)))
+ #  endif
+ 	{
+ 		if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
new file mode 100644
index 000000000000..0a3f32bbea02
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
@@ -0,0 +1,37 @@
+diff -ur a/xdm/choose.c b/xdm/choose.c
+--- a/xdm/choose.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/choose.c	2014-01-06 16:33:09.628065364 +0100
+@@ -54,6 +54,14 @@
+ #  include       <tiuser.h>
+ # endif
+ 
++# ifdef HAVE_SETPROCTITLE
++#  ifdef __linux__
++#   include <bsd/unistd.h>
++#  else
++#   include <unistd.h>
++#  endif
++# endif
++
+ # include <time.h>
+ # define Time_t time_t
+ 
+diff -ur a/xdm/session.c b/xdm/session.c
+--- a/xdm/session.c	2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/session.c	2014-01-06 16:40:57.508072789 +0100
+@@ -54,6 +54,15 @@
+ # include <usersec.h>
+ #endif
+ 
++# ifdef HAVE_SETPROCTITLE
++#  include <sys/types.h>
++#  ifdef __linux__
++#   include <bsd/unistd.h>
++#  else
++#   include <unistd.h>
++#  endif
++# endif
++
+ #ifndef USE_PAM        /* PAM modules should handle these */
+ # ifdef SECURE_RPC
+ #  include <rpc/rpc.h>
diff --git a/x11-apps/xdm/files/xdm-consolekit.patch b/x11-apps/xdm/files/xdm-consolekit.patch
new file mode 100644
index 000000000000..fbacd36fc073
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-consolekit.patch
@@ -0,0 +1,230 @@
+http://bugs.gentoo.org/360987
+http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
+http://lists.x.org/archives/xorg-devel/2011-February/019615.html
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -362,6 +362,20 @@
+
+ AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
+
++# ConsoleKit support
++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
++	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
++if test x"$USE_CONSOLEKIT" != xno; then
++	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
++		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
++	if test x"$USE_CONSOLEKIT" = xyes; then
++		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
++		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
++		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
++	fi
++fi
++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
++
+ #
+ #  XDM
+ #
+--- a/xdm/session.c
++++ b/xdm/session.c
+@@ -66,6 +66,11 @@
+ #endif
+ #endif /* USE_PAM */
+
++#ifdef USE_CONSOLEKIT
++#include <ck-connector.h>
++#include <dbus/dbus.h>
++#endif
++
+ #ifdef __SCO__
+ #include <prot.h>
+ #endif
+@@ -472,6 +477,97 @@
+     }
+ }
+
++#ifdef USE_CONSOLEKIT
++
++static CkConnector *connector;
++
++static int openCKSession(struct verify_info *verify, struct display *d)
++{
++    int ret;
++    DBusError error;
++    char  *remote_host_name = "";
++    dbus_bool_t is_local;
++    char *display_name = "";
++    char *display_device = "";
++    char devtmp[16];
++
++    if (!use_consolekit)
++	return 1;
++
++    is_local = d->displayType.location == Local;
++    if (d->peerlen > 0 && d->peer)
++	remote_host_name = d->peer;
++    if (d->name)
++	display_name = d->name;
++    /* how can we get the corresponding tty at best...? */
++    if (d->windowPath) {
++	display_device = strchr(d->windowPath, ':');
++	if (display_device && display_device[1])
++	    display_device++;
++	else
++	    display_device = d->windowPath;
++	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
++	display_device = devtmp;
++    }
++
++    connector = ck_connector_new();
++    if (!connector) {
++	LogOutOfMem("ck_connector");
++	return 0;
++    }
++
++    dbus_error_init(&error);
++    ret = ck_connector_open_session_with_parameters(
++		connector, &error,
++		"unix-user", &verify->uid,
++		"x11-display", &display_name,
++		"x11-display-device", &display_device,
++		"remote-host-name", &remote_host_name,
++		"is-local", &is_local,
++		NULL);
++    if (!ret) {
++	if (dbus_error_is_set(&error)) {
++	    LogError("Dbus error: %s\n", error.message);
++	    dbus_error_free(&error);
++	} else {
++	    LogError("ConsoleKit error\n");
++	}
++	LogError("console-kit-daemon not running?\n");
++	ck_connector_unref(connector);
++	connector = NULL;
++	return 0;
++    }
++
++    verify->userEnviron = setEnv(verify->userEnviron,
++		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
++    return 1;
++}
++
++static void closeCKSession(void)
++{
++    DBusError error;
++
++    if (!connector)
++	return;
++
++    dbus_error_init(&error);
++    if (!ck_connector_close_session(connector, &error)) {
++	if (dbus_error_is_set(&error)) {
++	    LogError("Dbus error: %s\n", error.message);
++	    dbus_error_free(&error);
++	} else {
++	    LogError("ConsoleKit close error\n");
++	}
++	LogError("console-kit-daemon not running?\n");
++    }
++    ck_connector_unref(connector);
++    connector = NULL;
++}
++#else
++#define openCKSession(v,d)	1
++#define closeCKSession()
++#endif
++
+ void
+ SessionExit (struct display *d, int status, int removeAuth)
+ {
+@@ -486,6 +580,8 @@
+     }
+ #endif
+
++    closeCKSession();
++
+     /* make sure the server gets reset after the session is over */
+     if (d->serverPid >= 2 && d->resetSignal)
+	kill (d->serverPid, d->resetSignal);
+@@ -568,6 +664,10 @@
+ #ifdef USE_PAM
+     if (pamh) pam_open_session(pamh, 0);
+ #endif
++
++    if (!openCKSession(verify, d))
++	return 0;
++
+     switch (pid = fork ()) {
+     case 0:
+	CleanUpChild ();
+--- a/include/dm.h
++++ b/include/dm.h
+@@ -325,6 +325,9 @@
+ extern char	*prngdSocket;
+ extern int	prngdPort;
+ # endif
++#ifdef USE_CONSOLEKIT
++extern int	use_consolekit;
++#endif
+
+ extern char	*greeterLib;
+ extern char	*willing;
+--- a/xdm/resource.c
++++ b/xdm/resource.c
+@@ -68,6 +68,9 @@
+ char	*prngdSocket;
+ int	prngdPort;
+ #endif
++#ifdef USE_CONSOLEKIT
++int	use_consolekit;
++#endif
+
+ char	*greeterLib;
+ char	*willing;
+@@ -258,6 +261,10 @@
+				"false"} ,
+ { "willing",	"Willing",	DM_STRING,	&willing,
+				""} ,
++#ifdef USE_CONSOLEKIT
++{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
++				"true"} ,
++#endif
+ };
+
+ # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
+@@ -440,7 +447,11 @@
+ {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
+ {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
+ {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
+-{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
++{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
++#ifdef USE_CONSOLEKIT
++{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
++{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
++#endif
+ };
+
+ static int	originalArgc;
+--- a/man/xdm.man
++++ b/man/xdm.man
+@@ -51,6 +51,8 @@
+ ] [
+ .B \-session
+ .I session_program
++] [
++.B \-noconsolekit
+ ]
+ .SH DESCRIPTION
+ .I Xdm
+@@ -218,6 +220,10 @@
+ .IP "\fB\-xrm\fP \fIresource_specification\fP"
+ Allows an arbitrary resource to be specified, as in most
+ X Toolkit applications.
++.IP "\fB\-noconsolekit\fP"
++Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
++resource.
++This suppresses the session management using ConsoleKit.
+ .SH RESOURCES
+ At many stages the actions of
+ .I xdm
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
new file mode 100644
index 000000000000..27b78ed8a148
--- /dev/null
+++ b/x11-apps/xdm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <use>
+    <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
+    <flag name="xdm-auth">Enable XDM-AUTHENTICATION-1 support</flag>
+  </use>
+</pkgmetadata>
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
new file mode 100644
index 000000000000..4233aea63111
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+
+inherit multilib xorg-2 pam systemd
+
+DEFAULTVT=vt7
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="consolekit ipv6 pam xdm-auth"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-1.0.2-r3
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-apps/sessreg
+	x11-apps/xconsole
+	consolekit? ( sys-auth/consolekit )
+	pam? ( virtual/pam )
+	!<sys-apps/systemd-187"
+DEPEND="${RDEPEND}
+	consolekit? ( !=sys-auth/pambase-20101024-r1 )
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${PN}-consolekit.patch
+		"${FILESDIR}"/${P}-cve-2013-2179.patch
+		"${FILESDIR}"/${PN}-1.1.11-arc4random-include.patch
+		"${FILESDIR}"/${PN}-1.1.11-setproctitle-include.patch
+	)
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_with pam)
+		"$(systemd_with_unitdir)"
+		--with-default-vt=${DEFAULTVT}
+		--with-xdmconfigdir=/etc/X11/xdm
+		$(use_with consolekit)
+	)
+}
+
+src_prepare() {
+	# fedora invented that in -187...
+	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+		xdm.service.in || die
+
+	# disable XDM-AUTHENTICATION-1 wrt bug #445662.
+	# it causes issue with libreoffice and SDL games (bug #306223).
+	if use !xdm-auth; then
+		sed -i -e '/authorize/a\
+DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
+			config/xdm-config.cpp || die
+	fi
+	xorg-2_src_prepare
+}
+
+src_install() {
+	xorg-2_src_install
+
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe "${FILESDIR}"/Xsession
+
+	use pam && pamd_mimic system-local-login xdm auth account session
+
+	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+	keepdir /var/lib/xdm
+}
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
new file mode 100644
index 000000000000..f57d51dfbb26
--- /dev/null
+++ b/x11-apps/xdpyinfo/Manifest
@@ -0,0 +1,7 @@
+DIST xdpyinfo-1.3.1.tar.bz2 136412 SHA256 aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927 WHIRLPOOL e58937ca09d7b80fa7502979dba66b491c1bbe8ff7aee3ccece6245f348658e3fae9cbf3e152ec76c2e517c1d37630e8a8d89fdc37d6cdd1b97cd94373e24b87
+DIST xdpyinfo-1.3.2.tar.bz2 141351 SHA256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d WHIRLPOOL 1635b93df53141f40f9fd396616259361452163b6f44e7d904a4780cc7a19e2411b9bb18a139b3123433ec26fbc66d5ad3845787b51edcf8a04123165bbb2b96
+EBUILD xdpyinfo-1.3.1.ebuild 1034 SHA256 154904bfc1ab299374e94ecb115b5eca91f6a35208a7dc2c9db5e62773f2b78a SHA512 dec447a1c53ff0e1437f6b82705a286afac2cfdcd02c89cef7db631f640b473937dee81082f52878842c2e37167cc17056b1391272d998ed85d2437c6870bce5 WHIRLPOOL b3bdfbfa2964a7e0da6d4cbd9134eeb9f84f3d6135a760536e29387301390c6bfcdd51c8529da061af5c262d9456aa5847b6c830a5f01a97c332a6b07bb4c844
+EBUILD xdpyinfo-1.3.2.ebuild 1034 SHA256 154904bfc1ab299374e94ecb115b5eca91f6a35208a7dc2c9db5e62773f2b78a SHA512 dec447a1c53ff0e1437f6b82705a286afac2cfdcd02c89cef7db631f640b473937dee81082f52878842c2e37167cc17056b1391272d998ed85d2437c6870bce5 WHIRLPOOL b3bdfbfa2964a7e0da6d4cbd9134eeb9f84f3d6135a760536e29387301390c6bfcdd51c8529da061af5c262d9456aa5847b6c830a5f01a97c332a6b07bb4c844
+MISC ChangeLog 4411 SHA256 0a188726131c8d4bc301ff799c096cb85752a7f65e09c073f464e3c7eef67c78 SHA512 4359558961ac972368ea7e21027214e769a8bd418f1f3a0a3a8853a5b4fedae18a9470f48329b1b3053180db837d6a9da592c3360482727d4be78bccedb301f3 WHIRLPOOL f72973ea314ede30f29d75e6d4d108bff2c52cd76faab2e6eff50cc0938e5a123dcf149d00d6e1154e78cdb908e487534fc47b4a061db0d460f5541e76d59387
+MISC ChangeLog-2015 10695 SHA256 e8c76047d4f1534dc1760bd7df50b5174ae009486983c1fe158ce4b37d631f2a SHA512 d1e43b17212affe5e045cfe164c7f68eafcbcb496b99921653f14e9ff9cac72766ca4b30c159b119eed2bd3b2ad20021ad73b829efe06a0ce47852707c31acdc WHIRLPOOL 25fb0a735d7027482beb46305f3022bdba84b2ba7317a70dc99540da9a6502217b9a8794f6503528d6f933ce5ef97187c3daddbc6aa370104222734c1f87b3f9
+MISC metadata.xml 347 SHA256 48977e191ba3083e3e4822951dbdfd7d56de35269adca077da78ab6303ccfd9b SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab WHIRLPOOL 6cedf2ffc1b5ab2424c4cb2cddde291a786dfeb37dea4125de646d89ef32832e1de4b7723b2d9878f933a18de8aa826290a18f2a0a44bf4cad9cd868f8d2a600
diff --git a/x11-apps/xdpyinfo/metadata.xml b/x11-apps/xdpyinfo/metadata.xml
new file mode 100644
index 000000000000..d0022e0bb4ea
--- /dev/null
+++ b/x11-apps/xdpyinfo/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<use>
+	<flag name="dmx">Builds support for Distributed Multiheaded X
+		<pkg>x11-base/xorg-server</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
new file mode 100644
index 000000000000..fe6297132ec0
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Display 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 ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE="dga dmx xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	dga? ( x11-libs/libXxf86dga )
+	dmx? ( x11-libs/libdmx )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-proto/compositeproto
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/renderproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dga? ( x11-proto/xf86dgaproto )
+	dmx? ( x11-proto/dmxproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		"--without-xf86misc"
+		$(use_with dga)
+		$(use_with dmx)
+		$(use_with xinerama)
+	)
+
+}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
new file mode 100644
index 000000000000..fe6297132ec0
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Display 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 ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE="dga dmx xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/libxcb
+	dga? ( x11-libs/libXxf86dga )
+	dmx? ( x11-libs/libdmx )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-proto/compositeproto
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/renderproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dga? ( x11-proto/xf86dgaproto )
+	dmx? ( x11-proto/dmxproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		"--without-xf86misc"
+		$(use_with dga)
+		$(use_with dmx)
+		$(use_with xinerama)
+	)
+
+}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
new file mode 100644
index 000000000000..d38943101cdb
--- /dev/null
+++ b/x11-apps/xdriinfo/Manifest
@@ -0,0 +1,5 @@
+DIST xdriinfo-1.0.5.tar.bz2 121276 SHA256 4cba3766ef89557422062287248adeb933999071bad6f3ef9c0a478a3c680119 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de WHIRLPOOL 771caf038bb15f174b85e5e930f5822ce559f53bd1b191206bf0a55f2f4619a0b018866b1bbe84adf55dbd6c7d4bec696b62ce89f57f9bd1223e7644da7c4e18
+EBUILD xdriinfo-1.0.5.ebuild 513 SHA256 bc691ecb4009faaf446ea4927c1f625aaf52b38c0107b36a03503f1e899e77cd SHA512 ee1f6cc695a16233fb9ce4e3f930651d722875a50f3c4bdd943205f8633193da43c67a6cf5803fb03fb63e3c7332b0a7776ea7f26d1c90502a5b0f19c3e3765f WHIRLPOOL e5e00208739ecd3e72a14e6beb40fb957ca89fb36175b04256d3a62087c5dc4e81a282dd911ae6e6e958fa67d58c6ed8c77153aa6992509b480a5d73d50ecc8b
+MISC ChangeLog 4181 SHA256 323472e138ca9543ff7933734625132bb7d06315665cb4fa23ba32d5b91ce01e SHA512 af68db1e8ad8dc5093d500dbf64cb86e4eaee05291137793ff9dd3e16e328fb869366cea23f33e45106b4128d44c0477320aa8834dc1baaf7dec84f4c59d7afe WHIRLPOOL b76dd5af1c912c98793afee078ff02c1745e3ddc2a525ba7f625285225aacb2446ca0e515b73031633a779c1947c97d62123e5ea5f67163732704767e4918b3b
+MISC ChangeLog-2015 7175 SHA256 8f5c0ad829ed3cb7c95d38ecf47b4471716c9723eef88aff6945745d66a57f14 SHA512 8ce76d7fa0975a9276bf2daf68ee0f2efbe51fced7827fee6f6f9dc0cccf99a48315aed0a36a14b5a75b8fbf659e8f62fe0a018aaab171a1f1de4ba1a43f2a53 WHIRLPOOL 8a1de9976e3cc8345ce3f9171f1f1ed15fe2e5dea62f3065923cd044ca49b16a11f7ba350a5cfbecf4d1196ebac09f083fe2297eb39395735533364f9700bc81
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xdriinfo/metadata.xml b/x11-apps/xdriinfo/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xdriinfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
new file mode 100644
index 000000000000..bc84de10df6e
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2 flag-o-matic multilib
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	x11-proto/glproto"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	append-cppflags "-I${EPREFIX}/usr/$(get_libdir)/opengl/xorg-x11/include/"
+
+}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
new file mode 100644
index 000000000000..8ecf4fcffa97
--- /dev/null
+++ b/x11-apps/xedit/Manifest
@@ -0,0 +1,7 @@
+DIST xedit-1.2.1.tar.bz2 520614 SHA256 89b0b0f86b0b5ab2898ee669d394b28c6ac5a9a53f8fae1726ba5664cd36c98e SHA512 8c0675e39219ce4da02f2fc09ba39a5ff774213d155ad2dfd55e7672ab896219e815b12a4a86f3c72dfd6fd32e75bcdaaefdecab81fa5a10aebf0ed6b88e5af7 WHIRLPOOL af96c09cd1fa4ffdf4cc50cb01280f1c8473624c52b8437ce5daecba391e3a9eec9a511bbb913cdc7538b7eb2184727857a1ca69cf88f3609579741fd32b5a5c
+DIST xedit-1.2.2.tar.bz2 525861 SHA256 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d WHIRLPOOL d7c61114e4b4b4afccf9ebefe36fda3c27f40bc0d490b07915278f9b6536393fc5e7320a537627efcaea5f69f50c25b234cd523a95438c8d3543082990d32178
+EBUILD xedit-1.2.1.ebuild 324 SHA256 5ab5eb6afb8b07e2587bf2b3f7749428ab9eae5db24bfec8a2033dcd2b8b4616 SHA512 d58047c0c951d451a5f4c36391d6d4fe2dc76a27f259bed693f898ce7d60cd587fd24bda0ad02d50a670e10408406f31003b8a282278a2e616e0996cdb184161 WHIRLPOOL 834cfcb33fb9189926bc16bcf45f2c079aa12071294a14d752c9c150e1e6959e9aa734733cd43234a7fe3fbbb43eb753548435cabca92a6938e652f63133ea66
+EBUILD xedit-1.2.2.ebuild 324 SHA256 ab20fa29aafec96afdbd014d42cb5b697fbd8aec80216bc35d0c564eebbd8238 SHA512 b9cd99b8a935acb1f806a28bc397ad7ef538d6c7b111fc021e7b6479209539b4d3efc63fa8f3be28482dcfef279ceca3c08e709ce2740eca33eb4f1ab54fcc00 WHIRLPOOL 71e46581de8fd12d446320992176647d5e7985ec0f194005d4fa281c615ebfbfce6c34465fbb2a89fe5080fa2e762f111f876521cb9f50ff7b6047e820cf5c81
+MISC ChangeLog 3414 SHA256 27e46530e7a61c3081105fbe66cddcd49d8bcea953c9db62d4074b0296316134 SHA512 5cdfff3299c3270b55e306fe9e384af65f156f5a3994be0b70f2d44dd7a5fcb1a95cc9f115a57f6fed9ea60b64da65e58305b626a4820313711584b272c6e9c3 WHIRLPOOL b69c2eca0579f883b573885c31a07730a2980fe172ec0f70d29f79fef4709be80f6aa62ea0ca20f51f5515b308e0ec18c522b9d20d75c2f4a4d4eb618b9124c5
+MISC ChangeLog-2015 5409 SHA256 e7f12977c44eb507a313f8c5577b2323de02e294031348a5499ca61309ca89eb SHA512 b82f12b3ed3298d6e1926dc6d7f50266cbe5c330048b3fe637134024d54a017afe8e28c1235acbec7c88f4d90d929f7a5aee14adb207d417c0b2edf37a224945 WHIRLPOOL 0c10cf0e9278fe3d533b59228b00304c721c855f76738f9315bec50c300c51dd8d6f201716c81a00bb519955ab7f11ed8ef79f31abd2f16e5aafabe9f6be2dbe
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xedit/metadata.xml b/x11-apps/xedit/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xedit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xedit/xedit-1.2.1.ebuild b/x11-apps/xedit/xedit-1.2.1.ebuild
new file mode 100644
index 000000000000..59948aca9294
--- /dev/null
+++ b/x11-apps/xedit/xedit-1.2.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="simple text editor for X"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
new file mode 100644
index 000000000000..785e70ab44bb
--- /dev/null
+++ b/x11-apps/xedit/xedit-1.2.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="simple text editor for X"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
new file mode 100644
index 000000000000..ffd28234508b
--- /dev/null
+++ b/x11-apps/xev/Manifest
@@ -0,0 +1,7 @@
+DIST xev-1.2.1.tar.bz2 125884 SHA256 11f17fab097f17d9efc51ea9d0e3140bea3904eb3c486afa7c8c3eedab496243 SHA512 6fbe8e69eeeafff4561b695293f23d9ce0f20261474f4a0f0281278b13f11e7ed9efd49f2712586f909e3e7a26b9fe39f8e98b50a2bf189d077668fc67388d19 WHIRLPOOL a3f82a81feeada1ee10707c685d5857e8ee2e9c85be6f35d714cb7f56fc26b828c381382207aabc77d09c3726dfc93949b1411e6b4d97bd1c0433b9291622845
+DIST xev-1.2.2.tar.bz2 132596 SHA256 d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f SHA512 453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca WHIRLPOOL b3ff75ad2a55a3015fd2de67af37b80a2df5ad891325f93ce9f1b8b0fc8d8a05ca9588bea8ade3f37b3b546670acd8f3902c1cae7362d062da0b4101414cbf94
+EBUILD xev-1.2.1.ebuild 397 SHA256 9d3ebb11b1fec797319efd1334a98101579fce71d7e46a42f6ba6e52b873c0bd SHA512 cea8c7ff94d17a098bcb2c24178f4c37bc57b02cbe5dc474f636ffda158a415e50948bd074869ef17b3beaca160329bad431235a4c9fa1e7bd94761fb214720a WHIRLPOOL 442dfd2df58ef104b9d487fc560503c82164333b7b015f13406017a8b7d78b624a3788d3b47334b191afc60334d1ac29f78f31c6002bd10120866a797e461543
+EBUILD xev-1.2.2.ebuild 404 SHA256 845d4862ea398b14918c21f7e6fad6ea5625119a1f828662e1c321613f2834b4 SHA512 3249d5b4e882ea5b88108445a43cdc0d9788627b14411975124b4bee04417e0957851073f6d4e4ac4785304851e2a14b8f0610f9651e90e87d7636ff1bd1325c WHIRLPOOL 7dcf5eaa18ff8e7adb9cff61741df96f4745e3d727c13b4ab211a83e4a9cc23d4152a68b5e72dfca98118f3e6e83dbb04d3fd77b4c53f418f45b7ce2e799d4e5
+MISC ChangeLog 4111 SHA256 fac28df17a8e16cc1f620337423a5158974170d19f85c1abf429f5820df81185 SHA512 0637010cabb451e4d88617066fafbcd21c03cbe350f32f81ef6a62390fd93010da2c9b80a6f1acb9caa6b3856ab5e737bfd14f00f073c4fce95a0978be957752 WHIRLPOOL 6537eff5aea62ee73061045525e219eac3db8c0e24b92042745e87bc54bea465c010cb0d49981c46731d4d7017feadc7b27131a2c8a24f175e9678b7df399824
+MISC ChangeLog-2015 8124 SHA256 65241be9779aca4d72c5e1b0b45aff392e8bc43c44a56e1c00d779c5058b5f9a SHA512 09085de2b9a01a99fc1d2b1d93b020e48f67c8c5262a9f42763bd0f6c03d5a5ea0b9e15e2aee0e2bba142e1af71b1b65fe864c26ca1539c92322437563317771 WHIRLPOOL e097ea32c70ad113affb170b16e59ae2e90fb39c16db6401e60d4d1a43caa5cd74b89f26b260eb2d3eb984d37d90ba940a2b32a8aa90895bf75a71cd0673b87f
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xev/metadata.xml b/x11-apps/xev/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xev/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild
new file mode 100644
index 000000000000..2194489aa3b8
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="print contents of X events"
+
+KEYWORDS="alpha amd64 arm 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/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild
new file mode 100644
index 000000000000..33c1a0371cd4
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print contents of X events"
+
+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/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
new file mode 100644
index 000000000000..8e05ebaa527e
--- /dev/null
+++ b/x11-apps/xeyes/Manifest
@@ -0,0 +1,5 @@
+DIST xeyes-1.1.1.tar.bz2 113757 SHA256 975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521 SHA512 3cb734239fa3180a9cc0eb2564c5a04f5e5c64ea314079c0604cebdbb821132f95a2c113dab476af8820308f0e6dbd4eac02b5da45dc2ed78a5d3ca010453618 WHIRLPOOL 8226d76742456063711848b6d578895e314fe028576cf11fda187f0900a072a9c11ce386f93768001084ecdf080cc0fb415b657745af75b97e7e3d9908e67b6a
+EBUILD xeyes-1.1.1.ebuild 456 SHA256 69a21a89cd2aad4edc5fba9f52be543d99a4788d4170002cd6148586bb56570d SHA512 13b3ac3c8110ddf0f09d7b616e58570c4980a483e3488f3ca154d7c2d565e05e3958f674691acaf906fb87bbe698bf60a6190a007ec4a7a54052f7ba5e8b4d1f WHIRLPOOL d48fe1cb3faebafd9d698879293ff5e95d8bc318248bcdb9121cc4458aefd53a89929aac62e73b0625b0fb01e0196441594209c9def50cfe7bc8afb21e5d7f9b
+MISC ChangeLog 2421 SHA256 8751b7e89ba3167fde0a3ad0aecd07931c918d427d5191f88a8d5bc3feb0659c SHA512 07c98fae0ef22fef17ca43fafec1b3fca818e98ce65aff5c5bcada63cab605f1923fba89ce101e4433746b43116abc5175ad2b32c1d55f3fb57a2aeafb97007f WHIRLPOOL 179e6fde7685abd0ed83af11473f13c9ac066e1acdba9519ab748fc278067146e4355aac3c1525998f4328819be85e9f65c763ade825d66d84e1dfe06ac0e93a
+MISC ChangeLog-2015 4003 SHA256 7efae5f23f924053b16ed8d11640a8ebf5fc9c840a603147a577c61520a129a2 SHA512 5340e8dcfb459ad3ba97670a2a2eca6f96778e982ca3bdee473985a216db6f3e72a37ab29ff3cc681d2de34cf0692246cb86189b8493d21b0eff4b880ecc5c40 WHIRLPOOL 12699831c2f23bd423776876bd446e62e1d19ecd15b45e1ce98162a150aeff554352607d8ec36cf8a64082ac8eb5591914eb0efe1d47af3bf48ea41df3672406
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xeyes/metadata.xml b/x11-apps/xeyes/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xeyes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
new file mode 100644
index 000000000000..e9532f0451ac
--- /dev/null
+++ b/x11-apps/xeyes/xeyes-1.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 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/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
new file mode 100644
index 000000000000..e960a58f1a59
--- /dev/null
+++ b/x11-apps/xf86dga/Manifest
@@ -0,0 +1,5 @@
+DIST xf86dga-1.0.3.tar.bz2 104935 SHA256 b4d87411049d5edb6f33b7e57bceb5a07e41ec5c48900aef492fb0ff74e6a252 SHA512 18dbf9b5bbe1bb9c993c742e04e132ee22e376148a499ee159418435477221b00904f36c1a6b1063df788079a4ff5520b4d604abcafaad3b5fd391a3b2c1ec07 WHIRLPOOL 4883a2a3ebd032b8e8238c7576effc93b643903122ca2626806650a9c16e19d20307be4f1c51b06d0bafb282d80ac69eecd9a30a97bea3890d930c9acd6edc79
+EBUILD xf86dga-1.0.3.ebuild 397 SHA256 17f6ef994f4f1aa017458b2f66c96a4da52138bf42d8a8ef2f7a81e06945b7b3 SHA512 cd1b8be52e7c1ea4bb23a2fb0da5a4bb09c34ecd150ac430d319c7a60087de14964979bdfaac1ead401bb6b0d0bd40ba8f0174a3b22397e2b6406fd6896cc741 WHIRLPOOL ed1f6fc34e10657f95ee7dc3a0912e3d288782dcb66305e04e24dfa8fa9c72074728b65f6833d7e9711a1eabe0307c9a2a9a911760df3311a10ce7068b0ff389
+MISC ChangeLog 2589 SHA256 c2d17d186149c51d19a1bfb2952cfc3eab414d6d653f7333f05f603c77b2763d SHA512 b0622d6bd029283b29eb35eac5d620062605706a8f3961abcf09fe3e4fd35231e3c38c3d1886efb0e7c34b438aa365c90ed4fa014fd8172adccd6f8a815857f6 WHIRLPOOL bbba71420dedaeae36388e3012863c73f2c195900e23344bb9fdbcf634b3a655295b5bb95ab71d3781a9e494f84e78d408a1b61029849b8d21e60184d25a9928
+MISC ChangeLog-2015 5207 SHA256 7c3cf4d9bda44d76868aff7b734cb1593f44ff311ab430def17e3f79563bafbb SHA512 701290b8a0fff542a03ec245acd3dff8a181f0e338a6d260d110c05f404f895d4f02ce974492adf3e0945056e31b397522087e79ac58b1cf9739e5bc52e75434 WHIRLPOOL d8a7d095c7817758656935e6f390c0d17a894cef7b4ddabcc769541d5b75be4cc39136f6cc3dfb70b9d247ab0e8bb2375d55398be0d65d37930c49fb9aa6bc9f
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xf86dga/metadata.xml b/x11-apps/xf86dga/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xf86dga/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
new file mode 100644
index 000000000000..33fa3524c0a3
--- /dev/null
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Test program for the XFree86-DGA extension"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=x11-libs/libXxf86dga-1.1"
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto"
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
new file mode 100644
index 000000000000..64c14b816790
--- /dev/null
+++ b/x11-apps/xfd/Manifest
@@ -0,0 +1,5 @@
+DIST xfd-1.1.2.tar.bz2 137632 SHA256 c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 SHA512 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 WHIRLPOOL 0945666ff9ea20426801253851da29cd488e895311ae22f03e74015f890f8ead36bcfa32b8bb1d3372980e25646381dfb1335a6713127cfde7821b898d5629e2
+EBUILD xfd-1.1.2.ebuild 421 SHA256 5b89fddd5e15dad957121b167c728f09c3dc0cb15fbf0492ba7b79acdc27dea0 SHA512 6e6b30c95188d3cf25984cb7047b98430e7e37253cc47bc967f191ac8a21bb466b34f7cc5da4b8b86bcff1c7958d4e66b221c4c9b4c0e80b885c54601cb96916 WHIRLPOOL 05cf5c15309899c3aed4b058aa2d1b49726b69972b268d8a1f32417ee8a6abc76806ba457596d9be5c150ee1ce98d6a13106cd476e8be380fe183bf5e9493b4a
+MISC ChangeLog 2415 SHA256 5d3cdd2a1926098cea84c8c80ddefdcc35aa2f5d33e02320a1f01f094bf0c200 SHA512 1946da60be8bbf57f13e9c6f4fb6ed4940db90b0537078bccbcc737c702534bbb16631d79687ee9e271e44221e948e09b5764e25108fa55c9793c23bdf1d5474 WHIRLPOOL 22c31cab47f2c3671c64374c0f0703b48585f7244a8a62f771c32ef1fb95d53c955f36ced0aaa08f4ad5380a636c9efd274c82b7da7229f165bd9e656b86f679
+MISC ChangeLog-2015 5486 SHA256 cbf8b0e84d4b3e72894ac7d334f1ce3a2332f85dfb1950829d25210d4c275903 SHA512 d4a998d480ca7fc0632d49019fab4e5c0d4db3500fd7dccfca6805d96a824f85441a662384c1d2a9e88899aecfaa38480d8d01fea47a1923991f16d2a5454a35 WHIRLPOOL 659342d2860fa901334a4503d27c2efa999424633f907e65abc9e1cd67c4c445858be6764c61c74ac256d043ce9ec0e58954a2f5e2381af5fda5a802435162de
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xfd/metadata.xml b/x11-apps/xfd/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xfd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xfd/xfd-1.1.2.ebuild b/x11-apps/xfd/xfd-1.1.2.ebuild
new file mode 100644
index 000000000000..ebe1357bd316
--- /dev/null
+++ b/x11-apps/xfd/xfd-1.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xfd application"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXft
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
new file mode 100644
index 000000000000..de73b6ea25f4
--- /dev/null
+++ b/x11-apps/xfontsel/Manifest
@@ -0,0 +1,5 @@
+DIST xfontsel-1.0.5.tar.bz2 139801 SHA256 170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4 WHIRLPOOL 8afe6704baab55503d6ef69d02d8ce46b1813ee2314134d8446f2f7218407551513acef0bd9c564e12fddb950cbc4ff87d30b69acddd40efeb9f17c128cddacf
+EBUILD xfontsel-1.0.5.ebuild 413 SHA256 b31413a6ecf10add66ad5034fb1ee9bc1050f5273c8fcea910be1af9f3390b44 SHA512 2339f388041f89368df82b3915a4e8e1e6023e418b952c55d9bc9787a830f989ad2d649c5a1f53767188664f6465781c9724456a590f13c472e47ff2b3f2040d WHIRLPOOL 242f48db6ba8466ecbabe66d651d23facf7bb77696d126d9d03f7b23ff294498f9f565f5e3b0d7281ddfcbb6a1472fba856cd46e2ab554f4c4487044117c918a
+MISC ChangeLog 2605 SHA256 192c3f6d432b4d45b1f1f51670a2c0d3a179e1179ad1b1a537fd3ab3235a4459 SHA512 7ca39345db5f3e58884016c9d4e9ea1ce669ef9c6ff458efbc06c6b6d9f08c868a213e22efa5054df118372f9993cf77b07d73da3da5cfc33c3ebd470aa30bd9 WHIRLPOOL 6fb775716a532f90ddfd19afa2532621bf93f5cbf60fde3925bf8bc419c9bfaa71e6e0feffd1ed8d5a5dfbaff1647653df1fba37fe148ac954a252ae3ec59ad7
+MISC ChangeLog-2015 7324 SHA256 0f4c5d05948592b35abe148198d6bcb7343122009b85993c0635e096f4345411 SHA512 767225934db151b692e7d2a41f7d35b56031e5cdb26e4f1f185b0f538560418a94ce462850a8ed538477fbb94d607dd4d169abbe8848bf9710fe4ddbd252ec08 WHIRLPOOL 6da76b5d9e782626c897a459efa7168a51fd26f4c5a61679872e4f252efaaafd2db1311aec9092d1b908e82c3501153354b0bd0c565ed6899e02d8107d0eeeaa
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xfontsel/metadata.xml b/x11-apps/xfontsel/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xfontsel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
new file mode 100644
index 000000000000..1d4b7593a2d3
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 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/xgamma/Manifest b/x11-apps/xgamma/Manifest
new file mode 100644
index 000000000000..3ef2f645fb6a
--- /dev/null
+++ b/x11-apps/xgamma/Manifest
@@ -0,0 +1,7 @@
+DIST xgamma-1.0.5.tar.bz2 115035 SHA256 e322a2fea80d559c09d6bc285ebe1a9e454dbeae2a07116cb7d2207db9d2c310 SHA512 6680a4e2ef7cc8806febdb69b85922eaf98a4c779ef2b1f9875507d10b31a43dc3cc2ec147b1f3ccac6f3c5f6abdaaea320eef2ebac68c14608599b17bae4ec9 WHIRLPOOL 1f1a0814ecc3bd70361dc4583b02783573136a45e5f2d1906d52b0c090da42f841768b092432873f2e511b6e405d5d53450ed0acf829093b8b78e28e833da587
+DIST xgamma-1.0.6.tar.bz2 123105 SHA256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a WHIRLPOOL 83ba23e63a587f3600f6fa8528fd4bb437e78983956d2dcc4fc3dd4c050624cd7fef97f4c1b5044e20225e79168b63b5f8ff01c3ca90826c83722ec2d0fcf89c
+EBUILD xgamma-1.0.5.ebuild 399 SHA256 5e7792178764324a1b04dc8b478d5b5f907f014fb80052cbf0790d81fe1190a5 SHA512 cae062e040f084775835f2b5492cd0bc2015db5b68195ee23a70eacb8e92425f3bf301ba288c4485eceb6f1bd9f97dbb03a208d0add0589159b74b9b37273db3 WHIRLPOOL 87888be4e34734c9e499cf3b0c18ea9968c6e7d7561c64c4e11d1dda81e291eb073d483825cfd963181ddb7cdc0e9aa6300ee2cba88f760bb3e4cc887e8f678a
+EBUILD xgamma-1.0.6.ebuild 408 SHA256 6e81d9a0c4287ee4be6001a4046976a5cfd2679085d433e2dca01646d6133365 SHA512 eb096e328801253bc47de54d9ef3d350e4e0fcebee5cf92ba511d047bdb4981e15bebb26457b7a20b0f294be6d49c9196b4372b4bfb0eb4cee12489ff6e29867 WHIRLPOOL 08d09b51bdf27c8827c48508d2559d7fb977c1da75132bf140150e13d5ed9f6bc646a27a5b61523c4e1437356e43ea262b33e2e1304f1b75d17421e03da24079
+MISC ChangeLog 4153 SHA256 000480866ef5aabdb4ec65a230e49a5d42ff152df6e438285cabbd095dd30fe6 SHA512 d0727eae3faf7a2f7206fbd685549e30b1fac6c5262aa1f287841c6d67a517b0d35e8ed75ef89ae3a236e0b99f28c4aa98d255f03490525f3164c65b0295f037 WHIRLPOOL 3bdbc44224f8da1f79462f8d8b6aecb7ecce53e25752c4834fdf4e347fcf0712536f13c7bee0f99e4d6445bee35809885fea4c6a1948d7477a9c5c0c844d53b1
+MISC ChangeLog-2015 6348 SHA256 cfb73f95252835f1a187faaa4ee749d1bf7d2bf9c1f6f12dc8b8957ee54b320c SHA512 0e50d9d76204eb6f7f09e76e1dad567144efcc326c599f0b1f573b2e201c1d3ba914649a1944825b00b5cdf9c544b6eee7f419bb5cd6e54ee59efec07c4d62c1 WHIRLPOOL 83f35fabab7dc65083cfa523e11d31c63af82157f331f6560d3c47bf1cb4c97975c6d1086bb6155a902cfd550a913e591dc09e1215fb68c8d829bb4c97e33498
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xgamma/metadata.xml b/x11-apps/xgamma/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xgamma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
new file mode 100644
index 000000000000..711a48f43226
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
new file mode 100644
index 000000000000..b7a197a96249
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
new file mode 100644
index 000000000000..95b8f8eeec24
--- /dev/null
+++ b/x11-apps/xgc/Manifest
@@ -0,0 +1,7 @@
+DIST xgc-1.0.4.tar.bz2 180138 SHA256 5ed8dc52619ed563ad51b8428a1e1678cdd40b30e8160396ee9e41b46f247e8d SHA512 c2156eb1c6dcc838d9b21ac9e45b188a92dadc991875c3c9497a18bae36212c01cf4c2c6df04830664da4e010880d2d84663e00aaa5e17082211ba969d480390 WHIRLPOOL e56291bf58b8c1886b9b5a24e34f7cf31599ac06faf5c6aefeab452cc7076b2546fda3678064c44031f6c482c0bea4b1d1c3c5e02d19b1321a694217c62143ba
+DIST xgc-1.0.5.tar.bz2 188307 SHA256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314 WHIRLPOOL 4cdbc9b82254a91b5f53a44f9e0902f73636aa0d7924898793e077853612f17c64029a8b53eaee7966b55d3ea658ece8525b483e90734249cba9e5b5dd4e4d65
+EBUILD xgc-1.0.4.ebuild 295 SHA256 d49ac9d3d5f95a3666ffb24f925e9e3e99d92d95fbc15aafc5e4a190edf48cd6 SHA512 a5fe8f1469d87a4769115ee00d8f02cc411c10162948d723d09ff955484ed5947abc17a56c709c226483b3758c0c6ab99d1f7caf1299a4302fc56fc6676a2dd5 WHIRLPOOL f6827cc0eba56d061a7aca80bbc35d29f8fe2db4ea5538069617dd4ee16654a12edefc8b6848b1f16c4565be999e44589a44ba308003252c10638ac688dc21ef
+EBUILD xgc-1.0.5.ebuild 295 SHA256 40b03c87231c8c091c49baa0aa5ed7bd1b55ead988ca57bbf0e4d58dbb48dab1 SHA512 06a08a39dabc55efb191f7a60e83fe0fcb3d8e876e11297d321f23d31ad374f1d2a1c7c587cf33a478b5f8ab7a1304077479141bbda23475112c062d97e330ee WHIRLPOOL b2a4ef1994fcfdc69cd432902a5f275513b8db96e14c4370c3051bdf360cc53342e6b7bcb9d13312f7a20b42078f453e2995e3b4b1b3f248b9f84e3bb9cf55a2
+MISC ChangeLog 3564 SHA256 ec4fddae0f67fda8d4614166e0335c6b143f66da4f6bcfafd46d60b35c978832 SHA512 5f9653535855eb4832bae523bed2a33bd4ccdaa827f0dc899340da2f67cb24bef4aa6ca7f43b3200e1c749206203ec8505033416b5203e419367224b349f0c70 WHIRLPOOL 8f43293ad2de547b4f68590d63a9ab8518d0ba975d66f7aaaa2e32dd8dfda7e5da6b5f865703831b61f311840bf2b6345032bd51135fa3a4a5e3e4daca24d2f3
+MISC ChangeLog-2015 4507 SHA256 7e945fdec9e2d9a5db16f094f57bd890344041c48e8adfc7b05f2263edf5b5aa SHA512 432967740b10ce308bf19c76c868a31e4ed3dccbeaf69dfe71198dab8bf4838ecea9cff39d739556fa1b6ad2d0e269faf5db42a9bfc45622c82ee3e08baab1f4 WHIRLPOOL e87f2cb8445e55a7e004b6c91b0ebc8ef27a66e325a89b757f63a931f2911003cd0056375e189a5653697cf2f41f6ab0f2e5747ac716a3faafdf2d2653d06700
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xgc/metadata.xml b/x11-apps/xgc/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xgc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
new file mode 100644
index 000000000000..7f9c2024f616
--- /dev/null
+++ b/x11-apps/xgc/xgc-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X graphics demo"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
new file mode 100644
index 000000000000..917bf3f76a9c
--- /dev/null
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X graphics demo"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
new file mode 100644
index 000000000000..f4c9722598b7
--- /dev/null
+++ b/x11-apps/xhost/Manifest
@@ -0,0 +1,7 @@
+DIST xhost-1.0.6.tar.bz2 133176 SHA256 a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2 SHA512 4e9b8b5b3a13b995e4f3596b26fa637d5892936090516eef1eb296c257358496ed5ad7b5c1e924003fcc18b6c8d4592f83e515d66a605a895f1d9fdc5d064f1a WHIRLPOOL 012c875be11a4cb6e4df884659fc08218e2f1ee3d8499c60bcd7d5227a7a0bad23c41fdfbf566eafc690b61dfdedab9e88bc47e8123816190baf871b616226f9
+DIST xhost-1.0.7.tar.bz2 135767 SHA256 93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a SHA512 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7 WHIRLPOOL 4960cf6263d698a2e016e493441d358a44670251ac5c4e7545913de57c9e0e7064efa9dcc421dd6dd6f4c545d2265adc4f41d99701764a20d84d2adee37c6574
+EBUILD xhost-1.0.6.ebuild 550 SHA256 572c7ed4d79026203462e2f016a2fc00cdfb6b4e7a88a9d299ec09cb3ce0caeb SHA512 15cea102e965f1e6e329e41e944496c76ebac7d967b82444cc53586127b6b43a705a472c927527ed20fe8b3254f7ceef63a9e8253f22fd1037f5c1d928991242 WHIRLPOOL 1798d1239005808245349cf4094d1309efee54c1bba987bf87209d5a2f1b9331346f7932ffb0a4d251925fef2d8a7d7227c91a845fc1ffaae3cba594abc665ed
+EBUILD xhost-1.0.7.ebuild 557 SHA256 3637901777e967f8006dcd8aa654b26017d1b03e167d0f221751e71c7999d787 SHA512 00c35a34cee52bc914a2c5daf0e4d46c5079e2d839b0113383dcba1fbef43300805cc2742c6523d1ac88cb5242f12946ea0bf77c4ce7ddd25ae25b642a9ddd78 WHIRLPOOL 6a6536f474ba286e5a07389b72df70b3f613770f9988f359bc477b67a4e01d32fc4a780d0796d197c8448144f851e183a21f207cfa45bda1a88a6992ba88be6a
+MISC ChangeLog 4139 SHA256 e7d50ea1e4547aaa14b9ebb84232c3add1c7cf37d4568a1237d64b2a29e7b9e8 SHA512 ce4743decb2018e8f96050b1c9b6c7bea83846474ff4f91a2bac71547a2610672e83abfa534c002ca174be63e533a80e69a10c0025f59cadf21956d519f48627 WHIRLPOOL c6cb468ace874e90ffa77d777f31d4323c145aedd1d8e3881e99609066472a03eb7ccbe169749ac610c83799e1539d3aa0c15333e91aa69251536d860aa646da
+MISC ChangeLog-2015 9728 SHA256 d45ecfafab5f822aba34e7437b06a1de0eaf74d21e645fed46a3d414ee24396f SHA512 623bc9655f9d05f86573f15b7845a905516b56bd0ade85c64cc96cf38a576f89643edccb3ce398b5069365a0c8eeb765d15fdbf83361ffaf32533ba5f249059a WHIRLPOOL 11bdb35a97f9f309e9aa931cf9f95ee20f383b0d4a1011f93bae022644e5cdf1fee7b13f0736d827d45d0c0d9c1e550d35c183bf1d612a7c261f788f5e8f4e40
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xhost/metadata.xml b/x11-apps/xhost/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xhost/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xhost/xhost-1.0.6.ebuild b/x11-apps/xhost/xhost-1.0.6.ebuild
new file mode 100644
index 000000000000..54067dc33aaf
--- /dev/null
+++ b/x11-apps/xhost/xhost-1.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Controls host and/or user access to a running X server"
+
+KEYWORDS="alpha amd64 arm 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="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXau"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-apps/xhost/xhost-1.0.7.ebuild b/x11-apps/xhost/xhost-1.0.7.ebuild
new file mode 100644
index 000000000000..b49a9aa27256
--- /dev/null
+++ b/x11-apps/xhost/xhost-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Controls host and/or user access to a running X server"
+
+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="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXau"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
new file mode 100644
index 000000000000..9f27f4276e75
--- /dev/null
+++ b/x11-apps/xinit/Manifest
@@ -0,0 +1,17 @@
+AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 SHA512 ef9bc61b9af6723236e543dae1b7c92c739050dd3cb5acc59deaf2589a490323db7e1f52b890dc325e7e7b8db299cd50ad604456c1209ec761da124efd75cdf2 WHIRLPOOL 81de4d5fe95cf145e4ca72291d0bb0984993f165351d7dba78146ff9e2e2555abb4861a867f0962c1148aaac059c3489d52d1aee54c28faf6f0e228ffe38eb2f
+AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb
+AUX Xsession.desktop 229 SHA256 68cc432e350e4c6a94dc5b9d4e6659382a92d8a76b6b30851254d140373f41fe SHA512 2d2fea82972d77ac925e6edcd488c730b678dd74635cc3a06536413ec8bdff63be915161139f12636214023926dded9fa549f053f9a2b916ef905be79591093d WHIRLPOOL 472f41a4f695723f7bdf89a07f789269607fc4466fa3c060a63b6b50cb8b9e4a1b509f729eed1ad4d05a66fc7171e287fabf980570d7de54fa5a61209667a6c8
+AUX chooser.sh 1192 SHA256 1aceac55722a24593314c60e465a1e68982ccaf5fe0cf4d99d01e0a4d6f4cc63 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255 WHIRLPOOL ec48a47f3647aff62a6dbe25a38c4b68cbb772c65062bf2978cd5558e128ab58aa1a34cf6081c110eb81a91e8dd047e030812c4342dc77d4947b601e972b1dc3
+AUX startDM.sh 818 SHA256 f343f87c5c89aa1b7112ec946c4df06b25e541d488405f4d98bedbeddd30bd32 SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c WHIRLPOOL f4ad1ac5b9b4bf271df814b549b3eb010489595e02591a91c0641c89943bc8cb110ab701c72fea9343e0186c9172a961f202b91e0049c33ee896fb5ca7de2759
+AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95
+AUX xinit-1.3.4-startx-current-vt.patch 808 SHA256 04e21eba179787b66e19c15ba11f7ddf5c7a07caa98b1b7dbbb805df7723e9b9 SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9 WHIRLPOOL 83056b768075c35235e0cac451f037a499577db2ebbe47e021c8869e2aa4c86ed93e96e3617c08b1ed132a5f799bf24cb4c67c9515a52757b6b5680d964091fc
+AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
+AUX xserverrc.1 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c
+DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
+DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222
+EBUILD xinit-1.3.3-r1.ebuild 1710 SHA256 cc39d9ecf7d848f8dc8ee86bd48f7ace95ecdadede0423ee50e787f58b6ecc56 SHA512 29936defecb686387f2f2f3ab5a53fae51541e1f7f079e5c9067016d22f771b529111eb425fd05514cf7385d7908054a4c92a7e5e47f960b59e2b1d8a1fd3ffd WHIRLPOOL 4435d3cc04067d4513b0575974591464fe3a1a23c9aa296cbae369a74c03ac553f2c4257bcf9d243281bf0eed4656f016ce38dc9ce51dcb17b3e43be80037f8b
+EBUILD xinit-1.3.3.ebuild 1678 SHA256 ef5aad73f82925e54508e804b24e2798388bd83fa42ea7d26c43992290afce5a SHA512 77692a2a2ea8ba21f797421e9cc9095b0f5f27c984757283fd11aae717fa659df109bc2878f6456f309d47cf50ff3c7cc8562d932d03c4c919da132805ab281b WHIRLPOOL 6e90f7eb989b2985355044dad8375da1c438397649d02961a261132a7114e170360ef8268047a8fcea3dd96e2a87561665b35f29ea52e728284d08868f97d9c8
+EBUILD xinit-1.3.4-r1.ebuild 1906 SHA256 b98e6d2ef85d5c22ffec76678ed02ee6f9b7cdbf6499baf0ed7ab324df991fa8 SHA512 b6cf4c297fa7c313b2eb6d29b4c079867755f8ce4aff02bfd710d52397d158a62a8f1d7c3e0f1c67b985f49dc5fbde1555ea851d778be6be0d642f65d1210e5d WHIRLPOOL 1f0f6e3712068e81cffb016bda6005a6aefd11a5bb456d9324f93f23a3b643d6503932d1a6ef3116f477ef834022ba6975c8085036642a4433f2cf42aa5325b5
+MISC ChangeLog 4782 SHA256 47bc98791a0ab8faa1987f7fad293f2b3c936062b715afa1e28c9bcf69e0cead SHA512 bd57878dbe63bc6255c44b95cceceb2737667f2df8189bc7cff16b9df4e782f054e3cbc26943c79c7273bc9e3a50f7f82e48653d554699ebf1d31b089a9502ea WHIRLPOOL 2be90a677295553ac1c4e4991dcb66fe4b18b0c6b078e6a8a9f5447d7a9e577b854e7a0603c6d128f5774d0b6dcc7300c9008e8eb166c8fa9a985b1747e060d6
+MISC ChangeLog-2015 39710 SHA256 3f9ad1a503986b8cf8c85390e7cf95f2fcebfaf391c610e3875b01a993f2f01e SHA512 8b3f48beb02722d48166016432bf8e003b2468eb99fd914802b254d8945c0d894c63f714ef97a780e82e9de403f7ff3ebb59d3c36a16f0fd7eefe6f06b024b2d WHIRLPOOL 26e0e971f9adc58f392d3cf3bdaa0a78e2a519ee376bbd38ca8ef6927dc9ac059bb6788942e3a5c14d7f67de1bf67cdcd9d09d00eec31c52cae88f5df74d10a4
+MISC metadata.xml 480 SHA256 2f9b94f5a7ec3f0058e3e17aee941e528167c2ace77aef03f081dbd47a5e0093 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55 WHIRLPOOL ce00934da5e14dc640184882aaae61d7071f9fdddf9545671de5ca1827cfe7c99316650dd744039536e28b13667793cb3fbbc1131acecb5464953575cd6f9f6f
diff --git a/x11-apps/xinit/files/00-xhost b/x11-apps/xinit/files/00-xhost
new file mode 100644
index 000000000000..82cf10381e68
--- /dev/null
+++ b/x11-apps/xinit/files/00-xhost
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Allow all local connections from the current UID
+# This fixes issues with hostname changes (usually by dhcp clients)
+# see bug 287498 for more info
+
+[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
+	xhost +si:localuser:`id -un` > /dev/null 2>&1
diff --git a/x11-apps/xinit/files/Xsession b/x11-apps/xinit/files/Xsession
new file mode 100644
index 000000000000..c86ccee19ff3
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+case $# in
+1)
+	case $1 in
+	failsafe)
+		exec xterm -geometry 80x24-0-0
+		;;
+	esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+	if ( cp /dev/null "$errfile" 2> /dev/null )
+	then
+		chmod 600 "$errfile"
+		exec > "$errfile" 2>&1
+		break
+	fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+	freetemp
+fi
+
+startup=$HOME/.xsession
+
+userresources=$HOME/.Xresources 
+usermodmap=$HOME/.Xmodmap 
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources 
+sysmodmap=/etc/X11/Xmodmap 
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources 
+rh6sysmodmap=/etc/X11/xinit/Xmodmap 
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+    xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+    xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+    setxkbmap `cat "$sysxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+    setxkbmap `cat "$userxkbmap"`
+    XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+       if [ -n "$xkbsymbols" ]; then
+           setxkbmap -symbols "$xkbsymbols"
+           XKB_IN_USE=yes
+       fi
+    fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+    if [ -f "$rh6sysmodmap" ]; then
+       xmodmap "$rh6sysmodmap"
+    fi
+
+    if [ -f "$sysmodmap" ]; then
+       xmodmap "$sysmodmap"
+    fi
+
+    if [ -f "$usermodmap" ]; then
+       xmodmap "$usermodmap"
+    fi
+fi
+
+unset XKB_IN_USE
+
+if [ -x "$startup" ]; then
+	exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+	exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+	exec /etc/X11/xinit/Xclients
+elif [ -x /etc/X11/Xclients ]; then
+	exec /etc/X11/Xclients
+else
+	exec xsm
+fi
diff --git a/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
new file mode 100644
index 000000000000..0c5adb9d84f8
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=XSession
+Comment=This session logs you into your custom Xsession
+Exec=/etc/X11/Sessions/Xsession
+TryExec=/etc/X11/Sessions/Xsession
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
new file mode 100644
index 000000000000..6cfc57426d6a
--- /dev/null
+++ b/x11-apps/xinit/files/chooser.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# Author:  Martin Schlemmer <azarah@gentoo.org>
+
+# Find a match for $XSESSION in /etc/X11/Sessions
+GENTOO_SESSION=""
+for x in /etc/X11/Sessions/* ; do
+	if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+		= "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
+		GENTOO_SESSION=${x}
+		break
+	fi
+done
+
+GENTOO_EXEC=""
+
+if [ -n "${XSESSION}" ]; then
+	if [ -f /etc/X11/Sessions/${XSESSION} ]; then
+		if [ -x /etc/X11/Sessions/${XSESSION} ]; then
+			GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
+		else
+			GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
+		fi
+	elif [ -n "${GENTOO_SESSION}" ]; then
+		if [ -x "${GENTOO_SESSION}" ]; then
+			GENTOO_EXEC="${GENTOO_SESSION}"
+		else
+			GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
+		fi
+	else
+		x=""
+		y=""
+		
+		for x in "${XSESSION}" \
+			"`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
+			"`echo ${XSESSION} | awk '{ print tolower($1) }'`"
+		do
+			# Fall through ...
+			if [ -x "`which ${x} 2>/dev/null`" ]; then
+				GENTOO_EXEC="`which ${x} 2>/dev/null`"
+				break
+			fi
+		done
+	fi
+fi
+
+echo "${GENTOO_EXEC}"
+
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
new file mode 100644
index 000000000000..66cceb3a68f5
--- /dev/null
+++ b/x11-apps/xinit/files/startDM.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+
+# We need to source /etc/profile for stuff like $LANG to work
+# bug #10190.
+. /etc/profile
+
+. /etc/init.d/functions.sh
+
+# baselayout-1 compat
+if ! type get_options >/dev/null 2>/dev/null ; then
+	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
+fi
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+export GDK_USE_XFT=1
+
+export SVCNAME=xdm
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
+PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
+
+start-stop-daemon --start --exec ${EXEC} \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
+eerror "ERROR: could not start the Display Manager"
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
new file mode 100644
index 000000000000..48dceabc500e
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
@@ -0,0 +1,61 @@
+From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+
+Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
+---
+ xinitrc.cpp |   26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/xinitrc.cpp b/xinitrc.cpp
+index 049a8e4..80c3ad9 100644
+--- a/xinitrc.cpp
++++ b/xinitrc.cpp
+@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
+ 
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=XINITDIR/.Xresources
+-sysmodmap=XINITDIR/.Xmodmap
++sysresources=XINITDIR/Xresources
++sysmodmap=XINITDIR/Xmodmap
+ 
+ XCOMM merge in defaults and keymaps
+ 
+@@ -84,15 +84,25 @@ fi
+ XCOMM This is the fallback case if nothing else is executed above
+ #endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
+ 
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++	command="`/etc/X11/chooser.sh`"
++else
++	failsafe="yes"
++fi
++
+ if [ -d XINITDIR/xinitrc.d ] ; then
+-	for f in XINITDIR/xinitrc.d/?*.sh ; do
++	for f in XINITDIR/xinitrc.d/?* ; do
+ 		[ -x "$f" ] && . "$f"
+ 	done
+ 	unset f
+ fi
+ 
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++	TWM &
++	XCLOCK -geometry 50x50-1+1 &
++	XTERM -geometry 80x50+494+51 &
++	XTERM -geometry 80x20+494-0 &
++	exec XTERM -geometry 80x66+0+0 -name login
++else
++	exec $command
++fi
+-- 
+1.7.3.1
+
diff --git a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
new file mode 100644
index 000000000000..362b420cfc8f
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
@@ -0,0 +1,21 @@
+diff -ur a/startx.cpp b/startx.cpp
+--- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
++++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
+@@ -188,17 +188,6 @@
+ 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 match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+-        vtarg="vt$tty_num"
+-    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/files/xserverrc b/x11-apps/xinit/files/xserverrc
new file mode 100644
index 000000000000..b4de2528749e
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
new file mode 100644
index 000000000000..6b57eeba6da3
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.1
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+  exec /usr/bin/X -nolisten tcp "$@"
+else
+  exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
new file mode 100644
index 000000000000..dce3523a34df
--- /dev/null
+++ b/x11-apps/xinit/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="minimal">
+			Control dependencies on legacy apps (xterm, twm, ...). Safe to
+			enable if you use a modern desktop environment.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..99c44ccf7a34
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 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"
+)
+
+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/xinit/xinit-1.3.3.ebuild b/x11-apps/xinit/xinit-1.3.3.ebuild
new file mode 100644
index 000000000000..ce597213f6ec
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 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 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"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir=/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
+	doexe "${FILESDIR}"/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/xinit/xinit-1.3.4-r1.ebuild b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..51dc72d6fef8
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal systemd"
+
+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"
+)
+
+src_prepare() {
+	# this patch breaks startx on non-systemd systems, bug #526802
+	if use !systemd; then
+		PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch )
+	fi
+	xorg-2_src_prepare
+}
+
+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/xinput/Manifest b/x11-apps/xinput/Manifest
new file mode 100644
index 000000000000..1d22a1520209
--- /dev/null
+++ b/x11-apps/xinput/Manifest
@@ -0,0 +1,7 @@
+DIST xinput-1.6.1.tar.bz2 152587 SHA256 b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a WHIRLPOOL 14d9da0390d5b40cc81fe6934554ec52d5be74d008a9c23504df7acdeef64cb17e11849445dd1cc21b931f46dd49e8f56769955a9ed611fa560d58e67caadb62
+DIST xinput-1.6.2.tar.bz2 158061 SHA256 3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4 SHA512 dbef3a87dd47bb8c593f1305bea7978697a12434a4992584e4124d745bb366812366b44fc205159137a3db6f7b8338effd1b90641a194497b19159b9fd91939e WHIRLPOOL 5d0e305607dec2f7920c4380dfe4b7a3efc9429b1ec3921a44bd0250d7606b761020f7f75478c1cff999811fa23ae71c95c8b01f7c2c327699c3bb022a44ea24
+EBUILD xinput-1.6.1.ebuild 456 SHA256 ae4018d7be934da71d2685b7b5177716f7ad9acf07f2248f89f7de3b61a969d0 SHA512 43d894d0a777e1bdb9d0e380ba9909025c297957698e687cb2c42f5770d5728eeb50134cebcdbcacffe9ffc5acd55138673dca17bed2f23478e5d0b28dfb81fd WHIRLPOOL b589827284dbbf6cc1eb0b06f23433e58939edf8104f299562d83d14a789e76ccdb0a94f1aef02c38985098c235cd15a439176430b4f1bebfe7d4657e0269dcd
+EBUILD xinput-1.6.2.ebuild 463 SHA256 4c617475422cd4e4b4135c166e979227884a051fd66391a0928770aa268dfe8e SHA512 f89aa6dc30edba15f2aa0a724ab19c0089671b44d7a0bff3a7df52484482861c2f35ea4b8db970329ef4d46720dddded47841e0d87e9213c20894a6d2b69da79 WHIRLPOOL 8aae08a65082f7377c1c725e4996ab60a58613e1179cf8daf37bda4ef66b3cc47c98b0f90e2cdc6815327e2a5197b739b3139e1a7cd040faa8efa8f3e1d450c3
+MISC ChangeLog 4229 SHA256 7985e45e02adff14f57704d51992b713b2d61428c19e76dc030e8ea46f595833 SHA512 be2223bf5fdd2ed3c7ce64a5ff4b57f4949269bafaf9a77a198e6a58fe806ce543ccdaaca66cd5623e1a39a56a6e13593e05a76381e48c5eaf4e8e8f299512f4 WHIRLPOOL 9c7e51497fccc38809199a5257297e91a9f589a35f22e0996ec5fbb3acdb73e605b10ebea169dc40acae45d9fe143535f33234268852155f5cfda8d4bbf0a237
+MISC ChangeLog-2015 10734 SHA256 ea5586787d2ed06a1f76aa0d972b44a108976ba3ff9cd1fe50d452fdeda0c507 SHA512 8ccc66a33cbd0238c6abfc2cd975afd158f2bd0fce888acfeb407f4b3e58c114fbdd3a8ba3e95f1f0c71396f8c7611114b71c411d14f6a540fd8a476b3105cd8 WHIRLPOOL ae162fd7b0b936dc57d6e7b50b4f432439dd35eba673b5aabe972bb8f42a974a2a3fceb8f9f2303dcd66c164f947c4d3f15511adda00372b774f5a1e58bd74c6
+MISC metadata.xml 315 SHA256 6c862647866106c2c47a3e845ea055dc2e4f504c29e522d0e4657a8dda2eed24 SHA512 d2d36e4e38b384daa8555a0824dc7fcd364b9a61350a31a7c25f7d24e42901e0386606a8410800e7ca6efac8b49c11b805b76bd27f1510f3dd89ba91a0856400 WHIRLPOOL 3e0dfe472d835b47b8fb7a06498a1cae7b9fc043f7888579dfa8ecdd17b9e8fc7886ba5cd025f7e500c92cc90b870d78e92098247ad988c583a4eeec2464b7cb
diff --git a/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
new file mode 100644
index 000000000000..c1fe381f7fe0
--- /dev/null
+++ b/x11-apps/xinput/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
new file mode 100644
index 000000000000..56ec43dcc08d
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	x11-libs/libXext
+	>=x11-libs/libXi-1.5.99.1
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.1"
diff --git a/x11-apps/xinput/xinput-1.6.2.ebuild b/x11-apps/xinput/xinput-1.6.2.ebuild
new file mode 100644
index 000000000000..6084a3a12fb4
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.6.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	x11-libs/libXext
+	>=x11-libs/libXi-1.5.99.1
+	x11-libs/libXinerama
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.1"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
new file mode 100644
index 000000000000..667733ea0f5d
--- /dev/null
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -0,0 +1,5 @@
+DIST xinput_calibrator-0.7.5.tar.gz 355313 SHA256 baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de WHIRLPOOL cfcc750bdf1885e616b0d82b15d8ad9aadc27cf8bc07f9e4b1ebd9aecc3626677d2abe1beb8f5999b0402c5b59225a0395785a998cd6298b756899987c833440
+EBUILD xinput_calibrator-0.7.5.ebuild 716 SHA256 80736adabbec932450e60c5696e7a8b5c34d9ce7875fef055fa6d2c40a5c3834 SHA512 2bb012789d39ce0430dfb50371fdc6bc8a7146e62277d4f358f11fb9f2408bfa8a5592bbae6dc2be5dac6455cc1dbc7faccf6b154886707b27e689b13cb650a4 WHIRLPOOL 77e6b9485edad2204bb6c79d4580b767e2685d5108c87a718a8a9cdf1718f0c93dec98b8c243198b9f46b391331de4c85afc907961591d8d1f27336d95b2edbf
+MISC ChangeLog 3426 SHA256 0f0e2a3c98b166a9fb45b850a5ae7240b6a37e0cf807a4aaa6d01572d2c35f74 SHA512 b9685db6b7ff0acf20cc56bebc4ea3f989611242f76da3dd3dbeff705004fac0a3df12551382f108d9a742e087e372306f8fa289ceeed7b55522865a8665f515 WHIRLPOOL fc3fcb213f4bc028a5a9d632920632d22896300fb02bef8892d85018fd3f8a7779a61adfc2ea41ced42b9d369f951123add1584ed0b0743d5c0e18c58ad51dc1
+MISC ChangeLog-2015 1076 SHA256 b34add8649342253735be48655655ec41255d1b575d2541d825c4ee99865749e SHA512 63a51fe521900b8dded427c8cfc842f6b5f8c599441088ca720e2a9fdcb2de8be4245b85656ea8ce8a3ee68de3f9664b8ddf27d91d1b350067673e9d4d1c30d8 WHIRLPOOL 4bdc30806b3042cee86184e855dae3d5bce74e3fe1859ded632d26298fc96d4f68e3ad57510978da5e2148f13ede673fbe321794a683af9c4f856b6dd985b9b3
+MISC metadata.xml 234 SHA256 900f23c261ef4bbc25ef3d591263a70142c3c6f1cf833d1e66301936532399e7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b WHIRLPOOL 362d1afca87746963dbde2f7b3a6d4cfdf0948f9347fef9eca5510c04e2c6c9b9e6f5f9a934ba0939e261f472a1a74111d70a4cc87a8590f38ceff7692fdca79
diff --git a/x11-apps/xinput_calibrator/metadata.xml b/x11-apps/xinput_calibrator/metadata.xml
new file mode 100644
index 000000000000..7a7bbf810544
--- /dev/null
+++ b/x11-apps/xinput_calibrator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild
new file mode 100644
index 000000000000..d00be953da85
--- /dev/null
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="A generic touchscreen calibration program for X.Org"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/xinput_calibrator"
+SRC_URI="mirror://github/tias/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="gtk"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-proto/inputproto
+	gtk? ( dev-cpp/gtkmm:2.4 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	append-cxxflags -std=c++11 #566594
+
+	local myeconfargs=(
+		--with-gui=$(use gtk && echo "gtkmm" || echo "x11")
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
new file mode 100644
index 000000000000..adfa0ef70d00
--- /dev/null
+++ b/x11-apps/xkbcomp/Manifest
@@ -0,0 +1,7 @@
+DIST xkbcomp-1.3.1.tar.bz2 246963 SHA256 0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d SHA512 03ee4cad3ef0295b57eda25eec2c301baf04beaea8936baff5ae87e3eb41ace3095ce3fc80a55cd1c4f58581ed23bc0acfbe38879fce27e2a6f6cd647ec6bae7 WHIRLPOOL 3f0c2aeef8959a4c886b5b1c7ffef56fb21b414d8d3193b2ecad6757d7d86eec7d12eb43b53c07f685267c11e00b6aa8f302d483b18175a80e24aa31869dea72
+DIST xkbcomp-1.4.0.tar.bz2 243774 SHA256 bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b SHA512 c96a63fc2d9a6ac17123297574966c45d0dcfd4ae3d4073ce863c7738d453f4c0a5f7a87c06efdec19f0b270207a7170fe1aa72a73ef1b50f95c7ca262f4882e WHIRLPOOL 27a6172260e9ec0bdb22c88344855e001b5dc476d61e64927b1cd28fa6df18d59a8eb4fe85ccee02dc80a690b220081e33c25f61f24b1c5246463e27baa39dc4
+EBUILD xkbcomp-1.3.1.ebuild 458 SHA256 9a6c768a4b9f03f3a89e7c91ab5f2d86135a75a3956f3c1bfeeea63d9c1d61cc SHA512 fbccde9c157ba47ae47ae3cdd52c3fe254dbb2fc4f395f0b5ad5e18f52f35022912646b42ba141b08ef1e644293ab59ab07fee437e4b4a8c5534083406dc3443 WHIRLPOOL 5bdfb16c7eb9a328b6c4e6d8be9233f267a9d375efeab53c7a8774a2e01fd7a073b670c0caa255fd41d2402f8881ee22c24b7b65b13f83fb10dda498409eb763
+EBUILD xkbcomp-1.4.0.ebuild 459 SHA256 0c070cb4678ab31b6ddea5a308820c15453562744655707d11171b28526b25b2 SHA512 98c2b3fe98181214fc7ba8e8fdf1a3add65b46e7a34e3d8b834436b75d59a5048718498adca976734ff05b690f9fd44ab6df18c73b460d1eea2a411b0d0ff1e5 WHIRLPOOL c6300bd923fee39d57075b9b794fdc1cb061468045da53164607a56c17ffb38e0a3cd03f46020ad09d79fc79ec7cbf723760c68d6249ba7d6e3379c07a30cd0c
+MISC ChangeLog 4027 SHA256 3ec331469ec368983a15b0310c7319d12489e4380173d35cb2e2e606217e67b8 SHA512 4908bcbda6ef60eb3d7accf10557e4db9f70f73757be7336ed9bcd4af33fbdf491f46d712f89ad811bd5594b868d1140588b1b5abfb32005aba0720bb5535985 WHIRLPOOL 4f23130bf3f19ad553c997f91f52c1ba11c195272fbac7c8f2bc673973de86270a8aad69f20b44bd6e9a7a497c188fd166543ac2f01bc55471b4e4501af95514
+MISC ChangeLog-2015 14097 SHA256 f8afb9b1460cbec0cea7e34ad172ef2413cd425ea4b7f65f102548a2c002ab25 SHA512 81d12aee6c8407c695aba60ada50d6b4034228930e4ffaba20ab54e434c08794d012c6ef990bfd87f2d2d1e4af46dbb2e6de76b81ba374c72ead2e3bca2afaa3 WHIRLPOOL 7fb76b8341b7b2cbb9156ba3cf01032699010627465ef3f7f076789fb4fc8429b645b53324476a05d27e6693706df9c5b0c92d2871aa03bf068a40248e1e1618
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xkbcomp/metadata.xml b/x11-apps/xkbcomp/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xkbcomp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
new file mode 100644
index 000000000000..dda097533d2f
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+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 ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
new file mode 100644
index 000000000000..f9cb77b07c08
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+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 ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
new file mode 100644
index 000000000000..18af05c9ff72
--- /dev/null
+++ b/x11-apps/xkbevd/Manifest
@@ -0,0 +1,7 @@
+DIST xkbevd-1.1.3.tar.bz2 147027 SHA256 55b2484f9851112c2685d503b64b319f0f98fce74863ef735ecd52b52ceb0116 SHA512 0bec7ec60c2eb7f252c290a80152d4917b6462df7ab2fc9a8234ae0ce68f56a06a939fb702513857c9176630386e2ac1dba29a8ca8b91db1adb6f3c5385f4f38 WHIRLPOOL 62157983771615b56609b897b44a627a860221a04e9012fed76e2a85a07eb74fb548d731624f7ff3e7a3dfb02070c43c13faba71dec68c71fed71f1074c0dd41
+DIST xkbevd-1.1.4.tar.bz2 151991 SHA256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7 WHIRLPOOL 850e89027569e94272f6c3f5f870c962b972f11f15a3edfcd018dca9dd95cea51c0b71f04ee94ff77bcee4c14b1d951d409dd0cdb4634a1d8843d603762f9f73
+EBUILD xkbevd-1.1.3.ebuild 350 SHA256 38d8977e64dfa31ebcb90c0619d444939e1d3e9200631ff4e19278b73453a459 SHA512 7859e20fdc0a356c916c5c2276b39a382e8c1a8b49b45d90ebf762a86ce3caca2a53b06ff2b33ad089479fc391d32e367d6c67fedf0379a624247442b77d1f78 WHIRLPOOL 1dfa6f26324915c254183712bdf09f33bec24458df833911f74dc21d3aa8f2d1b68d3b70d897d3aba03b9879572219b73ec5544eacde8d23e4c43fa48e61060d
+EBUILD xkbevd-1.1.4.ebuild 359 SHA256 684f68683f2d479887e156184be32d589c7e93724087ec13baa0c465062b7a87 SHA512 6769422e9b64a387e04ff5ac83b725b10321643ae3918d1443348d5578462ba368d115ce6d55a3b0b7327435926fad3d81661a23455e920e9524e98ef358e2fe WHIRLPOOL 740dc1847237c1d492dafde1c028ca837ecb731c114b9db7f53bd770cedb9f87928eb635a82d070fd914221dee9e84f58f4650a648f5b60f1cdd2558981dfb3a
+MISC ChangeLog 4153 SHA256 6521963f86842ec98aa846681960a5544903bf733fffc32b119000be9b822928 SHA512 361e456614fde85515699dd9237fe8c3aedb765b4f11a3630f11e56850bdbc31b8d972845fbd33a9dcc6dd670c8180e44820b9710ed3663e95a13b0150bf8c38 WHIRLPOOL 56ab345db42e6b0d392c538bbc9cb9f69edd137bed789b79f2c498e72c592b5f4e137c64bf4bb209a86f8d2ec8f3063b401f71273d6eef85b5e17c87514946ef
+MISC ChangeLog-2015 7116 SHA256 49faf0bafb38b34a868d1ba1803f623eee794688b89d25e00c40c584ca99f4ca SHA512 5780563e460331a23ff2cec3b0f5e1501d6348ff95f1c9d239685ec5cc3c516ac49b6f9ff92200d36e4b0dfbc353b5f2a6493799afbea541dd8da1f9cbc59165 WHIRLPOOL f1007d983e7799d6a1e2b29d4472b6a3b5b447ef4984a8d3001935909ac2aa4778da35cd0c6f53fe093ecc134e2b0c5fd51cc44b7ba947c0716fddd366b29cf7
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xkbevd/metadata.xml b/x11-apps/xkbevd/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xkbevd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
new file mode 100644
index 000000000000..a0c6e65b6be4
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
new file mode 100644
index 000000000000..438e537d6e59
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+	sys-devel/bison"
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
new file mode 100644
index 000000000000..2d1c24f46ef7
--- /dev/null
+++ b/x11-apps/xkbprint/Manifest
@@ -0,0 +1,5 @@
+DIST xkbprint-1.0.4.tar.bz2 163810 SHA256 0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12 SHA512 bb65a93ae737cd4b78787fef51972f4d0072a272166f82103bfaa92cf275db6363fae3530539b7c9a4139f6b87512019ac15ab3478d4ad05967ad18a8e80033a WHIRLPOOL 5a400dbd54ebcf64a0c5085f08bbacb84a7ad617f093472eccb91e6add576aa326e06f7182fbf98b21136ef6ad6e5fd4a2dd169154e6d3dd09a0d68fc30b451d
+EBUILD xkbprint-1.0.4.ebuild 318 SHA256 706388de27eb3d3ed3d7f9bb9b02a68fef5abeb6405a12bdc3c08d1099ca1ee3 SHA512 78dc1977241358cdbb699d05e690cf98fdec0c8b6ab13c5082f499301343f6adced9ee24ef528b9dfa1a367508472d4dcb73b20125fc7280dd9706a672cfa037 WHIRLPOOL 6d69924564504775cafcc9e5085ccdf5b270dd584f4b4808ff8c0f4fb9cec87d8df609690b89a81a37ba389c5d6dcd6efc28a52251175a59a9a4748bec48ff5b
+MISC ChangeLog 3386 SHA256 c4461b828d24c1e492aecf9f6a868e6729a629348f97456ea52275a0e67ac0f9 SHA512 7ca660d699329fc88ff99e44979c517191811b33ad3fb0e912e43976fabdd8fcb3e08e59f2451894b63b660fdf2ba6fd16ef6491f82c053d489b207c8364b348 WHIRLPOOL b56fcf079cb3da1c451e64b759f730dc0c33ef8489c1f0d040ef2b1d35639b6e07c6e099f32def14a7e7cc9c2a6af20ec1e6e33344e606f763c13af7c085199a
+MISC ChangeLog-2015 4186 SHA256 4300c2853548cd9250110b41a5221ab0c0280fb27d72b913b903b5194d7ee8d1 SHA512 d6c3726d9107ff2c9bc8e2854164196bb9a769879fd2662931745b84ea82a9fe17929d3682627f397c1338dad97cc470fbede2c739f6a887a9f1c24901b074a6 WHIRLPOOL 3965d7d6d93ea2e9a05bef1b13c448b667e4142d5b0ead378f68af40eb9114fa90c7313984b4a0eebfa195d5dfac7c40f743c10698c6c45c39dc1450aea1e6de
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xkbprint/metadata.xml b/x11-apps/xkbprint/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xkbprint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xkbprint/xkbprint-1.0.4.ebuild b/x11-apps/xkbprint/xkbprint-1.0.4.ebuild
new file mode 100644
index 000000000000..527b61992765
--- /dev/null
+++ b/x11-apps/xkbprint/xkbprint-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print an XKB keyboard description"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libxkbfile
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
new file mode 100644
index 000000000000..96656f3b7284
--- /dev/null
+++ b/x11-apps/xkbutils/Manifest
@@ -0,0 +1,5 @@
+DIST xkbutils-1.0.4.tar.bz2 131269 SHA256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d WHIRLPOOL 4226604655c6c12742254f4beed43d4e9e0ae42f472f3620f14685fdecfe0c5e28c0a3821853c44760df3069f217669959133222a2ba0f9d1e41d9d8961d9a74
+EBUILD xkbutils-1.0.4.ebuild 404 SHA256 47886d60809b19a76d5b1a9132b31b3d294735c3e5c44232fe8183237487872c SHA512 ebcad94e6598a8e71005d4968e75e69fbe0c0d27873c12490c50473da2d58686b1557d05405a56d26c8b68e5109ad79628f29ca0bdfff6fbfd95a6fdad24db91 WHIRLPOOL 60be409492e76d2a642015529dc444411ce5ab2a04e81660991185a80f19239cac89ab4c0d4114bc08e29f5d21725c8a88a48ca0a8d342d36a5b0fc767c4eed2
+MISC ChangeLog 2593 SHA256 82ba7b249837e003cc06b3ca2b680a2a4350f61a015672d141b45a0a46ba7797 SHA512 a787ed4086cae692075b9b8905d035c0a882aebdfef76aff6277a3824162bac6743ea6ab52d2a3bec440f27f4157c3551f9faf23534332482078819a778851db WHIRLPOOL ef45d509752c60c8ace56bbd05b3a220aac57fd95d8ec2fdabc1448d1d7c741f1ab83135ca20e8fee40e64c32307e87d7af998fde448172d15134a0473f981d7
+MISC ChangeLog-2015 6612 SHA256 7ca737c8bef36f3e845c818441ea9434b02c3267d09586c74ba7ab0ba0911d1b SHA512 d72867267a0485a32b5fc39574d6dfb489a4f05f5b829faafc10207407df009874b52c3d9b7d42b417d621f9a634934915624b568e8c903826cf936c6f1a6d59 WHIRLPOOL 4505e16a7084e979d3c41022442e361ed0d576848a421be50be8bafefa627d73663b12f3b48201463bb86552ad2b718818cc30cf78165dd1486a1168c2802e83
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xkbutils/metadata.xml b/x11-apps/xkbutils/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xkbutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
new file mode 100644
index 000000000000..b8c25fa73d30
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbutils application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/inputproto"
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
new file mode 100644
index 000000000000..e2abf58e404b
--- /dev/null
+++ b/x11-apps/xkill/Manifest
@@ -0,0 +1,5 @@
+DIST xkill-1.0.4.tar.bz2 124828 SHA256 88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545 WHIRLPOOL 680cd355eaaabe99d724056676f789a1ed24398179d98d4ee98a82264216e92a3cd0328b8f8f7164ae9690cc8cc768dea04b21be3715acc0cbe126a503fcf27a
+EBUILD xkill-1.0.4.ebuild 388 SHA256 dde188e390d264e321d626930e039aa2483641aabac251b0742d16ee45708e5d SHA512 acb71c1ce6a9c25efae92867c70873e3a2b8b9267a914303d773a412e5a126ab29aedbcf6b75f6aa5cdf58dd2ddea5a8a3ed85c0d1cc92c409ea62cfc9e2f794 WHIRLPOOL fb28addda153504e30f2f15c5da942442a61f4e83f3e726131148521f844e7c603c12d5fa056d7995b367435586e407327c5d7595fb436ada22953147dfc23e5
+MISC ChangeLog 2581 SHA256 93a1eaabb8d4b1154f0a9aa84ae10ff12fc718ce83f9f8a6bc4549afd26d6971 SHA512 359403172e200b01d32123398775c57e8b17296f579abb51cd422d35515dcf39adb5abfb5497aade4ddc2f534615d4cdd6cf5115c697411fca779975f7728f8e WHIRLPOOL 59da9c39c4b908baa27e816770f2dcaf58a57542299bde13ba817bb232a434bf36710054b955854270473f90ba5acfced9d239316dc26d6b83b625fc56a71c05
+MISC ChangeLog-2015 5314 SHA256 4709427ddbc9ffdf504707a2904bf99bd7e1d80b74072ce8db86be29cde6d2ed SHA512 fb3d3526c6be78d4cfc3cbee6982c816b0cc6dc990c7043e2dc2ae9ac9207f5e1ea00d02db3d44b46d783e579869a952f8fa63f95c8b4edcca92bfe598b60e69 WHIRLPOOL cbb5fcd43cd173150e3b5adc7088ef70deea9f9bbdd63fba3e78973330b7b78812bf40e2cda3541127bef8b13e14532eb8892f354aa0ca5c392c2310d2a736c5
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xkill/metadata.xml b/x11-apps/xkill/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xkill/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
new file mode 100644
index 000000000000..dd50dd0f41bc
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 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
new file mode 100644
index 000000000000..fd290e21e5e7
--- /dev/null
+++ b/x11-apps/xload/Manifest
@@ -0,0 +1,5 @@
+DIST xload-1.1.2.tar.bz2 136745 SHA256 83f8e6260435f1df2e2e5036bb3325688b79f0b33069ef445eff5058d127e078 SHA512 9c83d26bbb135cc0f2b3ef7f25b081cda5d080dd02b1c89195b40825a7d71211965b34336c853eb455472d9748f3edf64108455584b34b81673e2548806f423d WHIRLPOOL 9b37fd9b834a3c238543e485962316b5709a6c949b4198dfc92e02c2ee3e56b874c3ba870dab30d2ed52e2cf96cc8008f9a1c92b7ffd9b457972840256c26cb3
+EBUILD xload-1.1.2.ebuild 378 SHA256 4c9925fbcbcf44150edef1bd01e85295f46921946f669790c6400537a5249ddd SHA512 445dff6e32ea43292a8a4544d19637326633c2faa96db2a6395d1b9ab50658f389f34f3978e9c23f71f9b20cb93f22d658a2cc8e1854d70864a7d5f4cf0277d8 WHIRLPOOL 2a5009be16cbda051e609e5dc2ea59467830e3bd7fb8e165e8659dfdb06436a7abc2ad14a0888f15aa961adfc1653456b6eb21d768a83c3a16804567a43ebe14
+MISC ChangeLog 2421 SHA256 bf53b11e306d160de4f18bc6edf0ce2c7583f3ac1e97566f45b9bb1bb04e2668 SHA512 4c77d6dc22307adc3de8a9665896d865d0c27a554c801675ef656daa35c30c3b1c7a25ddafb85fa54e0f317421dd6f8419a73bc9d594ad47cc1494ff80792990 WHIRLPOOL f2b327ff890b0bded9415f208035271e6bea17671551e12ce75e9d64d28a12b3dd47403da1cf8e44ecf677bb1d6ae8470f75ea6c6878011edab9b67b882124b2
+MISC ChangeLog-2015 7410 SHA256 ee7060d81e32ee17dfd14dbce7ce33216db04c55ddd8af08b9eb9a98bc0bd64e SHA512 1981bb59d605b4f965a1a981c739095911ecaf7ee0492f028eab463a94717a169813c0632675441b9cd2930606ff1a651068f1c8be59c72df744f640e5045848 WHIRLPOOL b1a0d8a5109be4adcdbc7bdc4fce92be0c167db393a956f6dafcf5aa42fc7adac526d9ea7fb21397a0b66e98610803d6c731217a09d7f037d8724d4298407334
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xload/metadata.xml b/x11-apps/xload/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xload/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xload/xload-1.1.2.ebuild b/x11-apps/xload/xload-1.1.2.ebuild
new file mode 100644
index 000000000000..64d4b12d527b
--- /dev/null
+++ b/x11-apps/xload/xload-1.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 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/xlogo/Manifest b/x11-apps/xlogo/Manifest
new file mode 100644
index 000000000000..72fff0bb27f7
--- /dev/null
+++ b/x11-apps/xlogo/Manifest
@@ -0,0 +1,5 @@
+DIST xlogo-1.0.4.tar.bz2 125967 SHA256 17af6f4fb73e7310e087fbfe5d773bab2b0d6f37a894ae5ee32de4693af6ba92 SHA512 cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d WHIRLPOOL 9a51ff27dd5c6dea8c6b0a78d52bdfefd3c409a2e0ecb2f17c7beb00650353a883006c86bf517c1ea3296b1e11aa8db582a3f26c77bd8826b48a3565eb923da8
+EBUILD xlogo-1.0.4.ebuild 456 SHA256 ddba2e7f94cfff3ae18afe4cd01845344c17b00667aac67dc011ba9be2665696 SHA512 0a5e2bc7349a76121bf014bf7cc1e2ac08882b0c85b0cac8bd312d846724ddefa75367e1e8e22957ebbf050e9ec4f3f338643e7cb91d1f490876ad5bdc74c585 WHIRLPOOL 7855f9962131f41c3f57075a40c4ef3a842c114b386cf952d9e6341eb1870328d791c8caeb25b0616bbcabce963982567159e14d2bbee5b28ad180351d6dddf9
+MISC ChangeLog 2421 SHA256 d0e73e00a99fae4885455c6dfce3ba6fb454744e66a5def52be846acdfa0f09b SHA512 8d25ab1e3d513418119dca23e087229de30c81ac571f04a06913aee4b457828b44fe9fe15c72e2ca729cf72d051b3c32d01729a4e6a8a159cbb5bc6c5ab87a5e WHIRLPOOL b84cbf943ef65f03ed66a05dab0710773b1955586f47706fba040c861ef87d6c1d32b5533c31f7b9e3ca0b1d9813adefc760e745e55fe975ecf995bce6feab3e
+MISC ChangeLog-2015 4960 SHA256 a1e5e2058aa8652791b929bc7cc5ba158414bd0f524ab93c24a18a73f1c2f5bf SHA512 e50ac10f69a4bae30b0c7d4aea3496207c87208242aa64ba3a15af4a89ddada9b07de4d61db46be22838aad56d525721e95f7c814bd696d62608daab558a1412 WHIRLPOOL 5caeb21ce3d9554166175e3a79f687c9365bf884516b66e642e124e444a48f80b0f65a9e9288fe371c040048781343edaafbd74475b2efa6ab866d1769d3afc6
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xlogo/metadata.xml b/x11-apps/xlogo/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xlogo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xlogo/xlogo-1.0.4.ebuild b/x11-apps/xlogo/xlogo-1.0.4.ebuild
new file mode 100644
index 000000000000..baef294e1870
--- /dev/null
+++ b/x11-apps/xlogo/xlogo-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X Window System logo"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXaw
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS="--with-render"
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
new file mode 100644
index 000000000000..c3aecd4e793f
--- /dev/null
+++ b/x11-apps/xlsatoms/Manifest
@@ -0,0 +1,7 @@
+DIST xlsatoms-1.1.1.tar.bz2 116501 SHA256 3b8bd98c1ca9789178db80bca75556b0c76e5092403014995d5ddaa3117536f9 SHA512 c372c80c82942eb7ee50eb243182d4bfcbaf417d0f6e2253c0baf7df65e506908914604b06add6d745cc32d7b3bcfa6c49e93dd52d78cecbae13ed49f856dd0f WHIRLPOOL 04ed2733e8b4e4d96067b997c81f123ecfb961cdbcd1730509da231c78bfef83b162fb206040083e92f89a33cc0c64f715c6d07f2e4b2497243366cfc6e1638c
+DIST xlsatoms-1.1.2.tar.bz2 123157 SHA256 47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4 SHA512 f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa WHIRLPOOL efafc8d31b8b6ec0864cd1ef62e1aabd931a46302484062711d6d07d40547837d457e12a488c3965322fe2e4ccd1d3df11711c92ae980f7a632ada7f6e077c8d
+EBUILD xlsatoms-1.1.1.ebuild 332 SHA256 1c45c94a43b8f7fddc1b9ebfd0e5e85ce88fe5e26849cb09c5a990e60abb451d SHA512 f0326e059f8511b006e0aa4f56aeba06e396bd9a407756fa844e8a3203dd68f183d18466e78d8644530f12c50b424c74e2edd52f0a4e23f94ed5310d690dc0fe WHIRLPOOL 84396897cd61fbe45e8d685d7ae56a79c49359326b8a68da0a36a45ee56a68f08c4a8739baac09431468ceb225f24db2beb1cecf6e2d3373a5ad61bee40fee4d
+EBUILD xlsatoms-1.1.2.ebuild 341 SHA256 079035ac75657d393c02195f53813f331d22aab54d0436e265ffbc7ad2b66520 SHA512 220d8b3c42669824e12f018beb64604b94bdde2f6bbaf5a40b23f442de7ad7427a61dc6f0305cdf6fe77fae2e0ae65428267542fdb023ba560997a05dc7a6a6a WHIRLPOOL 475abb7f275011572973a6cb8026c90f9f54f9564072ed5dc8b2a325d5187cb3c9c023b7b2c7d392ed5b591ef4b2f360744ed4610029b8e44652280c763cfd0a
+MISC ChangeLog 4181 SHA256 ba074871fbbb0042a31e730596216a67d16a7eb54ca8bca89d798e0871506df7 SHA512 8e9e17d40749f57e6fc868ecce8addfb2e1f05fdebd7c63c702e2e429d3e31eb726279a7a52bf9ea584357aaf506a4a7c405a376cfb04d8184138b83cc0d252d WHIRLPOOL 7b965f5b07da9c368401a665b42d2916c424ee5c15a1ce3307ee4db68fd997d9fc09fbc4140103a71670bac066803430135208865091f0f930c1f0f129cbab8a
+MISC ChangeLog-2015 6326 SHA256 3040d7d83a95d742ad9115aca516b0352eb3d7cd9c3bcad3534872e1648a0738 SHA512 3fc8982eb337a89779b02fde4061e5e7448cd5d71cf79b0d3a3a124e22a43994b77702bd90aef85f1755b372fe23b257a8a97305c1a530f58f4ac9a8c156f608 WHIRLPOOL 29ee49b1bf62c1d8d502e5888f3fd46e395881c1a555f3117d21d8c890f2c4539076e1b892e5db463209a0965cbb1fd117041d4c33d2be260b82760d03435e1e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xlsatoms/metadata.xml b/x11-apps/xlsatoms/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xlsatoms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
new file mode 100644
index 000000000000..dd0a6fb289e4
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
new file mode 100644
index 000000000000..b20d9f240a91
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
new file mode 100644
index 000000000000..b2c9cff6a91d
--- /dev/null
+++ b/x11-apps/xlsclients/Manifest
@@ -0,0 +1,7 @@
+DIST xlsclients-1.1.2.tar.bz2 114703 SHA256 1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1 SHA512 c217c17ddd937fd27b11706e6453a6171037bc33f9d108c0bf717dd5f2a0580eb82bb9085342d81d526c75d8aaa0a2d911e6ebcaa12ac8cafce4caa726ac93e8 WHIRLPOOL 2cb1fc41b4a88b2ac8999f5a2401afdd10987e4ffe7bf7602e6d495a7fc2ea1cd95a229bcb2067faff10cbb9130fa7c5d94d803f92228519ba28d82aab21f4a4
+DIST xlsclients-1.1.3.tar.bz2 127324 SHA256 5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d SHA512 4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85 WHIRLPOOL 6d37ebef099e8d2ca511442ef21cea9dd698f2a920abfc7e0549889f71df4b2a0608029daab8b547cba667933f321c6eb87507c501d0d8e3a5f5d83dea519d94
+EBUILD xlsclients-1.1.2.ebuild 359 SHA256 f0ce751f0f6e3c1a511896b701e2330775472bae710d91481f9c4626524cbc5f SHA512 f20475c6510d02d85480f2d776ad626b5bb075c1fcf20c3e2341c688b1de868fc4c24f2756802da2147e1b67affd419dbd83ded9bde697e84b6d9b70250a1aad WHIRLPOOL 83437a9898f875482fccb627bd001a9fd12a78f7c1e6bc71e4fd888d7fe4100bc772a251aa31523e2828e3f93d20bb776a7106a0ea7b701c3d062f7ac942c170
+EBUILD xlsclients-1.1.3.ebuild 368 SHA256 d313bb815a4c61860c02c3930750f397979648a03a524d5a4510db831d90adfd SHA512 dac8507547f2304debe0eb4e1a0184d5b97b5027866a53e22c967b1ce79e5c0c1e318bb55f3b320506de2f557b3363fec7922b7634d7019e6591c1d94791a287 WHIRLPOOL 498ae33ad348625621c93f221309a067b199f3cfc2db5fa58e6fd06029e2840ddde39e307ad92c6b43596c93c086fcb38369ada14db6555cdc694681f4b468c2
+MISC ChangeLog 2659 SHA256 48329cf744a3534f51d8ca40da38d7f63bcba9e3ec92cf1fb1fcac063ddbb229 SHA512 45edabc43e84515acf0395323f3b8c3a170de8054765e5f04a008b0bf5dbd5cd15de473612e621dc839f5ddaa608e937d9f703a2fa28bebbefa2afab4d0e65d0 WHIRLPOOL b114f71fc0b6b714587b603a6cd3541eea5887c00f3d81b734400ef3bb5b4c9ef8b5e4ea0422a0ef912a52a4032f2b63dc078b15b8a82a3ae0ef7be7d72e1c47
+MISC ChangeLog-2015 8563 SHA256 054e59c4427ab0f14955b942a3dc674864ca49016611b73a104e5fd847096f5b SHA512 e5f88833af1b6504e96cd1cf0393369c4b3ec0d5638f9308f1988a08d5bdd7ae35ad63c231808336d6466e798a86ff9dda26b6165f00e7618b3503bf309d3179 WHIRLPOOL 9560cdfeda87f22587659f5eff2d7121e099c52ad320924238978afbeede033f7c8dcded76e9398d5d8df5efdce11685aaac39ab597a85e902b949941e9796dc
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xlsclients/metadata.xml b/x11-apps/xlsclients/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xlsclients/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xlsclients/xlsclients-1.1.2.ebuild b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
new file mode 100644
index 000000000000..e6a230099598
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="alpha amd64 arm 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/xlsclients/xlsclients-1.1.3.ebuild b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
new file mode 100644
index 000000000000..ba85c829520a
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 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
new file mode 100644
index 000000000000..d16684076a26
--- /dev/null
+++ b/x11-apps/xlsfonts/Manifest
@@ -0,0 +1,7 @@
+DIST xlsfonts-1.0.4.tar.bz2 124533 SHA256 28179185ec2bf81dfe13652d65bdb2a4ae74e2775df591a62d66a70f80e90cd2 SHA512 e4cc52ce2f677f9a90e0924dac15a732c3bba584e2513fc68a4aadd46c6d2f56401fb1128ac42e8b569b722023053e07933d2d7bc45f18b7c8717c667d260c4e WHIRLPOOL fdf0b4ec60bfd96f721db87027089c5a43cfb831b6f45cd9c6d92a535c8dc6f4bc5144d638759deddec988be9f28901bc04c4b5e121cdabc4641c02aff7bf982
+DIST xlsfonts-1.0.5.tar.bz2 131072 SHA256 40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa SHA512 e20f9efa0fa33980486671abd4ef59a82fd3df033d9c1b24db8c5b2b27ada93f03dba1e3ad586a35f3b7893bef5e8f14186f1914ab3507862cce4e104199a490 WHIRLPOOL 9744290878ebe076d680dcb1e75cc47535f68812128fda27168cc5978d7f5b24c0f2c2cf434c61a682bfd771b1a69cdb69790e7f567a065ad1c1cea158d96a6a
+EBUILD xlsfonts-1.0.4.ebuild 351 SHA256 eb6239f096df82cb8aad0689dc1f3e393cca33f9308a31170d2111a41a1c9d04 SHA512 61603c2404e6f7331ac51c0b57ec455df9475abe63b16501163ce0680d91f72b45f57ae788b9b382ee40ff35ee09b223f5e7b89466348b30ce39aeb548f485f9 WHIRLPOOL 699c225a050b6c346adf337e6b48da05130a334c95f413562602c6dfe984de420eea3d00e17320ecbca743df995d66c6869b6b5d1e6fb044f1c949a34416f3ef
+EBUILD xlsfonts-1.0.5.ebuild 353 SHA256 c03d4715d87d8a4e2342293273aca8fc8f49560c8079207f930fbb2814deb172 SHA512 2e49a32fc545cfb8173ef9b5c9d1f6a6012c9ad595f9958d18c36722788b4204b8301b225766304443a4705733b656aeea81ef728c8169b5741fee976482ec32 WHIRLPOOL ae3bef9a3cb58cef373e94e8c068f06a724f0f740706bfe711065497f84c98b41324d138e60a9922f5937758f87ea2479dcf6d1c47e950491834b16b6eeb1f26
+MISC ChangeLog 4018 SHA256 8eb575df288dfaf68f32ba6a7965d1e60ffb66463bf34e4dd6cdfc99138cc586 SHA512 d461bd8c03d2ad92bd30bb094bb61818808ea651e9c049d1c857358f717e706d3c8a39b625a93baa678cb49ddb110e9a203304a0396ffca17d0e7a7958a7ad3e WHIRLPOOL 88f19a2370992d300a24fd42fe98d53754fcca2a714c4a723315af24e15e8ae61f0254b9b951f338d5f8913812c1c8e4048a71125d36e4eb26d1978f9fa75d6f
+MISC ChangeLog-2015 5823 SHA256 e410063baeab0a1364ca11d41be76674aa242a3bb53f55a7ac328d9d5c3e5fb4 SHA512 6216b0ffdb8d8878678fab11c3b489ece51d29e03af3dc1480058b12cc6a59a4e3fc5deeba56a956f4d341ab32a7501b09ccab49791792000bbfb46ff7423491 WHIRLPOOL ed0938a7a2dc71ff9f3273eefaf9ee97a8cce368da56731fb0e3f071a6aca40ee22697ec592ba8d270bd72df3cf4e3145872c57add2dde0f14875dded895783e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xlsfonts/metadata.xml b/x11-apps/xlsfonts/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xlsfonts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
new file mode 100644
index 000000000000..2f2e1d89f6d4
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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/xlsfonts/xlsfonts-1.0.5.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
new file mode 100644
index 000000000000..9cee87cd6cda
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 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/xmag/Manifest b/x11-apps/xmag/Manifest
new file mode 100644
index 000000000000..83d984c0f777
--- /dev/null
+++ b/x11-apps/xmag/Manifest
@@ -0,0 +1,7 @@
+DIST xmag-1.0.5.tar.bz2 136976 SHA256 4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6 SHA512 2f17a672b4b21842ea194fb6bee387c44cff510dad70f487a13de14d6a24f5c7b8f03c06fb30f7ca62753a44827c1fed67ac4d2d3550780f16ffdd932e4a8bfa WHIRLPOOL 243c1ca3937662d42c5d532f68489e91787dcea6bd83bead4c8d11262a7474ff7af9e9ee750086f78002a475614ea61d31b176e02b910eaee16fa90ec49c38ee
+DIST xmag-1.0.6.tar.bz2 143112 SHA256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de WHIRLPOOL af1df3554a5a204667abea861dfcaa76e44697386b31e34f1d02503ef1a0de0b0071ead8e77c9edab00d16d59433842dd87c9c601410f98d6944244be0b0c92c
+EBUILD xmag-1.0.5.ebuild 337 SHA256 5c752124e5f6a6901f89fbae03e35979d3543016d915b53cd0901dac9056c1e2 SHA512 1173ff0a2e72a6f100dc441c85eaa02b15136f8bb235c78657a6ef1c33614ff5a409ea63aa5e4365af00240df7c0dc9cef6cd4e71e32183420b849a5bba0de0d WHIRLPOOL 8f9be658331a99e6be4686bf3a0f2132bbba18120609fb0a798d61589dbde5baeb91ffa7516decbf8044271f34f857f142d97e1ae4e21cb2f87184cc6a809d9e
+EBUILD xmag-1.0.6.ebuild 337 SHA256 7d3e3deafc213b3c1d194ac1562988c674587c9043e7c9d828dfd350ae85b746 SHA512 606c0b1c780bf4193ba7ac764ea4218ba03347e8081dddab0a0ac10d6e9b943da7c31c94cd0ca95bb6b35e3547e9fb3551bd87fdff720a4373783c904fb7c9ac WHIRLPOOL 64811a15346aef7431a88b66612046a8c161e727554a09181b5fae8b3d14c8234e92768efeed686f64402c3dba6ce36ee03e148a616f1625a6439aa22e7f1f2a
+MISC ChangeLog 3575 SHA256 e1be13578aabf2f229ce1bacb4b60a81abdb6e9a6d9b1fd76964d3c839dfe0e1 SHA512 625497dc40e7e9fa3c767392c3127c30cde89ec2c60df249a4d2e44be33477dfb472861277ede2315b143c2d6384a00846f7f9a30571819dc711e30955d4b9bb WHIRLPOOL 24da4b9c998a413a4858beb3015d7c61176d48fa88bb3ef72aa92de7ab751e5b1164a7ac1ddc3087ee731bf17e4f2cf12bc638aa4dba8370a811b0252e88310b
+MISC ChangeLog-2015 6130 SHA256 5fc75a428f0f0396192cd645a7a8d8aeca43ed98cd442333cc307b5ef2a44a8b SHA512 90f251a686d83234b4ea0113867cf6bac04e0855d6c7c48c428b3848d37a2d0f0febc1cee2230fd0616def5627da045a824605764bf09a5755529601a84ee200 WHIRLPOOL 393034d3ce09259d254022e5b831fbefa1bfbee5065fb1a29a7762773a6bcdc4f8210843e57da8042742638c59f03d20522eb23cac99374f1179e88a7e396688
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xmag/metadata.xml b/x11-apps/xmag/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xmag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xmag/xmag-1.0.5.ebuild b/x11-apps/xmag/xmag-1.0.5.ebuild
new file mode 100644
index 000000000000..d17a8f6bb82b
--- /dev/null
+++ b/x11-apps/xmag/xmag-1.0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xmag application"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
new file mode 100644
index 000000000000..b013f1b4ca79
--- /dev/null
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xmag application"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
new file mode 100644
index 000000000000..f218530c960b
--- /dev/null
+++ b/x11-apps/xman/Manifest
@@ -0,0 +1,9 @@
+AUX xman-1.1.3-mandb-2.7.patch 1843 SHA256 c5342c47ca4d9149c75d4ba2e325e4616d7ac2ef1991d40e462357d70499cf9e SHA512 74d4467ea8a2904cc4adfa02a92d57020ec045bc72ca1571451511080227a9031c0e5fb0d7b97c8a6625755f611a4bf4a352a751f420da18985a86289d0a0f5f WHIRLPOOL cd8080b6f030c8ec93b7ac7a294a437aa97f363a5216fd01a64cf940ada8867fc0b25481833a1c701030d95f8562e60f47b36dba17d9567c1c6fe21f03e3791e
+DIST xman-1.1.3.tar.bz2 184340 SHA256 405211b606a7fa420029897f099dc107791bb4c29bc88481c6efac9c4590bb1a SHA512 7c6475434984205f359ff3cb47a41282536be6aefe7bc6e970736c4372b23b5de01a26864d7f5b2cae2f770eeef6d254ebbdf6db717b5efab0042a47cb7497be WHIRLPOOL bb3870840c627ac12122dbf038c2488e9c6e7dbf243d3efa74c8fa26f5bb07c261aa5550ccf36cb37314b4344b2e96a3b862b58b8d1dac1f6e78d2519cb86f0d
+DIST xman-1.1.4.tar.bz2 188259 SHA256 b3fa9d2e3f3745c529eb0b6ee4f0e00d936457d11e5221b2efad06ff7c84df29 SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68 WHIRLPOOL 846fc19937832074e04ec69b9b4f05c1966b00dccc28993b168659b478b7ace6ef88c473fb4c9cf378e0fd96b26f7b571d0b532eae89ec28d64a413f4af9c88f
+EBUILD xman-1.1.3-r1.ebuild 449 SHA256 d2cb1724998a2619220e39bf251272134dc769f0ea4cb5de44b805e4656d081b SHA512 28c8ebdaf60e9aa1dcc90e3ba61c802f9c8de387ac1e82447698749cac8398a2707001a559f09bdea02df33d15c2d6d1bda5b72f4ea551ffb9a99132a1183a1b WHIRLPOOL 22246e89a1117847d6bffee485511f14a3d21a6ee5e1c97bbbc5aa6d7f6b653d75e42372454849927d06a7d4e2e28d8328784295050513709ecd110db710c182
+EBUILD xman-1.1.3.ebuild 389 SHA256 aee663d8180b75a6c841f6d1ca0710eef2e88873386a4e6679a49970c157d8b4 SHA512 fdd55a83abb82d67c2d20d6f03012194049200e78f4a796bbbebd8c565db17e1376de99b8c7484cf96f694dd41585ac2eaf0860809fe3be5ead6826c93d87833 WHIRLPOOL 13a876b7c7d88b5c3066fb0028cd660fd0253acf0ff3c42b926db522fa314de96cac82282ecdd3ec33b07c4ede271d6c99cf91a608d0c46c87e5945bf7523a6e
+EBUILD xman-1.1.4.ebuild 453 SHA256 fe55ef7144c6df48885109826b8b45fca5d222acdbc771bddeb26777d9bbd78a SHA512 f30ebc70da303437a95d08c13e3de0539a86f21e9c4faf76f82aac9cbb4b2cc6a622eca104450b50bd3fccf4953303a5f27666351730b9162e9e20367f304d69 WHIRLPOOL b1bf854ab31744f6972b9bd5f5695fc7084875cc77c8e47f125ec3ffdfa29145557965bdf94a60377d354d7520a148b981075e3eb1e658ecc7217b3d36b7eb30
+MISC ChangeLog 3198 SHA256 18925417305872250e1bfd4af359ac662b9b0ee1a757a48170d6a67c6a8f1383 SHA512 4f60daf1122fd491efb90107d1dbee1fc408231869842486cf03de082b9f99c9f0a750ddc4382c486c48d5419a6f60dc1e0c7c83a02922e59275f9ada6dd661a WHIRLPOOL dd0b2887d354f67aa1a5734e11dccd815190c4da790dedaabe3abba9173e090676e7fbd0ce63bd97d0a6f25addc184379c4bf3ad0d41ff391544b34afdc202e5
+MISC ChangeLog-2015 8158 SHA256 09be94572ab7eb409d548e4a70d97ed722602233aca94368885c01e7a5783a0d SHA512 b838fe6a160014da91ee194b69beec6a355684ab7a8ee67f4fff2e606a0c95ae489b6c7f18b17f87eb58e8f107d3c6b3003dcbc05c5d1efb68f83e8b165ba23d WHIRLPOOL 4586f1018746f92f8da39fd20cb5ef0eddc656029a628265e75baeef00e69442f847a0f34537eb0c4444abd057dc4e6afd7a34c8bce1c5219ccb5b3f31ff1e0e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
new file mode 100644
index 000000000000..f42ce577c2be
--- /dev/null
+++ b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
@@ -0,0 +1,60 @@
+From 438763b6e231410b95b5e352feb65c63cd54de6a Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 7 Nov 2014 16:19:57 +0000
+Subject: [PATCH] If we have man-db, don't try and emulate man's pipeline
+
+Just let man itself do the formatting / zsoelim / ... dance.
+
+Debian bug#764792 <https://bugs.debian.org/764792>
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ xman/configure.ac | 5 +++++
+ xman/misc.c       | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/xman/configure.ac b/xman/configure.ac
+index 9a80cbb..8bb44f2 100644
+--- a/xman/configure.ac
++++ b/xman/configure.ac
+@@ -44,6 +44,11 @@ if test "x$GROFF" = "xfound" ; then
+    AC_DEFINE([HAS_GROFF], 1, [Define to 1 if you have the groff package.])
+ fi
+ 
++AC_CHECK_PROG([MANDB], [mandb], [yes], [no])
++if test x"$MANDB" = xyes; then
++	AC_DEFINE([HAVE_MANDB], 1, [Define if the man implementation is man-db])
++fi
++
+ AC_CHECK_FUNCS([mkstemp])
+ 
+ AC_ARG_WITH(helpdir,
+diff --git a/xman/misc.c b/xman/misc.c
+index 06891cd..da8744a 100644
+--- a/xman/misc.c
++++ b/xman/misc.c
+@@ -661,6 +661,13 @@ static Boolean
+ ConstructCommand(char *cmdbuf, const char *path,
+                  const char *filename, const char *tempfile)
+ {
++#ifdef HAVE_MANDB
++    int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
++                        filename, tempfile);
++    if (used >= BUFSIZ - 1)
++	return FALSE;
++    return TRUE;
++#else
+     /* The original code did the following to produce a command line:
+      *   sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
+      *      filename, FORMAT, man_globals->tempfile, "2> /dev/null");
+@@ -783,6 +790,7 @@ ConstructCommand(char *cmdbuf, const char *path,
+         return (FALSE);
+ 
+     return (TRUE);
++#endif /* man-db */
+ }
+ #endif                          /* HANDLE_ROFFSEQ */
+ 
+-- 
+2.1.1
+
diff --git a/x11-apps/xman/metadata.xml b/x11-apps/xman/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xman/xman-1.1.3-r1.ebuild b/x11-apps/xman/xman-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..35afd7622a73
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-proto/xproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
+)
diff --git a/x11-apps/xman/xman-1.1.3.ebuild b/x11-apps/xman/xman-1.1.3.ebuild
new file mode 100644
index 000000000000..f046ff40375f
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-proto/xproto"
+RDEPEND="${DEPEND}
+	!>=sys-apps/man-db-2.7"
diff --git a/x11-apps/xman/xman-1.1.4.ebuild b/x11-apps/xman/xman-1.1.4.ebuild
new file mode 100644
index 000000000000..f312218b2583
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-proto/xproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
+)
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
new file mode 100644
index 000000000000..fb666634bc5e
--- /dev/null
+++ b/x11-apps/xmessage/Manifest
@@ -0,0 +1,5 @@
+DIST xmessage-1.0.4.tar.bz2 125011 SHA256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd WHIRLPOOL 10e5609685ded588b23a01265f165f9624f22e2adea622381be13cc3f428027958aa2b333eb6b138d2f4710ee6f8fe6acffaa350f73174363cc5fcb31b2bd8da
+EBUILD xmessage-1.0.4.ebuild 505 SHA256 f8fc87c0c3384c7a261df1a4e92e41e9d8f389191293694c3da0564be927cdcf SHA512 88d5d07f9a3ff8e8f3f270a24f5f49b59d4e03db96df40434ea78c9a061256c33af6acf5c1eb3f136b368ed89c8fc20ce90e1e5233bb23c21793abd4c46b2203 WHIRLPOOL c4866a0b3932f53039ac800a7712e3567108beda54bdd79e92452128ca6880f8decfaecff43cbac5a8573ac401f472dedd0e7898d283faf3aaf44d2471d81b0c
+MISC ChangeLog 2605 SHA256 07b7b1cdaee84ac7d071c216ae77c853c2c734778944c31a552874c0d80c71b7 SHA512 ddbf61d13e8092101564ed4fc47f1d8db4e9b6f5fc24d552b53e9e8bf9f3e49c9f3529fb390a653b4526c69868a752baaa5b903d247c4d16a746e6523a0d3038 WHIRLPOOL 5c146d10983f14aaa82d8ab6a166b40ac522dd61cf66e9334c3c2fcc2c285bf66408b13ca81e71b2fdaa93e408ba379c3b025144318e2fb825b224286f3b2e17
+MISC ChangeLog-2015 7434 SHA256 77af78fbb117fc210f20f611580d02ad31441640bb0c3fff91236af6b5d30734 SHA512 6c7e2c555aa6d6701e7e4e5c91a2e552d94baf6f63d025c2459d4d1cec38dd357a90edcaef682447de75d3c773ccf638444209ef1c79f5dc927445403d3a838d WHIRLPOOL 10e4e00e6af53f441740f7c0fdb0697af19e3132601172af0bee291fc207c2ed0a8530df1c7fd270af724dd752ec06a67fa8934627d326c47e68f8e59a8a4e4e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xmessage/metadata.xml b/x11-apps/xmessage/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xmessage/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
new file mode 100644
index 000000000000..746e39fa454b
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 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/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
new file mode 100644
index 000000000000..825de36bc274
--- /dev/null
+++ b/x11-apps/xmodmap/Manifest
@@ -0,0 +1,7 @@
+DIST xmodmap-1.0.8.tar.bz2 141026 SHA256 efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3 SHA512 716cd1ee2cdb1db31b84c018eb223fb3eb05d499a7e76e0bdf038b58a5f71dd17631c8ce39d8108f6c47fe11fad718016f2891baa813b35a9dc607d3a3946a63 WHIRLPOOL 2f33c7ceb879b13605f1d5d3a50c4896d58845477034a1cadc3a74938e4839ab4879db6c518861803efc8ba4d719c295b34c84bd70ee7e9d746d42bd837dac70
+DIST xmodmap-1.0.9.tar.bz2 142565 SHA256 b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478 SHA512 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac WHIRLPOOL 97435f194a8bcde50f4298e8206f430907b9086b1413086a20be859e84c02472e83e16d2d68b81f58517a3ed8e29ae4dcf7e29335ce8efdcd2122da3e0c2a49f
+EBUILD xmodmap-1.0.8.ebuild 425 SHA256 2c5a290337da63737e8f80d6ea99df3817b29b8a2ea513dd04989ae3749de1bd SHA512 89f90c309ca3d06f42fffae83bcd9fb4c608c0aa1a09d29963485f7d3cb01fb72ea0489f316185ad88574a7c9048254b460ac2ba8076cb7460e17ae30e368b25 WHIRLPOOL ceda7517ef95707ae1b6ba308363881ef6df8ce65d545b3b43be927567fbd08a7e6175feccffbf8821ef23efa9cdd14770307993973b7776663e919573dbc094
+EBUILD xmodmap-1.0.9.ebuild 432 SHA256 dd3d0f3f7793f39ed7806e908b562ea77be9e3f7c2678ed65d94b8ce23a863d5 SHA512 309087b2637bff0e66531838bfd252b0adfd0758d9f0fda7dc8b25bf8d4202ba4ddba1580799c8f36644b526edf4c9d437e80998d38673d7cf8ea50b2afe7187 WHIRLPOOL dc0f4c0c3ad57abccc85d4eab2568a290b2e63c0d7c0d492da306103af630661d844a532d2ce679522f8b82d54b21e7825046592af919e8329bbfc9521e1f310
+MISC ChangeLog 4167 SHA256 2ad5edae78f6fb934615b1e6a607d6b7d174e6926ebb3b62f3bfa2194d6dfa09 SHA512 45680491491bbff1ab916c5bc48d1f0e5e8588cc75a888bd4be0cab8e66bac4bcefc42a00b22e1076564a2bf421424279f3d8b758c5eab43b70a576e0e4f56c5 WHIRLPOOL eea5b46b281ce0947cf6555af04979a65c5dbb6950c5c09313283df55638792ede859bae6f46bcfb6d8e15e4d2bf9a33682e91bbe051a0b5553c1bc3a0b7e376
+MISC ChangeLog-2015 9993 SHA256 48a56e9c829013c1c13bf8c7edf8c61ba7683f1e14f7baa26f9b3ce971ec4f6e SHA512 10807e4e8ec1cc182230a05cf23487a31a60738c7df2dbe768f5f30c9f6f50ed9c41bb853d4e70f3215a1f22f20372933bfea6e013349d4de74d4e28be4fa605 WHIRLPOOL 67dc9648355d2777885a87d794716eeb3b6ffda57035769444412d78b65897b2abcb69fc489519bb5aab78942bc74a96ec4bc601bb7b9957c8b8fc1157556680
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xmodmap/metadata.xml b/x11-apps/xmodmap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xmodmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xmodmap/xmodmap-1.0.8.ebuild b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
new file mode 100644
index 000000000000..f9aef2572cef
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.9.ebuild b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
new file mode 100644
index 000000000000..c23eea402764
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
new file mode 100644
index 000000000000..44a4ade83a5c
--- /dev/null
+++ b/x11-apps/xmore/Manifest
@@ -0,0 +1,5 @@
+DIST xmore-1.0.2.tar.bz2 107340 SHA256 2a13f97891a3fd497074acc8ac8069f8583add5db4d3bf34a5da6a92bd61b9e2 SHA512 718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb WHIRLPOOL b68bfbceeb91d9e5a4b33e15dbe8de8a9e5ef638e9bfb75362b3938f147601b03e8dfc541ccc6b43de76280bbbc85dd16648283b13d90d08bac3f9089d40ef47
+EBUILD xmore-1.0.2.ebuild 332 SHA256 06a6a7b1baf1fd4556520c637721d299e1c1b65b1df448b38f3e7cf3ea7fbe4c SHA512 de96bd49e3ae92e68cb58835f37dd43d29811d08b4577eeaf43a9f671216d959187e96a8867516f79e3e72fd644b272a93a0088419fecf40c06487e1eb48b49d WHIRLPOOL 6753b0657995a1e450cc641c5a8864ee8fc5434cde1e7c600b1b376be132a0271120e5b68e57a61327999f8996d472dc5b6743ca7319319ce0004c2879da1c48
+MISC ChangeLog 2421 SHA256 9d3cdcb283d47ea762208bee6aa2882c3969368cff3ebea7774d41a29481e57f SHA512 18e173fe013fe9a46683769ab59b45e406aed4e5351a9a9785a44c3d3053338b10f593d5179968b1a106663536fe34df32c315c73e21b90af69f302fa6e79634 WHIRLPOOL 3d9f0ba5aa49ba4ee8d65df6f618ca8b77d542e13c03bd144d04ff2a26c758d014d5f56fbba395d5a2d16c9c6d6e9efd73284723d1098f192d6aeae2c512396d
+MISC ChangeLog-2015 3776 SHA256 8ce7f16721eed779e000b2468286b5211c19e367dc4eb4fee85fa641e20b4040 SHA512 1acff271a167462deb166d50c2393ae7644bbeba5ffb0ad57ff6a09244a262d212bf396c22e9927f056eef8a6187d336049c238ab2814b3799042054661cd69e WHIRLPOOL 959275a40dbf26daee88d086642c54c9778886fa4b409babf27113fec20b589bbfe00f3db0b605857f2a9c014b8b71de997e4761fceae3115a335cdc01e2c652
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xmore/metadata.xml b/x11-apps/xmore/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xmore/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xmore/xmore-1.0.2.ebuild b/x11-apps/xmore/xmore-1.0.2.ebuild
new file mode 100644
index 000000000000..8029981f0895
--- /dev/null
+++ b/x11-apps/xmore/xmore-1.0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="plain text display program for the X Window System"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
new file mode 100644
index 000000000000..1bc9b47274fb
--- /dev/null
+++ b/x11-apps/xpr/Manifest
@@ -0,0 +1,5 @@
+DIST xpr-1.0.4.tar.bz2 143144 SHA256 fed98df31eb93d3dca4688cb535aabad06be572e70ace3b1685679c18dd86cb5 SHA512 4b88b71a6da835b8f27b185510cff6bc6b260e009b31b9118f12d77d37e660606654ff7ebd50014ff13f15ca74011cd3ffc12a417cea5e38d6d29ccc820a2957 WHIRLPOOL 45515a7f637cc70750aab4d8a5adb3fa3646f6948eea9fca3e324d539858ec989f304f26b18f9b423218f4d572c4800f129875e62ed6ab8f109f1aaf0d5ff653
+EBUILD xpr-1.0.4.ebuild 338 SHA256 9d183e3761434b6a6a9ec83a3c5f9a939f0b1774c5d9ad45c89fc6e826586fb5 SHA512 3ed52e0c001c580d202ac6f824681551f60de13ee2744e3e0c2cebf320eebd14c7b6d467fe10359f4e7965cc79ff89fb8ab949aee29d61e143db1f44a9f06442 WHIRLPOOL 230eaac78161d3be76627a639bc109e478252a57a0893dc62751e446528d169b8765b64ed50a71da2a5bbd72514271886bd7d451b1ba4fdd2f02743b750cad66
+MISC ChangeLog 2573 SHA256 b01c64d9302d12e235610f44f31765e6c1a84187ae313735013cbdfad8c72254 SHA512 1381d52b85bd7322b314be7696310b4a280660a43d5cb4be8d74ca166487cc43329f33a1399cc0a4045fa3c5ebdbfc8664e024a93105a8941d659b70bec7a12f WHIRLPOOL 16c78b3f9e6cc955ef2dd5d05a1bb0a450014f4a8baf44545243efb63fbf940a6d0916e10b879695416e8c0bd4d3d14bb05542b85a45eb1af433acc8050a257f
+MISC ChangeLog-2015 4867 SHA256 75447bca00137c89265d687ab3de025616f96e26c776e841738da6f1a60b5592 SHA512 7587a79c6e626c184b8eb1a53c1cb58e5d5a906d835ceabd18c44004f5b7ed6fcba79ad470f12d59b1b18d3d8c6f9e0488a21114103532cd86fa939fcd0295cc WHIRLPOOL af1fd726f68a2e96a2c3fd380b53d8fb4612cc28ebb5ebe78d970b642ce083c07006a001f44fa7842cf6250d370fdc9f6e1d13fe4b457e7ec9fd062fdb5f80c5
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xpr/metadata.xml b/x11-apps/xpr/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xpr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
new file mode 100644
index 000000000000..12163336328c
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.0.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+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
new file mode 100644
index 000000000000..01528feda2e5
--- /dev/null
+++ b/x11-apps/xprop/Manifest
@@ -0,0 +1,5 @@
+DIST xprop-1.2.2.tar.bz2 145556 SHA256 9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572 WHIRLPOOL 0b9d317bcf9ceff38526707933e41dc47c6a2a4c974629785cc5f1a15bf43c0986b208a1e0c0742f185b793eab6dd7cf07fe705cf8d5023643cd3b557c8a7f75
+EBUILD xprop-1.2.2.ebuild 432 SHA256 e39abb9932f100fc8bf57c6e54496c13b05ef4307e496e9417d307fa2e411326 SHA512 f6a30db3566a9b9b8b47968903dd9f863343d986162d2ab585ae24e48036e337d16c2dad6dfc4608efaf2d18076eefaaf72ba4c576b86d0519e861e6f7d7acfb WHIRLPOOL 4026ca13b5501318f4ddc403d81ee48c04b34cd8cfa115bd075273db66c4f54adf46e022e969816a8f0e89d06e8be893bdcc3b4775d652e8bda3c5bd82fb0015
+MISC ChangeLog 2421 SHA256 40afe9e08f97037c057dbe2e13e46e22a359a7ca48a9b12c96cc0356c53fb6b1 SHA512 f8f30bf71f18468c1fabfefb50d1fb5761989a6d76916b04ba94a6cc30bb5cae096df9de71ab4dac45d57cb3f9bd17440a89cc7e865d8944ff7ad73c2541edb9 WHIRLPOOL c27f886feabbea5a60ca5867921dd34a90315939acf9026537ac5195e5cef9f9ef21e8b97b31b315c43bd353adb0e49e82d19fc5a25725c39e93739b09fa336a
+MISC ChangeLog-2015 9507 SHA256 64217ba6a099feb3f17fa76d3a665364fe6c5dacb3aaebdda092278a803149bb SHA512 5d2eac4e10cdc1596577b842d39a3bba2d90825377c4bef2e6d421877fea4c6f176e5f2701925270736de576c30fbf8f24eb1bceb843ff748bf26989cb09ed5a WHIRLPOOL d37729d4eede4c6098c17f24222d292af20d17af8e2dfee5cce1989527c3c8b43f2d442162112603f5f2a4c23848f160894a4e161f079b927a74713f78bf932e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xprop/metadata.xml b/x11-apps/xprop/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xprop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild
new file mode 100644
index 000000000000..65e87ccc79ee
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.2.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 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/xrandr/Manifest b/x11-apps/xrandr/Manifest
new file mode 100644
index 000000000000..ee42c8a47d6d
--- /dev/null
+++ b/x11-apps/xrandr/Manifest
@@ -0,0 +1,7 @@
+DIST xrandr-1.4.3.tar.bz2 169850 SHA256 7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b SHA512 eea2637484e744af305366606ec8fba77f54bb66bf45bd131367abb0f5ff90b858d85fbe4c17ee48f7b2f32f277d5f08b18e9cd61f147757828d415a3db9b9bc WHIRLPOOL 0088c7729bb002ab427249fa7cee0855ea38ff4b0927411e92f5544837b0c3f7d2f48573a7020d3d2263796a535b1d6312439450feafb15264379de314fd0f04
+DIST xrandr-1.5.0.tar.bz2 182515 SHA256 c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd SHA512 11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4 WHIRLPOOL a873db930fac01a5d54ac351203da5ad27abca95aa61dcc750200cabbdd89aa5eb37649937190d1558b0d0afe6afcf1258338203d12e4643f5c4d3388675976a
+EBUILD xrandr-1.4.3.ebuild 517 SHA256 61ede51a82dd8cb69161c2b747efb6748d1ecbc10746e24dd3449f89372dc2e6 SHA512 57bd81f5c4181e5a9c1909ca3bf06d92a4abc5617c3f29d51db9e48701d45787236522b929c39d8706f60ad0ac9fb6b8be7bbda487523bcc215ee8785297656b WHIRLPOOL b9ead356d711cd7e7def685f20637f32708de29ee622afea38cc5078f1183efbbe9f0138b9d9a9a51de4bb67178eff0abb0b6209cf77c8136fe59f85ceaa6437
+EBUILD xrandr-1.5.0.ebuild 517 SHA256 3facf0b928d74df3d7ff4ed382aedda4727d2e2a4fb76abde465ab4ecdc83283 SHA512 d34830cfaa3afc11feabfe4aea49a4adb4bdf9246e5fa930f24f8f44dff43d792e630d5b34eabe3389de453021a9023c86519bafb9f5bd26786e1c128d7a4ef1 WHIRLPOOL eb1f1f9a26f804184018dbf1884d23a07555cbe8cc64013ca5f7ebab4b7ff77784de9df6d8ecb51a7876f144d39e4c96a146ed13e4c81371e84b43d2ede5a89b
+MISC ChangeLog 4156 SHA256 056a382d176106551e94ad133068ad831f5800a13843e2c08321a0311dc858be SHA512 2839b7c882603f1677da801068a7e85bce486278879d2273d6c64ae3d876efe2cf90f7b13e7da2e3caaf3a793bd692d69f3f22f8ed4b69df8eceb7b0ea0cba61 WHIRLPOOL 572624651def88f3a73cf2571dfb5bea72cce98779419110e739115fc5ca1f763a274de3772fa458c8ac5f6352a31efeecbf79dd46113c2b72727acf68c80231
+MISC ChangeLog-2015 12470 SHA256 dc40d56009a9ccc9c672e0df433b556e1644b22b2f815d0159c29c46ad3d8a87 SHA512 18125e216f4baf0a23d756471163763b3c4e22d4a5e4b0a6f82c0a02df8c84e335f0d4148c2f6eac5dfa59ef1b3890a82fe954d87d03f04a83b8acd54110fb87 WHIRLPOOL 8470e2dbe77f7a1718f72a56a80fe6b897b4554ac9c63c5396a2fc6e4c3cfb065a31bd1baf6aee1ea6e96e3c188e795f8bd94f816aab661c7f771bda80dce012
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xrandr/metadata.xml b/x11-apps/xrandr/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xrandr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xrandr/xrandr-1.4.3.ebuild b/x11-apps/xrandr/xrandr-1.4.3.ebuild
new file mode 100644
index 000000000000..6279258731d4
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.4.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+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/libXrandr-1.4
+	x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	xorg-2_src_install
+	rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-apps/xrandr/xrandr-1.5.0.ebuild b/x11-apps/xrandr/xrandr-1.5.0.ebuild
new file mode 100644
index 000000000000..3c6a090722dd
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+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/libXrandr-1.5
+	x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	xorg-2_src_install
+	rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
new file mode 100644
index 000000000000..373c1bcf48ab
--- /dev/null
+++ b/x11-apps/xrdb/Manifest
@@ -0,0 +1,5 @@
+DIST xrdb-1.1.0.tar.bz2 138035 SHA256 73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407 WHIRLPOOL 8d595bd3ddffd8153c2dc6c0af2072eea9fa5ecb76782ea5dafc589395809c2e88b527e54ad551de2728691631cc7307c17290e46874254764ed6adc09ef9239
+EBUILD xrdb-1.1.0.ebuild 453 SHA256 42393e4bfce78b22a807dcd646f10ba17b5d34323ea2ec13003af06257b94a60 SHA512 c04e14cef41a0c133f403b3c4ea3a9c04ac2d49d27541ef558b1cde2a8a5951cf138a411a15712d69fb06006d02f77572bc9d0135974f0051f00f45f216c1c9a WHIRLPOOL b63cc6cde9315e9d78c4e23c010600168f75609837cf67d9e8f54dbe2056c971585392ea2d9ce3541369bbe8cd89d218f614d42d15d4ab0f97653233411887ad
+MISC ChangeLog 2418 SHA256 ac1227f66fac19a727770f1718c6c0663fc70d0189976d4e46bc13b69922a6ef SHA512 f737c9bfb90e12f9c8c7fda99918aa4df40dbfe055d2aa64984ae17467bb828bc7b54ce7fafe47ef2d82e9b04093703e2c1dc3bb418b80173e5f2df2d4d87b13 WHIRLPOOL 7b5e3222a5ff30b9823bd6b14851c3cacf2cb557726a81e80b2acf32988445d4ab0fbaee558aede83547cd8e883490bfa2c13d3445d9d2e2a304eae7232cd221
+MISC ChangeLog-2015 11202 SHA256 e517c2ca91309c4573d3f9b0e0c425ec545c45d218e974627faee909a4ba94e1 SHA512 bc08ce7c2a500a27e78cec67395e1b602ebd437ac7f6b1ecdcc6305dfae26b2c34ba7a0684fbe56be1e51b4e2cbe7a01649e4681cfc6df16d4d417fe01a0c6d5 WHIRLPOOL 4bff9642ae9a3d2e597340f49adbd8dc3e94255e5a7958a4cb397c673cf38530bb585f4d3774f8bd14fb1382ab87c5eb249617146b6d9165ae30e038f9a00aae
+MISC metadata.xml 317 SHA256 fda84d05f438571885c9ad85ce33a549cc2b07b75761090d055f6354a7e30936 SHA512 460dc7431825b65cf43260ca92bad810e99a9cdcc0602da758d5f23ec6faf69a3c056d2db6df266055aed47fe3a1c7063cdd2cb942e09a9b08f60ea81597bc96 WHIRLPOOL ec9157a6b998f6499f72d1d7d0c0095e4ab26fdd4a9e90b82a873f99751e526c6b977e407d7ee9a67c9180d483dcbc0ade809993a1d19ea559a90623e8266cf3
diff --git a/x11-apps/xrdb/metadata.xml b/x11-apps/xrdb/metadata.xml
new file mode 100644
index 000000000000..a8b29cc3c1b2
--- /dev/null
+++ b/x11-apps/xrdb/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>x11@gentoo.org</email>
+  <name>X11</name>
+</maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-apps/xrdb/xrdb-1.1.0.ebuild b/x11-apps/xrdb/xrdb-1.1.0.ebuild
new file mode 100644
index 000000000000..ded76768fe6e
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 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/xrectsel/Manifest b/x11-apps/xrectsel/Manifest
new file mode 100644
index 000000000000..aff610e039f5
--- /dev/null
+++ b/x11-apps/xrectsel/Manifest
@@ -0,0 +1,4 @@
+DIST xrectsel-0.3.2.tar.gz 14834 SHA256 1b4b928bb7270e0531467c1e7f93322c784c7c0dedc13d1d5e53034417fde785 SHA512 56e87002dba1858c900ceba4d6cf1613fa92a5a8f59fb5c4852e65835bde9478bf92c160ca398cd19e99543ed0ab94ad4ac8ba2d60a7dbaf95bc2826f8953fcc WHIRLPOOL ba0117a43e78e09b542dfed575315e0c32517468643064c669bd2ffd3b258d208f83840e7dd4f4b404d1cc74d797431a54f9545e59b71e57c8cadd9d448975ea
+EBUILD xrectsel-0.3.2.ebuild 479 SHA256 ba9903a499e295a98e6f01ea41b63e02ac3ac62cf77e6ebbb598975a2f7565b8 SHA512 92ecdc3ab3abccb20ba460c5dda6c811b598484556108480d34fe73f571d4a2644940cf3bd88468bc90032d55347eb9b59ef09fa207a4ef43bd5e2a060d3370f WHIRLPOOL 5a852bfb837a3014954f52b4e8b5f4ff027acbfa3f6a5e3e6f3420cef93c8845c871e8f6122dbf08de03f2788edcc397638beb5cf0e477e0a12eacd0f3daebc5
+MISC ChangeLog 2058 SHA256 5ae9e7ceda2b6019e6a41ef7f6e924744616908e8eb343dc14821905f21c79cd SHA512 a69c3ff32e657d111866fb02567c8ddabb816d7c804d070ed6914c1a333c86fe73bd4a00cbd6da2dcfdc863a079dcbd7f9ebc1a38c8ae685eac8cbcf499c5749 WHIRLPOOL 2fdbdd7bd8315ffc4e7e625a57b219dc99d73d13d6bcdd2e8703baaa7e4f5c20772c5f509a3f65f354a431e9add0d14feac660b592b9ec17c5900640a8facde9
+MISC metadata.xml 319 SHA256 259831bf653097139e27f1729581af64c902c1202d0f3dee82d4c06b46850395 SHA512 2ebb4b23e5c8e3c3948f8bdca96fe1905155373831d7a4d4a729da8c833f2c3b6c7571618c53fd1328849f9af43aa5a60a2abb5fa7cc8f523ff65a25f5e2e3d6 WHIRLPOOL 595709247a5bf0df10bb735e1fadc3acaa4024cbc94f7cd0809aab9a62b6617d7610704f437986d4232f885f120972a9973d9447063cd17c617cc466b281cb05
diff --git a/x11-apps/xrectsel/metadata.xml b/x11-apps/xrectsel/metadata.xml
new file mode 100644
index 000000000000..ae13be4177ff
--- /dev/null
+++ b/x11-apps/xrectsel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lolilolicon/xrectsel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-apps/xrectsel/xrectsel-0.3.2.ebuild b/x11-apps/xrectsel/xrectsel-0.3.2.ebuild
new file mode 100644
index 000000000000..9286f5208a28
--- /dev/null
+++ b/x11-apps/xrectsel/xrectsel-0.3.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Print the geometry of a rectangular screen region"
+HOMEPAGE="https://github.com/lolilolicon/xrectsel"
+SRC_URI="https://github.com/lolilolicon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
new file mode 100644
index 000000000000..38a6edd31c56
--- /dev/null
+++ b/x11-apps/xrefresh/Manifest
@@ -0,0 +1,5 @@
+DIST xrefresh-1.0.5.tar.bz2 120757 SHA256 3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014 WHIRLPOOL 74c3f7938eb9da294545960d0160b6ce099c9ca666f837a7406a8202b07a1aa1bb68fa19db80c209f018f7585cf4202b15e455bac85e540a058375c7c0cd6404
+EBUILD xrefresh-1.0.5.ebuild 338 SHA256 59f577f3f26ad8ed0bb032a50227a39ab85db8dd8a3d913e5077c8cd39faac4b SHA512 53bb115111882bb7748513f1b72b1568a3ed9780651f15881c163310e83c91caeec3ee7f34ae4d68b852bdae2224a2634c97eb39c7e01f6e4f08a7474b7897c5 WHIRLPOOL e3e97f3b05ae0abaf7c75d615477649c34582fe049219bb30f8a2b93b02974ffe48ed591140e83959a4eb7c41781867b397fd37b75231fe441bca536089dd1e7
+MISC ChangeLog 2593 SHA256 74ae48ca9da3cb4e8b430c2d9055059119c85e858378f473ce8fd1cc28bd35a4 SHA512 0f74192cb729affab3875d7c67433f8618b7554125e2680fe55e90247fad7f98e48441bab0b6c461608413ac6d4c3a631a7ccf85e7e2a55e29a06442a5b727c4 WHIRLPOOL e98c49562598c26f556e73a36e514a5ed7566621dc5b97fcf5f377a6d76ef8972566cdc6fa9bce1210a6302d8f35a95c6342db76e75a21c4f9a71601c4eaf1f3
+MISC ChangeLog-2015 6378 SHA256 5d4e943aec6dcabee5757d0750550c996b6497508019be38f9a6015c66662fd7 SHA512 82af9f50dfcdaef2b7f7724795851df37a91fdff3c90d13ac6ffe0325f82471ecb0c3b957c8cbfd980ad27a4903ec60c59a25f21aaa152ee1232c7eb99f596ce WHIRLPOOL cacde816f1cd30b8bcf8ede8978df8707518b24ca7b114c6cfeba7380eaa2ff2b9d504e6b929af23c6886821056e5f457b166ef933031f17e9c6af424f6a1444
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xrefresh/metadata.xml b/x11-apps/xrefresh/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xrefresh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
new file mode 100644
index 000000000000..c342bd9478d4
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2016 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
new file mode 100644
index 000000000000..b2f0f29f9e32
--- /dev/null
+++ b/x11-apps/xset/Manifest
@@ -0,0 +1,5 @@
+DIST xset-1.2.3.tar.bz2 142286 SHA256 4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a WHIRLPOOL 54d52ba753a397120e9358d1de8d14629bac997d1a75728b17c949f1b90e0122e830c0721b4d2605f4c1f07c5cc6731064e2fb9cb154ce5beef9743aa58595de
+EBUILD xset-1.2.3.ebuild 509 SHA256 f7fc885ce8d6c0ddbe22203ff494a7302970413ff0433152c9247dfbe74583d9 SHA512 166d07be62cd1c8a4409f634493e8b9fe04f379f32919d7446bd18c22e23c74b7225054bd127d7b5cff2839fa8327254bc6ce6dd885c744c54a60a532d3404dc WHIRLPOOL 29f573a0cde2d748b057c37bdb2b89872bc360a0bcd7ef91bb4052cbe0d16ecb3424cd33df0094c23c51ace1e98d4940f43d18e68f6c2987397a341ac69aabcf
+MISC ChangeLog 2418 SHA256 fa780da016a2f741ea23f97e9714364dded057907da60af6f5c030abf7dd5e58 SHA512 57f22563e35ee1b3b96fc337b0a4c424e11c60304e8087e0cd2be16769be272d76ca5e00bf8c7b6187d6b52b2d2c8652ba843f6132b670712866e825ea3b375a WHIRLPOOL ccd688b2de759c7821bb2277e58fd33240b8710b9f3a2793c9909dee252c6a29b5e2dddcfb76147cdd6a150dbec485be45f01cd6d92da507c9dd2679fdfb4525
+MISC ChangeLog-2015 11330 SHA256 a73d0677b4693783bf36ad7b1d6d4e9d39e727d05bca1836f2a0aabc477fbf34 SHA512 954fcb0d091a6993dbac9d4ec6eab4027acbae13b14bf33699ea2905954e8b21da8c228dffa396c658a4a5fd2959911386c4552c17a08738f9c623c3f8bb09a3 WHIRLPOOL 4b454489c2ef40915ff70b7540d5118fde03e27f6628845423ba41df108f044ad2d99749abc100c26837debc424dcaa00ae6218aedc8ee52c7c03bb422bfcba5
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xset/metadata.xml b/x11-apps/xset/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xset/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
new file mode 100644
index 000000000000..7e1b0780fbb4
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 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
new file mode 100644
index 000000000000..7648300e8e43
--- /dev/null
+++ b/x11-apps/xsetroot/Manifest
@@ -0,0 +1,5 @@
+DIST xsetroot-1.1.1.tar.bz2 119977 SHA256 ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64 WHIRLPOOL 89cec2aabe15f5eb3ce94ff4a78865a119ae2ef914760118399ad997c575b9e87e349891ba2a4c40743116e714ec80278c671484a47dd1816eab8961e096db48
+EBUILD xsetroot-1.1.1.ebuild 422 SHA256 3d553e1ddbfb715612509d533368dfd585e9d15bddd5d371de9816623720c94e SHA512 fd9b0cad752ad6a93e40a3acaea9cb3a67c63d815a1f859999f63ebe2d999ab26e9fae91c22741af19b30cbfa05bce3639b5ef1213a3e473fe4b16077f7c3af2 WHIRLPOOL d5a64a61118b2a90eca1774960158c6a80434e045cb695d1d4b1f273d56b280b4badd5a78b7fdae46ba265f39469f2abeaa2828ec6b31bdd41130f0b9eea3780
+MISC ChangeLog 2430 SHA256 58915b720b7f99aa8b30f4698461502e8bcdbe70528ab3543d6abfcfa0bf02ca SHA512 ea4bf6fa8d4417d95c5ab61ba3ae670926922c628acd417d402410963b82495cd4a256ceffdc4885d9205618a1e209087bf8e4d4bb9f9c50da5325ccbfd80ec6 WHIRLPOOL b6efd6f42ff34c4a7bd12fdb763a74c914c2a7decba866160d08d62c7165526ec393c0da6dca5d6b966e14b82fcc7d0f56f08f800a3101b2bab28a92d90661e6
+MISC ChangeLog-2015 6882 SHA256 b6ee8c49c81f5caf4d6eeb2eec1db45255713a6f1639e88e0b4294201b2e5bb9 SHA512 687a01333e8878c31077e23649187ceaec3aef5af67782309901e560ef3101ba01b8630156fa4b9cd1c36e89525d3bcd96c267dc87b37a5a96eeeaa1872570ce WHIRLPOOL d735bf4cc1891043b7fc2d6ac2937c4b97d25ee51f6cfa78d62f3e9fc48459f891640d0ac23a47f12b6cdb055dfbe772fde51c257332c7475d845c62009b0186
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xsetroot/metadata.xml b/x11-apps/xsetroot/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xsetroot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
new file mode 100644
index 000000000000..9837f8afacbd
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 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
new file mode 100644
index 000000000000..8400af335b57
--- /dev/null
+++ b/x11-apps/xsm/Manifest
@@ -0,0 +1,5 @@
+DIST xsm-1.0.3.tar.bz2 161012 SHA256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0 WHIRLPOOL bb8a30a849c3570c91a69b5490509919fe19e9f986a018e8ea7b71b36aa986c2770eba4206b8d17918f3a3f199dc34c105e57aaa23716d897f81bb5f8682c2b6
+EBUILD xsm-1.0.3.ebuild 848 SHA256 4a58f64e9f1dde4ea1b3030ad6db7606f74831d40dfa3c3b725354066fabbbc6 SHA512 fda19eab58e2a49338dbe029e492e4379016a3f165c18eb7032d5e47e24b560f913b69f9e333d58f1880d23b282ff7d4d81b7b9a6b270a3cb2dac0c4657e896c WHIRLPOOL b8df9d4a92d9fd57ccac3bfe766d368d1620d158bfb6048e2ed2ebf0047c5b09f0ff7a56a2850d2b7324b87a09c144913112e896300e1237eaef2ca618299be8
+MISC ChangeLog 2415 SHA256 33383a85f6b189530eb57118105ceb237d5791ed9a19aa8fb2708124e62af07a SHA512 767fb63146860f7a4ee39e4d83fae1eddaa00905d9b582b64546cea450d4cf0e1e99d1ca29948639e8eaa5dda51f47eed0c371ad5b11ebb1f4b010ce0dd142c2 WHIRLPOOL aaae72df5d35f3dc109542803c661d5651a74e7c1485040a786d52786a4419edb14406c72f6dd6d85af815f6bdd09cb0c7d991f1dbe094112861e4f1341f5a36
+MISC ChangeLog-2015 5142 SHA256 a13c06d55af3436ec6c86d7148715c6a87cefc5a46b8de8248c1272dbf939b13 SHA512 8c03062ef076a6389275c571e1932b5434b127383dd95a0d563fd34d305d9354d39b65fab5b600a52cebe66a6226c649d67c3c584bceb1046e67dba67ff705d9 WHIRLPOOL b70e1357c0aad14e42da40f60f67991fc2bab5908dc32e20e484e0cbf1dcf948885a57d8f941c2bbf7f10acd4efecda7e0bc252cd0fa03cb20dd926022d33932
+MISC metadata.xml 333 SHA256 b0388c5d0152dd0c6ec9ead8aef8f08a84c352cb98274a7c67be9ac0f3bf28c2 SHA512 5496dab87579d1d5c218ddd1ef1e8b63e73ed8d0e695d3be9577d862fc03a775b9cd3dc82abd356c1ef124522f4ed07a5f289e5e3355bb76c2d8746e6cf5a7c2 WHIRLPOOL b81265f2a215722a68267c9a44669f92c1ad9812d5bf7018e10bec5f5d97a593f8ede616ddd9f2dd121ca618f78fb8c8159a0d583f039e57b9737b08ad0e0cc3
diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml
new file mode 100644
index 000000000000..e8a1a945c76f
--- /dev/null
+++ b/x11-apps/xsm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<use>
+	<flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy).</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
new file mode 100644
index 000000000000..ea8dc51e0705
--- /dev/null
+++ b/x11-apps/xsm/xsm-1.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 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/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
new file mode 100644
index 000000000000..b362fe458a7f
--- /dev/null
+++ b/x11-apps/xstdcmap/Manifest
@@ -0,0 +1,5 @@
+DIST xstdcmap-1.0.3.tar.bz2 117491 SHA256 f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1 SHA512 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 WHIRLPOOL 507a82f9692767318ba3cc0c484e7cf71fa2fa5005945f8e8146c160dc215a273a640505dd3476579fb5807e7bcbab8480377ab035f53f51d265a2f3245a3cf7
+EBUILD xstdcmap-1.0.3.ebuild 308 SHA256 ecc6207900e20fbceca7fa3ff1452714fd29eb61e0c8efe24f8fc3be3deff245 SHA512 dada4e88db321dc4f7c43a6b5bbb5c946c8a86fb543a835d6648233919e74c9b10f674210a1ddce7d70ec09d0669f35845631e6f60cb167dc724d60a6dc3c9da WHIRLPOOL 303fc07871645423c1d9982ccc66b14dd9d4b5063faafc6f9363306b70ecdb784ffc4f6673140d129b68f62a9a7edb42e8955e89772c85b8fd020b96c4b769bb
+MISC ChangeLog 2430 SHA256 329d677655b58fb7a92852a08c3637a7749419a6967ff47aadf539141481a40e SHA512 5a0a9f4c17fd911e74d6c94f99bb3bdbc3c996d72fde23287a3ea51d40a6dd12307a1222d3d20f93f0302754950525072c93f21dae6ab68f51ab1897db741118 WHIRLPOOL bbd1ab0cb3e76cee2263900c6721db01e47ba0c5c750f08ee28871bed4c60fc109cdc0874bc4e2c31d83082f9182fc539e828ce50c130831ce4c270dd150426f
+MISC ChangeLog-2015 4226 SHA256 48e5802b64c595ce66d10e3282038049bc5e6a43b09edbbb3aa47dd89898f31a SHA512 8357516aef0cec0a3abc63344c90b0af769b3f8dd2d2fb7fb2789c78e8436df49756350651e6a42505e288830c5ffb9496f19e7fc1b9cab189804f47a3c36b07 WHIRLPOOL a6140d7b659187fd3b32ac111e217a89dfc1f490508f00bd4334fe0d6f9ae6ca0b91cedb9ded8663c2e2228d0938ce066b5a19c5f148031bc7a852b9965e9e91
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xstdcmap/metadata.xml b/x11-apps/xstdcmap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xstdcmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
new file mode 100644
index 000000000000..1609cc4d3a80
--- /dev/null
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X standard colormap utility"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
new file mode 100644
index 000000000000..d832f135d269
--- /dev/null
+++ b/x11-apps/xtrap/Manifest
@@ -0,0 +1,5 @@
+DIST xtrap-1.0.2.tar.bz2 95471 SHA256 8f513da45b0c65dff4a3d477e5600a98d677571d7ed283f52c905987dcae0fbc SHA512 5fe6e02dd36d2fb65e5b83cbdae81d89fcbf467c9fc3f943a013299c2fc03c76f125627294302acb808d8b53e3ec51a82ba288d793df6ba3e88e0c980c6b3f77 WHIRLPOOL 07acce594469c7cdfc1d51c372e9eb49459b9726aa35af2b949c38702f837f3f570936c4a09e0903298a190c061d724200d3c37b2352e821e95e5cbf14de9188
+EBUILD xtrap-1.0.2-r1.ebuild 324 SHA256 21c693a91a75fde8a19eceb3b4cb7c768c0599d0d03905a3048a12307e308edc SHA512 6ff90efec4593cdce795f438a7e016029823264f4cd7f0759b4d74601926f29346e24aafbd1030d71249ea2e6570dcaa29cb52c12337a3f1a32328119ca6710c WHIRLPOOL 4ba57f339757a4d822a73ff2c21e562a07e1f19dd974456d368d11e17662aab820f29c651a11496e22bd33ee70bcdc13503b63338a16f6fb5a4f5011576771ec
+MISC ChangeLog 2427 SHA256 cc61a848a30be956843e66e69cf405918d5f85f670030f5c39e440c6118d07ca SHA512 e62dd3ac0ed06eabd514467c1e710d3a6cc87677aa91ad861d4436b7e34fdc1c1624fd074759b528c9d9cd4d10f2bed7b1365fc05e83143f934d6fb6460d5a69 WHIRLPOOL 130b2b430d46cc1c58e5de6ed06b55792a71d8f75810c8422d5cc16f93ffeea7b63d7142938e14ab4cdc9522b06bef8d2a04dbeb5d9d5df50edf3ca266f40c80
+MISC ChangeLog-2015 3581 SHA256 63583c11b6b7a6c942bc9aeb6d401f2c067d4596e2f5036faae1f43617cce065 SHA512 152ce8d3010b9eefdf5365a37b2d52cf8c279d9d5fe3a8b3be1a88ab746238198ad3d19f63ec436c381649d7700aa2e914134d46c9420634eac85b541c7e45d1 WHIRLPOOL 5646a35301036fd005e4ef4b18d079da7c7876a4ce4cbe78a5fae3fab1b822821c1745d4bc25623eca3f1f5b224161cba8596552156691f9f4df547e52793ea4
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xtrap/metadata.xml b/x11-apps/xtrap/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xtrap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f5919090c5e6
--- /dev/null
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrap application"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+	x11-libs/libXTrap"
+DEPEND="${RDEPEND}
+	x11-proto/trapproto"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
new file mode 100644
index 000000000000..9c3424f361c3
--- /dev/null
+++ b/x11-apps/xvidtune/Manifest
@@ -0,0 +1,7 @@
+DIST xvidtune-1.0.2.tar.bz2 113117 SHA256 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53 SHA512 4afbd4739e9fd1f94f7c5694a0bf4f7c90deba8e0b34ae446b49058293ccc90f27d0b3da2a134e1724f87183b8bbef73035eaf8c82fc11094e85b6e84c773276 WHIRLPOOL 691eeae2f738cb848252dc5f73de9d5517bcbedea8bce7df4f5e9fee743d90e75120af6dc045e0f7a6cead903b9b457ee44ef4301e338d686e3850b5c05f73f7
+DIST xvidtune-1.0.3.tar.bz2 128492 SHA256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 WHIRLPOOL b3474f83932765db29239750847efccc03ab5b4f72671544b215f6660ece16999844681666453c886c96b5f743881bb47904a417815ce85d9eef855f88f6eaa9
+EBUILD xvidtune-1.0.2-r1.ebuild 392 SHA256 6ffb6f71a765c2968f15ba6b6f7b8e88a4683a2fe2c00cdc72534fc9af789ff4 SHA512 3fcd21d92381ecc6050373aff8b6c0d8c1a06464a6f069cee27a42beed96d4798d936d8c85cbe10608f769db21eaa58a26d580f8a088903885ccba16078e19ef WHIRLPOOL 9fbef3ecfab2cbc17612ebb385c3aeacadbc92134ef7cf67ed89c011433a5ba029f5dbe08826a01690ae7cd1995733fd4dbbc4bac7f4ac7e3b82195a331d4c08
+EBUILD xvidtune-1.0.3.ebuild 394 SHA256 3ec36a8e693b2da1443a3e75fcb410fe59fb7eaf7ff07c7485a8c55b0401c10c SHA512 e218d6a48007e663eb8f429402d6173efe96e9bb807fb8b569004dc242b73416427d99ca434c6abf166974181e10f14b701f01aaf0960903ed7fa2f8a8589419 WHIRLPOOL 16f6a4e40e78851582ffb364084b9d0e543deecb4be8c5a65e1db7a0e5cacf3724fb8c483f8ff7560d2cdff8595423d20a3635c0b4e5e0b43b7b8c616c557029
+MISC ChangeLog 2490 SHA256 bafb334cf2a7cdd41b4382a1027bdf00a1bcc32f43500e4e3d2e255cc30797e9 SHA512 13a98df18924f87c6ab8740faac97385bf5f11387e800ee79c392a1abc73013038a4f1359f3330088f4b515e8c44abe3ffb461089b166459e4167f39b5dc7243 WHIRLPOOL 2896ba3a29b38f8a97ac2b7434a08e734af66bededec85c886ff0c8406be4fd1f6a67f9ed9b6fea2e09d71186516fd7c52d71e34485446a4efe8f24f8b82aaca
+MISC ChangeLog-2015 6074 SHA256 b07cf2226158628b21c5237389f854e692a5baa0d67a72f2690a63ab6c44828d SHA512 261ab62527da5569e16ad7ca1c0a163ed76ba1149507a4162ddf778b363d742d714d839cd1c84613ac6505302b0e07413b23ee23e3418bd5ec25471e1e21284f WHIRLPOOL ef7e7424a12abc21fb675ab7b7a3f49909c80881398361184a2ebb4fd5bac2a6bc5023f7a989aef2b02f3b490bfe971a8b58a9986de5df9a5aacf5b42ed22e45
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xvidtune/metadata.xml b/x11-apps/xvidtune/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xvidtune/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..c0e6df2bc894
--- /dev/null
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="video mode tuner for Xorg"
+
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
new file mode 100644
index 000000000000..eb84ada1084d
--- /dev/null
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="video mode tuner for Xorg"
+
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
new file mode 100644
index 000000000000..17c0dadd01b6
--- /dev/null
+++ b/x11-apps/xvinfo/Manifest
@@ -0,0 +1,7 @@
+DIST xvinfo-1.1.2.tar.bz2 116906 SHA256 eed3d90ffd788ef728c4a5e7aa4bd86dc6bbcebac929caf7a0479cf8b53b50e3 SHA512 0cf431afb52807f88654aaa3acbd286630461c934516ee5bbe280ec468ebfd3970b5b10f69d3a25aa36b6e0c0ac46d1c20c9606ac1de76261df80f1821362732 WHIRLPOOL 3ad7cb1a3dd278551ca5a8e33f6e8bf55543ca3628e160835b0237eaa1c69e350ecebdc3ec936f6809f4fc87506207452fc96bd0262ad8d0834520cbf20a4153
+DIST xvinfo-1.1.3.tar.bz2 123750 SHA256 9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb SHA512 df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc WHIRLPOOL 94b1db5a3d7cb183f56699f81a2577128dbc53e88b03a3ab0213c87bd0d664d817475d522d2366878f0bbd012141209dec6ec6ff9f5ee26d5416114a67a6987c
+EBUILD xvinfo-1.1.2.ebuild 361 SHA256 ec5982dbfc3b7e772ee9c00c956bd6ff20478a61a0fb27ac8d18599d2cdb32ec SHA512 6cf8103a22a853ec1c65b5eeb3c2a89e98d36bb228c2b923538390a29de5961dec685b12ce1824385311e334884fff406a496d7e9eac60acfac704de2888f94e WHIRLPOOL 5392c2b1fbf51ba6bb0435f424f2268dfdeb0dd90f2ad5b27971cab332778db8bb10565d60e61f1de25654060efc3f8d4023ba60eeed936bbec4e413f6d5bb8a
+EBUILD xvinfo-1.1.3.ebuild 368 SHA256 3b07144dcbe0a8146419915fcdd37213e6132b8217ffc87fe41adb03515625d8 SHA512 84ec7d89440db62d346cdb880db34116b03ebe93ee4c61332ed1154dc35662a41db998829f522a3f58c0ebc74714984f9bd6c2a210e0e2d44f9ac82fe9c44413 WHIRLPOOL 54dd8b8fb7af676e2c9075ca268ae8a8e5091c23dd3e9f9c363b695d220df2ff0ce36b3498f71cb9edc743f39cfe0fb124f2da44207072b0fd7c5413dcc6a6da
+MISC ChangeLog 4153 SHA256 11db9d13594e99c86498a7b5623abb6be504c9d637acbf2ec0de1770c580cb58 SHA512 492bdaca31bc9a33afeb109ab2a5c5aacef5c643931b61af4e40b65d1c0000eec1d2a9df98974f07f49fec8054e7f38895a1062468fde0c0acb07df4ca0ab26c WHIRLPOOL c65575813058f2d7515b3e1fe51dc9ec3cf6381bfe7bb0214b9d1115053185da9651f335dc10474781dc9f461763a3d7497b881ffeb64a10ceda2fc5085e077f
+MISC ChangeLog-2015 6848 SHA256 7864681e1a82d3748ab5f4b681b58e0a40980b36b0233bb1dea9aca01ac4f03e SHA512 ac6c198321715daaca24b12c8cc81e369320a34236a4758978474fa52badcbd4a82c30219b2f1d4db9a0e66407ea35efde3e83afb39f7c934a3af6b1ce195315 WHIRLPOOL c6f79aaf945dde73eade24ca4a1d46f0e3a31b836cbcb79ac74e440a2c565d2fe5c3e78cbe42b7f8f15b275d910c678827ff595511705ed18f8032c844629771
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xvinfo/metadata.xml b/x11-apps/xvinfo/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xvinfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xvinfo/xvinfo-1.1.2.ebuild b/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
new file mode 100644
index 000000000000..0f3205f094b3
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/xvinfo-1.1.3.ebuild b/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
new file mode 100644
index 000000000000..9f52d2c7332d
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwarppointer/Manifest b/x11-apps/xwarppointer/Manifest
new file mode 100644
index 000000000000..7307bc3bc4e4
--- /dev/null
+++ b/x11-apps/xwarppointer/Manifest
@@ -0,0 +1,5 @@
+DIST xwarppointer.tar.gz 2338 SHA256 3569bf9e67ef080b8f8b2b13f51f6648866c1ff19f63c1385c8a72a6b064930e SHA512 630b64076b6ebab26eeb278c5f222777a8ca150d4fdcdb78c6749800d4d02fc3c43305fe3e3cf9f640e5e5535f7e10899aa2ed31e8c23245bc6f215d0d25a38c WHIRLPOOL 15a6080762442efd0f4a2e40fd68b7a34c4849c937a4e719cf468e401d418aeee29db9a841eaae6b1ca4baeaf59ea65f591aca4f294afa7d678856e4a57dd971
+EBUILD xwarppointer-1-r2.ebuild 710 SHA256 ccf1ff0e5906827f48f2fae70bb4fc7643cc5f2dab491aa2d47fd282aec9935b SHA512 ee4a96ed837973b926594532edb248c0c00bc03cd5c0393e958d89ef9861282ef08f5c39f401e069df51675613d272827e6bec5284d47218d8f92bbe5362043b WHIRLPOOL 93168d749e66d0d17f9d46a8add6cea27f8030cb5576ee55f56bda99d667a59fa33495d67fec8ac1990f712cbf8b55af423efce5b7d5c07b81507fd112663d63
+MISC ChangeLog 2754 SHA256 51317a847902966bdf967c192420803bf16ec8bd28a07b7abf0c7b2d7f868a95 SHA512 98b1ecbfee954c8668f7962664c74d4b1e3ce8138ca2cc48acfb866789f981af48ea5450b41beb9e7b497b746a4292453260d6e828bc610261082eae351830f5 WHIRLPOOL 68952af1dcde2e0968b2993712b18cbfcf6595a3be625fb8a6acc70ce8804bacac427f472947962174f5c265c4213305319099e4613d31a03108a6d49001fc3d
+MISC ChangeLog-2015 1060 SHA256 f8a1adfd00de9fb05fc3d201a15f292e6546b36e162416727868e2aa5651545d SHA512 f1be7929375d29cb2e7345e870847abb1197b897306054f5d09d6d798e20b700d7ae456f1ff35b698d068ddc0e3263a255799fd224ccfdbf394ab73b36499a2b WHIRLPOOL ed5d880196b2137ae5ff86f4eb15a0a8b61b4abe9bb2553a9796cdfa89156cf5d7c28df66953cf8d023f5f11a19c2e112cc60be26f6f1366049de1bf2b2e2511
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/x11-apps/xwarppointer/metadata.xml b/x11-apps/xwarppointer/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-apps/xwarppointer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
new file mode 100644
index 000000000000..6bd47e64aada
--- /dev/null
+++ b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to move the mouse cursor"
+HOMEPAGE="http://www.ishiboo.com/~nirva/Projects/xwarppointer/"
+SRC_URI="http://www.ishiboo.com/~nirva/Projects/xwarppointer/${PN}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i Makefile \
+		-e 's|^X11HOME=.*|X11HOME=/usr/X11R6|' \
+		-e 's|^CFLAGS=|CFLAGS+=|' \
+		-e 's| -o | $(LDFLAGS)&|' \
+		|| die 'setting X11HOME failed'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README
+}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
new file mode 100644
index 000000000000..883f9d139d58
--- /dev/null
+++ b/x11-apps/xwd/Manifest
@@ -0,0 +1,5 @@
+DIST xwd-1.0.6.tar.bz2 144548 SHA256 3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f WHIRLPOOL bfabf94e0fe6fe46c25c22b1d062e6548e9c0632d24a17c52dfe8891c43f0029ebcda827c1e85aeb4a2fb54a156ebe36290c97dc5429e5d78aa4efcff63a6e9e
+EBUILD xwd-1.0.6.ebuild 462 SHA256 46add1d6c725cda8cbaeceabd41ae703a6c479500b8ba542832b73fdeb6cbc85 SHA512 9e07413ae79fa875abebfe27c2a820d2c72f263b9ad3e42332605ce8131f2667a5bc3f129fbd6d2838ed4e23d6f5162068f891fa87dcd229592e8c56a3cd6fc1 WHIRLPOOL a2202a37fb7c0e41096027e065224cc9451a81232f3c5b84ed2e556a706345bd85825d7b52a1af60d2c81325ee8b049822b3e81578dc2aeec4da7d276ae3daf3
+MISC ChangeLog 2573 SHA256 01dcbc2e294dd29ccd766acc121aad22b8436479435d70d220bddfbf23652ffe SHA512 34a1ecdc046b37d4faf32a524ca3074a73170afd6035e897a483bef6702a8fdfe50c43d05e432ed6b353ff30516b07ea64398169307fee0c48b816854710308b WHIRLPOOL 488e905e380325c22d98a031727e28480725e4707dafed962473c04bbb84ebb635608d74fd2c4f07cff741fc55259482934fe4ed64b63c274ffa900cb6ec6ad0
+MISC ChangeLog-2015 7185 SHA256 a1495e86d92ab1a15f4bf62d85a4160bcbf81df858e7da6b2c431972c95f1d2d SHA512 4aa99fd3fa809ab36b01036e66739e3fd009256eaa54619aac6b6ce502fc32b921aa978cde005807795435874cf47b72d8ea66e68fc22606c0ba7054e4d9314e WHIRLPOOL 506ebb1b3c33da11af688821e3deb8eeaeadaa8a48f45bf748008f13c7ca4ea3fb203c5ed55a86d4b36b3ece3f0fc05a151b65d2059f6e34e85dfe9ead5b455e
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xwd/metadata.xml b/x11-apps/xwd/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xwd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
new file mode 100644
index 000000000000..ec840a7e31bf
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 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
new file mode 100644
index 000000000000..c58e143820d6
--- /dev/null
+++ b/x11-apps/xwininfo/Manifest
@@ -0,0 +1,5 @@
+DIST xwininfo-1.1.3.tar.bz2 157512 SHA256 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466 WHIRLPOOL 902c45b6c94a6b659c3f1bec04d4324c40ec88c8a75daff742e2c801ca388fe3c6bacb31efb14d62237de4e39c1ea776ccbb5788b705c66e86260fc17ec281e7
+EBUILD xwininfo-1.1.3.ebuild 741 SHA256 6774f75d984d047e1956ffb265ce7c1d54920b311f0cf2d5eb88be53be89e101 SHA512 d48b8bba681614c0e5355c512977455cfde7de628cfaa3fd511dbe30b1eeb3b3e5c2bf950a6d384c2e8d9af9a49dbdf38b65f767a75d2e7692d0ccc666be6d84 WHIRLPOOL 596f459f055552d8bb56117bd651cf1f5fcd2c48fed4d7464c44d4cb68a7c791c1ce1b18e6ec819d2db533d55c2a734c1ae920316367eaa946aacca1d3c7f58e
+MISC ChangeLog 2605 SHA256 69d496c8237aeb6c750cde82284ae5490ede0d209bcaf7582924ba80c9ec64f5 SHA512 d3b27871429ebcb34d54e1a7bd70c2f0814d019033db82c553b85b3c79c6214ae4b62ce33d925b10e741d7129bad2fde5d3be1894b1e01bf442cb49b393b8ec4 WHIRLPOOL be1e049959490264a04287624dfb9f95278cefcd08211db9afe15ce8ccd09538380b25098ac65759e5b12c143459fbe7ad32cd3025fe28b48e38dca813c4d12d
+MISC ChangeLog-2015 9727 SHA256 b7a6808126d2f6b8bd7d07cd0e625caf0f0913f9723f234dd4ff162bc8a69831 SHA512 9cc766052398d9a43380442cf5b4a7f41d5ce0602710993471d8fcdff3e936ba4e9b6eef9128b424fdcb17951397c72eec84b5a83eec7bb787dbb0d782279705 WHIRLPOOL 2e6bb91a822b8247b8de554ac3fc0701836e776b539a3dabbf3223505e02c1d5802007d5982059a4d4652f395bc3c7518eda69b96956664f7ea4232eb6b90c45
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xwininfo/metadata.xml b/x11-apps/xwininfo/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xwininfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
new file mode 100644
index 000000000000..9a8fb51ef20c
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 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
new file mode 100644
index 000000000000..69251c1799f1
--- /dev/null
+++ b/x11-apps/xwud/Manifest
@@ -0,0 +1,5 @@
+DIST xwud-1.0.4.tar.bz2 124604 SHA256 d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd SHA512 f3ef5fb0dc9c9e3dc3acfa597c1332263f62be5e524c7512600106e9d8eb5733231729853f6b123205367db52cb0a567320dff65d29743bf892e237795ebee57 WHIRLPOOL f1b9af182bcd9df90be86d87974f1bc58e8d4c3542dc2efed6f4ebb3a64b5d668c6ff9c4f62730381bcc79e66cc5514ec8f8acc89c190cb5ced3641528c385e4
+EBUILD xwud-1.0.4.ebuild 324 SHA256 c46ec9f0b2e265a5d7dfa09ddc6881eb2de259c66a1f5cebf84f5d50ed619ce7 SHA512 203269ab64350ee68c3b1f1cbd98401c1da694f4bc92c20ac4321d0c1a28c4800f39c8d3308adca9fc0386a0f78fa4eb8a5c418447bb14d26826e9c59158b8b2 WHIRLPOOL 729be24f4a09d691490e056bc3716256111ca6b3ae727ecdd32cf0e4c4b423dd73670c74752c880aaeeaa4853411e350d232eb280867a7a3f849db892d375c03
+MISC ChangeLog 2577 SHA256 bf31a3152ae31fadd7e8c3a8bf39b054b2c9112269a0264aa96084e5993ac745 SHA512 04ac5ea7988f082492a591d27de971c7c3ce6d4431a17ac0424203bd93fdec740c72b98ece216c61ec7de1ed7f214c59421cd80479311e351f7d39bd3d7fc493 WHIRLPOOL 1f341fa6771efcffb4dcf9b07d0560b31c65b331db04e41b7f2a859ff36dca37819317211f879fb105c24610aa34f8d1810596d43687838e44f5b025b08bb7cb
+MISC ChangeLog-2015 5014 SHA256 bd987a5b5af3f6a12136d46d9e52fef24d67972d5550abea5742a24423d2aa38 SHA512 833d52c656e97b57e7704ba5cef22288c4d8c70a8d95100f51d5386e0f9377a45b9ccb578c808e172f899431337b11b9c06b09ab4de036f225c7ff18da4f7b46 WHIRLPOOL 86e0d02960f400bc6a3872dbb2b32c445448c99ea4a8f46ff0907faca57e0d0cd08616db3cee009cf2a97084a95425bf33decb2aa50e42291dd36d5a719e55e1
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-apps/xwud/metadata.xml b/x11-apps/xwud/metadata.xml
new file mode 100644
index 000000000000..e943b72b8a48
--- /dev/null
+++ b/x11-apps/xwud/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
new file mode 100644
index 000000000000..f345b2edc8ce
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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}"
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-apps