From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 19 Mar 2019 11:37:34 +0000
Subject: gentoo resync : 19.03.2019

---
 x11-libs/Manifest.gz                               | Bin 21849 -> 21872 bytes
 x11-libs/gdk-pixbuf/Manifest                       |   2 +
 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild       | 143 +++++++++++++
 x11-libs/gtk+/Manifest                             |   2 +
 x11-libs/gtk+/gtk+-3.24.7.ebuild                   | 230 +++++++++++++++++++++
 x11-libs/libFS/Manifest                            |   2 +
 x11-libs/libFS/libFS-1.0.8.ebuild                  |  21 ++
 x11-libs/libXcomposite/Manifest                    |   2 +
 x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild  |  25 +++
 x11-libs/libXcursor/Manifest                       |   2 +
 x11-libs/libXcursor/libXcursor-1.2.0.ebuild        |  22 ++
 x11-libs/libXdamage/Manifest                       |   2 +
 x11-libs/libXdamage/libXdamage-1.1.5.ebuild        |  18 ++
 x11-libs/libXdmcp/Manifest                         |   2 +
 x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild            |  25 +++
 x11-libs/libXext/Manifest                          |   2 +
 x11-libs/libXext/libXext-1.3.4.ebuild              |  25 +++
 x11-libs/libXft/Manifest                           |   2 +
 x11-libs/libXft/libXft-2.3.3.ebuild                |  21 ++
 x11-libs/libXmu/Manifest                           |   2 +
 x11-libs/libXmu/libXmu-1.1.3.ebuild                |  29 +++
 x11-libs/libXrandr/Manifest                        |   2 +
 x11-libs/libXrandr/libXrandr-1.5.2.ebuild          |  19 ++
 x11-libs/libXvMC/Manifest                          |   2 +
 x11-libs/libXvMC/libXvMC-1.0.11.ebuild             |  20 ++
 x11-libs/libXxf86dga/Manifest                      |   2 +
 x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild      |  18 ++
 x11-libs/libfm-qt/Manifest                         |   2 +
 x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild        |  39 ++++
 x11-libs/libxkbfile/Manifest                       |   2 +
 x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild        |  15 ++
 x11-libs/pango/Manifest                            |   2 -
 x11-libs/pango/pango-1.40.14-r1.ebuild             |  58 ------
 x11-libs/pixman/Manifest                           |   4 +-
 x11-libs/pixman/pixman-0.38.0.ebuild               |  58 ++++++
 x11-libs/pixman/pixman-9999.ebuild                 |  64 ++++--
 x11-libs/qtermwidget/Manifest                      |   5 +-
 .../files/qtermwidget-9999-nofetch.patch           |  41 ----
 x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild     |  33 +++
 x11-libs/qtermwidget/qtermwidget-9999.ebuild       |  37 ++--
 x11-libs/vte/Manifest                              |   2 +
 x11-libs/vte/vte-0.54.3.ebuild                     |  88 ++++++++
 x11-libs/xtrans/Manifest                           |   2 +
 x11-libs/xtrans/xtrans-1.4.0.ebuild                |  25 +++
 44 files changed, 981 insertions(+), 138 deletions(-)
 create mode 100644 x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
 create mode 100644 x11-libs/gtk+/gtk+-3.24.7.ebuild
 create mode 100644 x11-libs/libFS/libFS-1.0.8.ebuild
 create mode 100644 x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
 create mode 100644 x11-libs/libXcursor/libXcursor-1.2.0.ebuild
 create mode 100644 x11-libs/libXdamage/libXdamage-1.1.5.ebuild
 create mode 100644 x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
 create mode 100644 x11-libs/libXext/libXext-1.3.4.ebuild
 create mode 100644 x11-libs/libXft/libXft-2.3.3.ebuild
 create mode 100644 x11-libs/libXmu/libXmu-1.1.3.ebuild
 create mode 100644 x11-libs/libXrandr/libXrandr-1.5.2.ebuild
 create mode 100644 x11-libs/libXvMC/libXvMC-1.0.11.ebuild
 create mode 100644 x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
 create mode 100644 x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
 create mode 100644 x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 delete mode 100644 x11-libs/pango/pango-1.40.14-r1.ebuild
 create mode 100644 x11-libs/pixman/pixman-0.38.0.ebuild
 delete mode 100644 x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
 create mode 100644 x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
 create mode 100644 x11-libs/vte/vte-0.54.3.ebuild
 create mode 100644 x11-libs/xtrans/xtrans-1.4.0.ebuild

(limited to 'x11-libs')

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1d64ad6d9885..da78bda6ece6 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 138ea120cc0f..ae08d57bc03a 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,5 +1,7 @@
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 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
+DIST gdk-pixbuf-2.38.1.tar.xz 5509328 BLAKE2B 9180e833b264e4eb1bec1ec92e6ee7cb07a208459a7b58da9edd3f1872cdc1a98a6d7c27a147674d5dbded1b74098a4b1f197479c7addd1a6b307ced82a2e4dd SHA512 e50badaad2ccb3c816ba0849be386ecb75ea3c7df203d0b0144541c463ad1ace86c0d190b7550e3f59f0cba9639acc5cc048b7127484287894e4df6d62777920
 EBUILD gdk-pixbuf-2.36.12.ebuild 4076 BLAKE2B bc49bef8fc97cb3adcbfa5262713d700089f06cc7392bb85faf080ae02804520a6c89e36c024757cfa7f0e865e70a84639d4094d6a45de6968e3fc1953cf08f5 SHA512 516b6f8b9643e86bd19e10172ccc430e38a289f319a521b45ba336a6f87e163b26c51077a9e4a855502c240b7bedd63021a82b878ce1c779581b82e78a82a0de
+EBUILD gdk-pixbuf-2.38.1.ebuild 4094 BLAKE2B be9ce2c104b33ca0576980846f62aecfcdfc77f853623f1f456ed27e07e863e5cc9978949b06105d43c1dcc0c4586694cfa59134299415b4384d0afdad00a7cd SHA512 fbae9222d52ee853f67f72f155b50d6052b0d09f0d7d9306ffcabc33d75453b75f200327ac9f9cfd0268802dfb9aa8f88c4f437c73722343243a3824e4beb54a
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
new file mode 100644
index 000000000000..00b13a19cf66
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.38.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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="X gtk-doc +introspection jpeg jpeg2k tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+COMMON_DEPEND="
+	>=dev-libs/glib-2.48.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<gnome-base/librsvg-2.31.0
+	!<x11-libs/gtk+-2.21.3:2
+	!<x11-libs/gtk+-2.90.4:3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		$(meson_use jpeg2k jasper)
+		$(meson_use X x11)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc docs)
+			$(meson_use introspection gir)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Ddocs=false
+			-Dgir=false
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+
+	# Migration snippet for when this was handled by gtk+
+	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 2b188e2de25b..f4442a4791f4 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -11,8 +11,10 @@ DIST gtk+-3.24.1.tar.xz 19307612 BLAKE2B f09b7cb252898b7290a3806f8fb579b706fc0ec
 DIST gtk+-3.24.4.tar.xz 21102236 BLAKE2B 1ef6445d582217a54538549fd63c59dd1e7f14832b33a41e971d2dd184a8887876d1eb599cb9fcbd590ec1a16ca29f0be92bc96344b1e7d2fdf88456d63c9a7f SHA512 d1cce6d0d7f1c5ef0f4e8988b88372a32b9d8a2924da4cfc46a80ede91cf8a2aacdcd87eec122dfab1369b36fc849d875832ac11d79426cf6884e1730e5d4dd1
 DIST gtk+-3.24.5-patchset-20190206.tar.xz 4208 BLAKE2B 09d1dcd0a6312f042739c633ef5c3a3b26c81f586c4c1396bc9ed4cd5e8a891507d6a6857e91b481794c8c6ea1e9511b756e7307775acb4ec53f561283c2139c SHA512 e3748ab10032d1c388b50ac35e295d08f7373c70186d35ee52f8a31ea53cddbac61eb25e5c6aac9855a4cb02c25ed0d2361241fe2530b6ce6738fb5e4840817e
 DIST gtk+-3.24.5.tar.xz 21012108 BLAKE2B 25b8fc92655be190a0dc082ee303614026054d9bf17f93e8df11129f77fe1e6dc9cc97d5ceeab139eb905e3d61ea918b01d39f342e11d06fb3245c590567d24a SHA512 344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1
+DIST gtk+-3.24.7.tar.xz 19375708 BLAKE2B 28ec4106258a7ecfa78d2f3dd8d2145cdf8ecbb55167bf22002e38186721e2e1658885032630eb306785bfe36486834c40e34fd5ac20d1c30d4f5de58cba7fae SHA512 2605087c3e09c81192769e6c4bcc4374e0fadbc4d05433edeaefd9915e128ff925c64fb3d07799bacccb16d85d31e53936ac09c696a09349efa6e21d886074c5
 EBUILD gtk+-2.24.32-r1.ebuild 10008 BLAKE2B 8bceca83e3a73a2565cd980c80d1baa5fa2a79de61b4b8cb984738bbf6740c59a5df4b04e878fa2282d46642970e11dc4db8dadbf479447576b854f597b274cc SHA512 f3dca376a7794bc8ecdc47362a09dc58d46de7636dc0fec7dda86727ed47cb0d2105d5901884b60ae0601159ba1a79d0da2e05d725e0d119d9382a7771369ad2
 EBUILD gtk+-3.24.1.ebuild 6868 BLAKE2B e602a63f626d30650b4ffdec0b7e5f21447646bd5cfc3c179aabbbe7c0447fa4714774e929becd35986dd39c4f800858721212945cc609f769aa451c39efa9c2 SHA512 779d1a44e18d00cb6051df289fc413bb9766ea4be932fd6207f83ac0d71c9a15883d585f778c1752460e5957a326f9d2b16550c1009230623c8561381bd51b6d
 EBUILD gtk+-3.24.4-r1.ebuild 7243 BLAKE2B 7aa81f0092387dce46b8fd55aa24f14c6e50bb7efbf903be4d64f9b703d2ebfea80c561fd426848aef69d445597283186a372f27c9c77ce1d7db3ffe2afcc6d9 SHA512 30b537ae298815f42c8faafc492b222849209903039ffa24bf004821411c7853d95d3de279535b4e1ec9e053a3b83a8df34121e8910af447090313af336a8583
 EBUILD gtk+-3.24.5.ebuild 7148 BLAKE2B 55eef75fa3935cde6c1830c0eab3689ea02ae51d7271df0f0e215cbdded7f4af903c2c22aeb871336039cb0bc7f5f04871b5b7201aacbdaa178089e228517577 SHA512 804468b38c444e63da54b17ddaa36180be7c8359b1c6e2e66d39a0af95dae17dbceec64182bb28d3ed6f8ce941a00fdcad916f34943c402029d48841f8478621
+EBUILD gtk+-3.24.7.ebuild 6926 BLAKE2B 8ff7447cb823bf90058d425523fdba79eb550084505245526143e857947d816a74cf6001f140b5145f10d8fb99fd671b0a4d190a65311e3e23a140f537b2cc33 SHA512 bed669e8776dc1476f6448f0a717d2a45140a8ff9401ce88fa80f7ec56fe92357bdde2d2683388a2c4e7b57c72cbe9c5fb64cd2f6f0aa8f2618b8fe7552c432c
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.24.7.ebuild b/x11-libs/gtk+/gtk+-3.24.7.ebuild
new file mode 100644
index 000000000000..4b530734859d
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.7.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	wayland? (
+		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.12
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	# cloudprovider is not packaged in Gentoo
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable broadway broadway-backend) \
+		$(use_enable cloudprint) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable gtk-doc) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-cloudproviders \
+		--disable-mir-backend \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
+	DOCS=( AUTHORS NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
index fb14ef5c0efd..8f34a56b4c18 100644
--- a/x11-libs/libFS/Manifest
+++ b/x11-libs/libFS/Manifest
@@ -1,3 +1,5 @@
 DIST libFS-1.0.7.tar.bz2 315569 BLAKE2B ea629c9d935e4e2f159edd6e3513a571d4a145fcd3030605babd2b931aff3377509e8476859e4278bfbbe48cfe94444d9daa85628e9fcdfa384c4ac0a46dc01b SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f
+DIST libFS-1.0.8.tar.bz2 347880 BLAKE2B 74f9079f4ac98ad8cc83e73a162f4e308c49b643dc11ab6d68d36afe5f70b9326023fafb7a17ab14a083bbda20f99d6e140bf85facc4a3177d356b7c5dd6e126 SHA512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f
 EBUILD libFS-1.0.7-r1.ebuild 419 BLAKE2B cb445c4d687e39bd563d8c11250c41f0b0975be0f49255b1b06426e595d960e6c648a3b2d98b4e119c7942dc3cfba403495911975672b25193b4547e67d1c52a SHA512 de2fec0b2fd48a25f47c2813bf28bd2392d5b3a3e37c694911b3bbe81503508799495850ee42d06f3a680bf4d32b638e52f2cce909673c31555c242d0ad07d24
+EBUILD libFS-1.0.8.ebuild 390 BLAKE2B 07ab99a933439b9e45f3277f62cbaa5eef937c9629748a3cea029185b4bce29ad320ffc9310a47104c42721d6afa4706a43bda001d08b417b623e643d8a06f52 SHA512 623ac8d86e62f950caffea741d3e23a6632b791599ab48450f7a76ca3668150183af84f753e9b10388cbcf1a4e0a02eb1ecfbb4b3d4fd9fee8e4c8f25b8a13fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libFS/libFS-1.0.8.ebuild b/x11-libs/libFS/libFS-1.0.8.ebuild
new file mode 100644
index 000000000000..21b0de0eed9d
--- /dev/null
+++ b/x11-libs/libFS/libFS-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org FS library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/xtrans"
+RDEPEND=""
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+}
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
index dd164c9d23c1..e220876afb58 100644
--- a/x11-libs/libXcomposite/Manifest
+++ b/x11-libs/libXcomposite/Manifest
@@ -1,3 +1,5 @@
 DIST libXcomposite-0.4.4.tar.bz2 283746 BLAKE2B d72781ee1352027fab3c6dd543b367757c63d878235e324098c65a47bcafcf9b3404343be0af15743a40c092146493360b661bdc42367502f97667d7cedbb2a9 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b
+DIST libXcomposite-0.4.5.tar.bz2 316993 BLAKE2B 4dc01b4c3fd85bdaad1ab9d9da0668caa162957056284fe864dacfcad302ddacf32a3ca233efe191592121a42783e04d5844277ef8ede21951e890114120ba22 SHA512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5
 EBUILD libXcomposite-0.4.4-r2.ebuild 652 BLAKE2B 8f1ce4cf97bbbf5f348bbfc789302a5a151d720c57f06c446f85658f3109307c9439c048bfe1445263d8f9ffb63914f0b15785a6575474e183abd011600a87bb SHA512 aff44cb5660f2dbd1e3d4af73af57b3c0074d31271e6db26bcdf462acd4957cc1996ee1133ae835fc640f6399c57a314aae7ab3256cd45d16e721db170dca5d7
+EBUILD libXcomposite-0.4.5.ebuild 639 BLAKE2B a93a0ad3fa21495dd861e1c11d21491fb681f4d9e6672928efc94cc1a061a17bd5e7071083f098f3e74157831070a2aa13a99315ae22cfa9bdddd6a2bd50c52c SHA512 46b729af319daf9a1769cb2f9cab4b7d9f889f8053c7aea1435b965ce02d2586e077a7b7ebd225051e4852c9221c709be1d845b1b7659695b509781fa68ffd06
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
new file mode 100644
index 000000000000..d50d9baf579a
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xcomposite 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+	)
+}
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 389920bb7d05..49302a2ffdae 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,3 +1,5 @@
 DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
+DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
 EBUILD libXcursor-1.1.15.ebuild 893 BLAKE2B b5faf01d58308ce71a746862a5e8b7a36cb4045e76ae3e020cb110f5cf769aa9f7867c035a93185fe85b72ae2268531bc5e77746782a2961cc838ce68770ddd0 SHA512 7784aa763260620de0090b04669d8aee49b81433aee71ff49ae356c5ff0827a941e66bb3e241c115e45016ab47a8ad0ef2841e4e5862e8e8f8c61e90b24227ab
+EBUILD libXcursor-1.2.0.ebuild 907 BLAKE2B 74140458df81e91e5b411532793bc4cf2e3e01acc986c66d64c6de5741af01692c0deefc75eead7250940d7b59ff72850629e123082f92c04886e20e4943f6af SHA512 a2e1701c49bb077c22f85bcf213cb7a6721f9115ae898dc65b2a99843f30ec3c0249e0359fa085c92f92c65fba1a032a90fd61b329b39ba8fb607190ee0d49b7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
new file mode 100644
index 000000000000..4e48fbaca81a
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xcursor 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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-icondir=/usr/share/cursors/xorg-x11
+	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
index cd9fab656a0c..bf2f05ff3acc 100644
--- a/x11-libs/libXdamage/Manifest
+++ b/x11-libs/libXdamage/Manifest
@@ -1,3 +1,5 @@
 DIST libXdamage-1.1.4.tar.bz2 278937 BLAKE2B eff95312ae989893904fca167075c10a784222db1ba4850d941f26c4235ae39ddfa242037e48ccc4b7912c27bb5e92b58eb61d7ac1ee6185d0b872b0be3e0ed1 SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904
+DIST libXdamage-1.1.5.tar.bz2 303750 BLAKE2B 78cb593365cc842cbc6fcb4dec94aa28293c385ad7ecfef032117d19e98c7b3f252c53b79559096b1c0b259d24a59220e9af7fb60d55c55f4474a33d117958de SHA512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124
 EBUILD libXdamage-1.1.4-r2.ebuild 534 BLAKE2B 5065cfdaa923f7e8b28ce657d34e84e5806d54a1b781a352a4d8a3e8bb1fabadf5c823a375a2ca9090fa516713d00b8562053e2004c05bb1bb918e143f11dce6 SHA512 c3407dc97ba81df8c69bb11bc92ceb13c2c3652ef4d7669c1cb5407d2cef45957c9bb9d03ee52c771ceb4c0771c62edd8ccdc4374d93b82869ddd6c9b711326e
+EBUILD libXdamage-1.1.5.ebuild 547 BLAKE2B 483ec879f6fc9307171e3fdc572a0769359359643ced82361210d5a8f578d95195f1cf425240ca73c8638d923e47ad7e494fab730bb2cd60488c631b19aadbad SHA512 123aaf1b94067035ba4d63529bbd0477da05a1a38c77acbc6a514c8beaaa987b48b94bb77ec8ef3c3d64bcd11398166b944d8ee286bd92c2a1e242c3ea3a3f5f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
new file mode 100644
index 000000000000..646138cdd936
--- /dev/null
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xdamage 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 ~x86-winnt"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
index a4a89b45b934..03d253f70036 100644
--- a/x11-libs/libXdmcp/Manifest
+++ b/x11-libs/libXdmcp/Manifest
@@ -1,3 +1,5 @@
 DIST libXdmcp-1.1.2.tar.bz2 331518 BLAKE2B 1a6f98d03a2bce62cdf34be641096e0628ea133a1d2ce33d4cf35550c6cabddbe3519265644d44bec491bc246d7e1d361c86595b56d1d59fb72baaf6d1919316 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb
+DIST libXdmcp-1.1.3.tar.bz2 332795 BLAKE2B 0c9df30450857dd2703c4bf54972d5a26c1b6f8e216b4f3173491def650cc32742554eee04c883670e783eb5f476df94ed2c0c52274a51e2bc54d45e5dcb8c77 SHA512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
 EBUILD libXdmcp-1.1.2-r2.ebuild 685 BLAKE2B be687e3a7b1b78fac3c84b45523c3e4ed3f36a1d3c50637adce258e8a3fea4be0b4f13c45ea211f8cf418574bb9280a4f46d886a0a5f4bd050240bd816c12fe1 SHA512 66f7b3772682c81d047c65c670cc0993f111999d041436fb1dcc86400e319be836d49b087a9a600466ad55307e3abe30eb74cbaa779aee205b7bdfe1a70f71e0
+EBUILD libXdmcp-1.1.3.ebuild 674 BLAKE2B f7e58ee61ad88e80ead70a8d3ef3a49e8be5b74a26d40c65bb342acad924aa20222c822bd306129c23e1a60030bd7813615e64e140b8c103dcb7b431358f1b4f SHA512 797a12d5988b854281d2a8b0184b0342cd79f8efc830dc759bc474f846571c73019bf317c3c0b4486cd4d97c6b7d6dd05e9a708f36327cfb10641d7747c5232f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
new file mode 100644
index 000000000000..d817cd293ef7
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org X Display Manager Control Protocol 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=""
+
+RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index d61b764df0c9..a7f7b5a31379 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,3 +1,5 @@
 DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
+DIST libXext-1.3.4.tar.bz2 389114 BLAKE2B 941ebf63583a05f40063ec0d2350a40ccc656c6463e58a347489f7dcd8dc5ae5c3b24b561d74a0af2661c2e3c941bd4ffd90295273c248f22e52f23e8d7c0ec9 SHA512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a
 EBUILD libXext-1.3.3-r1.ebuild 676 BLAKE2B be1c3db0252893768f8a3be19467e9a05749951636c9f9eedbce5d29125ff51df9c89d20794b6cf35f7697d311c284019d2a369125194bc8e0f5d24c62070574 SHA512 247e2f6c5f496a499f327ea9d7b34fe6ec46da8140e50e8e887d94b7a3e69d6b6bd41460ce8be3a970f441181fcf8400cb8bcc031180efeac08bcb3c0f1744ac
+EBUILD libXext-1.3.4.ebuild 658 BLAKE2B 9da3ea535bcf6b8ea7f2baefd70361ce2c6ff70383d620b2ee70f2faa863bbac62b5673bc63884da536c703036911520e578e12762831b691955e258a40c0f42 SHA512 061a449e1ac66e025602d5232be508eda1f7632e5c34a0a211188ee3615ececf87d0578def2181dccc952d963c137b8d162385fc127e335cbed2167b92dfc7bb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
new file mode 100644
index 000000000000..51d23c7df9ba
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xext 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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 2f3a29a10e67..28c0ee9393e0 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,3 +1,5 @@
 DIST libXft-2.3.2.tar.bz2 335495 BLAKE2B 9592e82449d3253fc71cb93866275bfbea37988ad7bf05c1d17de14038e48099cbc2569e329daba9354bab1d522dac03077d94e82f561e0747f08bbc08f6a737 SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398
+DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
 EBUILD libXft-2.3.2-r1.ebuild 744 BLAKE2B 03dd006dabbb23349fdc3700bd6e6cf2b0d39f394f143f1bd15a67ab6f0159eb4359f78d031d9c2daca449196b1a55214148f4b7394099a496f80e5628b8ce61 SHA512 047fee7da75a91b71e9f77d8cd9f0242e9e1bab9de1eb0ebd56c0c36b6e1d3ca72d4302dbb6fde25bb9beb9ccc8b3b0e0a761124b328720d68ca27416f41d531
+EBUILD libXft-2.3.3.ebuild 739 BLAKE2B 56662a25b9a3720cf4b057c8dbb5640620e863b79183ae14a8833efbbf4c840ef5f11405956250348e9358c353b2610a9a5ef94c752cd4ddda98ae50aa9fbb22 SHA512 40910bb901c3d56c32ac04423c63e04b273da41de84d42387ee25e577bb6e6772b9f637ac51c39393247a4e071fcdc5b443e55105d2fd9e86bc05ae025453108
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
new file mode 100644
index 000000000000..8f1db029239f
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xft 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+	virtual/ttf-fonts
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 0fea4fea0ac9..258724fb8534 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,3 +1,5 @@
 DIST libXmu-1.1.2.tar.bz2 396230 BLAKE2B adcea6ff4c9874b8f7022b236f9c0f76f6291b61ad2bc3ef16f9021d49c2cdee01b07e0bfa46afe3636bdbf2802f2c63f7e01854c1e0ca7acdaa274d348b2eb1 SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc
+DIST libXmu-1.1.3.tar.bz2 394330 BLAKE2B 5bbc4345f32588a8b1e196fef39a636b9a765a2d22a12cc30bc7f5528b004c1f73370d25b023b68772081f1c58b4813293971f8f08ca8f2b9508adb4c3925c94 SHA512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762
 EBUILD libXmu-1.1.2-r1.ebuild 776 BLAKE2B b60176763dbeb092bf2633c953bb43a08148a512acf4178504b7ceefb41565acee26d1105782e8cab0e2f3b4ee939eae8e510942f28ac7e3587195eed561c14b SHA512 e1215d6808338ddf17a0f3f5e2a1ab6578f203e236baa381f65bd898e9bcfc55642a149f0b755d93aa3fabdff888b0c77b9bcdbfc94a983085937851764683a6
+EBUILD libXmu-1.1.3.ebuild 760 BLAKE2B 5b8aed6691426002cf0a577366178476d76097e564c2e40d5681d0afea5286b3365553796e277d08d98b0a9dd22e62ef2068e35437a3b57f0fa7134c1bd021dd SHA512 7e61e0cf3bd94d35ba1688e8fffb7f16a5cbe0692f875ba58d97873738e811e1d52f034ec60dec048412be510fbe13592107dfa15624bf604657ae0d1eb72bc9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
new file mode 100644
index 000000000000..8879951ab2d9
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xmu 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"
+IUSE="ipv6"
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 4a03ee27de72..e7d7dcd07aaa 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,5 @@
 DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
+DIST libXrandr-1.5.2.tar.bz2 330726 BLAKE2B 2d91e4cd2d7af6b79ee952a0d51b0c61d64251c61f862677b47065f2eda811650a5e3bb3185d09a6401291b5a8bb30e8d29cf7aaf1699ac3f49b838ef7b1208d SHA512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87
 EBUILD libXrandr-1.5.1-r1.ebuild 611 BLAKE2B 06fc667d8e66764bc37abad74f6445deec1ca70147cab1080c32e7c26f241bfb3b22dc44bf6ff95056d1cb2ab4d6f4f26f57a09b8be309a221068ea3f29f5b77 SHA512 0d5275e585b7b8cf645e39ccc556b80fe5420c4ed37dbf27ed6498291b8b0e532dabf34d62d4057f54e41b379d83ea9fd90deeaa6866e4bc77a74e15b2b82561
+EBUILD libXrandr-1.5.2.ebuild 621 BLAKE2B 7863732b58467ab6e2157fe7fb14682737deff47a6833b46a34f2c7ee2880c8987f2f3a48e62f5919554f6e917ada6481ad13d74f04bcceb00ec93499462153a SHA512 e2ebb2f3ac681651ad7f2eaf827feb22a8ed8e27d6b01b65c792088653cb09908618ff83583a31da5cc3eb725aca0d766a754b730c53e5aae34e8f79ae8ad45c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
new file mode 100644
index 000000000000..d0f3168cf49f
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xrandr 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 86d3a3e0e2c3..e3f5a00f6b76 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,3 +1,5 @@
 DIST libXvMC-1.0.10.tar.bz2 313887 BLAKE2B f5440e60c29e83be8945d215e484a995547411fa8e96b2fbf757b93bc618b5d1083f41ccc770c9e8f4b0e13e6230968575aa7054f036ed2443b85b6301078930 SHA512 db979627eda2e58dbc95f0705681aa4acf51dc375a078467ea0b1c78414963e52417e525bcf224b4642eab2e540619c168c1e4757fad97bac7d07b60b23b3e19
+DIST libXvMC-1.0.11.tar.bz2 303516 BLAKE2B df1a34ead982c9b88428143d1c6250ef7d4353a6fc4e151c587f62ab91195e3e2c3b320beb1817b5e0b8a6db485aa0b839084361ec60a798ac1476b684542af3 SHA512 4fe49e956ac97a45d851292cbba7bf242706aaf3bd9eb7ea4d2fc50e40745115d857a4fe179d2b87bc7cb6f9ac93911e89a167f02f6d1ae25a59df9a517a2476
 EBUILD libXvMC-1.0.10-r1.ebuild 562 BLAKE2B d414cbce81c1f625685b9684d17e6c568b659222ad12bdda3469c193ec6d7472305d1f0db8133a2b3fb4684a9e2351e6f775fd2d3679fc266a30c412dfa68f3d SHA512 5b9daa16cf33ca27e14219a81d83222c644c2ca6938ba2e2d2c20e7ce1dac32e1aa6fdf44299e0c40435dbca00770d3742c1fe90e3bcd032177b4bea3ac2c8d3
+EBUILD libXvMC-1.0.11.ebuild 572 BLAKE2B 55ea00c93304e27424d491951048c6b1f1ccdec48debef77f16f04e3bda4ec1a92df69f74339256acc0abe790b7dfc517675fcd6874c895c5835d12d00fa1c2d SHA512 6eb785778d93e81b398d207215a52a1159a589f91e79b591ef2068db5fbd42586d705eca7b7facf4ae9e6846216135fb5a57ff9128d0d8a7a51205ac1f8bf0ff
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXvMC/libXvMC-1.0.11.ebuild b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
new file mode 100644
index 000000000000..bc60b8a91c31
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.11.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org XvMC 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-solaris"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index d67efc1b52c2..21443d368708 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,3 +1,5 @@
 DIST libXxf86dga-1.1.4.tar.bz2 280216 BLAKE2B e67a1e2fafc91cdce5b1d4f4ad2083080656f27fceaf167fcf6626c641f1dd7fa14ebe4f8508042ef0489e0fd689b05f6088487b9eda65995888158452898546 SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2
+DIST libXxf86dga-1.1.5.tar.bz2 301685 BLAKE2B 8c70299e52cd2f34b4dbfa0d56707df20f7b368ab92321cf9e8c0fe15402a3b4e1b8eb62d0e53fd3321e95521bb4f35479493e412710a74779ac98ffaef966bd SHA512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89
 EBUILD libXxf86dga-1.1.4-r1.ebuild 500 BLAKE2B 21c0be8f011be2de53a59f3300757086e8f59089460091f0557203edac6c80a108249482d3ffb5f8c544cb116640fd58a7f5a6eb1d092bb9111f8bd43e00d16c SHA512 b5f69baa57f912ebe24a153cc74549fac5640fa919b0703a9e6780da11a7278d6ccfa6c1c3692c08f1c95e2e78702d90b92d3d62336221cbd428c252be349463
+EBUILD libXxf86dga-1.1.5.ebuild 509 BLAKE2B a36704a5a4b87177e3396010fff7f737ff73ea3a7be4345f48808b8d660ba08b707ea3a2b80470211d858103d508e8699e8ab3eda624a3455304a9a9d008f1d0 SHA512 c845480b3da811521bc07cdef0c2df8a40832854c4b64ac000beaaa2ba893b87849c32bea1d6b82e863c2cb3437596b677969087f608248ae27ed8fa786acc3a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
new file mode 100644
index 000000000000..07bf27147689
--- /dev/null
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Xxf86dga 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"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index e107cb76aaeb..e546b5e03ccd 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -2,5 +2,7 @@ AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d7
 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.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
+DIST libfm-qt-0.14.1.tar.xz 328192 BLAKE2B ff229256d3232eabc046da1fed3e4b4e51a09c3d1f2815fa726bad62f3fc53111e5d7f003e82e383dde4fe910584644e66613cbc1803ad0e11f7b6bdb2e30cfe SHA512 a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7
 EBUILD libfm-qt-0.13.1-r1.ebuild 1095 BLAKE2B 7e1463e541f2676d4ece12fad6597ffe37cb6fc28af5d5c1c8206f7eee3c63b7c5367f3ea23a2ae15c9acc30c7ca0262e460734ba610438419255e031bd0b049 SHA512 60ce1fe6b3a84af04aa4ae4664fa2ebda0dc3173626698616d863a82506b48dbec8cdac67b8f111e09cb484a2bf709ee7643660a1fe320c92e89cfe9d7aa1f23
+EBUILD libfm-qt-0.14.1-r1.ebuild 822 BLAKE2B 080790b3711cae891be14f98b458e31ca8f83ae2d211cd5a3aa3d4fb7f06f50b5935e6497ca20514315e68d142beff29f8cafd7bcdcc15e8884080c5d6b29bb1 SHA512 d078e48cdd17ae37e27573698f057a88ab1cc88b405a5b911206e5d196bf90e5c6281482eed84a3eb24487713dfa1d929cf1815ffee4f066a4c5a94c87c43fd9
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..de820366ee64
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.14.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+DEPEND="
+	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/libxcb:=
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 20d6a027cdca..98a0c236a187 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,5 @@
 DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
+DIST libxkbfile-1.1.0.tar.bz2 364678 BLAKE2B 577da1c43e6ce681630676f3f52f40b1f31d01862a891d4c1bd853056d90b03d9993299714c5e63a903b243165a1e299e1e014cd94614eacb50aeef363be8990 SHA512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826
 EBUILD libxkbfile-1.0.9-r2.ebuild 505 BLAKE2B cca836f2f61bcacdaaab12c2a3c441ce79788acb124fcbb2b69f4582c5e2d9659979ffce730912a4f174d2b464cc1dde7b0eae5ff624b9b9cc94cfe3217597a0 SHA512 652743dc378993a03bf281df0da9da023b0227e31fa37e14cc340376e3b73c5881fdaf6f1e365159102cc53ed93de9997c97f13c6ce8666a5c2d3f3234077e65
+EBUILD libxkbfile-1.1.0.ebuild 516 BLAKE2B 98faec5dc3930b3419f924d1d96570cf959b06fceb3f03fe2f19d4cbd9b0a8123c77e032c06e7482c566ea473b110aa1f0754eb690a0de54d3c0f4e8c6a5f8c9 SHA512 b8c9fbe0b95407ad2a72e49f9f97e04f6b7f490b385d8e0a79a15b93374a152e827acb1284e39067574907390aa14a4b61047d836ea74a068e694248882955bc
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
new file mode 100644
index 000000000000..770dd9184630
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbfile 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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index a95d9c66a76b..ec3a45744cda 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,8 +1,6 @@
 AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
-DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-EBUILD pango-1.40.14-r1.ebuild 1680 BLAKE2B 3232426804fbbff57e8b7071cea928e241873cb25fa444b8aa412e5ee6b11141d46f68d843f3e764b85ac5b93b0f4d72983e18660590dafd4fac962093d52e52 SHA512 e4c34fd5ce181a3fa04021736763c11c152e31dda71cca14d176cba2b9816d64f3adce6ac3583e957e987fa1849eca4166ad8abbbd35d03529a33073f18828b8
 EBUILD pango-1.42.4-r1.ebuild 2296 BLAKE2B c7854de793ba07eb255d48722a02bbd8a75499f96b1db15bd46dee2bec06452b7e4427b0433569602aaa026509e314200750c0bde22b0a27366c6da878b466b0 SHA512 499a9e0d82d931b12b817a61e3a59df6a150e78281e2f834176edf85320ccf57124a9d232b8dcc7fb084afd87e6019c67b270a2d29801ef42b1d86889ec9fc54
 EBUILD pango-1.42.4.ebuild 2046 BLAKE2B 23b124957c056dcefef238d6066ee8c2ef36a5ed5f2a7aa5f30530aac482af61f220261f8eb7bdc1d9e2e073bfcc154e40d659902a408bc87cb6d3fad96aefa9 SHA512 e23638c8c3cd188ca413178999d407c1a967b3ee97834a5b190ddf6b2f14164727bc9b7559954dc031e4f94ef5b04eed509f3f1d9180221ce718f58aeee617d6
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
deleted file mode 100644
index 3ea1420d6682..000000000000
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-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"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.11.91:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( x11-base/xorg-proto )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 39b1274c596f..66b3e436dfc3 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,6 @@
 DIST pixman-0.36.0.tar.bz2 739957 BLAKE2B 05834dbed8a5bfed607a20f78523e7441f5b78a7a01c7d302c48b8f15dcda37111a8a99e7119b84a0a8a26b55fa93db1c2af316359095cb7db0d8a9e263a1eb7 SHA512 ed99c85a8ce11f52659da61bff599c0405ae0069c30434bdef7238bc9f18e83e6d534cddf38c14d753943edbaeba580c5005ad7575f27e469ca7be7878678d21
+DIST pixman-0.38.0.tar.gz 891291 BLAKE2B 8d057fba6d85ab4d2bb83903e8f1a6ac05659be4d0645782f5cf4c190e7b27fa0e7d6b2718ab111bd8ded9b617c7aad42dbfdf2169d49816b7eaf6e6673c6a5f SHA512 1b0205dbe9d9185c68813ce577a889f3c83e83fbd9955c3a72d411c3b476e6be93fc246b5b6ef4ee17e2bb8eb6fb5559e01dff7feb6a6c4c6314f980e960d690
 EBUILD pixman-0.36.0.ebuild 1011 BLAKE2B 39bdaceeb38639ce856d207792a88ee7f1237cb2b0ac8ca34d93503f3ce3b69146ea015657e7a9b55481f59a438d29ba491711716d7820ede4620d9dc56e7118 SHA512 034b0716e27095c89beeaa0bfcc12032a1d629800d91b308fea8de21e5c1f369fdf62d1ab14188126c8eaf7b3f802d5e007cf1fd7e0b0f1e5cf9f7673c5e8978
-EBUILD pixman-9999.ebuild 1022 BLAKE2B 1876024bdba963fdc1f8fd2226099d75b8a4ef5c7918ef4967bc7ea24aa4dc59a08fc6d81acde1778308043a9f9fddb6b494607f265fad6b75ae2889142eb85c SHA512 ec76a5f65932b57d0d76f841a152646edeea44a3f2d3e8bdd4d078ba7de36b7ed264b0ee7221eb64c27206409e8ce66d7dc01c56d50e5214f55da267d1b7b08c
+EBUILD pixman-0.38.0.ebuild 1536 BLAKE2B b989e0b34a2592b748f15bd845f6b4a2c0ef5e57d0a2dd47b89ff4681a5661d3aab185d02d5112e5408843022997f474611e6536f0611ac064ee5c6d305c664e SHA512 242b48a9e2f4d56309b2aaf08d4e91b91b5c4efaa235dfba0292fc591bfbadfe12b5f6bc1fe91f6a83d845d5339b943381aeefec1aa760826ea2265ef1a72e13
+EBUILD pixman-9999.ebuild 1536 BLAKE2B b989e0b34a2592b748f15bd845f6b4a2c0ef5e57d0a2dd47b89ff4681a5661d3aab185d02d5112e5408843022997f474611e6536f0611ac064ee5c6d305c664e SHA512 242b48a9e2f4d56309b2aaf08d4e91b91b5c4efaa235dfba0292fc591bfbadfe12b5f6bc1fe91f6a83d845d5339b943381aeefec1aa760826ea2265ef1a72e13
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.38.0.ebuild b/x11-libs/pixman/pixman-0.38.0.ebuild
new file mode 100644
index 000000000000..9af2c222cf3f
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.38.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="Low-level pixel manipulation routines"
+HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	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 ~x86-winnt"
+	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
+		$(meson_feature cpu_flags_x86_mmxext mmx)
+		$(meson_feature cpu_flags_x86_sse2 sse2)
+		$(meson_feature cpu_flags_x86_ssse3 ssse3)
+		$(meson_feature altivec vmx)
+		$(meson_feature neon neon)
+		$(meson_feature loongson2f loongson-mmi)
+		-Dgtk=disabled
+		-Dlibpng=disabled
+		-Dopenmp=auto # only used in unit tests
+	)
+	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/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index 076a3ddb2d76..9af2c222cf3f 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -1,30 +1,58 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
+EAPI=7
 
 EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-DESCRIPTION="Low-level pixel manipulation routines"
 
-if [[ $PV != 9999* ]]; then
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson multilib-minimal
+
+DESCRIPTION="Low-level pixel manipulation routines"
+HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
 	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 ~x86-winnt"
+	SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
 fi
 
+LICENSE="MIT"
+SLOT="0"
 IUSE="altivec cpu_flags_arm_iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable cpu_flags_arm_iwmmxt arm-iwmmxt)
-		$(use_enable cpu_flags_x86_mmxext mmx)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		$(use_enable loongson2f loongson-mmi)
-		--disable-gtk
-		--disable-libpng
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
+		$(meson_feature cpu_flags_x86_mmxext mmx)
+		$(meson_feature cpu_flags_x86_sse2 sse2)
+		$(meson_feature cpu_flags_x86_ssse3 ssse3)
+		$(meson_feature altivec vmx)
+		$(meson_feature neon neon)
+		$(meson_feature loongson2f loongson-mmi)
+		-Dgtk=disabled
+		-Dlibpng=disabled
+		-Dopenmp=auto # only used in unit tests
 	)
-	xorg-2_src_configure
+	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/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 120311a370ee..a0eac10f25e3 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,5 +1,6 @@
-AUX qtermwidget-9999-nofetch.patch 1236 BLAKE2B 2c797ea767681357a587c6e86796c9869f9a1e5d455b7c0bd76a14eb04c56b74aba637df337aa29af5fc5f0f4b40c4ea2ca9637eab6e7cf9b4808609afdaea6f SHA512 b7fe3cc1effb00fc8f6a62cc6284de756e6a6b671ae8c803dfdb89f7af74055570711b7d8d8985695c7ca40fb419768721ec8a748f7658590304c90a07053c84
+DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
+EBUILD qtermwidget-0.14.1.ebuild 653 BLAKE2B 52ea1ad162390b40dbc8ee65fc5809b567d51be644f199ac92ae9f4eaf1ab4acab4a6d776507a96c34ef8286a19b99a6f1ef6cca884c3d5bf28155bd9190a1b3 SHA512 a907e1aba9e50429ada5c6287580682eb7beec949f37de9d3cf7beab874630fbc6f811411d2a123b8c8a507f1a629063a8781462ed54b1edfa2f97009684f714
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
-EBUILD qtermwidget-9999.ebuild 516 BLAKE2B fcfcd0622a1718d9b60f0f26c72cb353066955dd83bba528398258ffe706984f066b01709784436da9cc26594b32d4d10aa2892de762727c05b6f8a9d18ac09a SHA512 6cec4d241eee31c9106bc7e8cd94d22bef7e7cc5b47fab30904f7ed480aa69c434320731f9be9bddeb2099a6db29838cf1f3fa866193f81c2c9c236267d94470
+EBUILD qtermwidget-9999.ebuild 623 BLAKE2B f387d0f3a47afac376cd5661718a61155b0943aa57776d286e279f629151748cd268ed87a75ddfca4c063d33c614c3293a2660b11b1bc812881d2fad7606bd87 SHA512 d335773a0d9aed1322a68bcf7bb0373013e6a49021d406212595c60aaec39244945e31727354c5997a448dfa734cf7470b878aacad22eb21bf074bfe4fb71856
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
deleted file mode 100644
index a4827d6dbb8b..000000000000
--- a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Do not fetch translations using git at build time.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,9 +29,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- 
- find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED)
--find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED)
- find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
--include(LXQtTranslateTs)
- include(LXQtCompilerSettings NO_POLICY_SCOPE)
- include(LXQtCreatePkgConfigFile)
- 
-@@ -117,26 +115,6 @@
- qt5_wrap_ui(UI_SRCS ${UI})
- set(PKG_CONFIG_REQ "Qt5Widgets")
- 
--lxqt_translate_ts(QTERMWIDGET_QM
--    TRANSLATION_DIR "lib/translations"
--    UPDATE_TRANSLATIONS
--        ${UPDATE_TRANSLATIONS}
--    SOURCES
--        ${SRCS} ${HDRS} ${UI}
--    PULL_TRANSLATIONS
--        ${PULL_TRANSLATIONS}
--    CLEAN_TRANSLATIONS
--        ${CLEAN_TRANSLATIONS}
--    TRANSLATIONS_REPO
--        ${TRANSLATIONS_REPO}
--    TRANSLATIONS_REFSPEC
--        ${TRANSLATIONS_REFSPEC}
--    INSTALL_DIR
--        ${TRANSLATIONS_DIR}
--    COMPONENT
--        Runtime
--)
--
- add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM})
- target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets)
- set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
new file mode 100644
index 000000000000..5f2257ff950b
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+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 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index cda15baf682a..9c367cc15cbc 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -1,26 +1,31 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils git-r3
+EAPI=7
+
+inherit cmake-utils
 
 DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://github.com/lxde/qtermwidget"
-EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
+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+"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
+LICENSE="BSD GPL-2 LGPL-2+"
+SLOT="0/${PV}"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 "
-DEPEND="${DEPEND}
-	dev-util/lxqt-build-tools
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-nofetch.patch" )
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index ed9a3be6beec..b72415af9b74 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -7,7 +7,9 @@ DIST vte-0.48.4-command-notify.patch.xz 5500 BLAKE2B 88b655403d2bef034604a283b17
 DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b27109724fb318d28200220f1514fb23e4cdc90263a756914b5db442c947578c8854a535cb960a06f7bc03a77 SHA512 4b75bd881e58b5043bc44e391ef3a826a2c25d0f1bb5ffb890367e11a60b1bcbce091575ede6972a89ae043b39c51897f91fca1faf6872664d602e503d8020fc
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.54.1.tar.xz 1083552 BLAKE2B 1e52275c953b5fbf51a1cc727dfca0bde3cc8f51a18055cd0c65c949479d0b4d926466016fa7d6f6dbebc9117c1b6fbde9a4bde38c5d82bb44ecce8612290de6 SHA512 5cb866e75c35e1b5728d17b0433641ceb4837495d59185a04fde9dd8c9849ab905a6b2718a50b27cc70323c7a6c5db31a808816576c30d7f18ece889a329fb61
+DIST vte-0.54.3.tar.xz 1087424 BLAKE2B becb668d6b3f56ebd1eb6d076c5cac2fc9623bfa012c877d8d3cf374cfbded6ff16ef1e0b1fc9e92ba1255f9653be25df1b81c7c85f42749449e5df12c530411 SHA512 dd7d2ac361ed9ac0550599bb3164a3bd6ba95535275c9b559c81ce0af1bbf4b3d150a7489f987b2e626b32d4a8adc82d1ff78e8c8640e5b1c036fe4076c5d8ce
 EBUILD vte-0.28.2-r208.ebuild 2962 BLAKE2B 7004c56381a05ed2c0c309736581f2e03478faae88903ca6eb2b74acfefaf37464fc8b1f1a077d3bff1344ad6a60383f4338b0a27ce2521bb0f68727eb252da6 SHA512 bf607001b0dd305cef30e4f1ae3389b73ae30c747a52915e4dd3df9bb051c44f29317c591a2d47add9bc0e95559ead75155338a69acd31fea9fb79c57f18577d
 EBUILD vte-0.48.4.ebuild 2296 BLAKE2B 1ae75d444433f1c6ea478e69968ae1a369b96e6ff7410a22a7f110d157369f15aeb0b22662da1ca4574b60b6151932823e2866596cc45394a38b76eb89009fd0 SHA512 80c270a32cf543c2bb29a534ff07179c5897505132383862cab59ec203789dda70e3c62e6cd6dffe305a3e36113510f2f5b7dfb49bf1de1e476e87a685499315
 EBUILD vte-0.54.1.ebuild 2207 BLAKE2B d1584ceb316b68eea40b37231568ffdea1515ebcfecf711d2fc500f222ae2e1d5afe9b088cfbde13805f4295e34592da41ee742f022b1067e2ec1e856163adab SHA512 9e905622b2a4f0b07558802831d1df90622a061c4b64c77f17829d6e0814034ea672ff59f4aeae0a30607a50adace8537986de3df46314f3bc87c9b14eecd707
+EBUILD vte-0.54.3.ebuild 2223 BLAKE2B f66e8f6d02e07e4ec980d5103485196b48c091f2ac2a48030de905e6afd6cd77f9aa832ec898fad53622ce39e2888b3251baf935335683f95c55483611fdb183 SHA512 2effd18c71a048c75c3b1884f2317c81b539363a8d5b77d860ede9489da58bc83774832f24d61d92e12a4929094763349aed1febeb1ce4dc4503b45f33b88f4a
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.54.3.ebuild b/x11-libs/vte/vte-0.54.3.ebuild
new file mode 100644
index 000000000000..c992365299a9
--- /dev/null
+++ b/x11-libs/vte/vte-0.54.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.32"
+
+inherit gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+REQUIRED_USE="vala? ( introspection )"
+
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libpcre2-10.21
+	>=x11-libs/gtk+-3.16:3[introspection?]
+	>=x11-libs/pango-1.22.0
+
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${RDEPEND}
+	!x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+	if ! use vanilla; then
+		# First half of http://pkgs.fedoraproject.org/cgit/rpms/vte291.git/tree/vte291-command-notify-scroll-speed.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.54.1-command-notify.patch
+	fi
+
+	use vala && vala_src_prepare
+
+	# build fails because of -Werror with gcc-5.x
+	sed -e 's#-Werror=format=2#-Wformat=2#' -i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		myconf="${myconf} --disable-Bsymbolic"
+
+		# interix stropts.h is empty...
+		export ac_cv_header_stropts_h=no
+	fi
+
+	gnome2_src_configure \
+		--disable-static \
+		--with-gtk=3.0 \
+		--with-iconv \
+		$(use_enable debug) \
+		$(use_enable glade glade-catalogue) \
+		$(use_with crypt gnutls) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		${myconf}
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${ED}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
index c0fa5e2c0c45..907fed8996c7 100644
--- a/x11-libs/xtrans/Manifest
+++ b/x11-libs/xtrans/Manifest
@@ -1,3 +1,5 @@
 DIST xtrans-1.3.5.tar.bz2 186833 BLAKE2B 890506df749d9a1e873ff626614bfd0989115916a896baaf811d0e1568fc939073f8226b096dfda86f5c917b7af72478560fcfaa7d8fb160107f9adddd0091d7 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b
+DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214
 EBUILD xtrans-1.3.5.ebuild 695 BLAKE2B 9433835133efffe7a141f536e3ec894339200253ff12236ad04079791c924d172f44ced45a3cb67d009802d0b39a00e50b9212e462e02d02f4818465092d8809 SHA512 a87771ea8b4d07565d4e5c595a7a7723cd5489ffe2b5ad1164adac7fb242e69dbeab8f1d776bca9862be35a6dbe7c2f8ec6f80ce39a78a36db6ea4601d74ce9d
+EBUILD xtrans-1.4.0.ebuild 667 BLAKE2B cc4f401a2e1423cba7e41e9b88bf916bf546cac8911eba0b7679520e80df3fa98bbc6a9674db0b2cfb733c3d4b4078aef25ad8b85e6c20e1c10c6486238646a9 SHA512 52e320d662171e5eb60b420bf5a8b3a8be28178e10e1685a1347372af0f94da98eaa208b8f3ddf10a31e8ccdff9238ab8668301e927ad5e9ea64e9b107f8f919
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
new file mode 100644
index 000000000000..b767aff35815
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+XORG_DOC=doc
+inherit xorg-3
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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=""
+
+RDEPEND=""
+DEPEND=""
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}
-- 
cgit v1.2.3