gentoo resync : 04.08.2018

51 files changed, 1107 insertions, 156 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 6eb5367a866f..3de01e1e59dd 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/enlightenment-extra/Manifest b/x11-misc/enlightenment-extra/Manifest
new file mode 100644
index 000000000000..19cfed394468
--- /dev/null
+++ b/x11-misc/enlightenment-extra/Manifest
@@ -0,0 +1,3 @@
+DIST enlightenment-extra-0.0.1.tar.xz 374872 BLAKE2B f067ae5115033d5b87783584327ecd5e08b3b38998d2f9e20b70b135b7ec25106fd92abf5314c2af580cfbcc66ecd65ca7e434429708e1abe8d02dd4b0e2ba98 SHA512 40cf1a19c48cb6f14fd7fbed3223eabdbc69260834480e4463495af36fbfa1d00b7bfe3777998a17e5081b14e66080dc3013a6d3a6c610a175a08c99b4e5529a
+EBUILD enlightenment-extra-0.0.1.ebuild 848 BLAKE2B aa6c027f5b33009ca0fe4d39296b4947b5d0e4c30e897107e40a3c09f17e913a588afac77207539732ff4b45a3bd18b85876f0f9e748313e0f5e1291995dd787 SHA512 02caa297c9a9d718a8ac932ae6a493729cc0d375c318dfbfd9cf8ce22348f179ed0af6f3c4ea03cdd75cc1e8c8e5e3775fb1b21363369f2d548e0b5044156120
+MISC metadata.xml 345 BLAKE2B c7372adfaf1dbac2ac58fdefeb26b327b0df266b3f9026467bcc44bddc1de8ea17a73ce170f4af092b547bcd984f82ae20bfdfcc1b507505d8a5210d2aa89f57 SHA512 f0e959b76ab3ba78d9c45af63b7b5368ebab5ee916cfa23d86a269d1778f23a03fcffa96bf7164e7c3387637ef2904cf4988658ad70227f4fec49be5b8e7451f
diff --git a/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild b/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
new file mode 100644
index 000000000000..a7d39571c7dd
--- /dev/null
+++ b/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/enlightenment-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An app for downloading themes and add-ons to Enlightenment WM"
+HOMEPAGE="https://extra.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/apps/${MY_PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/efl-1.18[X]"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_prepare() {
+	default
+
+	# Fix a QA issue, https://phab.enlightenment.org/T7167
+	sed -i '/Version=/d' data/desktop/extra.desktop* || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-misc/enlightenment-extra/metadata.xml b/x11-misc/enlightenment-extra/metadata.xml
new file mode 100644
index 000000000000..ba2dca1a6dde
--- /dev/null
+++ b/x11-misc/enlightenment-extra/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="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
+
diff --git a/x11-misc/gccmakedep/Manifest b/x11-misc/gccmakedep/Manifest
index 9795ddaac73f..2b31de5d2cee 100644
--- a/x11-misc/gccmakedep/Manifest
+++ b/x11-misc/gccmakedep/Manifest
@@ -1,3 +1,5 @@
 DIST gccmakedep-1.0.3.tar.bz2 104766 BLAKE2B 4da8c3d4423f55fa110b1be748e9488b713a36b575f065f58d68c24eb4fdfc337aa9c715b82dfaac6eaaf8cb2037ab4d0355297a61c39f7e7672f136bb1395d8 SHA512 563b2897770a4df2792ea3eae8183a1f9e78192b7efc9c8296ee68d1cba6e72fa962a88e3251bb780df776e2aa7e80d74d5096675c61526c232aefa4f9e6a5fc
+EBUILD gccmakedep-1.0.3-r1.ebuild 973 BLAKE2B 6a00b2c48f4355eed755dff7fcd43ee93fbd84d95e79decce1c26885de02c383863d7f5f9026901f8ac1c179c4be92b408e39fd1c33e2eaace4fee521b459bdd SHA512 8a2f1b683db50bed1d126444fa079f911a63e4054a3f252e255393744eb8dfb05a9c839a0437e90b8223f28d19c2285239859e1725c8936703c3819b5891a230
 EBUILD gccmakedep-1.0.3.ebuild 446 BLAKE2B 60c78ce3d332150270cb83248adb545db77fc07e6bcbd77e5b4a5ac3d0544498f5876c791f47da69dd1d4e8be3292c145aec05f123d93bbaf000966c837fa609 SHA512 0218532ade41810ea98f91b057818c8a3b9767f5230102bc80e1d056e662a921e29561e683950466a79e14244519e08892befd439e732ba47aaf8f0c53726e58
+EBUILD gccmakedep-9999.ebuild 973 BLAKE2B 6a00b2c48f4355eed755dff7fcd43ee93fbd84d95e79decce1c26885de02c383863d7f5f9026901f8ac1c179c4be92b408e39fd1c33e2eaace4fee521b459bdd SHA512 8a2f1b683db50bed1d126444fa079f911a63e4054a3f252e255393744eb8dfb05a9c839a0437e90b8223f28d19c2285239859e1725c8936703c3819b5891a230
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..dbd7fd229348
--- /dev/null
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/${PN}.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${LIVE_DEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/gccmakedep/gccmakedep-9999.ebuild b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
new file mode 100644
index 000000000000..dbd7fd229348
--- /dev/null
+++ b/x11-misc/gccmakedep/gccmakedep-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create dependencies in makefiles using 'gcc -M'"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/${PN}.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${LIVE_DEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index 7e25f88e9cec..4189aa34c6e2 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,4 +1,5 @@
 AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
 DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
 EBUILD gtkdialog-0.8.3-r2.ebuild 856 BLAKE2B 11c7acc7942c656985102486fcce90e2ddc694a705164af85d5f47bb769d1e737fb88e31ef4d6c8d82766977561d39a7114b51c61ea1bc6c9708a57079926cac SHA512 b8e4bb6409b96a671b35f22f298340e28e1cdca2489b4e9e0f6eceadb965cbfea5b82fcb19142937fa2398c0b540d289c690f19ae34af48c4d2ba1b6fc2b9f04
-MISC metadata.xml 1002 BLAKE2B 5a42afbad8492225f6bf658397ce17a2bece23ac07770005904484bd99d3b103ef6be0c6fc4aa943443ddd7b203c9a1f737a346cb2afda09dc187463511d27c1 SHA512 5d23a5e1409705ea1114dc7d072284d1ff367b2afd3d452d27729bb4b44e0f7546b4bf44d2d79e601747d5a457cc06ba3f8175c5e62051711ea7a2ef81ae16b3
+EBUILD gtkdialog-99999.ebuild 818 BLAKE2B d0821fb5d6470c1a8996e7f69be5c779c06001f7bccc7d280f90cfa1d6aa6ea1d4a70964a30275ce96bb566088e935c5680ed651e09fea8931f0142a0b00cd5a SHA512 7db7be5b52ac5be6532fc9d0e51f009d4c6dac85c19c73a35069ac5a3acda275d5821880c8cee2bb806dd442ec901dc2f120fdb7b0de10267e30ec49f6cc4947
+MISC metadata.xml 1061 BLAKE2B bda57a1f52134507775d030d4fbf19704ab69b138635ad6001e12e13a779390f7d8b3640dcab4696da1bfd267db4b772d5e5ff233b7ec1d0ff2feee90e9648ab SHA512 90b0871d127602aef6b3066f32c8b7abca20634afdd4879ca06fbfd1971ff3ea0d03165e076912cabd1ae0b730f1621999c220ce9fe195700a778a11c71adb36
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
new file mode 100644
index 000000000000..b9843533462f
--- /dev/null
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools git-r3
+
+DESCRIPTION="A small utility for fast and easy GUI building"
+HOMEPAGE="https://github.com/oshazard/gtkdialog"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk3"
+
+RDEPEND="
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/vte:0=
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.91=
+	)
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk3)
+}
+
+src_compile() {
+	emake -C doc stamp-vti
+	default
+}
+
+src_install() {
+	# Stop make install from running gtk-update-icon-cache
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	einstalldocs
+}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 635a9b6bda84..2de333f9467d 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -19,6 +19,7 @@ provided.
 </upstream>
 <use>
 <flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
+<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 <flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 02a12e04d1b1..a7a7a7408e32 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1,3 +1,6 @@
+AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a4adab3f2491e52c7bfe674de1509120104ea7f042b2a6a61fa30ce1d5573289c01bfa63ff0826c9d76281ed927ada61 SHA512 c6eba0da6cc37702293273d762481b522467f3cd5ae7d216f397ff47657762db78deaa0780706c2e13d0010b739067e65d09b235ab9df379430a826c95e6fed8
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
+EBUILD imake-1.0.7-r1.ebuild 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
 EBUILD imake-1.0.7.ebuild 706 BLAKE2B 71e4d7544364dee5831c4c7b81f68d8ed696b19cee1f4b876fb047a27b4c329b0230c8cf10d6e2d70a503e378dc2c455d1a6177082d4c225d801d4e3aaaa1bc7 SHA512 7a66beb7081f938f47223aa7233295a7eae5d39bb6652307ffd3892ea8a2688684108fc7096ee18f3ba62d2e23f38ceff89ef99f1b07154cd59eea74aae764e0
+EBUILD imake-9999.ebuild 1181 BLAKE2B 7d73f32499f52d213ca8506e8991e6fccdf74178af7948313cbbf34db04600b6bfcac3fa1d7f9a812fddb243ec2264c901007b19b4060addedd41eea706e9008 SHA512 cb8170cd71b37487b2c81608d9485e85bc09e80d12d838c55802353ad052816bfff7703ddf5b1b7ab01a362b24aef70a78f697ceba35d47d2f749ef01f2bd346
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch b/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
new file mode 100644
index 000000000000..27fe234f99ac
--- /dev/null
+++ b/x11-misc/imake/files/imake-1.0.7-sun-compiler.patch
@@ -0,0 +1,19 @@
+--- a/imake.c
++++ b/imake.c
+@@ -1,4 +1,6 @@
+-
++#if defined(sun)
++#undef sun
++#endif
+ /***************************************************************************
+  *                                                                         *
+  *                                Porting Note                             *
+--- a/imakemdep.h
++++ b/imakemdep.h
+@@ -1,3 +1,6 @@
++#if defined(sun)
++#undef sun
++#endif
+ /*
+ 
+ Copyright (c) 1993, 1994, 1998  The Open Group
diff --git a/x11-misc/imake/imake-1.0.7-r1.ebuild b/x11-misc/imake/imake-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..a4ee1f9952ca
--- /dev/null
+++ b/x11-misc/imake/imake-1.0.7-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C preprocessor interface to the make utility"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/imake.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	x11-misc/xorg-cf-files
+"
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# don't use Sun compilers on Solaris, we want GCC from prefix
+	"${FILESDIR}"/${PN}-1.0.7-sun-compiler.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/imake/imake-9999.ebuild b/x11-misc/imake/imake-9999.ebuild
new file mode 100644
index 000000000000..a4ee1f9952ca
--- /dev/null
+++ b/x11-misc/imake/imake-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C preprocessor interface to the make utility"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/imake.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	x11-misc/xorg-cf-files
+"
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# don't use Sun compilers on Solaris, we want GCC from prefix
+	"${FILESDIR}"/${PN}-1.0.7-sun-compiler.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/kapow/Manifest b/x11-misc/kapow/Manifest
index 735c5775fa25..419a3e41fee8 100644
--- a/x11-misc/kapow/Manifest
+++ b/x11-misc/kapow/Manifest
@@ -1,5 +1,5 @@
-DIST kapow-1.5.6-src.tar.bz2 855057 BLAKE2B c0d5afefa4caf0f1be243e8e2e5dad80e52bab4dc856791d198d009a90c864aaafbe2eb624e114f6331c685b2bbc1664add045de9ed46699f865481461968423 SHA512 b0d1e1ed3cbe9a4a4e253399de4ec645f832a10633275b122729dd7653bbb40c7cd473251459fe1e0c35be314a02c704cac3fd25cb7ee498e282a58df6cf06a0
 DIST kapow-1.5.7-src.tar.bz2 855284 BLAKE2B a153b8e6356850d66f3743d91b2be685c9c51d2f257fe37b89d95fc3fa640babcd53470de0a7097174b87c2ae2cbef530e09e58d53b024fb893959354d1ca4b1 SHA512 05244e3c76350af7e7e3c35d70eba30580221fcfe73d652944d8dda40d5d630b037440a4ca296773b404bb7555b3c4aaba988bc51593456150eb9b2f69d1d2bf
-EBUILD kapow-1.5.6.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
+DIST kapow-1.5.8-src.tar.bz2 834178 BLAKE2B dc24e2d47e3e8286336e4de509e2486f0b6f6c912e5be532e36035e6fbff09a0f0453108b061aff2aa7bab45e1c782b63ee94f6183d17b0b50e04c24611b2e7c SHA512 168e9581b360a905e24d8dc4d01af58823789f4ea6fe533744c14d9c6830720e640923859c2726c51aa9ef9064038a2bb920960c74ca858e3fdc6b0ff17cf861
 EBUILD kapow-1.5.7.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
+EBUILD kapow-1.5.8.ebuild 1282 BLAKE2B 29d43e8b055f3cfb8d37154c85e5f84eea9706ba12d0bcb3995a458429fd1775b901291c5183b50fcfe5b2e46b2023b8fa6f0e0a8168320f024e737786827c19 SHA512 8f648b1dc1aaceed63f1dc1013bf6c2737ab8d13e0cef388505e8dec4df14245cadffac5950a4aab04b41431064916c6286d821bcb814f51555c39185f08c608
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/kapow/kapow-1.5.6.ebuild b/x11-misc/kapow/kapow-1.5.8.ebuild
index 2dd79d2b2ec0..2dd79d2b2ec0 100644
--- a/x11-misc/kapow/kapow-1.5.6.ebuild
+++ b/x11-misc/kapow/kapow-1.5.8.ebuild
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index fa6afab68fec..b6acda5bf33e 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,3 +1,5 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
 EBUILD lndir-1.0.3-r1.ebuild 329 BLAKE2B 9db3fce24ee36408c424c6aca65d16e8e56a7db7dad4d9733363b09183b8e7eb7b49f6a846fd4731bc212aee653d96fed30af6033cf3adf05d6236961c638152 SHA512 c5696fbfa2394fac512f6a2ab005af434570b3cc8fa2689d5aa61bd17dcf491cde2d894d9bb12e7b68bc166bb0f27f4001d8c5e4d7f619be59eee3fbd04446ec
+EBUILD lndir-1.0.3-r2.ebuild 882 BLAKE2B 8d818620a5e442cc56e9cf4c72d6ab63fa0a2f8d1b0b91a7641013cf727e7421642e6ed7b9639ecd656b0c9783633bea0f843ab2661179c6070ae2724e927ce8 SHA512 9330d8504ea7427de7c4132dab36fb0a9ea8c7cd432391863eeb9b37d14f77de0134c031723f273d483ca8d1626a5b0252fbbfa91476a5e3d586f1e72dbfe8ba
+EBUILD lndir-9999.ebuild 882 BLAKE2B 8d818620a5e442cc56e9cf4c72d6ab63fa0a2f8d1b0b91a7641013cf727e7421642e6ed7b9639ecd656b0c9783633bea0f843ab2661179c6070ae2724e927ce8 SHA512 9330d8504ea7427de7c4132dab36fb0a9ea8c7cd432391863eeb9b37d14f77de0134c031723f273d483ca8d1626a5b0252fbbfa91476a5e3d586f1e72dbfe8ba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/lndir/lndir-1.0.3-r2.ebuild b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..3009d675272b
--- /dev/null
+++ b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/lndir.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/lndir/lndir-9999.ebuild b/x11-misc/lndir/lndir-9999.ebuild
new file mode 100644
index 000000000000..3009d675272b
--- /dev/null
+++ b/x11-misc/lndir/lndir-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/lndir.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 7c49a8e1fb66..d0178cddbcf4 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,3 +1,5 @@
 DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
+EBUILD makedepend-1.0.5-r1.ebuild 1017 BLAKE2B 96f9b8a1322c52fc97538359f1e13d2bb443124c106e826214d09953f4a6c8df2855c61bfb8a7c5e40f6bf2e7b8f62705d8651ee829dfa0b554b751e7bfc9306 SHA512 8295219d41af90f9453d7aa88a925c75702a4d60930e82259fb83e9b385466cd4c003d0fca5b770d05b4085619628d03ac9f8f4ea687f79a41e1eaaa9afd3b60
 EBUILD makedepend-1.0.5.ebuild 451 BLAKE2B 88672029cf2ca0e9c48744ebe371c2e88c7f97722c676a08f5cf3773095eaab501c2189e7db607a80a41f491d933b984ecb21c1c32c44198e246c5b8ee3314d3 SHA512 423364cde322cc2a09639d692ddd6c51b4035d3078cd0fcf6e4494aa831b24c76c6e098522e707ff45da07e4c20251d0a13b56c4c1f212584155598a79c5fae9
+EBUILD makedepend-9999.ebuild 1017 BLAKE2B 96f9b8a1322c52fc97538359f1e13d2bb443124c106e826214d09953f4a6c8df2855c61bfb8a7c5e40f6bf2e7b8f62705d8651ee829dfa0b554b751e7bfc9306 SHA512 8295219d41af90f9453d7aa88a925c75702a4d60930e82259fb83e9b385466cd4c003d0fca5b770d05b4085619628d03ac9f8f4ea687f79a41e1eaaa9afd3b60
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..ee323d6f29a0
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-1.0.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create dependencies in makefiles"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/makedepend.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/makedepend/makedepend-9999.ebuild b/x11-misc/makedepend/makedepend-9999.ebuild
new file mode 100644
index 000000000000..ee323d6f29a0
--- /dev/null
+++ b/x11-misc/makedepend/makedepend-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="create dependencies in makefiles"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/util/makedepend.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index ac89cf600254..caae71f6e0f5 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,8 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
+DIST polybar-3.2.0.tar.gz 242314 BLAKE2B 1bdecba237f6d400479305caa2e571b5de708b07251c77f999fdc16af4c89a54ff722956c24b0b188aa76b5418cdf159eb21004091d87d2b93e2d43ba8a888c8 SHA512 14516e37bc39736eddb53aaffd38bbfa8443fa6744bd3bd374359b9d55c085c89f59ecaa80f31815f4828398d378d2772bbd79fac36a639a208814a0bf230930
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.1.0.ebuild 1694 BLAKE2B 140bcf98cc7dd8b0928c313d93335117e3196fe7da14808ab2a9416cffcfa802b100ff66ebcbada4e5ae9a2754641c2622b002e459ab100ed4be89b838693892 SHA512 1f60c5389d5e217bc6409fdd0a91bd7b0563606134a5528d8121325e88bb9967374cd4cd42d40a493eac6d93c35bcf1e6095357a93239d7622a2c93d6e32f670
+EBUILD polybar-3.2.0.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
 EBUILD polybar-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.2.0.ebuild b/x11-misc/polybar/polybar-3.2.0.ebuild
new file mode 100644
index 000000000000..480c094886de
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+XPP_VERSION="1.4.0"
+I3IPCPP_VERSION="0.7.1"
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/jaagr/polybar"
+SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+	https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	x11-base/xcb-proto
+	x11-libs/cairo[xcb]
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	i3wm? ( dev-libs/jsoncpp )
+	mpd? ( media-libs/libmpdclient )
+	network? ( net-wireless/wireless-tools )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	rmdir "${S}"/lib/xpp || die
+	mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+	rmdir "${S}"/lib/i3ipcpp || die
+	mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+	sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_ALSA="$(usex alsa)"
+		-DENABLE_CURL="$(usex curl)"
+		-DENABLE_I3="$(usex i3wm)"
+		-DBUILD_IPC_MSG="$(usex ipc)"
+		-DENABLE_MPD="$(usex mpd)"
+		-DENABLE_NETWORK="$(usex network)"
+		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 6cdb524e73a0..9beb2b903151 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,3 +1,4 @@
 DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616
+EBUILD rendercheck-1.5-r1.ebuild 562 BLAKE2B 56d43236100f71ac927a430b494241ec76c67facd6e6a2042684201aed6ca453d6f281c733bf07624d4bae2a9d76726175dd34b641b9e0c2fce38537d4051374 SHA512 0efe3a36e22e98152d8583bee67358a9a3ddf539c21149edbda2f1f0f85c6bbe5701fc26d1b7e00637264bbf979707b7d4e5dc8c4d74122004e4008e43ad5000
 EBUILD rendercheck-1.5.ebuild 345 BLAKE2B 7515bbebf9da063e91acb7953767d4fac4baf7d9c2b00b973032dd6e3069f6953d0e197e1081e320f41a75278791d12530ce144de62bd768c4d169ad91f94a12 SHA512 37c5b8b56343b14eaca7aa6df41e54746841602f910cbb992689d74f9d4b4d5476449ee2fb21dc91424270acc41816b3d452c3e59663d136c7d07126fa596f93
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
new file mode 100644
index 000000000000..70a68e865b0b
--- /dev/null
+++ b/x11-misc/rendercheck/rendercheck-1.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tests for compliance with X RENDER extension"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+SRC_URI="mirror://xorg/app/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 9fe1e1d920c5..a81788a12bdd 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -5,8 +5,12 @@ AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db
 AUX sddm-0.17.0-consolekit.patch 1192 BLAKE2B 1ab5dfb6995fffa033990380c2a82baaab77de8f95c9b28b301b7e6e4db0de0dcbf84e0767fc404d75361d6171c566c9c44cc52c741f884fe7cfc93f53d42b9b SHA512 f05b88d8faf63dc492e0177cc1f7296074738470172fbf9b97929a035fecc4116388d839a8ec504a02008a3f14be1a4780f8796e3dec2269ef8d59d96282a7f6
 AUX sddm-0.17.0-logind-race.patch 944 BLAKE2B b92897b1d1de88de5f6edf9862221bfa56c1d5294177651431099dd09c25435037e03095ec2fb3f776cb190ca16808a9caea35282045ca9e353176dee75883b8 SHA512 4e4c388529dc898da2b8983f46e809bc2939cef02d4aa605761cc9978b4946121cd2d949353bed3d19a14cafd1628fdae3eb928dd56f81ddc976005cafb4a939
 AUX sddm-0.17.0-switchtogreeter-r1.patch 1891 BLAKE2B 1d06c1fbca6d7c0af8bfd4cc0f4cdd1bd1f60fff32626fe74763bd6c3a3cff30d13588471ae3377db8b272233592250079dfec2150e62f30f2ba385451044701 SHA512 c8c1f11b82521343422e1d792c53ad2a9f101210df5e2bbd4767c1c5d7ef637d750fcc8e9e00544f8260c522d7a8463e2b1f4996c611accd0b66a73fae4b5232
+AUX sddm-0.18.0-Xsession.patch 606 BLAKE2B 0af5d0d6b8da47ead31b14ee6e21dc05e173765b64e74332c01bed2d44e6e5f3d3d67166cb460ffbbdcd0cae41d15883a9c4385b2ed242b858f337baa4e3f614 SHA512 19921eea20964f8f697e7839ce58c63412034ccae6db7d4acabddb5ca43523ccacaa8ba10dfe221d3241eeb5fa0f9ecbd205f10025afde4dc48d4106d38d140f
+AUX sddm-0.18.0-sddmconfdir.patch 1894 BLAKE2B aef497f08bd11c4fa4fdfe584b73b69192b875fde9050dbb39d6a0b1924759fedd5c50ed4fa54316f5cc9bb25c667c96eaaabce60d2acd826a4fb0bda2bb7495 SHA512 ebfb026ffca4f450005ecdc64c816720b0714ffcec7c03316148c7835919f01bb47c4c6e5041fcdbb271b70b38de99d74d959fd94b6c30b415159035b0d2b784
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
+DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811 SHA512 474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
 EBUILD sddm-0.17.0-r4.ebuild 2372 BLAKE2B b17f693274d6d62724fbc42fe06b84bb9b35ecf0104a55d3ed6b3d9731520a7a1c498ab4179d7fc57ae54350a310527531c86c5aa3d13325aadba6c3278d675f SHA512 1bdeea78d6c7af3353a5aef8f1785ff239bd11d1984fabbdbc6495900c1b8d80e12cc1f7b6d0a9dd8fd6630d7f43a91f3a0ed62af3a0e214e0ace34266c05b37
+EBUILD sddm-0.18.0.ebuild 2784 BLAKE2B db107f3297c1de6e961945c3a089b51f86851cc5709a684b1e7d1cd6e04b987fdb0f1d35ab33fabbe5f44a501271dfb487377e98b08f1dd6f6b022cc5e15f1b7 SHA512 fea821e49f0a0c89c4e6289206a334737a5b63cf18dd2a02c9170b5a1657e417200ad686a5323d8ff4b9013c7235e0c5739457e1baf52e7460e94f45301683e9
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
new file mode 100644
index 000000000000..41c813a06645
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession	2016-08-28 14:52:04.910181422 +0200
++++ b/data/scripts/Xsession	2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+     ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$*" ]; then
++if [ -z "$command" ]; then
+     exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+ else
+-    exec $@
++    exec $command
+ fi
diff --git a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch
new file mode 100644
index 000000000000..9d8f2b545a1e
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch
@@ -0,0 +1,32 @@
+From 300078995ae82495cf09a0646a07e0214f0ae030 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 21 Jul 2018 22:41:29 +0200
+Subject: [PATCH] Change location of sddm.conf.d to DATAROOTDIR
+
+/usr/lib is not a location that should be hardcoded - depending on
+distribution and architecture this can be different. So far, SDDM
+does not use this path unless the above conditions happen to make
+it coincide with the install location of its Qml modules.
+
+DATAROOTDIR is defined as: Read-only architecture-independent data.
+This seems to be a better fit for a system SDDM default config dir.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8500c65..5150b7d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,7 +184,7 @@ set(WAYLAND_SESSION_COMMAND     "${DATA_INSTALL_DIR}/scripts/wayland-session"
+ 
+ set(CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
+ set(CONFIG_DIR                  "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d"      CACHE PATH      "Path of the sddm config directory")
+-set(SYSTEM_CONFIG_DIR           "${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d"      CACHE PATH      "Path of the system sddm config directory")
++set(SYSTEM_CONFIG_DIR           "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sddm/sddm.conf.d" CACHE PATH      "Path of the system sddm config directory")
+ set(LOG_FILE                    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log"  CACHE PATH      "Path of the sddm log file")
+ set(DBUS_CONFIG_FILENAME        "org.freedesktop.DisplayManager.conf"               CACHE STRING    "Name of the sddm config file")
+ set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"                  CACHE PATH      "Components translations directory")
+-- 
+2.18.0
+
diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
new file mode 100644
index 000000000000..e182c1901907
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.9.4:5
+	>=dev-qt/qtdbus-5.9.4:5
+	>=dev-qt/qtdeclarative-5.9.4:5
+	>=dev-qt/qtgui-5.9.4:5
+	>=dev-qt/qtnetwork-5.9.4:5
+	>=x11-base/xorg-server-1.15.1
+	x11-libs/libxcb[xkb]
+	consolekit? ( >=sys-auth/consolekit-0.9.4 )
+	elogind? ( sys-auth/elogind )
+	pam? ( sys-libs/pam )
+	systemd? ( sys-apps/systemd:= )
+	!systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.9.4:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-5.9.4:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
+	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
+	"${FILESDIR}/${P}-sddmconfdir.patch"
+	# TODO: fix properly
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	if ! use test; then
+		sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
+		cmake_comment_add_subdirectory test
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PAM=$(usex pam)
+		-DNO_SYSTEMD=$(usex '!systemd')
+		-DUSE_ELOGIND=$(usex 'elogind')
+		-DBUILD_MAN_PAGES=ON
+		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
+	local confd="/usr/share/sddm/sddm.conf.d"
+	dodir ${confd}
+	"${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
+		|| die "Failed to create 00default.conf"
+	sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
+		-i "${D}/${confd}"/00default.conf || die
+}
+
+pkg_postinst() {
+	einfo "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
+	einfo "Use it to override specific options. SDDM defaults are now"
+	einfo "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	systemd_reenable sddm.service
+}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index c4beb7440475..999ebeba5bb9 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,5 +1,7 @@
 DIST util-macros-1.19.1.tar.bz2 83274 BLAKE2B 014cf10cb1389809c4de793d28aa7941403734bc0abb28d920b22be3f05b7597a7106d716b0f3b5de5dc945fa23095dfd032e103711dbcd0711b8634a5153b7e SHA512 d69a415d5922f072bab1ddf8984c98bc349a24ffc7a60184320a12992a76b04d7cb773b426b1a7000e6dc7983d59df51bbc8f2ff25273d63e4e238b4cd91eb38
 DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
+EBUILD util-macros-1.19.1-r1.ebuild 701 BLAKE2B c8718b974072425244c92bae1fd5082cb8a7006af17218cd19659c38907d995da94d08fc512e52dbd9eeb7bac7103e3bafb2b6ff712cf9dc6921aee186c5ee06 SHA512 5ba39f90314dcb22b4a873915e1d953e8ef185941dfb5b9c9ef7b2e7f6807f7f39606750968961a805a8f2e83d4ca7e0d8d50035f70af91a412c1aee73eeb5a0
 EBUILD util-macros-1.19.1.ebuild 483 BLAKE2B cf7ad79fa74ce7a9f3d50a4f4981970d85e11029bc2d05a1f2d1ae3964088255bbbb14aa99339e6055d093a698191c73876d2c2379064df2936b7e2e1b6689a3 SHA512 6107a49a06da5d5f508528eb4d0cb92559e33f0944f690bbf412b0858f3e2d6629c2a2286ae521b55f769ab69d0338873be05182a55d7a44fcf9d357ead14c64
+EBUILD util-macros-1.19.2-r1.ebuild 701 BLAKE2B c8718b974072425244c92bae1fd5082cb8a7006af17218cd19659c38907d995da94d08fc512e52dbd9eeb7bac7103e3bafb2b6ff712cf9dc6921aee186c5ee06 SHA512 5ba39f90314dcb22b4a873915e1d953e8ef185941dfb5b9c9ef7b2e7f6807f7f39606750968961a805a8f2e83d4ca7e0d8d50035f70af91a412c1aee73eeb5a0
 EBUILD util-macros-1.19.2.ebuild 482 BLAKE2B e4d3f9ca69f9f0a76a8e08c0afcb4a673cbbfdd38c7ad2ebe73104cae39f4c84d63c72c4de0e3e68ad5d146b313322b20967416f7922718f973ada9d90115284 SHA512 79d70e4ee32a706daf0884a5839fcec36b63ea49abe7b9da80e56b445af32d8c288170ceee9179cd70a57bafe20afb8cf9f3b5376aea57a980a345b504d904fb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild
new file mode 100644
index 000000000000..dd326f167cc6
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org autotools utility macros"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
new file mode 100644
index 000000000000..dd326f167cc6
--- /dev/null
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org autotools utility macros"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+SRC_URI="mirror://xorg/util/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/winswitch/Manifest b/x11-misc/winswitch/Manifest
deleted file mode 100644
index b584463f0926..000000000000
--- a/x11-misc/winswitch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX winswitch-0.12.18-PIL.patch 2481 BLAKE2B 4f4d3a86986c3e37dea9658164c4450dadcd45be740ce2f5e04241a542e8ba30715e23fc89b6f053f13a02bdb03dd301da3fcdfdf856353ea592755b2540c93d SHA512 fca8d822537da67b753142a2ede895b5e6a49f2c5625b8cc80de2637f355d43cdf0a9a9973adfa0ae83ae70b213a96317ae7e4ac21cdf9b6ccd2295c0dd519af
-DIST winswitch-0.12.18.src.tar.bz2 1193952 BLAKE2B f9da52da90f10f1d623d66d6469f0a995316e45fa1fce3e21945579592b7da914a0dc2b86b80afb5f0a72d48a8d8897d06659d4ffffa3366ff0ebc0b03ecbb74 SHA512 841d269119ab3118acbbd7ad1c2d27203b45a72213fd9e8d75d937224d973e78110a05e5772a3856a3f3c9440633b200c7a0eab67a3d5b0125de22f33084819e
-EBUILD winswitch-0.12.18-r1.ebuild 1287 BLAKE2B 31135ab08a0f75725cdb6e42790bc888a3f5b7481372b5eb31a1c5bfc127fd9224829d6bf5233e9ac5531604453280cae259e02a18624955fbd977026360b470 SHA512 270f0eb74495fa062f9a32e34bc882f0a9d3ec38d83f6689a84011a73e545b42dc2c116c3f7bb85388cd3205a562282a76218904d692fea2b20dfc4c7069e945
-MISC metadata.xml 374 BLAKE2B a62f43183802266562c694e5ae4b94a917a91f12ceb5b85ac95b00e79394fe137800f04d1eb5f989b8c152a92fd8c48b0394e7e2388e602437d9d7c163174a1a SHA512 fb37c9db3fe38df1a05bd09ef5e86c0bcc5cd41a9081ec81ee33f6b827be6d19c6d4836650f19d893927cbb602d4b7c90de73d8a75a64ef64bcf86af38f68131
diff --git a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
deleted file mode 100644
index be6484dd1084..000000000000
--- a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471564
-https://winswitch.org/trac/ticket/238
-
---- winswitch-0.12.18/winswitch/virt/xpra_client_util.py
-+++ winswitch-0.12.18/winswitch/virt/xpra_client_util.py
-@@ -95,8 +95,8 @@
- 		widgets = []
- 		has_pil = False
- 		try:
--			import Image
--			has_pil = Image is not None
-+			import PIL.Image
-+			has_pil = PIL.Image is not None
- 		except:
- 			pass
- 		jw = self.get_encoding_widget(server, server_command, options, change_cb, has_pil)
---- winswitch-0.12.18/winswitch/ui/capture_util.py
-+++ winswitch-0.12.18/winswitch/ui/capture_util.py
-@@ -125,16 +125,16 @@
- 		#resize it
- 		img_data = load_binary_file(self.filename)
- 		import StringIO
--		import Image
--		image = Image.open(StringIO.StringIO(img_data))
-+		import PIL.Image
-+		image = PIL.Image.open(StringIO.StringIO(img_data))
- 		self.save_resized(image)
- 
- 	def save_resized(self, image):
- 		""" save a PIL.Image after resizing it to thumbnail size """
--		import Image
-+		import PIL.Image
- 		(w,h) = image.size
- 		w,h = self.get_thumbnail_dimensions(w, h)
--		image.thumbnail((w,h), Image.ANTIALIAS)
-+		image.thumbnail((w,h), PIL.Image.ANTIALIAS)
- 		image.save(self.filename, "PNG")
- 
- 
-@@ -190,13 +190,13 @@
- 
- 	def	do_capture(self):
- 		#force py2exe to include these:
--		import Image
--		import GifImagePlugin
--		import JpegImagePlugin
--		import PngImagePlugin
--		import ImageGrab
--		assert Image and GifImagePlugin and JpegImagePlugin and PngImagePlugin and ImageGrab		#avoid pydev warnings
--		screenshot = ImageGrab.grab()
-+		import PIL.Image
-+		import PIL.GifImagePlugin
-+		import PIL.JpegImagePlugin
-+		import PIL.PngImagePlugin
-+		import PIL.ImageGrab
-+		assert PIL.Image and PIL.GifImagePlugin and PIL.JpegImagePlugin and PIL.PngImagePlugin and PIL.ImageGrab		#avoid pydev warnings
-+		screenshot = PIL.ImageGrab.grab()
- 		self.save_resized(screenshot)
- 		self.finish()
- 
---- winswitch-0.12.18/winswitch/util/icon_util.py
-+++ winswitch-0.12.18/winswitch/util/icon_util.py
-@@ -27,7 +27,7 @@
- 	HAS_CAIRO_RSVG = False
- 
- try:
--	import Image
-+	import PIL.Image
- 	has_PIL = True
- except:
- 	has_PIL = False
-@@ -58,10 +58,10 @@
- 	return	scaled_data
- 
- def pil_load_scaled_pixmap(filename, size_limit):
--	img = Image.open(filename)
-+	img = PIL.Image.open(filename)
- 	(w,h) = img.size
- 	if w>size_limit or h>size_limit:
--		img.thumbnail((size_limit,size_limit), Image.ANTIALIAS)
-+		img.thumbnail((size_limit,size_limit), PIL.Image.ANTIALIAS)
- 	assert img
- 	return	pil_image_to_png_data(img)
- 
diff --git a/x11-misc/winswitch/metadata.xml b/x11-misc/winswitch/metadata.xml
deleted file mode 100644
index 54d7be4f1121..000000000000
--- a/x11-misc/winswitch/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
-<upstream>
-	<doc lang="en">http://winswitch.org/documentation/</doc>
-	<bugs-to>https://winswitch.org/trac/report</bugs-to>
-</upstream>
-</pkgmetadata>
diff --git a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
deleted file mode 100644
index 290afbeebc97..000000000000
--- a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="client server tool to start and control virtual desktops"
-HOMEPAGE="http://winswitch.org"
-SRC_URI="http://winswitch.org/src/${P}.src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/gst-python:0.10[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/twisted-core
-	dev-python/twisted-conch
-	media-gfx/xloadimage
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-misc/devilspie"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
-
-python_prepare_all() {
-	einfo "Remove bundled Vash"
-	rm -rf skel/share/Vash || die
-	export PREFIX="${EPREFIX}"
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	elog "You might want to install following packages for additional protocol functionality"
-	elog "    net-misc/tigervnc[?server]"
-	elog "    x11-wm/xpra[?server]"
-	elog "    || ( net-misc/nxclient net-misc/nx ) "
-	elog "and net-dns/avahi[python] for automatic server discovery"
-}
diff --git a/x11-misc/xbitmaps/Manifest b/x11-misc/xbitmaps/Manifest
index 552392e9ad32..50ddd55647d8 100644
--- a/x11-misc/xbitmaps/Manifest
+++ b/x11-misc/xbitmaps/Manifest
@@ -1,5 +1,7 @@
 DIST xbitmaps-1.1.1.tar.bz2 113346 BLAKE2B 2ecedf3208ca8d5e4802bccae0316e0dcb5ad9b1efede1ace2348779797f29adf6aa6b173fae4874cf7ab73341f87af0bdac645a9e378c8946fbd941739fefd3 SHA512 172a74014e699e5f295ae726a77f1669baf4ac00d64a138b77e5502102b2a02c10127f35ccea5b6af5479d17f60a6bb63ac0f943fd071ab8b396d43ef314ae61
 DIST xbitmaps-1.1.2.tar.bz2 129435 BLAKE2B eff2f1e2efbabf447cbe98db09f81db96dc1442d4cce01b570774fb4e3e7323a40385d7821685724a9d9c69219528da980b2ecf01b0d3b822be8879e4d7f3e9c SHA512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d
 EBUILD xbitmaps-1.1.1-r1.ebuild 469 BLAKE2B 14ff0927ada1adf936c496bc6c8168f8dd9476db1407da50742e814ffbdb0ce57e11c16e40a9d64c5b07e9014c472aa06a80dca58c470df6f6a1babba5aba497 SHA512 00b7997e9722f3fffca67a76590239658e8c3cb1d42f173e055608b0eaae0f81fd0978bfb95b2017df2a15d05efd2f08c2807a32269cc33c1443b3c6190f75c4
+EBUILD xbitmaps-1.1.1-r2.ebuild 695 BLAKE2B ba6250c3fda4dbd97bfa09508236e10f833f51f390762d2a0f41037289502c83fb4f377c4a0ea3035cb666042065950e33139044d0dcb94046e1b47fa6505476 SHA512 c0f9138fb2b647814655dc6da56cf8a05ba2a00da66ed91ecb64d36550c21e4484dc271127ba3a0369114d6bb8da7e0c8ea89ba8c4ccdf95474183ed2497313a
+EBUILD xbitmaps-1.1.2-r1.ebuild 695 BLAKE2B ba6250c3fda4dbd97bfa09508236e10f833f51f390762d2a0f41037289502c83fb4f377c4a0ea3035cb666042065950e33139044d0dcb94046e1b47fa6505476 SHA512 c0f9138fb2b647814655dc6da56cf8a05ba2a00da66ed91ecb64d36550c21e4484dc271127ba3a0369114d6bb8da7e0c8ea89ba8c4ccdf95474183ed2497313a
 EBUILD xbitmaps-1.1.2.ebuild 468 BLAKE2B 082f551bc0bb00732046acecbfee1c58d01a6051889fa185a49080bc967fc04db58fc55f642dcddb6ec26f4a5d1d60086a673709794b4c8709d86d74a0c5a218 SHA512 e42d3550476b545670a5b65f10d12a85779e5d2674cfa9dadb78f0520aababb8c2343e5b38e07b1d9742319ff7735045a2737452ef1e6955155ddc735e2db8c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..a6d6551cdbef
--- /dev/null
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org bitmaps data"
+HOMEPAGE="https://www.x.org/wiki/"
+SRC_URI="mirror://xorg/data/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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}"
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..a6d6551cdbef
--- /dev/null
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.Org bitmaps data"
+HOMEPAGE="https://www.x.org/wiki/"
+SRC_URI="mirror://xorg/data/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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}"
+# there is nothing to compile for this package, all its contents are produced by
+# configure. the only make job that matters is make install
+src_compile() { true; }
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index e1c12e5a210f..ac0363459a9f 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,3 +1,4 @@
 DIST xcompmgr-1.1.7.tar.bz2 136667 BLAKE2B 3231cca0cebc13aade6f008414d77461913d274303289c28b8eb366640905cf9bbb4715d5aa7ad8eb897ac94db099b040e408b2e3867dd2ad46940b3bcfe518f SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c
+EBUILD xcompmgr-1.1.7-r1.ebuild 911 BLAKE2B 697a60c13fc12819fcd418e2b39325d2ca4b85a896296413144a195fcac821a40cf777096a8c041fe2884981ea9ba7e2aa6c9cd02640daa8acc0a2f3a096aa99 SHA512 6b9658a761f2b2ab10a60dad9a0b7345e569cac84ae158f339718455a2caa5449d8f435a8c887a8ec74732a2304756a1f706c76692021795c867d0a68998769a
 EBUILD xcompmgr-1.1.7.ebuild 500 BLAKE2B d0876987205a64069657b80700578fc71c137f75a73b12034d1e2bb442eec8088682884c21a6b3cfaa353f7b903a7df22712fa3add2f30ede15a27c09565b7f9 SHA512 5e62cbc526635fff3dc68f8a0b038ed0e8197e675ffec37a3abb8ab8aed8666e0e5ad35522e8e6852ba1ac99bc5a42aec4a417d1a68a5aafbdefe5026a9b4aa3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..c271eab9415b
--- /dev/null
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.7-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X Compositing manager"
+HOMEPAGE="https://freedesktop.org/wiki/Software/xapps"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/app/glxcompmgr.git"
+	inherit autotools git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/app/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXext
+"
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 0e5c41edcd37..0e98fb805615 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -2,5 +2,5 @@ AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12
 DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
 EBUILD xdg-user-dirs-0.16.ebuild 958 BLAKE2B 8bc39473a803fbdc008203ac14d524b3052920a2477dfcbcaa152ffa229712a149f5f4653817482582bd0a69677e49c70ba7ae0d22605e6c483a01d0126f7d0c SHA512 b3bd6a03aa1a11cfb3303cd94c3409d9b4dff9507015a014c60b4e35905d42b3679d1d02d8ad2e31d15bbe80760cd454e0e4f178e56e4eab220faad783398c37
-EBUILD xdg-user-dirs-0.17.ebuild 961 BLAKE2B baa93c93a02bdfc6096588aa48ef2b18bde35322118e10f87b0c7d49ef68fc9fe95d52dc1241f47af03b6cf8c0aaf2ee39cff8935fea475356613399469b4f1c SHA512 062e1da4f6e06e9b8377b98f158602cc408732b3796368110f02a7225fe65304212639ed2e0bd458cbcd61ac52319191b847e46c50b7f478c92fb500f6bd9e18
+EBUILD xdg-user-dirs-0.17.ebuild 958 BLAKE2B 9e7803c311d8af146e587079c29655213ed46f77f0f69488f208ad0ff8f786688172c3cd400ae552299bef2a0917301e961862fa1be4883bee82007fd73ab157 SHA512 26b9143f2464459b31bda07c382c341b4fe86f866410dab2bcd9df901149c7788790a14ff027d44ee21b271d026d654f684a8128200808413a68bbd3cce2f301
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 9dc4570f7d8a..bda8f32b740f 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1273659bcc0e..11857aa2ad50 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -2,5 +2,8 @@ AUX xkeyboard-config-2.23.1_fix_typo_in_polish.patch 609 BLAKE2B cf0dd9cabb3195f
 DIST xkeyboard-config-2.23.1.tar.bz2 1053991 BLAKE2B c5551eb39f4cb240d36943d1e2fd3f9156bada61bb33013f6c43d036fb55aef5332fdb133ab6cfb03ebdbc68dcb3df7d974e3972904936b1e6dd89eafc4ec647 SHA512 d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba
 DIST xkeyboard-config-2.24.tar.bz2 1057889 BLAKE2B be9c6e0e0885c8a40406b3cf761f854268026084f2025a1a9f3e0326570543dd7fa11a2355947da1018d35af2ab4818092abbef5b7bdc3da923fcfe65059977d SHA512 96b65d18a85443a9bf93d65a4423da6e2b3d44882dae6a03bf46768a92017e9762cf3721361ba399c2873d53782944d0292eb673484f1cd8a8bdbf643e7a1dc0
 EBUILD xkeyboard-config-2.23.1-r1.ebuild 1143 BLAKE2B aa3ff040bb72dc32bf836bc6b9411ecf5584de9bf3b7a2e25648a774fee753ad0a8773410219519ba41bab934852afc9b430829c2a664281c9038fec515c3cd0 SHA512 178632a8720598205c048a08d7936fd45bc3c3151c9563ba74df8453c0316f873615f3c97ec52592db091c154f4e3d331badd092602671f14a1706fa0a46155e
+EBUILD xkeyboard-config-2.23.1-r2.ebuild 1290 BLAKE2B 198eb2114a709458bcd0d2d6b5bde150ff10f13a7507449b0176f0053a03cc770ce456eb9bfce7870b82c5e531c8855912d7fb104a47e6376e1677e030a40c2e SHA512 ef6839dc36403e36ceb4544ac06dbaecdde1a77e99c20dbfe21055c95e7a83d508889121199a8882d5e2ce5c8fbd96a50a768b3d7a9e0ed421a7886c6d78490e
+EBUILD xkeyboard-config-2.24-r1.ebuild 1232 BLAKE2B d1e025602139ba5d29d916253a8de3e7450268e21656d8357447ec79412f9e648a9f07bfa06dbae81ce7c7f983e68af70dc71cda4dc023af26dfc64e5dd7bd37 SHA512 659dc8569fb0dfb9f47e002bff7528f4ec35a26b44a6ec793b6d90ae98feebebe79b9cd753fd4a5e00bea842109310ff7b650d1aadbb9be0d69e5625cd7d02c3
 EBUILD xkeyboard-config-2.24.ebuild 1095 BLAKE2B 5ff0f206560806df10edf855cf7d81bb94bca1e13d779219f3564d315aa557772054de31ed1f661c89b8793ec44bce2d02304f9ff2f270b7ca1274688a16d5a5 SHA512 f7bdf5f231a033420eac29903ae03936fcc11568bbfd92fd01c803ca5bcf7d4c9cd947a371b6634e78c437108200d7bce8ef7b953a82d8b3ec20f7551683da70
+EBUILD xkeyboard-config-9999.ebuild 1232 BLAKE2B d1e025602139ba5d29d916253a8de3e7450268e21656d8357447ec79412f9e648a9f07bfa06dbae81ce7c7f983e68af70dc71cda4dc023af26dfc64e5dd7bd37 SHA512 659dc8569fb0dfb9f47e002bff7528f4ec35a26b44a6ec793b6d90ae98feebebe79b9cd753fd4a5e00bea842109310ff7b650d1aadbb9be0d69e5625cd7d02c3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
new file mode 100644
index 000000000000..c462673ea04f
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.23.1-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_fix_typo_in_polish.patch
+)
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
new file mode 100644
index 000000000000..0f57cc43593e
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.24-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
new file mode 100644
index 000000000000..0f57cc43593e
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 346449237099..2ff69a183532 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,5 @@
-DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf SHA512 61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6
+DIST xorg-cf-files-1.0.6-solaris-prefix.patch.bz2 4364 BLAKE2B 219911bf7fb6907762b70062c43842f116bb0c8ff033569d3a033918b004d89514eda43d1f478c7f0dc1b18adb17f5792990cc8d15cb9770b57e555c0b362f10 SHA512 159d55da274decdac934cded63f33164f5866dc81e853b1a205abdbe56fba4099ab4278e2fb5ff855c0b76784ba2b3fa89e6db2b4fdc9647111698e2c77da4a3
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6.ebuild 1811 BLAKE2B 0e2c01b59de28939f673cbec97fdec31fe6cc08a7282514c37b0ec8afc5a69a0e1f5dab52cb0660f16d06ff8789cca5bf60ffdc2761c943b246ac0e7ff5a347b SHA512 fddd89a739952d67d7318bcb38af5d0cdab137cb71704661edca19cb90a1558f4c2615d133d9948dfbb61ef19cc4570cb1e6e48edf981000510565dca1b002c9
+EBUILD xorg-cf-files-1.0.6-r1.ebuild 2124 BLAKE2B 77067b06822ad02c0630b91d356639f3264b33335cd730d3383c25e74ba97098fa5d8be42bdc3756ecaf441c0bb6e4674d703d06e79b2a059b4ef5576df81865 SHA512 51a4e8891cd6b4af1139d6ce1cf3ceb596a858100d75e2bd772189191596b0ebc62175ae2c2076122187bafa4692807e0b67cccd59b1d0b288100943ebff312c
+EBUILD xorg-cf-files-1.0.6.ebuild 1818 BLAKE2B a0eae43ec7b013ab501284e88729aa0132add4b6f544aa9e26b62719d69332c5a98573e1cfe1354b74821fef4489579c136687f0ce6663d0a7bc398567af8836 SHA512 f116901238eeea9e4add4db55174f321acaa63743b3c4b884d1f5469aed4a1761515448a0765b1eb7b6ae63b19f110f8de93dafb0fa330419b5db81a5d19391a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..0ea092a0e0b4
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Old Imake-related build files"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+SRC_URI="mirror://xorg/util/${P}.tar.bz2
+	https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+	app-arch/bzip2
+"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
+)
+
+src_configure() {
+	local econfargs=(
+		--disable-selective-werror
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	echo "#define ManDirectoryRoot ${EPREFIX%/}/usr/share/man" >> \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/host.def || die
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX%/}\2|" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+	sed -i -e 's/-DNOSTDHDRS//g' \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" \
+		"${ED%/}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index 2c4b306c33d3..76edd0242ac4 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
-SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-1.0.6-solaris-prefix.patch.bz2"
 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=""
 
@@ -14,7 +14,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${WORKDIR}"/${PN}-1.0.2-solaris-prefix.patch
+	"${WORKDIR}"/${PN}-1.0.6-solaris-prefix.patch
 )
 
 src_install() {