gentoo resync : 30.09.2018

30 files changed, 526 insertions, 389 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 927502c64a26..1590922530f9 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 78dc81303e2b..2c1a7035471d 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,8 +1,6 @@
 AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d37ae1aedaf62b0aed499303f60585ed1e3bebf9ca93abe64c8556cff9a96b4591537da02626eef81590968bc4fd35bb9 SHA512 53680a5ffe7ec0892d3e39414ebdffe466c3a98494b164efa5b21939e9e981abea16929da249c6c3a72315ebc3ad297352cc74877d0610d2dd5537f324f0827b
 AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
 AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
-DIST libX11-1.6.5.tar.bz2 2361556 BLAKE2B 6001d745cd989dad2586690da69b8d67c68a4f148a4b3f595a7b58d5ed3a054928b302307b73d776a2a707f62c2d6d97453dd1484790ed8f4e9cf36ca4758148 SHA512 63c40d37c92b8d1ac78541830b0c624c4e936924b26bce769936e0e2523fa8997be364647705057065f803f804897ea8173d1c41ef69a92832f20cc7c0fd40a0
 DIST libX11-1.6.6.tar.bz2 2342730 BLAKE2B 7b3936606a6cf8981d691caa06b2ebbf2383259a4b74ebc6fa72277ce4870222d7e797037f21cd669dc1f1177f5a08f7fdd5d0158b6579c3ca3d0587a3e4e950 SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7
-EBUILD libX11-1.6.5-r1.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
 EBUILD libX11-1.6.6.ebuild 1278 BLAKE2B b77b105807f0740d4207a1dfb980532f91f06d4b1ba4bd0575e9cd14976597afee960ba722315839cde89c883d7054b0c7a94c98dbb115cce2ed7259ec188a73 SHA512 e521b1fb9b085feda4ea22ccaa36b2bbfcfc5756287ecfc3dba6823b6dbadc2620981b15d6b2e22473005cb3fe7adc6b5382eeeda18331e7c5e061457817ca00
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/libX11-1.6.5-r1.ebuild b/x11-libs/libX11/libX11-1.6.5-r1.ebuild
deleted file mode 100644
index 765aa43ccd5a..000000000000
--- a/x11-libs/libX11/libX11-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
-	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
-	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
-	xorg-2_src_configure
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		# Make sure the build-time tool "makekeys" uses build settings.
-		tc-export_build_env BUILD_CC
-		emake -C src/util \
-			CC="${BUILD_CC}" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			clean all
-	fi
-
-	default
-}
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 0d28b2408f57..e1b066bc92a4 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,5 +1,3 @@
-DIST libXScrnSaver-1.2.2.tar.bz2 290437 BLAKE2B 051218bdfc249d7dcf3d53b3d6e7136b0215b3b445254aba27515ab4813da6b086d09d7be97e35d3f33ece78ecbc003911e671564f492e47d240e1613de5cda5 SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.2-r2.ebuild 523 BLAKE2B 03c0175b3041459c0d0ae6d050d8ea627b882aada8c0aca08a21f3a0bc3cf632b8127fed0caa553b6a6c05d8a1dfa5e715f8b32a584c15db24e2761ebdf69317 SHA512 a197a8c6ca879a84127120c5851e24ae2b2404548d4fd279d79e308dca01c578dd3a885325c80ca5efee983596437f73c398be180bf700cac6196d3da825e7e3
-EBUILD libXScrnSaver-1.2.3.ebuild 527 BLAKE2B 73dfe07615e167da15a81c5838038072a1d2d37254efc859d10610b42fc6233dbb838191bd4f27a69cac25c5507c579483cb91ff746bb8e9c2fa38fa7e467114 SHA512 726d1a78a0706edd7a4a81ea66f2650fd6ba062563f99f3321c6f035e571bcdd19238379c15b4b5b9fdd4a9193348a304e3d7d45b618ea9e22a4a57d9f0a24c7
+EBUILD libXScrnSaver-1.2.3.ebuild 524 BLAKE2B 7805fc2630257cd0f58b000e6ae9f7d9d664c91b4af6260b757f638fcec34b7de197767f848c6d977ed76d4e0baa30b7d233ee6ae7b3ba9302211ea27e80e7cc SHA512 4f6b5db5a88c3fcfc056b6302f6e9ac97ab3453641107879645fe01d8ce7f9f4fe30eff45455c6d91b1305dc2059fe4fbfbdab9480d6f3794423d53f84c1347e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
deleted file mode 100644
index 76e0d3b4a933..000000000000
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index e9064e8ae5cc..c4535430c85a 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org XScrnSaver library"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 54d1c1631057..4be45a2146cc 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,5 +1,3 @@
-DIST libXaw3d-1.6.2.tar.bz2 551851 BLAKE2B 13a03eba7af518fcaa33e89e0cf7c0955c175866348d314210f15a291590fdea98e1b5b9628252932826069bb3a3e89b2377dd80f1adfe3a2bb06e6f82f85408 SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea
 DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
-EBUILD libXaw3d-1.6.2.ebuild 671 BLAKE2B c1b541170f716a2aeeb1b60243bb2e100c85e357e1f077980e7bf4786e56dfea1c0e511368d9c5bbbd129a5b04997e2bfb06a19b584362fbdc8631addc0735fd SHA512 1afa7f6c9b7ab380132c8b04ab88e410809e4d3871f1a46d35dd668f9c01d87fa4a2d2effcf4ca0dafcf6aaa56ee30ae5f1d30b865cd4300469209f767a1d960
-EBUILD libXaw3d-1.6.3.ebuild 718 BLAKE2B 1fcdf750847f96f5c3ad9ddb78ab5c36ded75e052f4e6b91e9223ebba8da133aee5d5c01ab9bc9d1d1dfc256a4778cff7b50bb9cc316dd1de47644e36aaa6791 SHA512 f9a8330b6386d566818b42baf35f47f68abb718d4ec943e0069c58a3f931e85e7b5c972363248b6f6119aeb431b92a4f8ec8c98c870ec92e7814a2a68ccb3e53
+EBUILD libXaw3d-1.6.3.ebuild 738 BLAKE2B ace50ccd6f9f0ce2eb7b0d516ff81a89cb269900e6c7b6618cd548ce1419ee1294dedacd1b0f5a471f7abb191186e6e6e1839bc898f7d65fbacbc29d8af1bf0e SHA512 6d1cbd7641a83360181cadcf88371a249860ce351cdea97556ca0bab9b730cf35deddb2b3032f1b40668389affcf03b25aae92ecfa1a8fa9fe209b07aa489f0a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
deleted file mode 100644
index d1ee612e8a51..000000000000
--- a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Xaw3d library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="unicode"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	x11-base/xorg-proto"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable unicode internationalization)
-		--enable-arrow-scrollbars
-		--enable-gray-stipples
-	)
-
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
index e608bc305b57..f034bea07daa 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,13 +6,14 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xaw3d library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode xpm"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXt"
+	x11-libs/libXt
+	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
diff --git a/x11-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
index defe2e827afc..9b01afdf86ad 100644
--- a/x11-libs/libXinerama/Manifest
+++ b/x11-libs/libXinerama/Manifest
@@ -1,5 +1,3 @@
-DIST libXinerama-1.1.3.tar.bz2 278026 BLAKE2B d44c693cee0dab38918fb4a00803430fa4bbbc985e2cd541187bdbb717a9e3d843254f76e098f415ce4ada575aa271ab7d3ca14c8b590dcc3fe31e615ee0db99 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c
 DIST libXinerama-1.1.4.tar.bz2 287162 BLAKE2B 9e27f9776eb200a430875e4ea3a9a559f205822b5dcea59e4207a58889e8c7b67b2014e9ceed5b3cedd311c47fa023b4a8f1a17faa511fb0041382c7467527d9 SHA512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14
-EBUILD libXinerama-1.1.3-r1.ebuild 526 BLAKE2B f51adde694fbc9743279f23ce96e4e78247b9066afa3e5ce522d37df08c17c3311ce0536ef425f3baf0fdfa31830ca8a34916279bbeac4ee9a77285f5303296c SHA512 5cf487a9b8f53b58720aeb31c30b213a5e01b55e7d83d3fbb63b9723e83b15b1fde5dfc33f09e33b0cbb9dce3690cc614187f896f952aee14b345df204bb540b
-EBUILD libXinerama-1.1.4.ebuild 530 BLAKE2B ca9d5527bb1810a2419aa970a7c25e0a6599cc2cb14cebac6dab377c122449ab59c3f77da729971994ff4cd1a4d4fead1dcb9ec9edc1124465ffe1ebc40fe438 SHA512 839b478655240fd40873b4705ebaadecd19ee2db72ce8bb508b596aa76f169116ff944c7ea609e71ce883a6abcf7957a565fa5deef8c1e3de7363b50d90eb922
+EBUILD libXinerama-1.1.4.ebuild 527 BLAKE2B 3ecb61891773fcd8b679f3c1a33ca646f1de3e9cc690a16b568c224bd55a9adf1cf8f71feceb84353b0fc000ad21165d54cdde93673359cf9aaa529b9dc1c466 SHA512 42a1924340cdefb54d4a55d49aa58f2d00f20b03833061dbd989583515903d04b49f195a18fedf20075e33ea355bd3c1c3d464af17a5e13b501c5f3c8654861e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
deleted file mode 100644
index 57b9c5c4e96c..000000000000
--- a/x11-libs/libXinerama/libXinerama-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama library"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
index a1006b48b3c6..cba156923c8f 100644
--- a/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
+++ b/x11-libs/libXinerama/libXinerama-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xinerama library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
index af59b75cf53b..193111a4cf82 100644
--- a/x11-libs/libXxf86misc/Manifest
+++ b/x11-libs/libXxf86misc/Manifest
@@ -1,5 +1,3 @@
-DIST libXxf86misc-1.0.3.tar.bz2 255831 BLAKE2B 3e9fc6cc8853fb74facdbb9183111a513de7fdbc484679561def89af46a99b2cf6fd49fe66cd6b7ad9bf95cc96aeb09207bcaa46094fdebcf373198db10f9a68 SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f
 DIST libXxf86misc-1.0.4.tar.bz2 282048 BLAKE2B 5d60bc5d04f232444143aa1d89b5760a92aa5951efb41b83eed449916219346d049f0c2b7893858c7ba5148dcf273bb0d2b558e43843f897d057780362d0ccca SHA512 1dbd51a51188a060f676b88e5d98809ea355f69933972ceb7721c83289b5bb94c1f7b889baa83209a5ed864e67dd8a4ed62f1393634e97cc99ce36a2cef447fb
-EBUILD libXxf86misc-1.0.3-r2.ebuild 462 BLAKE2B 9d6283f7af5d246898cdd56a689ea391989adcd7e545d1dbcaff20b4c2c0c024c14628ab38372ec2245df41ec3af8deb2db9c9b497f2f060eca2cc5b675d8b72 SHA512 490a206c66a00c7f10573c29b88b82ae444e6a8e65fc8f6fc256134ae0ac50d9302e9d1e2b692d75a0010d9b2245242c2f6a2d92f2772124c4189fc76b0a2404
-EBUILD libXxf86misc-1.0.4.ebuild 467 BLAKE2B ca61c0e524095607903f362642687f79b794a434cff0de35f8dcc5aaa9cf9a8139e8ae4d47a131648388ac45b8a928e5b4948ed7ed3dd0b5372f893a33098522 SHA512 71f8416057dea0e0d19334484eeaaab36a3b3350f5f1b6fa43b344a91c524fb888a60287197e8c2322ee94495e84dc7d5933fc592d96965e9957931f2ae7c9f2
+EBUILD libXxf86misc-1.0.4.ebuild 464 BLAKE2B 9d4c0a880b2e67461e01e482ccf7f7ff816a1cdb613c39d2598b101768d68b7c008e78ad481e3b2c87a4d1c3f30da0a713ad72f15a17ba9825d294cd33cfd10f SHA512 b57de4675b3c79b09a6bf3c78a7f5da2583d910361f02c8cf14c5964a371991b12dcbf76aa917399487e8ba3c5a9a69ea5935bde87327218e38ef32c221cd6fe
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
deleted file mode 100644
index a49f155b6511..000000000000
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org Xxf86misc 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-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
index 669975916b50..1c815d1e57e4 100644
--- a/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86misc 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"
+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-base/xorg-proto
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
index 9a0feacb7fd2..2d0899ca6a16 100644
--- a/x11-libs/libdmx/Manifest
+++ b/x11-libs/libdmx/Manifest
@@ -1,5 +1,3 @@
-DIST libdmx-1.1.3.tar.bz2 290859 BLAKE2B 3cf8094d7b1a3d82657ae5b4c41735738beed4ed5264f0d7dcdcf25c0741f9dc567d330f1a8b8bd1dbddfd87b7317a16692053379a0aebe62637614be96c3610 SHA512 551cbba06e87ddc6f9a1f4567de4b8c592a4b6f6b6c27970c67c644ffe5c7f396e3c64c6df564d83a73f1b3842ba0a29a2463580fc0a264c552d76fbcba5a021
 DIST libdmx-1.1.4.tar.bz2 316517 BLAKE2B bede1dcf554fba15257277419c1a458125ab962365a4ae679b22a98d6a1e31584087fe09fc1a2e5a7e9b212c0fd332438cdf5c56c8a9d32b6ea755091026b6b0 SHA512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9
-EBUILD libdmx-1.1.3-r1.ebuild 358 BLAKE2B 56e69625e3bbc67ac6efc595f16bfff928f67588714229ce1f015b1e7ab065330d1fb637c003b75b251e07e723c75a881ee2686375a64da6bd7860680b1099a7 SHA512 4043dc1f31c73236d8f998dc5afd2466ffd0d5b2f21349fd194926ee03aed0ae6bb2d2afff5a03130a16c812ad752ea9e70e23342bfe086703e20638bc2d43e0
-EBUILD libdmx-1.1.4.ebuild 362 BLAKE2B f8f106a3c3fd9255d68c7b7d2c2656aef3cdcdfa3afe248be0af2705ed5583ec30c2eac56187cd579ec444cdb00e006377c86c59dbd6a470ea8aefc7ec192c9d SHA512 4f0fca54bb2e1c34184611ced54d1d0636ff22ee9b264c1f4c096f54d670c04b750b09903790a72ad3055ed753a03604e6c94161a6509df3e70129fa4cec80dc
+EBUILD libdmx-1.1.4.ebuild 359 BLAKE2B 8ee2514e4da96c37b58cc12db00731d825ed7a49c0b3fad307f6fd9644c2e3bd7cac620f7dfbe24641f9deec578c21a4e6eac31e0487f2cbe0b107af570d53f4 SHA512 58869b3c4b000ce98e1d355370437fcb107551969e3fbced849b5c7f3fe14056f7d43b330e93b49bfd402fee0d1dd3c1a7a7b8337a4c9c8dfdc9f7da04d945a2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libdmx/libdmx-1.1.3-r1.ebuild b/x11-libs/libdmx/libdmx-1.1.3-r1.ebuild
deleted file mode 100644
index 952303706498..000000000000
--- a/x11-libs/libdmx/libdmx-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xorg-2
-
-DESCRIPTION="X.Org dmx library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/libdmx-1.1.4.ebuild b/x11-libs/libdmx/libdmx-1.1.4.ebuild
index dc97d5ea37ed..d1f21753e75a 100644
--- a/x11-libs/libdmx/libdmx-1.1.4.ebuild
+++ b/x11-libs/libdmx/libdmx-1.1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org dmx library"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 5eeb6da714f4..c280f3626208 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,12 +1,6 @@
-DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
-DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
-DIST libdrm-2.4.92.tar.bz2 821789 BLAKE2B 6cb2b98e43eae6a04c333693c20710e6693d218cce3ac255d935093a83e318fe5aeae3ea0a56e6ccfb615a4f917f83cdcc11bcb5fa8bc3f41c2b57a046919dcb SHA512 9b75584d8957d298125884d490b74c0a641725d17088ba47f3dc2ec9d06519d8387eb464c024ee11712b31b17fb84e1a9a52bd4ebc7c316beb7d2f8711dc9eb2
 DIST libdrm-2.4.93.tar.bz2 826579 BLAKE2B 6b2775a6bc631001be874d1337ef9607ee8ff5b86ce5e3d8ff6c6eb58182a30e2c70592cb4eb9e88c9e046d73b510f632272c57621706afd1db416acc6ce366c SHA512 ba4221e8d6a3a9872fb6d30a0ea391e30ea0e17f249c66f067bed9c2161ed1ad8083959cb2c212834c6566c3e025f4daae31e9533d77aae19bbbbb9de6c2ab3d
 DIST libdrm-2.4.94.tar.bz2 829060 BLAKE2B 99de0fb3df6ea9bb5540cf0e3bdfe182c28db9876f679030eaaed1abd873bb818586bc07e73e0499f831ccaa7ede91a5b73b2b2bf681853e14e786a4af9abd98 SHA512 1a1699d6ea70b8759b37f3863e0802a99430b58f02e62632ad451356e2463eaf6faf4b810323f7dcc85ffdcca28f674b32caa5631ebd65b83e5b86bd59a35937
-EBUILD libdrm-2.4.89.ebuild 1958 BLAKE2B 55aa1113792ae265115d7856e5f7478f88d58253f8d780ee17b166689ba3d13617a2d443500adef0e36476cefdf57e77ba44b63144fcf257166c4a489ee68822 SHA512 e0a299d1e84a088ee87213d027714a302c0827a7c598e957dac3d72260fcb1b207a4542877f24b06f188e40966ca1a034600e850aaa97f427e174399c38a0e12
-EBUILD libdrm-2.4.91.ebuild 2113 BLAKE2B 8a1ca83984ec7487d606566250fc3845d25c1361ce24977139c9f3cd751be2f6480081b0145904f57511c3df7be6a06234ff389eb10c110ec8e9d85f6a6c3810 SHA512 79b696bb0fc820871622a13b127e61ca10f36e3643619414b388e2d3397586914028a07dd99dd1247be8d206e2cd01d7cd5834982c219023e49c49a8ae2fb0b9
-EBUILD libdrm-2.4.92.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
-EBUILD libdrm-2.4.93.ebuild 2116 BLAKE2B 8930d12e5a980e77e0089c69295b85fab23f210f3f395b838d4e98bed7ba3451e4d65c4163c96c749f0253ee092d6bdbeae4bd942cf71ff4e68df911c779e5dc SHA512 52e7990d31d1a4caefe821e624ac3d2fa8a916c396713a044f243272ba58c9b41b2ce977e784ef7af86e65ad3ecf4de793a675aae0fd6f383a3d7de33b447c63
+EBUILD libdrm-2.4.93.ebuild 2113 BLAKE2B bd75b9274d572854c30020c44ad6a59ea91c563709f2641483f18355a8b10e6780e377e8853255c761c2f967e22b230b71fc208b85a63dd59d04c22964a54835 SHA512 650a6a3dae11732881598e9af1ba7c1966128840069d1f5408d66f5d26f5ce7180e1e4f9edb0842c52cce3fc35f6f88cca5bc4dc53bb06a5be322c8a5e6eaea6
 EBUILD libdrm-2.4.94.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 EBUILD libdrm-9999.ebuild 2122 BLAKE2B d12b473e20e26342b25d1feb09d0fd43d4e63258dbd5a5a5b948a5d9adc773edf6873915f24d480073289f00ba3110093071033d8dbbb095ea365d64cdb52333 SHA512 7f9731b2b4022520d127d0ee0644e040ae402792a12f083530bd5d0f392c1be6a2e6e07d377eede06d3928df64decdfeaad1e5859a56832454e5555ec050f118
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
deleted file mode 100644
index d730ab8fab43..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-	epatch_user
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_amdgpu amdgpu)
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vc4 vc4)
-		$(use_enable video_cards_vivante etnaviv-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		--enable-valgrind=$(usex valgrind auto no)
-	)
-
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.91.ebuild b/x11-libs/libdrm/libdrm-2.4.91.ebuild
deleted file mode 100644
index 78bbb3f2cc44..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.91.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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 ~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/libdrm/libdrm-2.4.92.ebuild b/x11-libs/libdrm/libdrm-2.4.92.ebuild
deleted file mode 100644
index ec0bdd16c350..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.92.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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 ~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/libdrm/libdrm-2.4.93.ebuild b/x11-libs/libdrm/libdrm-2.4.93.ebuild
index a95c09ec6788..11d0b618285b 100644
--- a/x11-libs/libdrm/libdrm-2.4.93.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.93.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 19fafff5f352..da84c6adeb74 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,5 +1,9 @@
+AUX libfm-qt-0.13.1-check-if-app-exists-before-opening.patch 2010 BLAKE2B 3f33d70abe1467df3b799602c3232af7a490481c1fb2c3dd5a68f4792dc45a251f1e5518df36604090d23a42c43d13051bd144b54eb15cb2a7c722c9283cbacf SHA512 cafb1b97a1f6faeb7e7e9da5fa7c323eea1754078d08e5e0ea4e437c29d7da371318ecc7b944c595ef60f3169697f35db9efbd2ee23282a2bd694fac19d2e634
+AUX libfm-qt-0.13.1-correctly-handle-mountable-types.patch 3498 BLAKE2B ed7a0541d2bcbed1afd30d0045f676f179a0c123376afaeeef29260107f80ea8b0cf89a3a55f4e004fd11a6157b4ef2d3c092c8ddedd2013bef321fb59728660 SHA512 3bc193a1ef82bbe64181e596e082cbcc26b60f1cad8f05cb1d1fdcc1d162af21f8935179e3cf8ff370a7640bd5299a2ef7380436f80f9c620489365fe76c31c3
+AUX libfm-qt-0.13.1-fix-smb-error.patch 11579 BLAKE2B 4a0cdc5c9579415a3334de6295cae8ae5b9a4fdbbd0ecf647484b58edd3c6bed07fc0b93050a81c6d0d55343ea3b0f554cde536f6873ce3db057a6da3e6c267a SHA512 cc00a79ceac417d969001ac35b3c65bb6b437b3c98c62d5e70ea1e23b1a0ad0e11f05ad5c49cee64cdc23b16121ba14a8fc8978aa42b4ba6c64da00f07f72f8d
 DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
 DIST libfm-qt-0.13.1.tar.xz 191972 BLAKE2B 760847be1fbb209003bd2b61a9c475ccf57721c469927039518a5f65543b8264c32f3e2c66c867be0b969fdf4636fb82cde0b2bd4e77b1365fcb9f61b0bd02c8 SHA512 29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8
 EBUILD libfm-qt-0.11.1.ebuild 905 BLAKE2B 617800ac0b96fb5ad880dddda765d1f66836871911c04f8a8b1388673bb3849edbd4ec242620f741e127fdf769d87e3bc20b16313ade87005cf7a80e28d76b16 SHA512 4d230db20a9c7aa842aa5b855080e7d01273f15eb2968d5a4de4211c1d9d5db5f7d3ebbc0db74b4dcf8b65744419552c04514ae51710532238c3e24db1b83ccc
+EBUILD libfm-qt-0.13.1-r1.ebuild 1099 BLAKE2B 16213a455bd0710d7171b6fe6e8161e466c06251985edff6fbf342a9f48677e6f19fdfb67abc81f25fabd07cf56aeb7f405987198771c6735167b3ac8d81e3aa SHA512 ad0560427f59782cf05974fd20598fe697f8f872506a59d87065c195e3fb3de255dfa62fb6749d0574711a5335a1b6ddbc6ba92615f04576c289280ca0a9beec
 EBUILD libfm-qt-0.13.1.ebuild 926 BLAKE2B 3f1262e5cc7c7c2113e50db9cf19327281b125820b03f5114eae2524f406ded9dd6697ec37b92eb7292a44fc19811e3505e39f880b4039616c0d6594ba101975 SHA512 0413552e13a4ea4e5b1ebe0cd2b6cc82b846fc0da0c58ecd21212583fcc9bcc76831c3c013c54bd7979896a5fbf3a6ea2f4e5e5be4ade801fea99688dc5fae0c
 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.13.1-check-if-app-exists-before-opening.patch b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-check-if-app-exists-before-opening.patch
new file mode 100644
index 000000000000..92b45be432fb
--- /dev/null
+++ b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-check-if-app-exists-before-opening.patch
@@ -0,0 +1,45 @@
+From 4923f860094787d14052e9dc416c9388ff1bb53b Mon Sep 17 00:00:00 2001
+From: Tsu Jan <tsujan2000@gmail.com>
+Date: Thu, 7 Jun 2018 06:10:37 +0430
+Subject: [PATCH] Check if the opening app exists before using it
+
+Also, show an error message if there's no app.
+---
+ src/core/basicfilelauncher.cpp | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/basicfilelauncher.cpp b/src/core/basicfilelauncher.cpp
+index 8390531..2c7f00e 100644
+--- a/src/core/basicfilelauncher.cpp
++++ b/src/core/basicfilelauncher.cpp
+@@ -256,18 +256,25 @@ FilePath BasicFileLauncher::handleShortcut(const FileInfoPtr& fileInfo, GAppLaun
+                 || strcmp(scheme.get(), "trash") == 0
+                 || strcmp(scheme.get(), "network") == 0
+                 || strcmp(scheme.get(), "computer") == 0) {
+-            return FilePath::fromUri(fileInfo->target().c_str());
++            return FilePath::fromUri(target.c_str());
+         }
+         else {
+             // ask gio to launch the default handler for the uri scheme
+-            GAppInfoPtr app{g_app_info_get_default_for_uri_scheme(scheme.get()), false};
+-            FilePathList uris{FilePath::fromUri(fileInfo->target().c_str())};
+-            launchWithApp(app.get(), uris, ctx);
++            if(GAppInfoPtr app{g_app_info_get_default_for_uri_scheme(scheme.get()), false}) {
++                FilePathList uris{FilePath::fromUri(target.c_str())};
++                launchWithApp(app.get(), uris, ctx);
++            }
++            else {
++                GErrorPtr err{G_IO_ERROR, G_IO_ERROR_FAILED,
++                              QObject::tr("No default application is set to launch '%1'")
++                              .arg(target.c_str())};
++                showError(nullptr, err);
++            }
+         }
+     }
+     else {
+         // see it as a local path
+-        return FilePath::fromLocalPath(fileInfo->target().c_str());
++        return FilePath::fromLocalPath(target.c_str());
+     }
+     return FilePath();
+ }
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.13.1-correctly-handle-mountable-types.patch b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-correctly-handle-mountable-types.patch
new file mode 100644
index 000000000000..adaed387e279
--- /dev/null
+++ b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-correctly-handle-mountable-types.patch
@@ -0,0 +1,80 @@
+From dc7a5753b934e323d4d8d13f3253cbe7ae55a111 Mon Sep 17 00:00:00 2001
+From: "Hong Jen Yee (PCMan)" <pcman.tw@gmail.com>
+Date: Sun, 10 Jun 2018 00:07:31 +0800
+Subject: [PATCH] Correctly handle mountable types.
+
+---
+ src/core/basicfilelauncher.cpp | 6 +++---
+ src/core/fileinfo.cpp          | 4 ++--
+ src/core/fileinfo.h            | 3 ++-
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/basicfilelauncher.cpp b/src/core/basicfilelauncher.cpp
+index 0dc8208..0ae1177 100644
+--- a/src/core/basicfilelauncher.cpp
++++ b/src/core/basicfilelauncher.cpp
+@@ -30,11 +30,10 @@ bool BasicFileLauncher::launchFiles(const FileInfoList& fileInfos, GAppLaunchCon
+     // classify files according to different mimetypes
+     for(auto& fileInfo : fileInfos) {
+         /*
+-        qDebug("path: %s, type: %s, target: %s, isDir: %i, isDesktopEntry: %i",
++        qDebug("path: %s, type: %s, target: %s, isDir: %i, isShortcut: %i, isMountable: %i, isDesktopEntry: %i",
+                fileInfo->path().toString().get(), fileInfo->mimeType()->name(), fileInfo->target().c_str(),
+-               fileInfo->isDir(), fileInfo->isDesktopEntry());
++               fileInfo->isDir(), fileInfo->isShortcut(), fileInfo->isMountable(), fileInfo->isDesktopEntry());
+         */
+-
+         if(fileInfo->isMountable()) {
+             if(fileInfo->target().empty()) {
+                 // the mountable is not yet mounted so we have no target URI.
+@@ -269,6 +268,7 @@ FilePath BasicFileLauncher::handleShortcut(const FileInfoPtr& fileInfo, GAppLaun
+     // if we know the target is a dir, we are not going to open it using other apps
+     // for example: `network:///smb-root' is a shortcut targeting `smb:///' and it's also a dir
+     if(fileInfo->isDir()) {
++        qDebug("shortcut is dir: %s", target.c_str());
+         return FilePath::fromPathStr(target.c_str());
+     }
+ 
+diff --git a/src/core/fileinfo.cpp b/src/core/fileinfo.cpp
+index b19a751..5838fe5 100644
+--- a/src/core/fileinfo.cpp
++++ b/src/core/fileinfo.cpp
+@@ -118,7 +118,8 @@ void FileInfo::setFromGFileInfo(const GObjectPtr<GFileInfo>& inf, const FilePath
+         isDeletable_ = true;
+     }
+ 
+-    isShortcut_ = false;
++    isShortcut_ = (type == G_FILE_TYPE_SHORTCUT);
++    isMountable_ = (type == G_FILE_TYPE_MOUNTABLE);
+ 
+     /* special handling for symlinks */
+     if(g_file_info_get_is_symlink(inf.get())) {
+@@ -129,7 +130,6 @@ void FileInfo::setFromGFileInfo(const GObjectPtr<GFileInfo>& inf, const FilePath
+ 
+     switch(type) {
+     case G_FILE_TYPE_SHORTCUT:
+-        isShortcut_ = true;
+     /* Falls through. */
+     case G_FILE_TYPE_MOUNTABLE:
+         uri = g_file_info_get_attribute_string(inf.get(), G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+diff --git a/src/core/fileinfo.h b/src/core/fileinfo.h
+index 8437d92..27f7508 100644
+--- a/src/core/fileinfo.h
++++ b/src/core/fileinfo.h
+@@ -150,7 +150,7 @@ class LIBFM_QT_API FileInfo {
+     }
+ 
+     bool isMountable() const {
+-        return mimeType_->isMountable();
++        return isMountable_;
+     }
+ 
+     bool isShortcut() const {
+@@ -238,6 +238,7 @@ class LIBFM_QT_API FileInfo {
+     std::string target_; /* target of shortcut or mountable. */
+ 
+     bool isShortcut_ : 1; /* TRUE if file is shortcut type */
++    bool isMountable_ : 1; /* TRUE if file is mountable type */
+     bool isAccessible_ : 1; /* TRUE if can be read by user */
+     bool isWritable_ : 1; /* TRUE if can be written to by user */
+     bool isDeletable_ : 1; /* TRUE if can be deleted by user */
diff --git a/x11-libs/libfm-qt/files/libfm-qt-0.13.1-fix-smb-error.patch b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-fix-smb-error.patch
new file mode 100644
index 000000000000..12611650a76c
--- /dev/null
+++ b/x11-libs/libfm-qt/files/libfm-qt-0.13.1-fix-smb-error.patch
@@ -0,0 +1,279 @@
+From 1a6fa2632388ffcc57ce723501a588c90b940f93 Mon Sep 17 00:00:00 2001
+From: "Hong Jen Yee (PCMan)" <pcman.tw@gmail.com>
+Date: Sat, 9 Jun 2018 21:04:19 +0800
+Subject: [PATCH] Fix failure to open smb:// caused by incorrect file info
+ handling.
+
+---
+ src/core/basicfilelauncher.cpp | 40 ++++++++++++++++++++++++-------
+ src/core/basicfilelauncher.h   |  2 +-
+ src/core/fileinfo.cpp          |  9 ++++---
+ src/core/fileinfojob.cpp       | 44 +++++++++++++++++++++-------------
+ src/core/fileinfojob.h         |  5 ++++
+ src/core/gioptrs.h             |  4 ++++
+ src/filelauncher.cpp           |  2 +-
+ src/filelauncher.h             |  2 +-
+ 8 files changed, 77 insertions(+), 31 deletions(-)
+
+diff --git a/src/core/basicfilelauncher.cpp b/src/core/basicfilelauncher.cpp
+index 2c7f00e..0dc8208 100644
+--- a/src/core/basicfilelauncher.cpp
++++ b/src/core/basicfilelauncher.cpp
+@@ -29,11 +29,13 @@ bool BasicFileLauncher::launchFiles(const FileInfoList& fileInfos, GAppLaunchCon
+     FilePathList pathsToLaunch;
+     // classify files according to different mimetypes
+     for(auto& fileInfo : fileInfos) {
+-        // qDebug("path: %s, target: %s", fileInfo->path().toString().get(), fileInfo->target().c_str());
+-        if(fileInfo->isDir()) {
+-            folderInfos.emplace_back(fileInfo);
+-        }
+-        else if(fileInfo->isMountable()) {
++        /*
++        qDebug("path: %s, type: %s, target: %s, isDir: %i, isDesktopEntry: %i",
++               fileInfo->path().toString().get(), fileInfo->mimeType()->name(), fileInfo->target().c_str(),
++               fileInfo->isDir(), fileInfo->isDesktopEntry());
++        */
++
++        if(fileInfo->isMountable()) {
+             if(fileInfo->target().empty()) {
+                 // the mountable is not yet mounted so we have no target URI.
+                 GErrorPtr err{G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED,
+@@ -67,6 +69,9 @@ bool BasicFileLauncher::launchFiles(const FileInfoList& fileInfos, GAppLaunchCon
+                 pathsToLaunch.emplace_back(path);
+             }
+         }
++        else if(fileInfo->isDir()) {
++            folderInfos.emplace_back(fileInfo);
++        }
+         else {
+             auto& mimeType = fileInfo->mimeType();
+             mimeTypeToFiles[mimeType->name()].emplace_back(fileInfo);
+@@ -103,16 +108,27 @@ bool BasicFileLauncher::launchFiles(const FileInfoList& fileInfos, GAppLaunchCon
+ bool BasicFileLauncher::launchPaths(FilePathList paths, GAppLaunchContext* ctx) {
+     // FIXME: blocking with an event loop is not a good design :-(
+     QEventLoop eventLoop;
+-
+     auto job = new FileInfoJob{paths};
+     job->setAutoDelete(false);  // do not automatically delete the job since we want its results later.
+ 
+     GObjectPtr<GAppLaunchContext> ctxPtr{ctx};
++
++    // error handling (for example: handle path not mounted error)
++    QObject::connect(job, &FileInfoJob::error,
++            &eventLoop, [this, job, ctx](const GErrorPtr & err, Job::ErrorSeverity /* severity */ , Job::ErrorAction &act) {
++        auto path = job->currentPath();
++        if(showError(ctx, err, path, nullptr)) {
++            // the user handled the error and ask for retry
++            act = Job::ErrorAction::RETRY;
++        }
++    }, Qt::BlockingQueuedConnection);  // BlockingQueuedConnection is required here to pause the job and wait for user response
++
+     QObject::connect(job, &FileInfoJob::finished,
+             [&eventLoop]() {
+         // exit the event loop when the job is done
+         eventLoop.exit();
+     });
++
+     // run the job in another thread to not block the UI
+     job->runAsync();
+ 
+@@ -145,7 +161,7 @@ BasicFileLauncher::ExecAction BasicFileLauncher::askExecFile(const FileInfoPtr &
+     return ExecAction::DIRECT_EXEC;
+ }
+ 
+-bool BasicFileLauncher::showError(GAppLaunchContext* /* ctx */, GErrorPtr& /* err */, const FilePath& /* path */, const FileInfoPtr& /* info */) {
++bool BasicFileLauncher::showError(GAppLaunchContext* /* ctx */, const GErrorPtr & /* err */, const FilePath& /* path */, const FileInfoPtr& /* info */) {
+     return false;
+ }
+ 
+@@ -249,13 +265,21 @@ bool BasicFileLauncher::launchDesktopEntry(const char *desktopEntryName, const F
+ 
+ FilePath BasicFileLauncher::handleShortcut(const FileInfoPtr& fileInfo, GAppLaunchContext* ctx) {
+     auto target = fileInfo->target();
++
++    // if we know the target is a dir, we are not going to open it using other apps
++    // for example: `network:///smb-root' is a shortcut targeting `smb:///' and it's also a dir
++    if(fileInfo->isDir()) {
++        return FilePath::fromPathStr(target.c_str());
++    }
++
+     auto scheme = CStrPtr{g_uri_parse_scheme(target.c_str())};
+     if(scheme) {
+         // collect the uri schemes we support
+         if(strcmp(scheme.get(), "file") == 0
+                 || strcmp(scheme.get(), "trash") == 0
+                 || strcmp(scheme.get(), "network") == 0
+-                || strcmp(scheme.get(), "computer") == 0) {
++                || strcmp(scheme.get(), "computer") == 0
++                || strcmp(scheme.get(), "menu") == 0) {
+             return FilePath::fromUri(target.c_str());
+         }
+         else {
+diff --git a/src/core/basicfilelauncher.h b/src/core/basicfilelauncher.h
+index a28aa75..3b1545d 100644
+--- a/src/core/basicfilelauncher.h
++++ b/src/core/basicfilelauncher.h
+@@ -53,7 +53,7 @@ class LIBFM_QT_API BasicFileLauncher {
+ 
+     virtual bool openFolder(GAppLaunchContext* ctx, const FileInfoList& folderInfos, GErrorPtr& err);
+ 
+-    virtual bool showError(GAppLaunchContext* ctx, GErrorPtr& err, const FilePath& path = FilePath{}, const FileInfoPtr& info = FileInfoPtr{});
++    virtual bool showError(GAppLaunchContext* ctx, const GErrorPtr& err, const FilePath& path = FilePath{}, const FileInfoPtr& info = FileInfoPtr{});
+ 
+     virtual ExecAction askExecFile(const FileInfoPtr& file);
+ 
+diff --git a/src/core/fileinfo.cpp b/src/core/fileinfo.cpp
+index 8e86f8d..b19a751 100644
+--- a/src/core/fileinfo.cpp
++++ b/src/core/fileinfo.cpp
+@@ -36,10 +36,9 @@ void FileInfo::setFromGFileInfo(const GObjectPtr<GFileInfo>& inf, const FilePath
+     size_ = g_file_info_get_size(inf.get());
+ 
+     tmp = g_file_info_get_content_type(inf.get());
+-    if(!tmp) {
+-        tmp = "application/octet-stream";
++    if(tmp) {
++        mimeType_ = MimeType::fromName(tmp);
+     }
+-    mimeType_ = MimeType::fromName(tmp);
+ 
+     mode_ = g_file_info_get_attribute_uint32(inf.get(), G_FILE_ATTRIBUTE_UNIX_MODE);
+ 
+@@ -196,6 +195,10 @@ void FileInfo::setFromGFileInfo(const GObjectPtr<GFileInfo>& inf, const FilePath
+         }
+     }
+ 
++    if(!mimeType_) {
++        mimeType_ = MimeType::fromName("application/octet-stream");
++    }
++
+     /* if there is a custom folder icon, use it */
+     if(isNative() && type == G_FILE_TYPE_DIRECTORY) {
+         auto local_path = path().localPath();
+diff --git a/src/core/fileinfojob.cpp b/src/core/fileinfojob.cpp
+index 3c222af..7bf8bb3 100644
+--- a/src/core/fileinfojob.cpp
++++ b/src/core/fileinfojob.cpp
+@@ -13,31 +13,41 @@ FileInfoJob::FileInfoJob(FilePathList paths, FilePathList deletionPaths, FilePat
+ 
+ void FileInfoJob::exec() {
+     for(const auto& path: paths_) {
+-        if(!isCancelled()) {
++        if(isCancelled()) {
++            break;
++        }
++        currentPath_ = path;
++
++        bool retry;
++        do {
++            retry = false;
+             GErrorPtr err;
+             GFileInfoPtr inf{
+                 g_file_query_info(path.gfile().get(), defaultGFileInfoQueryAttribs,
+                                   G_FILE_QUERY_INFO_NONE, cancellable().get(), &err),
+                 false
+             };
+-            if(!inf) {
+-                continue;
++            if(inf) {
++                // Reuse the same dirPath object when the path remains the same (optimize for files in the same dir)
++                auto dirPath = commonDirPath_.isValid() ? commonDirPath_ : path.parent();
++                auto fileInfoPtr = std::make_shared<FileInfo>(inf, dirPath);
++
++                // FIXME: this is not elegant
++                if(cutFilesHashSet_
++                        && cutFilesHashSet_->count(path.hash())) {
++                    fileInfoPtr->bindCutFiles(cutFilesHashSet_);
++                }
++
++                results_.push_back(fileInfoPtr);
++                Q_EMIT gotInfo(path, results_.back());
+             }
+-
+-            // Reuse the same dirPath object when the path remains the same (optimize for files in the same dir)
+-            auto dirPath = commonDirPath_.isValid() ? commonDirPath_ : path.parent();
+-            FileInfo fileInfo(inf, dirPath);
+-
+-            if(cutFilesHashSet_
+-                    && cutFilesHashSet_->count(fileInfo.path().hash())) {
+-                fileInfo.bindCutFiles(cutFilesHashSet_);
++            else {
++                auto act = emitError(err);
++                if(act == Job::ErrorAction::RETRY) {
++                    retry = true;
++                }
+             }
+-
+-            auto fileInfoPtr = std::make_shared<const FileInfo>(fileInfo);
+-
+-            results_.push_back(fileInfoPtr);
+-            Q_EMIT gotInfo(path, fileInfoPtr);
+-        }
++        } while(retry && !isCancelled());
+     }
+ }
+ 
+diff --git a/src/core/fileinfojob.h b/src/core/fileinfojob.h
+index 53a03c5..d75e88f 100644
+--- a/src/core/fileinfojob.h
++++ b/src/core/fileinfojob.h
+@@ -27,6 +27,10 @@ class LIBFM_QT_API FileInfoJob : public Job {
+         return results_;
+     }
+ 
++    const FilePath& currentPath() const {
++        return currentPath_;
++    }
++
+ Q_SIGNALS:
+     void gotInfo(const FilePath& path, std::shared_ptr<const FileInfo>& info);
+ 
+@@ -39,6 +43,7 @@ class LIBFM_QT_API FileInfoJob : public Job {
+     FileInfoList results_;
+     FilePath commonDirPath_;
+     const std::shared_ptr<const HashSet> cutFilesHashSet_;
++    FilePath currentPath_;
+ };
+ 
+ } // namespace Fm
+diff --git a/src/core/gioptrs.h b/src/core/gioptrs.h
+index 401424b..ae22602 100644
+--- a/src/core/gioptrs.h
++++ b/src/core/gioptrs.h
+@@ -112,6 +112,10 @@ class GErrorPtr {
+         return err_;
+     }
+ 
++    const GError* operator->() const {
++        return err_;
++    }
++
+     bool operator == (const GErrorPtr& other) const {
+         return err_ == other.err_;
+     }
+diff --git a/src/filelauncher.cpp b/src/filelauncher.cpp
+index 5f667fc..ff14533 100644
+--- a/src/filelauncher.cpp
++++ b/src/filelauncher.cpp
+@@ -76,7 +76,7 @@ bool FileLauncher::openFolder(GAppLaunchContext *ctx, const FileInfoList &folder
+     return BasicFileLauncher::openFolder(ctx, folderInfos, err);
+ }
+ 
+-bool FileLauncher::showError(GAppLaunchContext* /*ctx*/, GErrorPtr &err, const FilePath &path, const FileInfoPtr &info) {
++bool FileLauncher::showError(GAppLaunchContext* /*ctx*/, const GErrorPtr &err, const FilePath &path, const FileInfoPtr &info) {
+     /* ask for mount if trying to launch unmounted path */
+     if(err->domain == G_IO_ERROR) {
+         if(path && err->code == G_IO_ERROR_NOT_MOUNTED) {
+diff --git a/src/filelauncher.h b/src/filelauncher.h
+index be5be5a..991a00a 100644
+--- a/src/filelauncher.h
++++ b/src/filelauncher.h
+@@ -43,7 +43,7 @@ class LIBFM_QT_API FileLauncher: public BasicFileLauncher {
+ 
+     bool openFolder(GAppLaunchContext* ctx, const FileInfoList& folderInfos, GErrorPtr& err) override;
+ 
+-    bool showError(GAppLaunchContext* ctx, GErrorPtr& err, const FilePath& path = FilePath{}, const FileInfoPtr& info = FileInfoPtr{}) override;
++    bool showError(GAppLaunchContext* ctx, const GErrorPtr &err, const FilePath& path = FilePath{}, const FileInfoPtr& info = FileInfoPtr{}) override;
+ 
+     ExecAction askExecFile(const FileInfoPtr& file) override;
+ 
diff --git a/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..95dea87773b8
--- /dev/null
+++ b/x11-libs/libfm-qt/libfm-qt-0.13.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-check-if-app-exists-before-opening.patch"
+	"${FILESDIR}/${P}-fix-smb-error.patch"
+	"${FILESDIR}/${P}-correctly-handle-mountable-types.patch"
+)
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=lxde-base/menu-cache-1.1.0
+	media-libs/libexif:=
+	>=x11-libs/libfm-1.2.0:=
+	x11-libs/libxcb:=
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPULL_TRANSLATIONS=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 5aa52ea5c446..a9fde8628fbc 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,5 @@
+DIST libxcb-1.13.1.tar.bz2 506778 BLAKE2B eca685a21d40f664b611c0c8da845e3464126b101320a86db27ee4d87b85ac0ad1a41950281b7f0ecca06883c591571d059a913591b0281890b339f279b7af93 SHA512 763edff9572623674f75a858adc57b5c09591f508cc5d5093218e7bb047abdbe0a0108bd465419a8bf15c7dcdc85efdd2d4d9fd56605c41475d15dc992640c23
 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
+EBUILD libxcb-1.13.1.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
 EBUILD libxcb-1.13.ebuild 1468 BLAKE2B 1a5cd7c835a58dfbf7032967cad02f1736f84279b96c8f11595d3ab22dfd82c1ae76d0846dfc5d29e350fe7a47fe2f81854707f93a08433fd51fb524fbf3c4ad SHA512 e0d1457e26b423a83a3054bfb76e59b70843a84f9346658f35f09dcf4406ad9f85279bd5c307d8fd235b7141cc1f4991973347be5afd7d7eba060cb5c4d1d120
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.1.ebuild b/x11-libs/libxcb/libxcb-1.13.1.ebuild
new file mode 100644
index 000000000000..102ff1507d80
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.13.1.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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux test xkb"
+SLOT="0/1.12"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+	doc? ( app-doc/doxygen[dot] )
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	$(python_gen_any_dep \
+		">=x11-base/xcb-proto-1.13[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+	has_version --host-root ">=x11-base/xcb-proto-1.13[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc devel-docs)
+		$(use_enable selinux)
+		$(use_enable xkb)
+		--enable-xinput
+	)
+	xorg-2_src_configure
+}