gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /x11-libs
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
47 files changed, 465 insertions, 702 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 946b69277c84..04b33231feeb 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
index 0574f2101098..e3305848f769 100644
--- a/x11-libs/agg/Manifest
+++ b/x11-libs/agg/Manifest
@@ -22,6 +22,5 @@ AUX agg-2.5-pkgconfig.patch 387 BLAKE2B 7f0034bf791618bf3fdc59ec60210732f582b54d
 AUX agg-2.5-sdl-automagic.patch 811 BLAKE2B 9cb34b0efc6980b5269f6d82e524ddde3557b11e369bcb5e351b4b7d814d92a52bc13cd9a1b85487ce9d3d42b897712e93fdb17fa191e0f8850160402acaa415 SHA512 11166f6b8ca9cdaef2e510c7752c643ee6c7a56051c6214111e56dd0274f2e0023be073014a806ecf9ffc086b1436adefd04b563fc82cdd53f9910d281fe2b8e
 AUX agg-2.5-sdl-m4.patch 6797 BLAKE2B 1050aa706618ad34f03d437105449b071478b37655b6799be0258fb5afe27238dfbd029aae77e339847372a97ab99946078a677d691895e05a046389e618b3d7 SHA512 880594c3ea43846e79529444608301b323acbec4dc1bb883880ae4610f8041e95ac31743f0edd042be7d70d36928295b571265910e9342f2538ee68e557406bd
 DIST agg-2.5.tar.gz 564313 BLAKE2B 6451688dad51fe9d0433218109fd555fcaea3dd5933ebb13bc5c6d935640885f007b5dba8607cf45c94f58f0974391ca4fcd2ea9fda954334c8a4309b881d994 SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf
-EBUILD agg-2.5-r2.ebuild 1414 BLAKE2B 34d9946175b2dcea675588fc74597f4e87c8e2b1f270657f49811afaac08ce9ccac721ab7f21a401c0b683209117436f9aa127fdd1b3bc7a9b5975ff9f71f482 SHA512 5d0f131ccb63c448e1a767b206f3bb98a86dfc1705962455b31a409d15edb151cec991d01b7395c7285642676f9e85eb91ed633166eb8076dded576c3708ff7d
-EBUILD agg-2.5-r3.ebuild 1347 BLAKE2B ffc1e449b15e237ae544c5d85ac1e6b9806e897cfec021406865474799f773f22772ce4227dd979a3f6f51e8ecbb39b73f88a8b4a23c109454866f17cbda6545 SHA512 deb1e61acae6a43f9a205d0fcd6192b339c3c5f6475e0c584bb9f479926a7d3ce330241293f084e276c2cbe47f1a0503b4f9d29439b86bb594eb2ff527571b00
+EBUILD agg-2.5-r3.ebuild 1346 BLAKE2B 2385cb5a987a8ed519eff4aaf00c846985ede913b49a7d9334a18772842a2baf1d5379dcfab16cc304cfb5b77606dad25f02fc1c252789d6a38b84433fc69e7b SHA512 8c572853428ba46d2c3048997e66a5348dd3d0b1b1fd6c29f801ace6e546cc5fe193f263981c868334e36a88bf05d99ce440b63cdebb961191f47eef100e593e
 MISC metadata.xml 335 BLAKE2B 4f8f3f570b1640e3dd48210e17eba5e9e0749313f4ba21d1d2f2565d8dbb2a7ec16ad73852ddeb0dd11f25887319bbbc44b9bc1c7397e02e43c36123789d186a SHA512 014f102fc0a515f69a841d11f7485287fe7fd4c4b44f33ea972813879d20e6c26d0ff2146268caf7332219055f6c968feb5d59951ee2c0e3e4a439c8f7fef68f
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
deleted file mode 100644
index 8228f01acbce..000000000000
--- a/x11-libs/agg/agg-2.5-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools base
-
-DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
-HOMEPAGE="http://antigrain.com/"
-SRC_URI="http://antigrain.com/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="+gpc +truetype +X"
-
-# preffer X with enabled xcb, really
-RDEPEND="
-	media-libs/libsdl[X?]
-	X? ( >=x11-libs/libX11-1.3.99.901 )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# taken from debian
-PATCHES=(
-	"${FILESDIR}/${PV}/02_maintainer_mode.patch"
-	"${FILESDIR}/${PV}/04_no_rpath.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	sed -r -i \
-		-e 's:^(.*)  -L@.*:\1:' \
-		src/platform/X11/Makefile.am || die "Failed to sed"
-	# fix building against automake-1.12, bug 420701
-	sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# examples are not (yet) installed, so do not compile them
-	# sdl is harddep only sdl-tests are optional so we enable them anyway
-	econf \
-		--enable-ctrl \
-		--enable-sdltest \
-		--disable-examples \
-		--disable-dependency-tracking \
-		$(use_enable gpc gpc) \
-		$(use_enable truetype freetype) \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc readme authors ChangeLog news
-}
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index a8beefe015cf..98492c566a25 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://antigrain.com/${P}.tar.gz"
 
 LICENSE="GPL-2 gpc? ( free-noncomm )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+gpc sdl static-libs +truetype +X"
 
 # preffer X with enabled xcb, really
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 0b558bcc7ca6..69cc01ec45d1 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,8 @@
 AUX cairo-1.12.18-disable-test-suite.patch 390 BLAKE2B 49db479ddcb636e80483357b291d66ae563d8dfeabde2f7b017fda4cb272cee856e9d29dfddcc22e3cfcb3e2ff62c9eba802ace0e5ef1e49aeeef26002482ec9 SHA512 097c1a32e007fb6852a0df1ad7f7eab6d00a422247055edf140d3f2b819122b16a9c09e21b9a601766a7facda1961262e68b078944877cab0b3b234eff149783
 AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0fd4981a07a25122387c2f1b6ca4cd89a830360357953706dee62e4233126cd0630e4622f0682f6782cd27fa31f20ecc SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
+DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 SHA512 9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
 EBUILD cairo-1.14.12.ebuild 3761 BLAKE2B f17fc603afc4bc9e29963742340ec1327d437c47d241e4311cffbf65018ee7acee099a3b921a0676abf2b712fd9f0f334f8906ea0a02125f00b330e08358b423 SHA512 da0960521e98184c23bb6d141c511f8de7ba01b42fac8634e18cc4ec32682188451f360fd1049a1097c3d0fa191021f6d346f20636fe2f7829e621bc68e3bad0
-EBUILD cairo-9999.ebuild 3821 BLAKE2B 0c45341a0bdcdef51cdf6e1f92341f9bc79a3a65a10e3f2b22fbf16b510e35f5d02f549d8293faaf92cb92d0d9bd37606bb1bf04b67c82aeb5ced3e00ed4b5ea SHA512 65feac02926e14ffc8432ba7379f3e767f05baf2278c9bcdfb729aa48981cfb2710789d5a4319489533ef4f945b72d5356ece9d7c94fc8b2db195c35eeb15850
+EBUILD cairo-1.16.0.ebuild 3676 BLAKE2B 4197653a25a3b25f78219c60823aebb1289855677210de6aef5d35477898fe8070cfed51d1016d8fc11e72566f38c5a77f066a20f261070d2f966bbf544ce604 SHA512 327c358eb5fadf96dd2bca519b9cf73ceef6c12d1dea362efee7c721c9163aa60ced0d312d106a9d2890f1a9de24abda5eeed41902d8dd985374f6b7be846502
+EBUILD cairo-9999.ebuild 3676 BLAKE2B 4197653a25a3b25f78219c60823aebb1289855677210de6aef5d35477898fe8070cfed51d1016d8fc11e72566f38c5a77f066a20f261070d2f966bbf544ce604 SHA512 327c358eb5fadf96dd2bca519b9cf73ceef6c12d1dea362efee7c721c9163aa60ced0d312d106a9d2890f1a9de24abda5eeed41902d8dd985374f6b7be846502
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild b/x11-libs/cairo/cairo-1.16.0.ebuild
new file mode 100644
index 000000000000..ecceec470191
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo"
+	SRC_URI=""
+else
+	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+	opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+	utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	)
+	xcb? (
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-2
+	X? ( x11-base/xorg-proto )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+REQUIRED_USE="
+	gles2? ( !opengl )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+	"${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+	default
+
+	# tests and perf tools require X, bug #483574
+	if ! use X; then
+		sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+	fi
+
+	# Slightly messed build system YAY
+	if [[ ${PV} == *9999* ]]; then
+		touch boilerplate/Makefile.am.features
+		touch src/Makefile.am.features
+		touch ChangeLog
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myopts
+
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-dependency-tracking \
+		$(use_with X x) \
+		$(use_enable X tee) \
+		$(use_enable X xlib) \
+		$(use_enable X xlib-xrender) \
+		$(use_enable aqua quartz) \
+		$(use_enable aqua quartz-image) \
+		$(use_enable debug test-surfaces) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable opengl gl) \
+		$(use_enable static-libs static) \
+		$(use_enable svg) \
+		$(use_enable utils interpreter) \
+		$(use_enable utils script) \
+		$(use_enable utils trace) \
+		$(use_enable valgrind) \
+		$(use_enable xcb) \
+		$(use_enable xcb xcb-shm) \
+		--enable-ft \
+		--enable-pdf \
+		--enable-png \
+		--enable-ps \
+		--disable-drm \
+		--disable-directfb \
+		--disable-gallium \
+		--disable-qt \
+		--disable-vg \
+		--disable-xlib-xcb \
+		${myopts}
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index cf8db822d91b..ecceec470191 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -88,11 +88,6 @@ multilib_src_configure() {
 
 	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
 
-	# TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
-	if ! multilib_is_native_abi; then
-		myopts+=" --disable-qt"
-	fi
-
 	# [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
 
 	ECONF_SOURCE="${S}" \
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index b94341b1dcb0..e80bab31c112 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -3,6 +3,6 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 DIST gdk-pixbuf-2.36.12-bug753605-atsize.jpg 80850 BLAKE2B 17e414ca097b7aaf513241eacae97c5bc582f7ebd8870e8b67ce4af4e57134b8b4ae0ed579eb4cf0f57db2891e95a673d2129a1bafefe5ab8e2a8dd5f66da271 SHA512 d27197d2395446cd3c970841381958f7eb1b8df78913f7da70bec5f09af6edfc5dd74cd809c37ec8cf69f0eba504e0cc6354f1ec6ce3ec2192ad316cb64b69c9
 DIST gdk-pixbuf-2.36.12.tar.xz 5675768 BLAKE2B da9e18b5dc55ad13a1bdab76d9c63a6233da1b45235ae5eb620e6e3f83888a0cc846f1ba17f72cb3b5af1ccd59a69631b3403bf09e262c53e0149e6f26896a33 SHA512 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
-EBUILD gdk-pixbuf-2.36.11.ebuild 3873 BLAKE2B 4472edbddf2264083f297d8d9afd78b2daeb789300c7a8dbc67f5e2f8342e7b63bf1ff65a7276c89b20d570142deba4a72d7200e5842dd2e5b7f68fa848b025a SHA512 14353cad1704c517110a509d7ac5d85cdca850acda696cb8c6fde5e809f497d8997ca371bfd08c291781c904a28ef08c6121a66d65c3f247f11cd580afe973ff
-EBUILD gdk-pixbuf-2.36.12.ebuild 4060 BLAKE2B b00f4c4ad2602a3bddd23ddd974bbcc5eff20e738b86c260b8b870f4e28ccd4a9ccdb2db0187be40d394a5ef0d028ebbc4c8c0b874d41a9ffc235ddf34eeedc5 SHA512 e32dadce0912058ce4370074332c19f32c54b5ff79a8dbfdac7515d75f5f21df629b3bd9cd15b0ce2fb1d3db56011e960ec51bb358342a135b35e9c128868733
+EBUILD gdk-pixbuf-2.36.11.ebuild 3891 BLAKE2B 04adc6a0d4efe34b9402d3d7464eb03f5082f8cd2aa942b4e8f33476de40bd4455d664768f957f74b28f84e6407fa763db0ee5bda2aac44320d174693cbd62a4 SHA512 037a2b68b2d072603cf751008388dba3011c5ebb5e529a99a71d78746ca354b94445097a047eef5a7d1698662068f26f2c46865d458f695d340e5db2ca4c8dba
+EBUILD gdk-pixbuf-2.36.12.ebuild 4078 BLAKE2B 6bf393a944b47eb42148ffaa01ccf7c37c26e1a71cad50172c72760a8704c1962dcd06bb9a7495045cf1a154babbf6e3827d789c254d8ef9a197525b7931f79c SHA512 3e8bd86c56377db4f648a30000db9f13b56b1a5b0d26bf43427ca7f026cfb41d8d18e6f5c2d2c911ccebaffcedd26882d265a771b666811bfaa9b54692998fff
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 67766b367ca7..5cf84878340b 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ COMMON_DEPEND="
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 4f8ee189a2f4..9778d4bb90d1 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.19
 	virtual/pkgconfig
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
index af6d82e69a8e..cb294b41b50a 100644
--- a/x11-libs/gtkhotkey/Manifest
+++ b/x11-libs/gtkhotkey/Manifest
@@ -1,4 +1,4 @@
 AUX gtkhotkey-0.2.1-glibheaders.patch 726 BLAKE2B 53e4bc2502e6d8dc936bc201335a54a06160d03063a57b27c18800e05cdd2a7b84508b22f7239a26b59ad60fff7f0c1905a8d0de799d580b10ababc0046c5f48 SHA512 32ed2b19a0f61edb877c70353abfd3817c3ca59010efbce6ea7d4332455e0468d527fdb5c8e749d8e6240723063dcff27b5c2589290e40fa08b0f00e0db189d5
 DIST gtkhotkey-0.2.1.tar.gz 382043 BLAKE2B 05ed162cc1eec7e6c981e796a5dca125e5c940c38ed79d67699d7194fce0c77489f3aae9747ae8610c14417b9871859cb5024990f6adb3524e6e14265603a07b SHA512 7f7e1b9bd94ff806d98277f2dafbf5b6569efdc6f0367a83e885d38584a8f6e098f31d0f03b080f2ca76394eb73e43f9da07e0d944a2e6443a55d9f2e8fee324
-EBUILD gtkhotkey-0.2.1-r1.ebuild 991 BLAKE2B cb216bb9910c965c74cf1ea64aa680f49c869e31d86ce97f4b753110657b877fec8b22e84cd50c5fd17b83776710e00aeb07aabbc18c8e75947456b42821ed61 SHA512 ebd0360dc36b47b9079fffb9404dc0114c0e1eb0521aebddb049eea1a573f84b0be843eb63d39208674e0fd6cc985314ffe25f22fde1136c3dc11262abff96fc
+EBUILD gtkhotkey-0.2.1-r1.ebuild 1041 BLAKE2B cf88b914f0091229140f3fdc6fcd5f203400111fabc132eb4c1f16d19fb22335c723616787f68ec3268efaafb9d1a5e62c04fd96e1441a8d8e24a6a56cf28682 SHA512 66ae720ee97835b629692ecb52b6f2bf8a864d2a71e707758bcd6e54591a6f00ec68a68596914ebe7285d3232531f9d747ab39f0dcfa74fa6b0ca508a7356240
 MISC metadata.xml 244 BLAKE2B cd13229535e9e125ecc3f936c85809a9eaf68cd4af4700c9fe06202625ee69f862708fc27bb0623e54b8958610b0fed734a10257ff7d04bbced67aaf1a338044 SHA512 6fe538123e95fd8536bc8965f2f8316828a399536618130db5b27f08add330a0bdef412e1f5ac8360df5c7bd8df56789e716d6d1d8cfd7b31f8c5e126f64f391
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
index c4e3b9053cff..3470b1d217a0 100644
--- a/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,24 +18,33 @@ SRC_URI="https://launchpad.net/${PN}/${MY_CRV}/${PV}/+download/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.12:2"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl"
-
-DEPEND="${COMMON_DEPEND}
+IUSE="static-libs"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12:2
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/libintl
+"
+DEPEND="
+	${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.35.0
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 PATCHES=( "${FILESDIR}/${P}-glibheaders.patch" )
 
 src_prepare() {
-	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
 	default
+	sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
index 21a3c8011442..c8a335961df0 100644
--- a/x11-libs/hippo-canvas/Manifest
+++ b/x11-libs/hippo-canvas/Manifest
@@ -1,4 +1,4 @@
 AUX hippo-canvas-python-override.patch 349 BLAKE2B 92912d75c47e78adf8129d85c963709dbf8200bf30c197e2da3c02837e5e2afcce050d4c4ce94f17a4ac53ad84167acabce2ae0ec3afae4fbd66c309b46b92f0 SHA512 58bb19ed76a4ef07cbebb7b7fad46b931ba7e81ea2e38a6596ea0247ea38bca96c392b13db9673a43f973b67b3297ae7d6a4656772105db688a34ef3be7847f4
 DIST hippo-canvas-0.3.0.tar.bz2 376859 BLAKE2B f224aab41c0cd34c2e65e30a36f0ce58969a20d911c7d63ec488634879206a4b02fa246f6540f5b3fce4a7ffa6a5953aec8b6f93501c9fd711211d1182386206 SHA512 8290f6ab1875eed606ea152f12741ec4ebd8839091a9c258b8c4fa39f395adf94217576c6c689c5ab22b62c65e37d82991c7b8942815cb2030bd45616528f4f3
-EBUILD hippo-canvas-0.3.0-r2.ebuild 1021 BLAKE2B b63e66ffdcdc7c7928c6321e06b7bb2bddea8d58fcd2e387bf35450deb3e9840d0d17b22d22ff259bee01b1703264a15ee8466fe3e2d228797976ef81c7acbe8 SHA512 f4050adb70e78a271baeb9a41d23783d8bc32e6a780cffed8bd2acbff6a743cabeeb010d56b656dd52aebd6978331d54300e1eacff61cd5b41ed2a6d7d76f099
+EBUILD hippo-canvas-0.3.0-r2.ebuild 1039 BLAKE2B 35b9f9585bed04c6bf7fbcc5f8d9491d93e70285e16c1260ecdf2987ba3cbb0d1a1c52b4e0e0238eca1b84fd17058a017ad290f2fe59e9f4acf476768d0a083f SHA512 ec0c767752fb6df100fca88b04d3f777dea7a61f0651a5c90daa79058a70676f38dcf7c54fa4a5c3550f51e76b7086708aacbfa3771bf1545b26f78c1f8eb68c
 MISC metadata.xml 487 BLAKE2B 922f057e5ea68f201e92d05f8cda6e5e4ca5a2f551f21e10d05f7027940fbd6ca4005cea99559261b8f0b0859d6e985508f84b6c2e63a4ace39ed2d218ac1005 SHA512 4fcbed02fb004fdde36668aa8c089a0180f38355103720d55f94687868189f1583f09d29c8c071f5151fa24695491044445f6444c5af4776b8e8517307388e8e
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
index 36b88c85f039..5def06c083aa 100644
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,7 @@ RDEPEND="
 		dev-python/pygtk:2[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	dev-util/gtk-doc-am
 	virtual/pkgconfig
 "
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
index 5692e037196e..15d08f5933a2 100644
--- a/x11-libs/libSM/Manifest
+++ b/x11-libs/libSM/Manifest
@@ -1,3 +1,5 @@
 DIST libSM-1.2.2.tar.bz2 348908 BLAKE2B f3d6d40bfb3058000fd13e9f5ed8daa6628ef197d737e9186e66a517d4c0d4238fa65d0f922b9e6b2839a6f37344c64a560b126911679315cb3824c814d474c7 SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca
+DIST libSM-1.2.3.tar.bz2 362595 BLAKE2B 20b7327cd16e066bd2a81eae60f52cab7499dd92d65786d0e5726faa64c2055376749562ff2158777f83711e1517b90b2dc94670892b787889b3950c0a975b68 SHA512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903
 EBUILD libSM-1.2.2-r2.ebuild 1716 BLAKE2B 929e1c043c04cfda1ee1805cb0db16a120a606628acf25feb09528db7c4bdec0b975398a7a413bd212936292cbde3217c938dde3d0157b57b9389999071ba305 SHA512 5d43444bb8e99a89c79cde615359d7ddf3f326428d8a368282e19f9df4b405ab146040c22c674d4eb5818059aecddb3125484de0e18859c08dd6b8fb20986b09
+EBUILD libSM-1.2.3.ebuild 1724 BLAKE2B 0e815750b78b5bbb11d61f0b21590dbccd39153353994422e3c0fb8e7ee7c07ea57a2d811ab4f863f46420da0bdcfdbe938266f7e3fda772908141452ae4066b SHA512 75845756c00100108153d9e8f702685f99da7c375423799e44c34f7ee85818c139e8db38dd96c84a8ec639be38719fda026b7c7ee41a81f2f51074081f21506a
 MISC metadata.xml 348 BLAKE2B 475822d6499e8c44bda145b3fb4d72b0f462c03ddddf44cdfb8359a2b0a0e44917a0004a53ace75218efa01c25491fd66e52c1bc0c7e392c88ba9cdbbe414e54 SHA512 4fa0439dc05b56a6fc0280c020ccbc52438ba0d22a4a9b8c0e4830844fa50bc6af8096498336b0d9752687b6e30dce581a24b4b67a812d2e7a62783e37af86d5
diff --git a/x11-libs/libSM/libSM-1.2.3.ebuild b/x11-libs/libSM/libSM-1.2.3.ebuild
new file mode 100644
index 000000000000..f122e0662537
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Session Management library"
+
+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 ~x86-winnt"
+IUSE="doc ipv6 +uuid"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+		uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+	) ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local withuuid=$(use_with uuid libuuid)
+
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+
+	if use uuid ; then
+		case ${CHOST} in
+			*-solaris*|*-darwin*)
+				if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+					[[ -d ${ROOT}usr/include/uuid ]]
+				then
+					# Solaris and Darwin have uuid provided by the host
+					# system.  Since util-linux's version is based on this
+					# version, and on Darwin actually breaks host headers when
+					# installed, we can "pretend" for libSM we have libuuid
+					# installed, while in fact we don't
+					withuuid="--without-libuuid"
+					export HAVE_LIBUUID=yes
+					export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+					# Darwin has uuid in libSystem
+					[[ ${CHOST} == *-solaris* ]] &&	export LIBUUID_LIBS="-luuid"
+				fi
+				;;
+		esac
+	fi
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		${withuuid}
+		--without-fop
+	)
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2c1a7035471d..229e6e080cc8 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -2,5 +2,7 @@ AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d3
 AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
 AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
 DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
+DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 EBUILD libX11-1.6.6.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
+EBUILD libX11-1.6.7.ebuild 1286 BLAKE2B 0cca32a8f311107f2de3ca511b3f259e078d4d2ff2398b73f29c8e11101fb47cc9784e1cdea5d4cdaf11ce8b28edf018f1df71b7803ac8a506f52f0f501b443a SHA512 d62c9d394c4b64143c99aa700e4b464168cd8c71343727a6b2a03d5ca70d259861139601e0584978f1e6684036eaaed57212f5dba63656d0a4dd5cd78775fd94
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.7.ebuild b/x11-libs/libX11/libX11-1.6.7.ebuild
new file mode 100644
index 000000000000..8434eea640fe
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X11 library"
+
+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 ~x86-winnt"
+IUSE="ipv6 test"
+
+RDEPEND="x11-base/xorg-proto
+	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
+	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
+	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+	xorg-2_src_configure
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		# Make sure the build-time tool "makekeys" uses build settings.
+		tc-export_build_env BUILD_CC
+		emake -C src/util \
+			CC="${BUILD_CC}" \
+			CFLAGS="${BUILD_CFLAGS}" \
+			LDFLAGS="${BUILD_LDFLAGS}" \
+			clean all
+	fi
+
+	default
+}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index e1b066bc92a4..20a4a2039ab6 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 524 BLAKE2B 7805fc2630257cd0f58b000e6ae9f7d9d664c91b4af6260b757f638fcec34b7de197767f848c6d977ed76d4e0baa30b7d233ee6ae7b3ba9302211ea27e80e7cc SHA512 4f6b5db5a88c3fcfc056b6302f6e9ac97ab3453641107879645fe01d8ce7f9f4fe30eff45455c6d91b1305dc2059fe4fbfbdab9480d6f3794423d53f84c1347e
+EBUILD libXScrnSaver-1.2.3.ebuild 520 BLAKE2B 08a9e8575f1cbaab178f933c1d300d11833855ee4f88c369011d195ed1d775dd1f3fa13a6a97a761868f9e19b3c770b0008deb84d7f243c51bbeedbe22ce2ab9 SHA512 a75128b98fec70a83252c590cc520e41a278c5bd92be61520dd0fa3b94568ee17ac23656884a6f517f557fd14f1dc54443f7cff5c9b97d9ad67101c89b37a1b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index c4535430c85a..22b97bc96ca7 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-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 ~x86-macos ~sparc-solaris ~x86-solaris"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index 9b01afdf86ad..761d586600d5 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,3 +1,3 @@
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.4.ebuild 527 BLAKE2B 3ecb61891773fcd8b679f3c1a33ca646f1de3e9cc690a16b568c224bd55a9adf1cf8f71feceb84353b0fc000ad21165d54cdde93673359cf9aaa529b9dc1c466 SHA512 42a1924340cdefb54d4a55d49aa58f2d00f20b03833061dbd989583515903d04b49f195a18fedf20075e33ea355bd3c1c3d464af17a5e13b501c5f3c8654861e
+EBUILD libXinerama-1.1.4.ebuild 523 BLAKE2B d90d16a41c6b7e196f69a52d7ba6d7be34aa850e4daaeee7431a2be5d835d6ba4378e03428c564680a5866a8ccd1a5c9363e8ee5ee10c26e8a08f20f27ad6405 SHA512 db7319c54578985e5ceb41fa223d721165b3fd04792745d0084a4b4c3114e259938173e7d4ea746f167aead141d122bc7434f4f0643ae48da6ae406f3b08b457
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index cba156923c8f..2996782670e5 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 441330329c14..9fd66f150d8c 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,10 @@
 DIST libdrm-2.4.93.tar.bz2 826579 BLAKE2B 6b2775a6bc631001be874d1337ef9607ee8ff5b86ce5e3d8ff6c6eb58182a30e2c70592cb4eb9e88c9e046d73b510f632272c57621706afd1db416acc6ce366c SHA512 ba4221e8d6a3a9872fb6d30a0ea391e30ea0e17f249c66f067bed9c2161ed1ad8083959cb2c212834c6566c3e025f4daae31e9533d77aae19bbbbb9de6c2ab3d
 DIST libdrm-2.4.94.tar.bz2 829060 BLAKE2B 99de0fb3df6ea9bb5540cf0e3bdfe182c28db9876f679030eaaed1abd873bb818586bc07e73e0499f831ccaa7ede91a5b73b2b2bf681853e14e786a4af9abd98 SHA512 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
 DIST libdrm-2.4.95.tar.bz2 820722 BLAKE2B ee12f1b9fabc0a00f5adba33fe17000d018cfd5d7fbb4e737bceadcd8e897b846fcccdc262582c4d37508738671a0fedc1a653976214327eb998dca7d5834e01 SHA512 9bf8178a871bb059471f58f236c8362245e08877b732b2c8366d402e8066c9a74707e4ec3bf680fca12303f1319875edc98ae8e31bc9826f172798f47197e631
+DIST libdrm-2.4.96.tar.bz2 829518 BLAKE2B d9a21ce31af65812c1b23968ef6c1901aea106b4cc68d76d3641a17b98423024b804bfda509862174eba98271bd7156c7f08d81bc0a520ea4a25c8e2e0bfd598 SHA512 008cb7658d953b44e11fa3cc6e00dfeb3efb59c7fdadd59f7066101aff138acbbc2f2508e9ebe0528340e39dc7693937755d1641816ddde135c10a13e7d81e3b
 EBUILD libdrm-2.4.93.ebuild 2113 BLAKE2B bd75b9274d572854c30020c44ad6a59ea91c563709f2641483f18355a8b10e6780e377e8853255c761c2f967e22b230b71fc208b85a63dd59d04c22964a54835 SHA512 650a6a3dae11732881598e9af1ba7c1966128840069d1f5408d66f5d26f5ce7180e1e4f9edb0842c52cce3fc35f6f88cca5bc4dc53bb06a5be322c8a5e6eaea6
 EBUILD libdrm-2.4.94.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 EBUILD libdrm-2.4.95.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
+EBUILD libdrm-2.4.96.ebuild 2119 BLAKE2B 82bbec93aa08d5a3cc52ca7110ffd16f747eec48c38be529cad7bced1f5bbdc8c80fcedc136568642a2f5fc69e959d0bcb87c52c82c5b9f39ba6b17668285f46 SHA512 fddafc73e1d88e9172b51d7b43cb15b5d492debdf0f05c1f683411a1a11929d391fc891d13802a6b9711978fc5877a1e1f00feef39eda224378a757f2f1e0a25
 EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.96.ebuild b/x11-libs/libdrm/libdrm-2.4.96.ebuild
new file mode 100644
index 000000000000..1e8cf3979538
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.96.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="elibc_FreeBSD? ( >=dev-libs/libpthread-stubs-0.4:=[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Udev is only used by tests now.
+		-Dudev=false
+		-Dcairo-tests=false
+		-Damdgpu=$(usex video_cards_amdgpu true false)
+		-Dexynos=$(usex video_cards_exynos true false)
+		-Dfreedreno=$(usex video_cards_freedreno true false)
+		-Dintel=$(usex video_cards_intel true false)
+		-Dnouveau=$(usex video_cards_nouveau true false)
+		-Domap=$(usex video_cards_omap true false)
+		-Dradeon=$(usex video_cards_radeon true false)
+		-Dtegra=$(usex video_cards_tegra true false)
+		-Dvc4=$(usex video_cards_vc4 true false)
+		-Detnaviv=$(usex video_cards_vivante true false)
+		-Dvmwgfx=$(usex video_cards_vmware true false)
+		-Dlibkms=$(usex libkms true false)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		-Dvalgrind=$(usex valgrind auto false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index eb785cfdd5f0..a748d2a03d0f 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,7 +1,3 @@
-DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
-DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-extra-1.2.3.ebuild 2554 BLAKE2B 9d5eaa416fb02fe0b3ee09b47cc2bcc33ad0d1e0e1831f977f2e429bbc4540fb7c67a0e46986eb1022f4714d14efa650f64f79553215a59a39b317203daa7dee SHA512 a2f7d8697f369aeef4b7d5ec823c6dcb9815a1d4bbae9d28eafaecb94a17d588d151c404493e8f3a01c314e53ef4a8176b77541a52839d7eab422868aa38b83f
-EBUILD libfm-extra-1.2.4.ebuild 2565 BLAKE2B 9237f5c5eadfcc85084b6914ea49d166221909b4e1be76757f5a9215c31ffcd98067cf703cc641a60c4e3cde60446ce31184a329c18d2511d6a6a56bfe103631 SHA512 f7df23c3a13f3f3bcd65e4e103a31dc0903b1c1509ceea4625d0f0e36074638cb475365622d511b34eaec54997b695f8672496098e0ef1bfa086d7f0a34af810
 EBUILD libfm-extra-1.2.5.ebuild 2565 BLAKE2B d39853407d9a146d8114f9f06c53551b0a800acfe15be1e425b6e5b0a7a4396ec912cf63d486537820c32a70628178e7111933f5be0dbc5b62203c85872a69af SHA512 f4775b74a6496c15115d8e2c79b8faeddbb6dd0e18cf93e5675d51f7d62c9b490dee85c9bfd8ca0f0b7a28e0f74913580a12ecef83aa89e944d226d8569a86a5
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
deleted file mode 100644
index 56f056e2e917..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
-		--disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
deleted file mode 100644
index aa65e3f1c6ce..000000000000
--- a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools xdg-utils
-
-MY_PV=${PV/_/}
-MY_PN="libfm"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18:2"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext
-	!!<=x11-libs/libfm-1.2.3"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-	sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
-		--disable-static --with-extra-only
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
-		rm -r "${D}"/usr/include/${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${MY_PN}
-	if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${MY_PN}-1.0 ${MY_PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index da84c6adeb74..49e82924235a 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,9 +1,6 @@
 AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d70abe1467df3b799602c3232af7a490481c1fb2c3dd5a68f4792dc45a251f1e5518df36604090d23a42c43d13051bd144b54eb15cb2a7c722c9283cbacf SHA512 cafb1b97a1f6faeb7e7e9da5fa7c323eea1754078d08e5e0ea4e437c29d7da371318ecc7b944c595ef60f3169697f35db9efbd2ee23282a2bd694fac19d2e634
 AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
 AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
-DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
-EBUILD libfm-qt-0.11.1.ebuild 905 BLAKE2B 617800ac0b96fb5ad880dddda765d1f66836871911c04f8a8b1388673bb3849edbd4ec242620f741e127fdf769d87e3bc20b16313ade87005cf7a80e28d76b16 SHA512 4d230db20a9c7aa842aa5b855080e7d01273f15eb2968d5a4de4211c1d9d5db5f7d3ebbc0db74b4dcf8b65744419552c04514ae51710532238c3e24db1b83ccc
-EBUILD libfm-qt-0.13.1-r1.ebuild 1099 BLAKE2B 16213a455bd0710d7171b6fe6e8161e466c06251985edff6fbf342a9f48677e6f19fdfb67abc81f25fabd07cf56aeb7f405987198771c6735167b3ac8d81e3aa SHA512 ad0560427f59782cf05974fd20598fe697f8f872506a59d87065c195e3fb3de255dfa62fb6749d0574711a5335a1b6ddbc6ba92615f04576c289280ca0a9beec
-EBUILD libfm-qt-0.13.1.ebuild 926 BLAKE2B 3f1262e5cc7c7c2113e50db9cf19327281b125820b03f5114eae2524f406ded9dd6697ec37b92eb7292a44fc19811e3505e39f880b4039616c0d6594ba101975 SHA512 0413552e13a4ea4e5b1ebe0cd2b6cc82b846fc0da0c58ecd21212583fcc9bcc76831c3c013c54bd7979896a5fbf3a6ea2f4e5e5be4ade801fea99688dc5fae0c
+EBUILD libfm-qt-0.13.1-r1.ebuild 1094 BLAKE2B eb12936a58ed4f3c8893fbecd0909cd58256d2b934cfd8301524e599cccef728ede24ef62c6a781bd88eab2d93a359bf816b2132163bb9aab2663d92d142743b SHA512 cf39485d2e53a40c43d61797915f0cdfe3cfcb94c1efeb18c17448a0f627927e8ca5925e29f513c3a355ae2ce21de42927f69514cdef0f891ed9f9a6e16ba957
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
deleted file mode 100644
index f377c3afce2f..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.lxde.org/git/lxde/${PN}"
-else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-0.4.1
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-	!<x11-misc/pcmanfm-qt-0.11.0
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	lxqt-base/liblxqt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=NO
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
index 95dea87773b8..e41d449e1331 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild
deleted file mode 100644
index d3a2aa6d6bfa..000000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.13.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eapi7-ver
-
-DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/5"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=lxde-base/menu-cache-1.1.0
-	media-libs/libexif:=
-	>=x11-libs/libfm-1.2.0:=
-	x11-libs/libxcb:=
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPULL_TRANSLATIONS=OFF
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 73bb72b98ae8..1a0448de19e9 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1,9 +1,5 @@
 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e
-DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
-DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-1.2.3-r1.ebuild 3504 BLAKE2B b7c0820ef9de929f94807cfd2ca0767033772fdc9da79f5c5b361f80a88a314c72ee8510ad790864bc537037653a0e1cb5db18348d80af4a31d56f1848065ba9 SHA512 32504d47f8f78d8771c5b73f2d39ebb4f84d604bd2fd6adfa4b2b83e4b0fa1d24efc30c264fae88b6920641943bcd59dc46618f2378fe4cf66f0e5e6b207e0d7
-EBUILD libfm-1.2.4.ebuild 3721 BLAKE2B 116ce5c067e3f05af89accde41d155d87bbb74b783a0a249b6f571dfca9e614471a8195f1794c92a232d42fdc528bbebc4f62d44164761673decba7ee4710567 SHA512 0e06741bdfcae3b237ad9a90184275b79935885057b8008a06b6a1e862e13edcc6532ff8c6e2f80f0d3ed2c4dc827bbdeaf2b221646b5f342749fce20672793b
 EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
 EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
 MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
deleted file mode 100644
index c9bde1ffe20f..000000000000
--- a/x11-libs/libfm/libfm-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}/etc" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libfm/libfm-1.2.4.ebuild b/x11-libs/libfm/libfm-1.2.4.ebuild
deleted file mode 100644
index 12d09617ea74..000000000000
--- a/x11-libs/libfm/libfm-1.2.4.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib vala xdg-utils
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A library for file management"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
-SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif gtk udisks vala"
-
-COMMON_DEPEND=">=dev-libs/glib-2.18:2
-	gtk? ( >=x11-libs/gtk+-2.16:2 )
-	>=lxde-base/menu-cache-0.3.2:=
-	~x11-libs/libfm-extra-${PV}
-	udisks? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON_DEPEND}
-	!lxde-base/lxshortcut
-	x11-misc/shared-mime-info
-	automount? (
-		udisks? ( gnome-base/gvfs[udev,udisks] )
-		!udisks? ( gnome-base/gvfs[udev] )
-	)
-	exif? ( media-libs/libexif )"
-DEPEND="${COMMON_DEPEND}
-	vala? ( $(vala_depend) )
-	doc? (
-		dev-util/gtk-doc
-	)
-	app-arch/xz-utils
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
-
-src_prepare() {
-	# Fix use after free bug, see
-	# https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
-	epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
-
-	if ! use doc; then
-		sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
-		sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
-	fi
-	sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
-		configure.ac || die "sed failed"
-
-	#disable unused translations. Bug #356029
-	for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
-		progress;do
-		echo "data/ui/"${trans}.ui >> po/POTFILES.in
-	done
-	#Remove -Werror for automake-1.12. Bug #421101
-	sed -i "s:-Werror::" configure.ac || die
-
-	# subslot sanity check
-	local sub_slot=${SLOT#*/}
-	local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
-
-	if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
-		eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	eautoreconf
-	rm -r autom4te.cache || die
-	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}/etc" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable examples demo) \
-		$(use_enable exif) \
-		$(use_enable debug) \
-		$(use_enable udisks) \
-		$(use_enable vala actions) \
-		$(use_with gtk) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-	# Sometimes a directory is created instead of a symlink. No idea why...
-	# It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
-	# symlink to it.
-	if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
-		rm -r "${D}"/usr/include/${PN}
-	fi
-	# Remove files installed by split-off libfm-extra package
-	rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
-	rm "${D}"/usr/$(get_libdir)/libfm-extra*
-	rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
-}
-
-pkg_preinst() {
-	# Resolve the symlink mess. Bug #439570
-	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
-		rm -rf "${ROOT}"/usr/include/${PN}
-	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd "${D}"/usr/include
-		ln -s --force ${PN}-1.0 ${PN}
-	fi
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
index 9bda6d76788f..914cfb8d82dc 100644
--- a/x11-libs/libnotify/Manifest
+++ b/x11-libs/libnotify/Manifest
@@ -1,5 +1,5 @@
 DIST libnotify-0.7.6.tar.xz 280388 BLAKE2B 89b5853f940be94884f6e50b1114bbc3428a5ee1645fc0b72cbfd2ca0f0bb574353ca0b379f0ded077022a478713419654598fdc603652f00c2d772a58666a40 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df
 DIST libnotify-0.7.7.tar.xz 285356 BLAKE2B ace0eedb1beecfbb89726960e441821d64f5ac456dfc6294b051479078726aed6fbacbd1e8cb17578933adbc4c94711b0d69a292778ba4bce096552a5197722b SHA512 133874114407bf12267ef609f5941657181760bc7cf115c5973b1810cb72bf55072b621c143e32be1e7e8b49f244851925d14bc3f9f26457747b8a8695ee9954
 EBUILD libnotify-0.7.6-r3.ebuild 1604 BLAKE2B f32ab469583abf5e62f6ee4cda0fa93397d7da8d4f050d014db0ec401b7370b5a1abecf3a4812bad09b128b185afd33e89630fce013c64aeeb9fbab32062c863 SHA512 7fee9407a9e5aae59ea94cc58c797d888992f754b3e17090de2b59b047a70aa7c962aa55788640d23d89d92efbf90a4c7cf82dd08842f0a845c69fca6494e339
-EBUILD libnotify-0.7.7.ebuild 1490 BLAKE2B 24679e740e217b1d79ff2e116eb1d270ca817875914f32f3d21f86fc5304dd5fe042c380fd55a2c2db7f5dabca426a4e0c21553e8e9f6511ff6c6f3107b7afbb SHA512 75911e883870aa6c9f41bd98e922e35cc18480f9e7f5fd6562e3ff69962622af54a4cd679ea13889962d6b3db9f36342da69c2eb68091bbe7930fbcec0849cb5
+EBUILD libnotify-0.7.7-r1.ebuild 1511 BLAKE2B e4a659b54a85c76b1e05e3417330763618845e2afd4f19451a294c6722bb4625ff9449b975ba7c4446ae0f7effa71df5a99a65b6e54f963d3f7fdbc4a1fff645 SHA512 8b320e306cddcd594d5683fd2c39311f6ac67566b7c4ffab6bf02755290a8fc4da2691646bf5ea1772b739314c80e4734bdc333ec7131ada1deef04616ca1c85
 MISC metadata.xml 276 BLAKE2B 889856a4e8b234e03eb27d32a4bce748a561f98ca0faa36de124e58e3832d804d1492f59db1154c4ec0e2e0e46c7d9cf38d9911ee83dd0863699581000610f31 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59
diff --git a/x11-libs/libnotify/libnotify-0.7.7.ebuild b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
index b281671c8f6a..684fa67f7764 100644
--- a/x11-libs/libnotify/libnotify-0.7.7.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.7-r1.ebuild
@@ -48,7 +48,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	mv "${ED}"/usr/bin/{,libnotify-}notify-send || die #379941
 }
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index a9fde8628fbc..ff04236d4b75 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,3 @@
 DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
-DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
-EBUILD libxcb-1.13.1.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
-EBUILD libxcb-1.13.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
+EBUILD libxcb-1.13.1.ebuild 1469 BLAKE2B 4f5e7e5242d65494d1c52b4c26cb6c1cd9f8f66b9cc513609793ed648ef808758e90b2e49ee4a76ff574007d6d2b22a8be8079cde92813d91aa1bf0079906d88 SHA512 725acc3d795ed3286e66b2c9ea24e7c3236607039de6bd7777e86c47e62c081067c6dc1a634d5dbd453510ef6ec4cfbd4474c1549f8e166008e79514d0463298
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
index 102ff1507d80..9bbbd758b0aa 100644
--- a/x11-libs/libxcb/libxcb-1.13.1.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE=xml
 
 XORG_DOC=doc
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
deleted file mode 100644
index 102ff1507d80..000000000000
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE=xml
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit python-any-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings library"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc selinux test xkb"
-SLOT="0/1.12"
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
-# Note: ${PYTHON_USEDEP} needs to go verbatim
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-	doc? ( app-doc/doxygen[dot] )
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-	$(python_gen_any_dep \
-		">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
-
-python_check_deps() {
-	has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc devel-docs)
-		$(use_enable selinux)
-		$(use_enable xkb)
-		--enable-xinput
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 93aed60d2d7a..8cc62a7ad219 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,5 +2,5 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.40.14-r1.ebuild 1662 BLAKE2B e367786214b081a64fa9036f06ed205200ee2a2ff110d269efd5eb0d3fab3d3ec401d327369a901c415aa6aa93ccdfcd740f729f2fbc6a361c50e2f8fbb5067b SHA512 be9bc00dcb297db2b0d367640ced582685c2aa452ad129b6bdfb9426183b634c094cc985a91309c82e003f23ff9f5714292e54f67d3e5874596f2ec0f7014550
-EBUILD pango-1.42.4.ebuild 2013 BLAKE2B 4326042dd1f3ccd825945515400896f46c45d505f152ad8445bd5f4ffb8fefc3d7f1a3c57f12a1c84daf42dd302d4b11a277581a3e65c87efd461d6ded013e49 SHA512 f1409a9a2b0b2be9d19584bbae8ed1a837fffc2bef88ec04d1d9ef113339198d5556009bf2e3f6dc1c6ffe0a032fd938935bfc5f0a983c8dc5daae33c955f9b6
+EBUILD pango-1.42.4.ebuild 2009 BLAKE2B 88249b266b08ec139933aac606cf7620020f4d1624f9e9528cd21c9ef6dd91dc76b275ad4a1ad276f10069e1ab0b6de633f5ae78ce9606de5492c0d41b1da91c SHA512 de72ed1ee81c1108db5964221e1ef41fa9ef73dcd5e59d4de3cfcd4239c0f4e894496e98eacd1afa6009db311113a9da6211c91634153fc35a681e4c6569ecdf
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.42.4.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index 9b2387917637..73a617d84d49 100644
--- a/x11-libs/pango/pango-1.42.4.ebuild
+++ b/x11-libs/pango/pango-1.42.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index fd7a915bafe6..74c88a89cbf2 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+DIST QScintilla_gpl-2.10.8.tar.gz 2736054 BLAKE2B 4bc7a2bc1974f8e10a96b7716a8e35d4854e9eeb8040734f99b796bddd9679ee2539f6517743689f9d7deff9ce523cdbb2f77ccd65eaadfc947dcc7a1337d918 SHA512 c0a216737dbda6bc390225196b37a43e4884c9cd67e6e81fc1b1b952683fe88dbfe7caf3c66d94a378f37502e1f08cbdf788426248e73f5f66ec65982b7652b5
 EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
 EBUILD qscintilla-2.10.7.ebuild 1802 BLAKE2B 54a078d16a981c7f5ca4b332592e388376caa4201f02867464dda62e2fda08b0f9e3a5535558367198931a67c657161b20e93b3982c62f83c92fbc308950c32d SHA512 d304e9df12f1915e24890bfe02e8019d6a9cdc660deb65467aa17c36979ce2947a615d09cc82d532b75e1b42c54cf4f18b48791b10787e1bf834d2096a1cb6a8
+EBUILD qscintilla-2.10.8.ebuild 1799 BLAKE2B 7674060f252519b516ce8ec1530eef5f943381b0f1ba3bb19bb450f035f040c624fdac411e5d82040b0aa76c5144135b82994e74c91a878dfeea4fa6620465b9 SHA512 c1af6dc28219da9fd43fbd9df0d4d2bb25402cf8f9865e16bcbda52a2b3c38c8717c363ae8e50748982b05160ea1cdb4868eacb6c9ae7bcc9599529b3a0e923f
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.8.ebuild b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
new file mode 100644
index 000000000000..45509318b948
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla_gpl-${PV/_pre/.dev}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="designer doc"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	designer? ( dev-qt/designer:5 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	default
+
+	# Sub-slot sanity check
+	local subslot=${SLOT#*/}
+	local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro || die)
+	local major=${version%%.*}
+	if [[ ${subslot} != ${major} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${major}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+}
+
+qsci_run_in() {
+	pushd "$1" >/dev/null || die
+	shift || die
+	"$@" || die
+	popd >/dev/null || die
+}
+
+src_configure() {
+	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+	fi
+
+	qsci_run_in Qt4Qt5 eqmake5
+	use designer && qsci_run_in designer-Qt4Qt5 eqmake5
+}
+
+src_compile() {
+	qsci_run_in Qt4Qt5 emake
+	use designer && qsci_run_in designer-Qt4Qt5 emake
+}
+
+src_install() {
+	qsci_run_in Qt4Qt5 emake INSTALL_ROOT="${D}" install
+	use designer && qsci_run_in designer-Qt4Qt5 emake INSTALL_ROOT="${D}" install
+
+	DOCS=( ChangeLog NEWS )
+	use doc && HTML_DOCS=( doc/html-Qt4Qt5/. )
+	einstalldocs
+}
diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest
index 9e49233d204c..2b59be561379 100644
--- a/x11-libs/scw/Manifest
+++ b/x11-libs/scw/Manifest
@@ -1,3 +1,3 @@
 DIST scw-0.4.7.tar.gz 410761 BLAKE2B b241f6b54e11631611f26fcff807b406b7ecfbc29c140e805a5d1902c93f98247386e33294d1a03b953c4b58317f65660ab24c74185f333f0583e48b5b4453fb SHA512 bf042396cfeb7a4266a5e7156c618a533cbccd21ae499154c704e233b719a7031f051f421b3ed9371a60f2a1ba0ca3a86b5a665de1ef5443bbd12063ce013f8f
-EBUILD scw-0.4.7-r1.ebuild 518 BLAKE2B 2db575825fd5c5fba67a2fae0d1c5ae22f1b671aaf11f7c85c62b8f90f1a6e3eb23a0ea6e47a779cb497e260bda80cce0e916b11a384c70938adc57c877131c7 SHA512 3ef99ed6c77daef6fb795d674e7c1312620105bc03cb160781c9cdb02a115ad02196b9fd245488d317464d0833030c25688d50f549e7a021a7b3a71e3b58f12e
+EBUILD scw-0.4.7-r1.ebuild 537 BLAKE2B db28ac60d379f9208995fda39819d724750d6c655f256cdfeb0b7e7c92f6dac85a40868786f85b2bcc7dc746365cb40005e0562e29542b1bdc082b7c2af5189d SHA512 78b489c47071a734e8ab17b4b8912486eaff12e3b16673a4e3d0f1c169e2827d86edf5de530a883de90699eb0e5c52861e9e622560202ae0083b04e6fbd8b492
 MISC metadata.xml 313 BLAKE2B e36cbf2fad338d261f015642096991ebea26e5cec6d4782cfd4c432019973e22fb3f39a2e354ed52e9d586317fd3e7aac45d6a5256ffc1a53f41ae1cf8f143e9 SHA512 88293932281dbd3587e85abe6602aed94678efd91ab737e597f30f8f16b0747c77440ed2e99389f78070aae0f89fff575879561220647e0683895ba2867c5466
diff --git a/x11-libs/scw/scw-0.4.7-r1.ebuild b/x11-libs/scw/scw-0.4.7-r1.ebuild
index 732ab3fd45b3..479049556dfe 100644
--- a/x11-libs/scw/scw-0.4.7-r1.ebuild
+++ b/x11-libs/scw/scw-0.4.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A GTK+ widget set specifically designed for chat programs"
 HOMEPAGE="http://scwwidgets.googlepages.com"
@@ -14,12 +14,14 @@ IUSE="doc"
 
 RDEPEND="
 	dev-libs/glib:2
-	x11-libs/gtk+:2"
-
+	x11-libs/gtk+:2
+"
 DEPEND="
 	${RDEPEND}
 	doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig"
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
 
 src_configure() {
 	econf $(use_enable doc gtk-doc)
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
index 664920a9a189..caca8bfae54b 100644
--- a/x11-libs/xcb-util-cursor/Manifest
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-cursor-0.1.3.tar.bz2 295224 BLAKE2B 7a1a89c0f326f4ac0768110c4aa5a7818ddace1f231f6a0dcfacaf8b157a2d6aae53f5278a02cb945822d83eccb8a01ebb14ab98e8828d8f1d506e42f51431ba SHA512 be5eee7b268b18f356d6aae04820a7e1c51397dac9020d876df379e833200255b5194269541c245a9b4ac286edad4cfe44dae8e4fcfd16a4726dd7553c104c21
-EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1319 BLAKE2B d2bf6f579a5e058ac15ea6ce2947e9fdb46c135e4d80879c0d8d2ad9921ebdb1ee01c3952eae1afa4eee35ab2e48a85d008b2802a64fb261153abde05de4ab3d SHA512 bf4865a70b8a5da98bfa60ebbc99e7da4ffe156462bf6b2f11b526388289c2c4245bae0010e350e0501e54706499b296ef2f258db35ddefdf245ec63dde9fc29
+EBUILD xcb-util-cursor-0.1.3-r2.ebuild 1315 BLAKE2B 84da77a43a6f6d8e152049a474fe71e32e484313e85e64b3da30145deae9e6a47079e2d7b870053750e9f71750dd8c930560b617e2d6269dfad9416083eaaef1 SHA512 d1cfb842a47ceba48b336508988fb86a44ec917dd366eda1081f2cd5a6b1f0dc3d3091e90b19b7094e74d7d8f2cab8a9587fc6099214654cdfbdfca01d4a94fd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
index 1b44dc87488b..25d4ccc8c913 100644
--- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-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 ~x64-solaris"
+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 ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /x11-libs
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)