gentoo resync : 09.03.2018

27 files changed, 371 insertions, 14 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 20c58dd2ef85..713744423a3f 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 0990ba4e3dcd..84b27da94e93 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,7 +4,7 @@ DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
 EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3943 BLAKE2B 98ab3b5f14093b6bd487bc50cdda9d2d3f357489645fbd7ef78b94baaf66f96271dca5c1853d376061487a9cd65d96ae7bb7b37f4e6e17087264dd855d896a3c SHA512 e730a2ebabc45a647d4a4613b0ffcb2e862ee59dc80c5092671c65cbfc7f758802b18f40ccd4a1447d35fe23c1f81436977c4f7780e7a0b67965e24bc69a3cbf
+EBUILD cairo-1.14.12.ebuild 3942 BLAKE2B 9398e30dc6d88b44ce8d5af4ae2983d8dee983355a58f409adefd666bda8d1300734191e88f5ed760b0bec69f92c17090f042c2c44b2a73b92898b3f55ce087b SHA512 965337c9f14b18aeef8d145301a43006d5e9eb43b1c79679792a953dedf5a66d93db56860af1649ca7ca316c36bd7fb507b82dd564398de8ad7804d42e5e8e62
 EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
 EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 7fce0e20be42..bb7fdfa02ae2 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index 0a2dd058f57f..ce306b239b17 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,4 +1,6 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
+DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
 EBUILD gl2ps-1.3.9.ebuild 1247 BLAKE2B ef60d1f74da711a1497ad44427e6c74b59f523ed306c3a844d4ccb0f8c2bbf2a807438b8181a46d94bc0eb784ea90d0a47a6bd318567b93051fc047a4d2583fe SHA512 02328e81109ab6dd6307174217d105f49de9dcc30fcba6ceeda219ae00927eee27e4991aff6dbf8cf5ac72344c210f3545a5cf75a7d2d445a3263d57a457b9fa
+EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild b/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
new file mode 100644
index 000000000000..2fcb4189a4e8
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng:0= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLE_DOC="$(usex doc)"
+		-DENABLE_PNG="$(usex png)"
+		-DENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+	fi
+}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 7629ccfdaf95..d6af094f600c 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -5,5 +5,5 @@ DIST gtksourceview-3.22.2.tar.xz 1596384 BLAKE2B d638cdec2aaa510c0039d9cbda3105e
 DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
-EBUILD gtksourceview-3.24.6.ebuild 1327 BLAKE2B 9529674cf02d832782a27f24dc5d8f7e446f569cb591d4cad96eddb7f3fb2510953c19aadcf0bdabbb20c8d7b19768a44499d60335abff9749b492fd684a307f SHA512 25026157b2e70fdb7787d40320af80187598cdd425ebaeaa8ea398deece79c66e0a1cd190530c06eb7f7711234afed248aff430f6944ca6ca89a63897f1681ba
+EBUILD gtksourceview-3.24.6.ebuild 1325 BLAKE2B ad85b053db9e45ec6aa2adf2f4f22ee07249de84a8695a7918c58b5c2c20a8bcc82eaa37e0a200ee4f2ec384516c654d869bb852ad52fa1b6718cdb859b9da33 SHA512 2379dc47372479844fa7e9424e8ce130ab7a80e04752208d0b37728e6ecdb4728ebee943c5f300ce5335c36790a81091a58ec55c49f4fd412d578897770f9106
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
index 264ff9c5d555..e60c1582bb67 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ee428a39ca89..e1e2f78bbc62 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,9 +2,11 @@ DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a7
 DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
 DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
 DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945bb1120390d22b01a9e2a6460014eeb3902ee84241da8ba2c7683e76eb81d117a4f312ef3b8eb69647773d09710 SHA512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c
+DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
 EBUILD libdrm-2.4.88.ebuild 2040 BLAKE2B c2ad4b1562f73e6c2d8ef2f92a56ed3fd6e641987f7cd141b8bcbc7135569dad2e7deedd53b28706318f6d27e2f2daeaec78b8f66717e1bf03b4c5ccc8dc65d8 SHA512 6549f96311d070c6b7cb1284b203c540a285f6167eb3f5587bb85ea37d31a44314e6bc57a78df96047b40e0117ad0e0e5ebc93dc5484018d5678fb82b5b5a4f1
 EBUILD libdrm-2.4.89.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+EBUILD libdrm-2.4.91.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 EBUILD libdrm-9999.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild
new file mode 100644
index 000000000000..e516fe208c88
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.91.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~arm-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/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index 7fc9f5b70c17..0027402b90df 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,5 +1,5 @@
 AUX libfakekey-0.1-ac.patch 746 BLAKE2B 01bcc6cabd6f138eaeb6fba8452a3c7348e1ad7a6e91b6676bf8d7a29a05004af4b295d134072697bb6d34370f9a3cfffa1358c774f785a4c05652feaa06412d SHA512 b1cabad39d87d8df492f48b2afff78e182e64167d5253a40abf74ab786c8598bb1ee6e24ee62f394c787e08e5f7740e23864ccc82624efa9d2a533b9a37877cf
 DIST libfakekey-0.1.tar.bz2 203504 BLAKE2B f3e51a1ff38dd95238a1035617045f728177c9dca96d760dfe3c4485511b500944e6f64aeb5acb3e65db3badc4c189ae25ea50f42f58a927f3ec1899c4778751 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808
 EBUILD libfakekey-0.1-r1.ebuild 1160 BLAKE2B 1aa023d22994559a48bd6feac59e17c4db200667a3f4838248c8a77e0b7a3eaf252f6c88e86465636c04ec4bd0cf237f3d7285bf044100fc37b06c2ae7a712e2 SHA512 fb1d4c1463ba21e5a3ec55b518c8d25ceef4359ec5dde616713500f3268ab45ee58bcf21293ccb7d1427b299030a2e7f9a065ee93c7671090b07a560d9afc1fb
-EBUILD libfakekey-0.1-r3.ebuild 1146 BLAKE2B 23b4430e46ceeb3bbe9de5c6694084ef222b7379d93912e202788474b1851fb26a0582cb9472095478a93ddd6dc2730cb17416ae15e6b4ebc517e5faabe88655 SHA512 9158e3016a03df8e0e8870ec52ed72f75f7dcd533a92d4f1e81bebd33bd01debf47be06359758e59b1443a329bea1339eaa0ff242b4fd1112ad4b5961c274626
+EBUILD libfakekey-0.1-r3.ebuild 1145 BLAKE2B b363f487b9e473d0ed5681ef0474096ab62bbf753433736e1ad47b4a7090abcb13b0350dfeedf681d83633ae89e203abdd1b00521ef7627973cc7811a75aface SHA512 9f93c6f9dd67b6c335ea0786a148227691a1edd66b021382ac9745b2af4fdea65908b5327d6263fd6f0e91041005e1057a837aa7b7819ddeff14356309a3372e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
index 112b8cab3703..b865dc4827dc 100644
--- a/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.yoctoproject.org/releases/matchbox/${PN}/${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="debug doc"
 
 RDEPEND="x11-libs/libXtst"
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 7001b3b553b5..dd4dbb1d4c27 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,5 +3,5 @@ DIST libwnck-3.20.1.tar.xz 693932 BLAKE2B 6a411ce9aa721ad158ba4c6cde6ca33892f834
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
 EBUILD libwnck-3.20.1.ebuild 1165 BLAKE2B 20830076f1e238c26302ff8caa9174684f452598835f990b9c9cdc2dc8bcbccb2cd556fa30712d6d8de174949dea0ac3d162197bc640be37e9dbe513f4663e48 SHA512 32f9bca3d0a1b8dcfc3a086f0572d8a042ef7779dba599304caef2bdbf717565d05cae8ad3205cdd48a744e7a18429506c1b44c9325a542b4e682d78a841f25e
-EBUILD libwnck-3.24.1.ebuild 1159 BLAKE2B 7a02b46e748ad75cd88d57f1a2b2262bf80117f528973b2056a3e1827edd14f10cd184dc61892aa9c15b8005f6946d0d0bd67992213cbe01f33b35d1c30d8040 SHA512 1c76b98e868a42b308896ba6b61d717a4165a5dbdecf1e3c8563e4b973f583527aa82eab7410b58b3d1969eaf4a5a04962dba21611eb9767d7a31af204529d46
+EBUILD libwnck-3.24.1.ebuild 1157 BLAKE2B d893afa5b036c59bb26a9e7c58e7e513edd69f9ce41e0ca1d80999a757520932671a3f7787e9c39b0b13d61e9aec7a7b4bd4db11f68d3c22e99cd17bb607299e SHA512 2e0f400dd90bb942b3d44a559e072f02da526554e8c79e553e0854a97a316db4824638f4d608f18e343033f122ce93ae76704ef706fddea0a271f16bcffd7ab5
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.24.1.ebuild b/x11-libs/libwnck/libwnck-3.24.1.ebuild
index 2cd5fdd0c245..3e91bf312184 100644
--- a/x11-libs/libwnck/libwnck-3.24.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 37f24787c4ab..132c5b6b05be 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,5 +1,7 @@
 AUX libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch 8094 BLAKE2B 1c5938cfc89201682ed1b4e777ea534ce5e1dd9d66cdcc452a641fa56b95d76b48756cf1e70ef5f03f693505e9c2e70b58c19f109839c239efc380ffb046658e SHA512 0775a4c98bda6d37a44c83ed67d8ec7c8bece1d4a7b0f3d06d7f7c16596cb5de27a77e1ef1f40921555a60a3054124c8c1192c8b4747a3a84d16d847341379b7
 AUX libxcb-1.12-fix-inconsistent-use-tabs-space.patch 2515 BLAKE2B 74b2969e976ce7736232a5caa35d7ab525cefdcc7915db2ea5a3333aa356e7995935a40ed0b1362abbe2d72e3ef5a847aa22d780a9267cf785a8540257967a4a SHA512 ad3b9d9b16b42756a72e583b7d42bd670ef581b614cf185de667badb6121524b84f2738933d2ea1e5da3d135b3a5f2296eb62206463bedc9e4d3f8343f476f85
 DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896
+DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
 EBUILD libxcb-1.12-r2.ebuild 1794 BLAKE2B 24394da85015f4ea44aa0d13fdaaaea5d481af559b1eb436fac25d147eb1b45ac8863f50d90dbbf2cefb74a75095e623b5b3e8d85d0216422dee87239aee4597 SHA512 7f1d8573eef31fbb309d5914c0b31df5c5f43083446263b7d88ef3683535f1f2e7e8194ee0b8e9a633eb1d52a3533a1f967d317b2e42589443269abc9c94dce3
+EBUILD libxcb-1.13.ebuild 1492 BLAKE2B 28cf78fc62ff5004af2d40415c078cae7ac980a0d9ef68a7626a842c107108ca7c5e1c600c387055ad594d425ab490e32b939be167dfbfc7031bd07a88747a6b SHA512 c0548c152c6a399f6efdacc0f73b99aa0493b82b801153dc83eb20168be63db7a7ef528df7305c0b533582599675b4f49deb3687f73a5bc243d95dc932dec5ec
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
new file mode 100644
index 000000000000..a8f6ab111833
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -0,0 +1,51 @@
+# 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 ~arm-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-proto/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+	has_version --host-root ">=x11-proto/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/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
index c0393239709c..9ce1498258a2 100644
--- a/x11-libs/libyui-qt/Manifest
+++ b/x11-libs/libyui-qt/Manifest
@@ -1,3 +1,4 @@
+AUX libyui-qt-2.46.21-norpc.patch 653 BLAKE2B e93b1a1da1ef585d7f1caf34325eb8107dc952a84707565dce174a35ae37cb90ffb384c6a5852e490b15d002cf7083fcedc32882f4bea0b7f30e4fa30ca53515 SHA512 123b2b932318bbf71621bd37cea5be25a39ea796359cc0800bdbc2270b0240bca2a105562dfff79ea4b8d4d0af23c7933703d15740340119b31211d0ec42010c
 DIST libyui-qt-2.46.21.tar.gz 167324 BLAKE2B 175df2de97b013e81298dd8f2c66d099047d6d8ae2ca56f9c92d2b634a5acbdd92bcd3c4d0243a4e013267eeb563366229440b7cdf160ea888dc5b85e12984e0 SHA512 715154efd9fa2753f528e5a809fd2a3c635751b9bee3d511e396051b04a55086446510dbec5c70e753b1926c35faf84aaf05ea92a2a7f089f9b95dce9ee1a77f
-EBUILD libyui-qt-2.46.21.ebuild 1272 BLAKE2B 28452249675f3b9533096c8b4a77b8c943b40e664656e74f10fc6ff0c6a69c1279d0700575e3fed58b9b5c91956cc05b094afcc24bd202555a8d2981d1e3d26d SHA512 aaf49b735478abcb128bdea5d579f4a2549e834729202ea3115f67f8519290554a5b7f158b520053cda5aee8eb16856e5fa788fdf72f76c747fcf47da9e97ba8
+EBUILD libyui-qt-2.46.21.ebuild 1316 BLAKE2B 697ced0fa0e95173d7b44ce3e1ba9cc1db8daac57ec2a483462c77d43466a6c1aa9fb805f25bb33a2cc10f32c5ae7e487b1978938f2a3346a4fbf33d01d457a1 SHA512 d5ba89b1af7dfc6bd1a5eb42388bc25a2f9a5e6a349dd27817ff0cafb2c1edbd283600104abf04360715ed31f9b343069e89eff61c31b383a4fcf02971db6fd7
 MISC metadata.xml 543 BLAKE2B 2c00717eccbb9788adfe5dec2da74394568380bacc972c446374806625f4b4bb01f481f903eecbdc14720438db11620b211546751c1f7d9370f8903d2744921d SHA512 0d946fcf6d015b5ef2607abb4e6f0bef9956f4d8764435e8539d16ca25904996f0eb0cd582cce74105ab73ccd1a70c93b72a6e674a8686d4d732c31f31180458
diff --git a/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch b/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch
new file mode 100644
index 000000000000..8258fe7b1910
--- /dev/null
+++ b/x11-libs/libyui-qt/files/libyui-qt-2.46.21-norpc.patch
@@ -0,0 +1,24 @@
+From a6e599e79bd15f6a97ff6d8f2e3109759ff37aaf Mon Sep 17 00:00:00 2001
+From: Thorsten Kukuk <kukuk@thkukuk.de>
+Date: Mon, 13 Nov 2017 11:15:21 +0100
+Subject: [PATCH] Include sys/param.h instead of rpc/types.h for
+ MAXHOSTNAMELEN, we are not using RPC functions and sunrpc is deprecated in
+ glibc.
+
+---
+ src/YQUI.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/YQUI.cc b/src/YQUI.cc
+index 7c82468..f949979 100644
+--- a/src/YQUI.cc
++++ b/src/YQUI.cc
+@@ -22,7 +22,7 @@
+ 
+ /-*/
+ 
+-#include <rpc/types.h>		// MAXHOSTNAMELEN
++#include <sys/param.h>		// MAXHOSTNAMELEN
+ #include <dlfcn.h>
+ #include <libintl.h>
+ #include <algorithm>
diff --git a/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild b/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
index 885e3886395d..dbd9945ad3a7 100644
--- a/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
+++ b/x11-libs/libyui-qt/libyui-qt-2.46.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-${PN}-master-${PV}"
 
+PATCHES=( "${FILESDIR}/${P}-norpc.patch" )
+
 src_prepare() {
 	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 37da62549198..58e9f54919ba 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,6 +2,6 @@ DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
 EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
-EBUILD pango-1.40.14.ebuild 1706 BLAKE2B fa4b029ac0b133267df6867aa33e1f266c000157bad17bd26e84c8ee04ef7f5ba76546178cd77619ade37e4148e13cd3eb2bd4cac2c23b51bcad58b87c5cd325 SHA512 e5b38ebaf04f360883bbfff3029eb94552130c2d4f754eb3936abbe66b11029ffe748de263494ea2f183891e8acbccbfe25ebca9e1e282141495cb23909bc20c
+EBUILD pango-1.40.14.ebuild 1703 BLAKE2B 38fafc9982801181621645212c3f41b23c85525210ad738182223933500d4a041933ba773bba22e497cb0b8b1aa96e2ce256f3ce037236a29a1000541c96f23b SHA512 4e99d2f19a9f7c298ad1736a8db13b67075b7e724e0bca20b8077d508281447f27ca2e2d74fc79f57dbcdc27d2dd22167414c56f59c7bca4172c61da2a6e835b
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14.ebuild b/x11-libs/pango/pango-1.40.14.ebuild
index ca46decb412a..13a5d87e9793 100644
--- a/x11-libs/pango/pango-1.40.14.ebuild
+++ b/x11-libs/pango/pango-1.40.14.ebuild
@@ -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 ~arm-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 ~arm-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 e83cc934217a..f8cf0d68b88b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 BLAKE2B 720ce990b4e3dd65d47cd26b473bffc07240d76b2c10d393cba41331c6f160472d87b9b22985fd45b5b8064d5358b3b25f0decfe8759542a9c987381249bca42 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc
 DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc590a6a1cfbe652f2dd52d57fefff71229251c46cd4554b546d2e272deb7c3f970c44f657966ad08e45279813215a775c637d SHA512 755f486d62275acb5908262c4a50ad31dd9d8fca0501eb1eeec1aa2181872f8d16179b42f4213b207fd6b46fd8a72d25af7ce6c5cc10eabb363a92c0600ca972
+DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
+EBUILD qscintilla-2.10.3.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
new file mode 100644
index 000000000000..1b74d6e22141
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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)
+	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/vte/Manifest b/x11-libs/vte/Manifest
index bab2d7ae8597..cc55527869a2 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -10,5 +10,5 @@ DIST vte-0.48.4.tar.xz 1008296 BLAKE2B 9f946d6909d38896ec80db2a02666d809155997b2
 EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46c0c114e47bebba9de573443a60f0def0660e359660d672398c469e61d9804d53e02ebfd6396e28d2fbd361cc821 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
 EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
-EBUILD vte-0.48.4.ebuild 2327 BLAKE2B 59ad38c8ff19665a1b5029e90ca3b58fbdd5dcc22905bf92c94429abb67037d47ea44b7fc804e5797a569cac6fa264fa3cc5f15e989b5df1a7c3a460a2c7a8cd SHA512 0272ae6aaeaaa51055a7861693f0b8c41d6592d7b854dae5f3f17ec0dad265ecb0abd94b806aa092474b289d53791a6b36de889e605f8fed2cb935ee4dbfd370
+EBUILD vte-0.48.4.ebuild 2325 BLAKE2B c82f69c6edc9e9d48d8ea8adb690db3cbfa5787b77bc3abeb092a82e598bfdbf48fce84a9c8ad316427a0d0d4e04806973003fc054e301e1b1f9e765fe90a9e9 SHA512 54dadee2a6b3a5c79571f8844bf0a0225c0a74c7e9f840978d86a64a4270feaa6c97d844269f2eb1389cb24b4c371611835971f78d71e1d47f0e4f55e6c3e858
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index a50e8b6db3bc..ec1299e5ce2f 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/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 ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
index b967e2389259..29a25a71afb4 100644
--- a/x11-libs/xpyb/Manifest
+++ b/x11-libs/xpyb/Manifest
@@ -1,5 +1,7 @@
+AUX xpyb-1.3.1-xcbproto-1.13.patch 482 BLAKE2B 94643f0eb2ee39219ace29c0c436984b9b8bb364deee017b659b3bed26111e542b115cf4a03691db1900fbf09d501951512b6d8cb1416edc3bcda1245729e34f SHA512 d8551d7e04e805b33d53792700fb91b2220c7551f3623bbf2b96ed99e8106d028fd378ae28085faab80524775d17ffc2e7f3297443ba38fef40d1c05012f53a3
 AUX xpyb-1.3.1-xcbproto-1.9.patch 533 BLAKE2B 1166382041c9813eae21b4d0b8f264dc558348102ff5a55627c5cba11f2dbf3c091d2be3e743fa1c41f65d3687b5024ad43f5de019e1311997a2fde0f59cb424 SHA512 62fcb656d0990b22e1d375e18b3fca7f8d7a09dec5a1a7d116c4c225ff3fab65e16cd00caba6e179b2b3dbc2d53574af36466d4ac87f7f3516f8660615a00bc4
 AUX xpyb-python.patch 551 BLAKE2B 6c413d578f4a9e2b63bcd5ecb46473478adee1e6d0a007da96770c1f06876177b42481ed4842f023d2a38eaca21ef109d12e878ba2645e23f23f49d2530be28a SHA512 1aa769145dac51fe70fcdd043f06e5dfebc9108c71bf6a34f3e3161e88d82883b7a53406e153dd6253d9de516745bb2297fbb8dbf1f8f0a1b3a7d6e1aa873cb7
 DIST xpyb-1.3.1.tar.bz2 273962 BLAKE2B 931502b14a6fcd41a5a72124895c5e1c2215c74a4baa20778e39611f51ad38e78d7c37859a45c5e7a7e4754aa612bcd01d7362d96bf3c77751c6025f41f4ec6d SHA512 f3020f9b9d27ae522408d22cbdb14c9eb3d4acbc911e6f8fac425323c3f99233f773c3c4e027aa3812dec11b832cf0df8a38f71d21b0c3a1918eea6efe36c090
 EBUILD xpyb-1.3.1-r3.ebuild 1124 BLAKE2B 1e4404db61b091420dabc07ca591c8683617e221fb4d0f8cb1b86fecd35d9048c93c12ae137c844f298a8ff55994ae63c534708da999c8374eaba34ec9885086 SHA512 d8034aa2de2092ce561c7f16c1ce72370c54ee0a3962777768046a8a773eade0c2349e03efb8972edaa8559b18ab3cf905c393440fa2bde4798cb30782f17297
+EBUILD xpyb-1.3.1-r4.ebuild 1180 BLAKE2B 69f58ce6cd5df91360332fa17d20e812e3a40bb9e9ab49d9a8163d4744f5a486468bba5c89f3b9df3bef89df6b847d735d1b95af829e0fff1d9a03b1a2edb6cf SHA512 844203bc639e0346476cf6a7f338f95967b7bfdaf451e5e2e7bd0a189e55e32f28885bccaa4b988efc090a4ce16016db0142a6e84165e017394a5d86b484177c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
new file mode 100644
index 000000000000..9cb901c9727a
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.13.patch
@@ -0,0 +1,13 @@
+diff -ur xpyb-1.3.1/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1/src/py_client.py	2012-03-24 01:24:40.000000000 +0400
++++ xpyb-1.3.1/src/py_client.py	2018-03-08 10:13:48.342758718 +0300
+@@ -585,7 +585,8 @@
+           'union'   : py_union,
+           'request' : py_request,
+           'event'   : py_event,
+-          'error'   : py_error
++          'error'   : py_error,
++          'eventstruct' : lambda *a, **k: None
+           }
+ 
+ # Boilerplate below this point
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild
new file mode 100644
index 000000000000..1e7d210bc6ae
--- /dev/null
+++ b/x11-libs/xpyb/xpyb-1.3.1-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit flag-o-matic xorg-2 python-r1
+
+#EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/xpyb.git"
+SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+DESCRIPTION="XCB-based Python bindings for the X Window System"
+HOMEPAGE="https://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+	>=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-python.patch
+	"${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
+	"${FILESDIR}"/${PN}-1.3.1-xcbproto-1.13.patch
+)
+DOCS=( NEWS README )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable selinux)
+	)
+}
+
+src_configure() {
+	append-cflags -fno-strict-aliasing
+	python_foreach_impl xorg-2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl xorg-2_src_compile
+}
+
+src_install() {
+	python_foreach_impl xorg-2_src_install
+}