gentoo resync : 02.03.2018

23 files changed, 336 insertions, 114 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 88bb22e6e591..20c58dd2ef85 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 70bd6e194a72..c90591c45648 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2
-EBUILD gdk-pixbuf-2.36.11.ebuild 3886 BLAKE2B 18ccab0fd39838cfaae2d1056a658a4cadbc2521e3523658891aa96f8251458015694e3e74c041241d2cea2cbb296d7d3fb6de7d59e3517d440b57e6476f2db5 SHA512 36fdd37e9c73dbebe4667028fa10604a431a8dedfc7e56305ce8d0f3dec2070f16ddc2147cfcb7a8523e068d40e0dfdbd0ea2510fe836826f568ff7dedba5ff7
+EBUILD gdk-pixbuf-2.36.11.ebuild 3885 BLAKE2B da12dbbf886f9c7824ae00767b9ba490fad8004804ba6d853b5d154fa83edcdad2bac231c930abb336949ea17ce11a173ebe614b6c246ea933874c573806bf2e SHA512 a9c8bc38a015a63c15100b5ebbca9253d1734c948b60e9d9e4f1f85e1bb3e0cf43d223f6a9bd7f81090d2ca5609b1af64b7a53e77b0aab20cf9461be13ccf346
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index d6b9f95178e5..834d1ee525f3 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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 ~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="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index 02ab05c1af34..1941ed2568d1 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,5 +1,3 @@
-DIST libQGLViewer-2.6.4.tar.gz 2996712 BLAKE2B c57df2a538d74a3cb9f919e572f02ce0cb8093e95e117202b2b12503cd3423552244edf3ee79fda17581fa3c7dfa7192d2303117eef097c97d5f983d3e33d6c1 SHA512 fae9caa7fe049b13ba970c971a9454700631cac18d46b6154ae4e155fabe64dc3b8eacf968dce69292743ade6c8c2772e236505ee8099bbf9ed291382dbd65f0
 DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd
-EBUILD libQGLViewer-2.6.4.ebuild 1235 BLAKE2B 4065cbec81221c971c48cb67edba095cd75b4553afe4e4543f9ff22b4ab63cda20e0a903b81915ef654c63ff5007182d1baf17fb8b335e6d421f535192ad6c65 SHA512 96bb2854665c64eb9821ac27497810a28e29c3e3056e0d853eb91bd7677636b983518824fdeead5932eb4f19797516b2af304a645aef3152b218b55aa4bf49cc
 EBUILD libQGLViewer-2.7.1.ebuild 1291 BLAKE2B 711010c65c0a0cebe90f239d1f223ee3a66cce014770e712b9997eca165bd39af562a44d000f5271aec7df0cb303c924ffe0785166b4ed0dc567940d9a011f7a SHA512 6620cba4f14e98f4b827ded73d98a9ef935fd7da30a8908005cad327b339f4a962a6476b2890f27565e129adf9a326058d8f644acaf7d50d69ed0259cf0e87ed
 MISC metadata.xml 337 BLAKE2B d41f3f134ae930728e76d4924cd145a6a958482a008c047deda9e0ac8864496ceed43f939792583cc49bb572785a4924fb3e44da738b6ea2c84e43ca592844f4 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild
deleted file mode 100644
index ad58bdbd9023..000000000000
--- a/x11-libs/libQGLViewer/libQGLViewer-2.6.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit qt4-r2 multilib flag-o-matic
-
-DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
-HOMEPAGE="http://www.libqglviewer.com"
-SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/qt4-2"
-KEYWORDS="~amd64 ~arm"
-IUSE="designer examples"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-qt/qtopengl:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	designer? ( dev-qt/designer:4 )"
-
-src_configure() {
-	append-ldflags "-L${S}/QGLViewer"
-	sed -e 's#designerPlugin##' -i ${P}.pro || die
-	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
-	eqmake4 ${P}.pro \
-		PREFIX="${EPREFIX}/usr" \
-		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-	if use designer ; then
-		cd "${S}/designerPlugin"
-		eqmake4 designerPlugin.pro
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README
-
-	if use designer ; then
-		cd "${S}/designerPlugin"
-		emake INSTALL_ROOT="${D}" install
-	fi
-
-	if use examples ; then
-		exeinto /usr/bin/${PN}-examples
-		doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
-	fi
-}
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 7a29231e770e..0d8219d436c1 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0.ebuild 696 BLAKE2B c11cd058747c79eee3eae8f0cce2b2faebd3154966d032d2087d4a9887fb4fe6b204da16511167bf69421dedf70cafc0346e47ca25c75ae6c17d494972f20ed2 SHA512 200a4dadcf255e5222a7148b553a8b1359fea258792e0e925351c1e201c0acdf006c3c1d20ef956af005609dc2ab1083e117dc0d85ef236eea513bea1412c013
+EBUILD libXpresent-1.0.0.ebuild 708 BLAKE2B d0170a4dec1e3f5a5cd6558d572b4113241ce20341cdd388c6568700dd1fe0b67277aa7558aa8e234642bd67201155b632485c5eab50fee1cc5f088afc9211f4 SHA512 fd57f308c7c1c25ef94ddbe8c78063ea862c07bfd28cd18c788b0b67fe524cf7244248f27311a32748f7dd877264b906d13db97003ff70f2ea0c1efbd5b90d37
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
index 745920fc9151..85701d296673 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 036bda3e9556..ee428a39ca89 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,10 @@
 DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
 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
 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-9999.ebuild 2048 BLAKE2B 420563dabca9536a39d9b6d3d2e4bdc8f17f456340d24759711514fad31095da3fce792ea5dc53b3f52bb619dbf9ce6264f9d2a5171afff040bb64063f7dfc60 SHA512 20ef3baf5ff00c1be17b121086b4c92e2012e77d5bca81979ef543c3710890411f76ec06daf0eec37eb91fc6b260f81ce37e6fed5c61ab0519f6d8fb1bb9c3ac
+EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+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.90.ebuild b/x11-libs/libdrm/libdrm-2.4.90.ebuild
new file mode 100644
index 000000000000..f9f91008a7ac
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.90.ebuild
@@ -0,0 +1,63 @@
+# 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 ~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
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+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-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 092c800d11d7..e516fe208c88 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -1,15 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-XORG_MULTILIB=yes
-inherit xorg-2
+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
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+	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"
@@ -22,42 +27,50 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
 RESTRICT="test" # see bug #236845
+LICENSE="MIT"
+SLOT="0"
 
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+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_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_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
 }
 
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
+multilib_src_configure() {
+	local emesonargs=(
 		# 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)
+		-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
-		--enable-valgrind=$(usex valgrind auto no)
+		-Dvalgrind=$(usex valgrind auto false)
 	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
 
-	xorg-2_src_configure
+multilib_src_install() {
+	meson_src_install
 }
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
index f9cb93bcae9b..7fc9f5b70c17 100644
--- a/x11-libs/libfakekey/Manifest
+++ b/x11-libs/libfakekey/Manifest
@@ -1,5 +1,5 @@
-AUX libfakekey-0.1-ac.patch 746 BLAKE2B ade99159db51a6ed84b65605491d2952bf5601cf4acd63dfea99c2c57a9f50714edb0d8a2c3e84bbf9109cc8a0ed12bf0abc124c38e9d9847f35c093c6775649 SHA512 383912a211882f03cbfa6223703531c8975821c7861e460466e25b451eda81ca2d8c7449c0d9e928061ce9bf82c476c064a6cee96f58ad93c00fab2cc4d2fa57
+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-r2.ebuild 1108 BLAKE2B f9ebd79e80fd41c73d6a4cb34808df72b40de91dd6051d8882bf3d0c095a2503a8dc1ee75292d3318a67ee392be5b9e6c80935afc0634b9b869e5ec500c75b89 SHA512 ee4a7cc72689baa119de57eee178405cce634fcbae818a8647e256fc5d11761e8f624effe2a845eeab7bf03170adb53d8c497c2f224c5cbab7364c2c6bd869aa
+EBUILD libfakekey-0.1-r3.ebuild 1146 BLAKE2B 23b4430e46ceeb3bbe9de5c6694084ef222b7379d93912e202788474b1851fb26a0582cb9472095478a93ddd6dc2730cb17416ae15e6b4ebc517e5faabe88655 SHA512 9158e3016a03df8e0e8870ec52ed72f75f7dcd533a92d4f1e81bebd33bd01debf47be06359758e59b1443a329bea1339eaa0ff242b4fd1112ad4b5961c274626
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
index 65c0b083aa72..7158ad220efd 100644
--- a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
+++ b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
@@ -1,5 +1,5 @@
---- configure.ac.old	2011-05-22 14:59:45.801746472 +0100
-+++ configure.ac	2011-05-22 15:02:59.437159981 +0100
+--- a/configure.ac	2011-05-22 14:59:45.801746472 +0100
++++ b/configure.ac	2011-05-22 15:02:59.437159981 +0100
 @@ -14,16 +14,14 @@ AC_HEADER_STDC
  
  dnl ------ libtool versioning -----------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
index cfbc9fdf891d..112b8cab3703 100644
--- a/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.1-r3.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
-HOMEPAGE="http://matchbox-project.org/"
-SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+HOMEPAGE="https://www.yoctoproject.org/tools-resources/projects/matchbox"
+SRC_URI="http://downloads.yoctoproject.org/releases/matchbox/${PN}/${PV}/${P}.tar.bz2"
 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"
@@ -19,9 +19,13 @@ RDEPEND="x11-libs/libXtst"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_prepare() {
+PATCHES=(
 	# Allow configure to use libtool-2
-	epatch "${FILESDIR}/${P}-ac.patch"
+	"${FILESDIR}/${P}-ac.patch"
+)
+
+src_prepare() {
+	default
 
 	# Fix underlinking bug #367595
 	sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
@@ -32,14 +36,13 @@ src_prepare() {
 
 src_configure() {
 	# --with/without-x is ignored by configure script and X is used.
-	econf	--with-x \
+	econf --with-x \
 		$(use_enable debug) \
 		$(use_enable doc doxygen-docs)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-	use doc && dohtml doc/html/*
+	use doc && local HTML_DOCS=( doc/html/. )
+	einstalldocs
 }
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 5401edcb483a..5e6533266826 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -3,5 +3,5 @@ DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 EBUILD libfm-extra-1.2.3.ebuild 2555 BLAKE2B a1386ee68a780b4f12a3fe37ada3343765304050c30b68ad66f7c09cd9f94170212c37fe6a7c7bc914c0bf364d26616d94a76a0f036e0d15d777dc8c19db9312 SHA512 0e995b9810ea99678f5844ca6dfbb046b7dc10928475f6457efb546809b521c48ecd433b561eac24c0bcedd3a13550277aead1aa19a9f867149e2db467160a86
 EBUILD libfm-extra-1.2.4.ebuild 2566 BLAKE2B a053a2e40326bc08444748621a23a660ff1348cedc9673b3b8d1a7d3008b8d52b0799d7ae49b0e13848f27c102d517da5b77e203b2fec2db249a9408a74e3c3f SHA512 2a15974f0bd4814c1800d880f5b0b79c11cab5f7d4f77a29a946fdfc65f7ff6807d7f26e1427399ae4877823d1b95cc51dca5a07e013bd3e7b43bd77726fac64
-EBUILD libfm-extra-1.2.5.ebuild 2567 BLAKE2B 1d27c438638a7354cfef797ccd0079961f5a4cf6ae7d25834a410c2e09bccf9556ac865ead1637d287e2ff92c349c378217c29f6717e4b896e17e9e684d1df42 SHA512 b706e5eb2e4c913abd56a2d61e561069687f37dedb7c6fac0d7ef42ea1cf056970871cebbcec100e8c8ea917653854e48a78b8ca2ee52b40824ded80410ccd95
+EBUILD libfm-extra-1.2.5.ebuild 2566 BLAKE2B df9fb2e09984aced324f5e41fc623745f32f85aafe66318e405ff34ae4b65223d11623129c12f8b1d0904459d042a28beec98bd04ecdb9f55159e02c2ea83e0f SHA512 9de8fdf59d48310208e95637a284104f41a44d16a4fe04d5b9ebd956523d1c0ff612821614ae54b71cc05378ac666d6c8e9235abd4204725fbfde94506050e34
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
index 4a960668dc97..0caa1a5efec9 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE=""
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 913808ec2870..efb88b42ad9f 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -4,6 +4,6 @@ DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
 EBUILD libfm-1.2.3-r1.ebuild 3505 BLAKE2B 13269a78260229c8e5ef3b16b82fcc66802908d6465581a3a36fde8bda936df294767af5133f8cefe0155cb902a1a9e5d8d4a969b025983d1f00dfb424519dce SHA512 ba54347a14bc1c297561f10077ab02d67d9df2e5c18689e5d12a8dba3c5a5902d411b93b6f603d7b924ab8a7ae4804e8cfc79943a329204c96ed750fe268c0ef
 EBUILD libfm-1.2.4.ebuild 3722 BLAKE2B 40b0b35b173db705616543465caf55ad9d5998672325f984e0a44ccaa85913cc7e224ea8c1b3834f7427c304d13208d9ad544c3f26bb9328077a76e893cd5d0a SHA512 0fb24103c5ef222b11cc4bc555fce4de90e95c649798d69b394ed9ab7dd6c9dc822c2c95ceef56d82a3dc5fbe1630284dd2ffa6477d56d8f6df504934f7e8d3d
-EBUILD libfm-1.2.5.ebuild 3723 BLAKE2B 56b0b6988a2f89a2721ba4e32adb9ec60d4773eaab2fa661ec7554f3ed6542bd8ab4c770258a3a0537ce3a3a6edce095d46e8af94ec8a055687fbe7b4565de11 SHA512 3bc3dd6968ac3ee19a69b41f7cb84da986b630e78d1591df9383927c62a7d8404969e4a64cda3712383169a43f8bfeb4e33daeee5e49333e981848618b189dd3
+EBUILD libfm-1.2.5.ebuild 3722 BLAKE2B 2fa4227fb149578bbb2ac0160ed6320cff38f02e25b3d76f2e105ce02075107d961920f125cd363bc2d1e3424baab81108ada622d48c557887fa7d3fb7f68953 SHA512 e84790a677fc35b040d5cf663458b79f66167e575b7aa5a55ef70785e678fe9b0100a80dbcd0a19e052fd4cc31887c2ec92a6d1cddb59d852bbcd04a81dce859
 EBUILD libfm-9999.ebuild 3434 BLAKE2B afb28319ba50070ca0b98762964ce0fa70faee48606470228c69345aeb88cbbccb5ec95e9eac79e710091c2902cb6cedcd7e4958b39a0ff50d65a4e4f852bdef SHA512 c53f08c820bb24c4c53c2fcf66bccf15313cdeea793d8d0595ed2587a6bb34e529006e7f5c8543f3780ac5ff35ab588300aeb329ec34d60cb549170564df7d1d
 MISC metadata.xml 891 BLAKE2B 2acc49a000fa81b6bd7e473c9c21d05174a4cc30cc5fcf75b5a1309a8e8354b034c30b7f4e3a44715c76ef9e557a5ff53fb6f156babdc3c5e34ca2b3cea1eb8d SHA512 de30c6bbfed377885da535958c50c726e8e9b69a10b322b5d228b0aa5031c7601e006d8721c2d12a820960e2208c860bb0d8d97af69f8c88f4e6e34591e643b5
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
index 5d88eb6c7ef7..ad671cdf555e 100644
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ b/x11-libs/libfm/libfm-1.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-2"
 SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE="+automount debug doc examples exif gtk udisks vala"
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 3d0265345778..01c317d9db7b 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,5 +1,7 @@
 DIST libxshmfence-1.1.tar.bz2 291347 BLAKE2B 76b9f91e2bd03cd52212ca5ac548d7f4c64ad93bb0e2c8e2ecc719b820295fc53521089241bd9e7e892dbf60c1644bd73fad93732b95aa552e1121a4e8359404 SHA512 ed3aae4a44849c11ce041df53d47667606dba5357059c13d5c0989205df57dfa626598db6ad66432114a80e69ab4118fb067877ea275897aab64d4bbf9bcd346
 DIST libxshmfence-1.2.tar.bz2 267170 BLAKE2B 16e253a9f8e567cab048f8b54838929f8e78d222549c854baa682ec6736e5dd13d3cb5d1b9c2635d79b1bf41ee03dded0fac1845fbeedd07385c173f2660567f SHA512 340a6dff5c7ce7f0fe89d8094ee91a0572c8bf0da888861c5262d6a65a13ecad0e2a079949ccc115e15a2d0d108c4f1ba1743874289cacbbc17aa3a05cd8e072
+DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
 EBUILD libxshmfence-1.1.ebuild 464 BLAKE2B 0688f6dc0549ce92f64ff70181e7f810c79c22a09fe669bbc5224e2cbc8d030b80375ad227b74c8c44b3b35ea9d47f14c0265792e563bb5a99ba3a89baa73ccb SHA512 d4bb938b7975702ea7d979c93c27a34e6e6181c445325b4a750322ef181e3b564f4ba9e08cb797a475bfbb29bb4fd47735c0cd6f8fa299f57b73c1b43134453b
 EBUILD libxshmfence-1.2.ebuild 466 BLAKE2B 26bdef08333387bc8f9a4ad2f358129307e644b34f370de616b6c07e72cf1ae883b428eff2743b7029905a5acf786d61eba8db42c9063b880aed52226806d5d8 SHA512 4003a74a9b05c1813cd078eec0a25c56b6efdc5bc43721a8ae9fa1570a6c9de31ce027d2a8b5615b99c03dc55a9e0dc38eb95212bcd4f2563eecc6b901dbfdb7
+EBUILD libxshmfence-1.3.ebuild 475 BLAKE2B f392789d30996d2c77cbb56a9f26b6d98992af7d5b658cd8adb3735113bbdb142cf56cf761be94709303cb16b328188850061b8d0e1f6e0da14f67a02ff78366 SHA512 3559160e352071e87c65a23d684a7eea058fc085e0b6262877f0edc6788cd2c2c0e0c8397b5a7c51583603a3b150123d10677c81316b9220db66d36187ccc021
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
new file mode 100644
index 000000000000..c0534c5f96bf
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.3.ebuild
@@ -0,0 +1,15 @@
+# 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="Shared memory fences using futexes"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+	${RDEPEND}"
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 0498a43b0c0e..344835bcb054 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -6,5 +6,6 @@ DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093c
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
 EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
 EBUILD motif-2.3.7.ebuild 3475 BLAKE2B e263486fea11744e213542d5b5ba2b38dc892dfc3464236a6c7f5f63e195beb5511e61ce79c825a173e691da0d000069b1833dde8e42a70cc90fd16f4f6fc4b8 SHA512 3df30f2bc144cce54876ad0e3dc4599a52faeefa095b3394332672c4b1d00cd3bcb46d1836f9cc71060a676214d2fdfb18afa5989e1897adadc931b61957e3d9
+EBUILD motif-2.3.8-r1.ebuild 3375 BLAKE2B 9b2454fb9bd9d0fc6048c9767ab92f2f4bcf54a5ac60cb5b627f26009125d7ebd113a1888e692d10f2d9972f1d56b250a412c192df725cd13731f195a491229f SHA512 f445931e7b529b14664645159e4bfcd8a6e07885403c1e25c11e8d5e48ee8f2bd768ca483aad3e783089c2a150d36758d8e460c4e1f72bf1097834039f103aa2
 EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
new file mode 100644
index 000000000000..d610557b64bc
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${PN}-2.3.6-patches-2.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	|| ( dev-util/byacc sys-freebsd/freebsd-ubin )
+	x11-misc/xbitmaps"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# add X.Org vendor string to aliases for virtual bindings
+	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \
+			&& use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		--disable-printing \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
index 28ca694bd63f..f65a065ac75b 100644
--- a/x11-libs/qwtpolar/Manifest
+++ b/x11-libs/qwtpolar/Manifest
@@ -1,3 +1,4 @@
 DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621
 EBUILD qwtpolar-1.1.1-r1.ebuild 1511 BLAKE2B e9813d90fa313f8c4323353ce613aabfc38e2dede7763b74f8529456909dd536a19c58dc957e77c2774107274260809806f3cd993bf6d795436ebac02c20a8bf SHA512 67dc81e5899408b04ff6a4164aedaf128e5035053e39d5ff9d42ae3d24914e3e62c5ca7a78b9e6af9fc0fcadda83066a73f3fde803b66a1c4d2caadfc4994063
+EBUILD qwtpolar-1.1.1-r2.ebuild 1443 BLAKE2B 4a218fa8e94e62876271d5713d2ddc3dc1991a283d8bfde6fd48862104cf2d52ded001d0091960b7204d6c90fafa7614926575eb9016f48377be620fba00a4ac SHA512 395e65639f932a539ef85db03fea2c04556c66d8842c94267d494b88fe598cd35103dd1566df6ca9c67cd6719f3570c868683e2b8eeee05624d257ce9c057b6c
 MISC metadata.xml 347 BLAKE2B e21decebd423f18e461da054cc36d026ebbb79da6419b31602b0ce8abd33922cd6d82a60c86a0d2eabfdf3eddd9aeaaed03a93cb83dec0a4a725d85c6b4dc794 SHA512 854d3d9237d44a1afc6926805c9efb4444326a87bf68fd0c2e636d44b4f3e012490f327921f0e3174579657b7177e231d64c983412d8f09cd4b99592d311986e
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..994d5637f4e5
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	x11-libs/qwt:6=[designer,qt5(+),svg]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+src_prepare() {
+	default
+
+	local qtplugindir="${EPREFIX}$(qt5_get_plugindir)"
+
+	sed \
+		-e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+		-e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+		-e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+		-e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \
+		-e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \
+		-e "/= QwtPolarDesigner/ d" \
+		-e "/= QwtPolarExamples/d" \
+		-i ${PN}config.pri || die
+
+	sed \
+		-e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+		-i src/src.pro || die
+	echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+	cat >> designer/designer.pro <<- EOF
+	INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+	LIBS += -L"${S}/$(get_libdir)"
+	EOF
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+}