gentoo resync : 22.04.2018

33 files changed, 112 insertions, 388 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 86e9353f19bd..e16dfef598aa 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 787cde06743b..1e21653752e9 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,8 +3,8 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e4b6f0eaeaa3f3eec6b26935c073590a32f17b6268d99bb297ba516da7debe7e3e0abf16d36e012e761dbc7ecada SHA512 a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
-EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3938 BLAKE2B 0c8f0e5cedd006f2fc75fb97fab1fa0e81125844223218ef30108089aa344a72a61138d136b4957e2ee0e108ec6529bd46571cf6bd4f90cac543c913bbaa6c56 SHA512 52c28b5ff5004cf791084195165e889fabf6b0469a76efaca5a0a52df1325e2fac29a281260f8d0e3cbbb79a8ae598ecdb3c7dceb531b91b38a87f3500fd4e65
-EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
-EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
+EBUILD cairo-1.14.10.ebuild 3820 BLAKE2B c38924f9d4debbee038b921a580fc301a85cb8883789e585ac6c26ad3cb67a6e5e537bb1f7d01e9da28e8d73b3cef12d5718a82aff3be49dfbafa13c61a91c1f SHA512 ffc989dcbcdaa765f27bde1c515d91ea27abebe70e52bf76fa957747d6e7284bb43ac4dcb32f306bdc8c7abc8b9293103d593ce20309db75a56f931a63fe388a
+EBUILD cairo-1.14.12.ebuild 3810 BLAKE2B 35e3a19697b85b9dc1cfefa4e1602b350db317be4dbc031253f0db49f8fb5e66629c7dedaeeaabeab7bab1195f0082f32caded5d9bd0467f4ff6613a52c4b32f SHA512 38b270e67abe11fbb71e192b1eb52d420c8158db5da1da8cfc3f3804d6fe8e3457084ffa836d1bce63b791c8ea3327e475655548384d87c24dc84343e0f4991f
+EBUILD cairo-1.14.8.ebuild 3841 BLAKE2B 4d27c8093de44a933e7dd6df6c906e5f1420534e16f1a3693fd6c69d31aec4be2e72410db1059f3249713302509453aeb7951a95fae6a7e45311205695d3e890 SHA512 70a4c769defec2e3c02b33fb207c5f76b50831fdeca41536ef4ba44597b4b8b5903d4ddf4967a6320faa6aa31cb85bf2d262f144282f088af103ff30011765c5
+EBUILD cairo-9999.ebuild 3869 BLAKE2B 22870a457ce5d15f3b8a3863d0a8b0065d7e63dc672d6f1b7208f51b316fa626c4ada84ecd2bc5b0ac29e0c7f9ae7a3aea43f2385907102e88e11dc9c9e769a1 SHA512 c5edad1ee9ded398aceee30f58403c60aa5438c992388251c4cf568ab05964e5ff36a155f29597fa168529a255d0381904735da5ba77b92c4072d7e41274f8ee
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
index a6ea82e1c364..5aaa2fe51429 100644
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ b/x11-libs/cairo/cairo-1.14.10.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 37c94b9168c5..b6e16c5bd43c 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index 0d661077e6fd..d09ee28f1531 100644
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 7f294e891d56..278ea13a4cdc 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -43,10 +43,6 @@ RDEPEND="
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 5f1df8eac8a3..b61a54cc0ab5 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -2,6 +2,8 @@ AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
+DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f8e11d11c9959a8b873d25e420894208444f1f88624d49f7366486039f0e1590692e2b5b0164c08c1358a8ea8b0b4aeaa3 SHA512 d86ef2bea6ae24c128f65e314c82f58265a53309abff22630360b0f5a5f9b640e3fc31fdd58b06221efc28f41c95c0f92613edb8c0a2c8f5c6147d287310a9a2
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
+EBUILD gtksourceview-3.24.7.ebuild 1331 BLAKE2B 12e4d6f54651c159eb77b492aa771a39c837bf1fcab5412d9557f36dbf896ba519f785dc9a6a228ec314a50cbf888f022132abd58c13fcd041427016759d5afd SHA512 2a323abde1e2c2ca9eb3a6f008410db0222b36f05f8bc367f7d2ae9d088e5bb8c4f65e232ee659548d4dcc78cfd6e3f12fceeeed8369338bc40204978be12b0b
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
new file mode 100644
index 000000000000..db3725e99188
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
index cd5bacb9c504..6d0be23ec338 100644
--- a/x11-libs/libast/Manifest
+++ b/x11-libs/libast/Manifest
@@ -1,5 +1,5 @@
 DIST libast-0.7.tar.gz 508654 BLAKE2B 0c5bf31d5b73fe11d4665bc0d8e1c9a987b944fcdcd89106a47ebf01eb90c2895b3e74e39874b360e91f027b8beaf5698363e9920ad879bfd241b13ef0232870 SHA512 0af1d508af88ce0a2f29fe7841e23759be7c6540a1e2698980c289245ba284fdbf76c593e457c0cd6cfc54dcb6d891b01a3fd4d4a6ecc511fb2de698c9a3046d
-EBUILD libast-0.7-r1.ebuild 948 BLAKE2B 9058a563e462b5db38a589d9e49ad0594fa2accd1ecd741a081b7f2f6745352e6956f65a4d4f165585f76036b981a2c0b27c662d95faa4a1bf5bcf1ce2b939a2 SHA512 cfc50ea364661dfbe144be399b8dd8066d5aacbd2564328a64e836c6e0d825ff35035965c74a9ef3191fca3db2be6ffb5f8fe0a85970758a2ffccd5f59f2c1c2
+EBUILD libast-0.7-r1.ebuild 947 BLAKE2B 03c61e1e987346c66ce52a759f930d783467b5e911c888ce68cddf806a1f892aa59e5ec9826fcaff19f6928ac6cc7ff5445861e30224b6d6be28c3616945066c SHA512 99f4a7915652f753dbdf3aacd3a35cc8d5f9efedc03cc7ac1079acba6f00d3bb5262f441b59c58326d5bd888d5b59384c3d841c78688ec8ddc06986eb27016a8
 EBUILD libast-0.7.ebuild 945 BLAKE2B c9a34ed7034bd0cb52f5d9f50e9843d8bc5c15c91e2fb889eb22a3ec4853ebcb70ca24abbd7a83483f1a1f67f770002990406407a9294a88db2021daf03bc9ab SHA512 1632a77e1c5216337fb1f81c15555606f95138c88822feedcf913bc8f33ca16080e5851d8f30bd024e10bb5dd8165d149adca153e25ce1321b2480a8ad5207df
 EBUILD libast-9999.ebuild 1035 BLAKE2B 6d28c6c66fe9fabd36d7a0fd5674d359348d9974a3eef1a4514568663170db108232464ff4297d4616573b8db1d567ab04b47ee3f50ca1609ff4d3bac6ea56db SHA512 9a08bda18d9d681948b58a9dd12e7b2b282cc6f6f780020936a7e77cbb6c4ee576c24648560c414d1ce256ae4b568bf00000fe12b8df6e6ca1331a053ba02a79
 MISC metadata.xml 736 BLAKE2B 603c1752552864610f08d8b3144503837feb5c7bddb3ebfe108f4d090e25d38fee56ed63f392c98f5468c69b6bc47ecb65e53bed8c335e6996351522e4257df0 SHA512 a2fd1a0875f0a0c866845b4fcc63d0ab715ad73fdd1cde271e6174606180ee5e1f4924270171c08074a0ffc7af52fb9299dcd32a5f057c1548175bf638598acc
diff --git a/x11-libs/libast/libast-0.7-r1.ebuild b/x11-libs/libast/libast-0.7-r1.ebuild
index 9164ebae0504..15f2c7592ddb 100644
--- a/x11-libs/libast/libast-0.7-r1.ebuild
+++ b/x11-libs/libast/libast-0.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="imlib cpu_flags_x86_mmx pcre"
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ce0cc73db4e0..c62a9fc46bbf 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -3,10 +3,10 @@ DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618
 DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
 DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945bb1120390d22b01a9e2a6460014eeb3902ee84241da8ba2c7683e76eb81d117a4f312ef3b8eb69647773d09710 SHA512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
-EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
-EBUILD libdrm-2.4.88.ebuild 2039 BLAKE2B a7484a4d636199aab21579b20951cd01be4bd9fe16d3299cb6304b3dadff5225e180e167b606c29acc67c8788e556bb47173cd7a5c599d68e0b74ab34c911444 SHA512 0627dc93340ae2f50cb1c89d345364a947203c8d4d200a9bc507ed95829959fe9aa54b2a946f47028b4c8fd1b81aa6ede031ed79afbffaa4baf48432f3e49cc8
-EBUILD libdrm-2.4.89.ebuild 2041 BLAKE2B cdfb9eacf0f5093f36294347461deb2c667dee18bd6c0fb2114c837998025f9cfe5bed695ae10b91942f56ad7d1a80363cee76ba1fb2fd53701c99cbea475358 SHA512 532f5ccfed6b85372c20c10a71454ed45e12db70796fa7834b7310214fbc29c1bb4978606ddf953f299fdbe002839ce4d250ac5e6c60cd00b5fa927299d89f1e
-EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+EBUILD libdrm-2.4.82.ebuild 1968 BLAKE2B 13f465860e3637b6df37a633e2076336f59ae33caa00a4b1200967ea9874b750706c2341abb5262d7a999d2fb49741c947db4032e200129217be034f110ba63e SHA512 bccc1090ea3c01865b4f39d9a8b83ca00436f7501468c12ed3204fdade362f18cc6a23e0e439b80799d7c189e2f1e367c2cfe22f8a52cdb523c64f18f5dc7164
+EBUILD libdrm-2.4.88.ebuild 1969 BLAKE2B a1c0294d7787b2fcd84a163324fe74a1ffb71f6cd950963c03a5af5dd268a0d761c43d1f4436f7df2b5e6f082d42f80611a1fcbeaecf62b83aff496c1f5eaaaf SHA512 5f6d166c1340c0404d921171ceffb7118fbe12fd726d389a00a790cd4b9d5ff2b9768eb9345a787df0e6445db661b47cf9cac87193466858bcbf04573c3ba1cc
+EBUILD libdrm-2.4.89.ebuild 1971 BLAKE2B 41bde55cd10e572c286cb413e7e2ebb23ba662d6a65681e9ca1f50e17720c7d53303ffdd6aa65d0110ca59379a459e06a2060af20e686b738875b44d24978c17 SHA512 ec71147dcc0455dc58833547cc1be082ddfcfa58c0ef495fb83c14a06d1052038a7bce37f5939082bb8a2d7972915aa8b4cd6480e0988516dc94c992aa6858bc
+EBUILD libdrm-2.4.90.ebuild 1978 BLAKE2B a554b2c5762f512145d792d87c172e05a9aa51cce878d5568a33bd6ebed014fc30f173cdb860bfd55d5090cd0339082b1b67000bc1d0c7851859fbdcfec1816c SHA512 502fe8a211d3cb64d7eab03c28454bf79109b1f11ece181d65fc81b84f9a7c29c38ac3a8a394d887530d1d2aca7a434e052400942734b66c4458566bca650283
 EBUILD libdrm-2.4.91.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 EBUILD libdrm-9999.ebuild 2158 BLAKE2B 8a1f197800e9e1dae5e3d35848d831a44f965db88b47503bb3496c6c40220bbf9667eea374186758e0651a9cd13cac3cd2b4cda1b934243600e601892d2f1165 SHA512 c6d8e39f09bed1d15bb40540ecb6c4c93e66a2d086281bce790fd67791044d76528843859c7d85d00df0eda7d53690c190bd753e7620bb8e14069c491f632f6d
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
index 5455efcdc753..00588bdc7a77 100644
--- a/x11-libs/libdrm/libdrm-2.4.82.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -24,8 +24,7 @@ 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(-)] )"
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
index 7a5da3105ebd..47f126e4ab31 100644
--- a/x11-libs/libdrm/libdrm-2.4.88.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -24,8 +24,7 @@ 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(-)] )"
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index 2b385218f074..cc8b1e46112a 100644
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -24,8 +24,7 @@ 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(-)] )"
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
diff --git a/x11-libs/libdrm/libdrm-2.4.90.ebuild b/x11-libs/libdrm/libdrm-2.4.90.ebuild
index f9f91008a7ac..7548eee91644 100644
--- a/x11-libs/libdrm/libdrm-2.4.90.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.90.ebuild
@@ -24,8 +24,7 @@ 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(-)] )"
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
index 5e6533266826..eb785cfdd5f0 100644
--- a/x11-libs/libfm-extra/Manifest
+++ b/x11-libs/libfm-extra/Manifest
@@ -1,7 +1,7 @@
 DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
 DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-extra-1.2.3.ebuild 2555 BLAKE2B a1386ee68a780b4f12a3fe37ada3343765304050c30b68ad66f7c09cd9f94170212c37fe6a7c7bc914c0bf364d26616d94a76a0f036e0d15d777dc8c19db9312 SHA512 0e995b9810ea99678f5844ca6dfbb046b7dc10928475f6457efb546809b521c48ecd433b561eac24c0bcedd3a13550277aead1aa19a9f867149e2db467160a86
-EBUILD libfm-extra-1.2.4.ebuild 2566 BLAKE2B a053a2e40326bc08444748621a23a660ff1348cedc9673b3b8d1a7d3008b8d52b0799d7ae49b0e13848f27c102d517da5b77e203b2fec2db249a9408a74e3c3f SHA512 2a15974f0bd4814c1800d880f5b0b79c11cab5f7d4f77a29a946fdfc65f7ff6807d7f26e1427399ae4877823d1b95cc51dca5a07e013bd3e7b43bd77726fac64
-EBUILD libfm-extra-1.2.5.ebuild 2566 BLAKE2B df9fb2e09984aced324f5e41fc623745f32f85aafe66318e405ff34ae4b65223d11623129c12f8b1d0904459d042a28beec98bd04ecdb9f55159e02c2ea83e0f SHA512 9de8fdf59d48310208e95637a284104f41a44d16a4fe04d5b9ebd956523d1c0ff612821614ae54b71cc05378ac666d6c8e9235abd4204725fbfde94506050e34
+EBUILD libfm-extra-1.2.3.ebuild 2554 BLAKE2B 9d5eaa416fb02fe0b3ee09b47cc2bcc33ad0d1e0e1831f977f2e429bbc4540fb7c67a0e46986eb1022f4714d14efa650f64f79553215a59a39b317203daa7dee SHA512 a2f7d8697f369aeef4b7d5ec823c6dcb9815a1d4bbae9d28eafaecb94a17d588d151c404493e8f3a01c314e53ef4a8176b77541a52839d7eab422868aa38b83f
+EBUILD libfm-extra-1.2.4.ebuild 2565 BLAKE2B 9237f5c5eadfcc85084b6914ea49d166221909b4e1be76757f5a9215c31ffcd98067cf703cc641a60c4e3cde60446ce31184a329c18d2511d6a6a56bfe103631 SHA512 f7df23c3a13f3f3bcd65e4e103a31dc0903b1c1509ceea4625d0f0e36074638cb475365622d511b34eaec54997b695f8672496098e0ef1bfa086d7f0a34af810
+EBUILD libfm-extra-1.2.5.ebuild 2565 BLAKE2B d39853407d9a146d8114f9f06c53551b0a800acfe15be1e425b6e5b0a7a4396ec912cf63d486537820c32a70628178e7111933f5be0dbc5b62203c85872a69af SHA512 f4775b74a6496c15115d8e2c79b8faeddbb6dd0e18cf93e5675d51f7d62c9b490dee85c9bfd8ca0f0b7a28e0f74913580a12ecef83aa89e944d226d8569a86a5
 MISC metadata.xml 493 BLAKE2B 5f295aa7bd56f402ee0452a48ef4a68088d4256bc33480bebe6406e144e4bcfdf3efbf92d39a2f166b6265c8ad9459543cd82cfdbd03e4fb29ffbf2c3a0735eb SHA512 12e967cd0e2f30984b1c3d826c65e33033391687210e1a39efc837871b671fd002f2e2d17673366dadcf74bb55cf2c253524eb7b5e200160b6d982974ad6249b
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
index 9295381c165c..56f056e2e917 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools fdo-mime
+inherit autotools xdg-utils
 
 MY_PV=${PV/_/}
 MY_PN="libfm"
@@ -83,9 +83,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
index 2f21bf8da9b9..aa65e3f1c6ce 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools fdo-mime
+inherit autotools xdg-utils
 
 MY_PV=${PV/_/}
 MY_PN="libfm"
@@ -83,9 +83,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
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 0caa1a5efec9..831645a5683d 100644
--- a/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools fdo-mime
+inherit autotools xdg-utils
 
 MY_PV=${PV/_/}
 MY_PN="libfm"
@@ -83,9 +83,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index efb88b42ad9f..796d5305523e 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -2,8 +2,8 @@ AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954
 DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
 DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
-EBUILD libfm-1.2.3-r1.ebuild 3505 BLAKE2B 13269a78260229c8e5ef3b16b82fcc66802908d6465581a3a36fde8bda936df294767af5133f8cefe0155cb902a1a9e5d8d4a969b025983d1f00dfb424519dce SHA512 ba54347a14bc1c297561f10077ab02d67d9df2e5c18689e5d12a8dba3c5a5902d411b93b6f603d7b924ab8a7ae4804e8cfc79943a329204c96ed750fe268c0ef
-EBUILD libfm-1.2.4.ebuild 3722 BLAKE2B 40b0b35b173db705616543465caf55ad9d5998672325f984e0a44ccaa85913cc7e224ea8c1b3834f7427c304d13208d9ad544c3f26bb9328077a76e893cd5d0a SHA512 0fb24103c5ef222b11cc4bc555fce4de90e95c649798d69b394ed9ab7dd6c9dc822c2c95ceef56d82a3dc5fbe1630284dd2ffa6477d56d8f6df504934f7e8d3d
-EBUILD libfm-1.2.5.ebuild 3722 BLAKE2B 2fa4227fb149578bbb2ac0160ed6320cff38f02e25b3d76f2e105ce02075107d961920f125cd363bc2d1e3424baab81108ada622d48c557887fa7d3fb7f68953 SHA512 e84790a677fc35b040d5cf663458b79f66167e575b7aa5a55ef70785e678fe9b0100a80dbcd0a19e052fd4cc31887c2ec92a6d1cddb59d852bbcd04a81dce859
-EBUILD libfm-9999.ebuild 3434 BLAKE2B afb28319ba50070ca0b98762964ce0fa70faee48606470228c69345aeb88cbbccb5ec95e9eac79e710091c2902cb6cedcd7e4958b39a0ff50d65a4e4f852bdef SHA512 c53f08c820bb24c4c53c2fcf66bccf15313cdeea793d8d0595ed2587a6bb34e529006e7f5c8543f3780ac5ff35ab588300aeb329ec34d60cb549170564df7d1d
+EBUILD libfm-1.2.3-r1.ebuild 3504 BLAKE2B b7c0820ef9de929f94807cfd2ca0767033772fdc9da79f5c5b361f80a88a314c72ee8510ad790864bc537037653a0e1cb5db18348d80af4a31d56f1848065ba9 SHA512 32504d47f8f78d8771c5b73f2d39ebb4f84d604bd2fd6adfa4b2b83e4b0fa1d24efc30c264fae88b6920641943bcd59dc46618f2378fe4cf66f0e5e6b207e0d7
+EBUILD libfm-1.2.4.ebuild 3721 BLAKE2B 116ce5c067e3f05af89accde41d155d87bbb74b783a0a249b6f571dfca9e614471a8195f1794c92a232d42fdc528bbebc4f62d44164761673decba7ee4710567 SHA512 0e06741bdfcae3b237ad9a90184275b79935885057b8008a06b6a1e862e13edcc6532ff8c6e2f80f0d3ed2c4dc827bbdeaf2b221646b5f342749fce20672793b
+EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
+EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
 MISC metadata.xml 891 BLAKE2B 2acc49a000fa81b6bd7e473c9c21d05174a4cc30cc5fcf75b5a1309a8e8354b034c30b7f4e3a44715c76ef9e557a5ff53fb6f156babdc3c5e34ca2b3cea1eb8d SHA512 de30c6bbfed377885da535958c50c726e8e9b69a10b322b5d228b0aa5031c7601e006d8721c2d12a820960e2208c860bb0d8d97af69f8c88f4e6e34591e643b5
diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
index aa6f3273385c..c9bde1ffe20f 100644
--- a/x11-libs/libfm/libfm-1.2.3-r1.ebuild
+++ b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools fdo-mime multilib vala
+inherit autotools multilib vala xdg-utils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -116,9 +116,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libfm/libfm-1.2.4.ebuild b/x11-libs/libfm/libfm-1.2.4.ebuild
index 6b60fec10a32..12d09617ea74 100644
--- a/x11-libs/libfm/libfm-1.2.4.ebuild
+++ b/x11-libs/libfm/libfm-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools fdo-mime multilib vala
+inherit autotools multilib vala xdg-utils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -121,9 +121,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild
index ad671cdf555e..1a0ea5310742 100644
--- a/x11-libs/libfm/libfm-1.2.5.ebuild
+++ b/x11-libs/libfm/libfm-1.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools fdo-mime multilib vala
+inherit autotools multilib vala xdg-utils
 
 MY_PV=${PV/_/}
 MY_P="${PN}-${MY_PV}"
@@ -121,9 +121,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 447a8fc27f50..75b2ae42c535 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 EGIT_REPO_URI="https://github.com/lxde/${PN}"
-inherit autotools git-r3 fdo-mime vala
+inherit autotools git-r3 vala xdg-utils
 
 DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
@@ -116,9 +116,9 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_mime_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
index 2a13a8d704fc..7add8e749fe5 100644
--- a/x11-libs/libvdpau/Manifest
+++ b/x11-libs/libvdpau/Manifest
@@ -1,3 +1,3 @@
 DIST libvdpau-1.1.1.tar.gz 541752 BLAKE2B 346dad1ee83193fb489a67016874b1cb9eccc88833766f1df987ed7369078cf259c168546d64ab847d81baceb4e4969d859c29a4081befbe100925d457dfb6df SHA512 e094494fc820c2395c9dbb4e69daa89334b9186e2ad1a6c06671c7f844568db191ce4d1d9df95c4536579864bcc8541eb6fd159c377bc73c228cdf2a0fea50fb
-EBUILD libvdpau-1.1.1.ebuild 1240 BLAKE2B b276b34093adcbede8f89de9d3edeb98651375ecf14296807c012a473beb36d6a509087c44580752bc1e2bfe199ec2c50309ce5b22a9c041d03af7c18b77e861 SHA512 33facff0c76b3fd95d21c15ec3dbb59b59b744b31855d2de34ee622e4d8147c9620f3f1876bfe6ec3ed1e4e00a912b0b39bc30a0af24180d99cbb32e9bf84b28
+EBUILD libvdpau-1.1.1.ebuild 1171 BLAKE2B 1de73128329ad0684d70e4d6b9fbb08e343b574586a3d5159750de14dc2de2bc1114ad3dd62f63bd69022e1ef98c42c00aacc362d1432565a9ebc95bc6ca0543 SHA512 8c9afd0473e2b5665adb5467a780aff8b0fd1d774779bfc334b9163ad7f6ec91e84244ce3be6088d6a4f3864f2c2680e7ab68de4e84cf0fb6379891ef76de4fe
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
index a9837898069f..37cf439581e5 100644
--- a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
@@ -18,8 +18,7 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 	dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
 	!=x11-drivers/nvidia-drivers-180*
 	!=x11-drivers/nvidia-drivers-185*
-	!=x11-drivers/nvidia-drivers-190*
-	abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+	!=x11-drivers/nvidia-drivers-190*"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 57dce5f4bf79..1a209bcd0023 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,11 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
-DIST motif-2.3.7.tar.gz 5715478 BLAKE2B 594aec6674c60e6c8f0e8abc830b934a11b7274fd5eb2d344943ceea9096caf047107523dc4429fed0023935935979e6af5a26b2481a593f3090807ad3fcd8ef SHA512 2485f6e111139d6815e8ac38630d082ac73474b033818b4a92b46f5e2213fa85030ef8095672b2e31b1ed5c207d3baf58f01ec5deec0cd3bd9527cb341f741f8
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093cbe50f9c7a632c618b81b90a9761cb06a944f15378673f22419e5e71ed975d18f95ba05ad366f88ddbca898dc08a6 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8
-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 3367 BLAKE2B 293a104c270e4b63220107795ebc7f2208f4aa475f6432686cdac9706d27248279a646937ec42321987d1d6c1dfd5f41a487b7e5bed675cb3e1497f96a65700f SHA512 4c7a0ab99ceea872659664e7b1222f04d5a413c3e641444899fe684f46e989137e1ae2e1b77b73b248e3947d0cca81e4c9da3e92c0becd90ed4b168a16c1cb4e
-EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
+EBUILD motif-2.3.8-r1.ebuild 3366 BLAKE2B 469019271c2d4572fb1ea7149d02ce02aa6f1cd3a1bba4ca02ce6050f961fb73bb255e83ec2794158ce823e81e387d4f940353cae026ac5d8473a6ad93732373 SHA512 b9d7e0ecebfa53883da90aae67f49cf8d54c8172f7e915443974b0b262bca7181d60f372d3ff2612403d8936f68b58befe9e61a270e6bc95e2e79fbd143a1880
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
deleted file mode 100644
index feb4e6b11620..000000000000
--- a/x11-libs/motif/motif-2.2.3-r12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal
-
-MY_P=openMotif-${PV}
-DESCRIPTION="Legacy Open Motif libraries for old binaries"
-HOMEPAGE="http://motif.ics.com/"
-SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
-	mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
-
-LICENSE="MOTIF MIT"
-SLOT="2.2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-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/libXp-1.0.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXaw
-	x11-misc/xbitmaps"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	# This replaces deprecated, obsoleted and now invalid AC_DEFINE
-	# with their proper alternatives.
-	sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
-		configure.in acinclude.m4
-
-	# Build only the libraries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
-
-	mv configure.in configure.ac || die
-	AM_OPTS="--force-missing" eautoreconf
-
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --with-x --disable-static
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install-exec
-}
-
-multilib_src_install_all() {
-	# cleanups
-	rm -rf "${ED}"/usr/bin
-	rm -f "${ED}"/usr/lib*/*.{so,la,a}
-
-	dodoc README RELEASE RELNOTES BUGREPORT TODO
-}
diff --git a/x11-libs/motif/motif-2.3.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
deleted file mode 100644
index 74bb1bc3b032..000000000000
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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/libXp-1.0.2[${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
-
-	# remove header file which shouldn't be in the tarball #578168
-	rm lib/Xm/Xm.h || die
-
-	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 \
-		$(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/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index bb869f9534be..1677a1ad6ac8 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 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"
+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}]
diff --git a/x11-libs/motif/motif-2.3.8.ebuild b/x11-libs/motif/motif-2.3.8.ebuild
deleted file mode 100644
index 3c3dba0edf71..000000000000
--- a/x11-libs/motif/motif-2.3.8.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 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/libXp-1.0.2[${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 \
-		$(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/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
index 8136a173041e..a25399ce3d94 100644
--- a/x11-libs/pangox-compat/Manifest
+++ b/x11-libs/pangox-compat/Manifest
@@ -1,4 +1,4 @@
 DIST pangox-compat-0.0.2.tar.xz 267396 BLAKE2B 364761c9610e497e3bc2c8a1d311cffa0298256b3cf68754c5ea4e31ce096d136cd50e2deca473d2b34aedf24e50577e8e8c37ca2556ed53c9210e4d3ff663c9 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3
-EBUILD pangox-compat-0.0.2-r1.ebuild 937 BLAKE2B 8648aad32174edc45bc616cfe002a114b4580443925240b0cd834caafc1c7b5090c100e1464ad2c620ed42b1237022e870f568a582a1a7a9deb589301800b99b SHA512 f8f4d5cf1a867468c7e17d8fbc2858054cc20043281096ffbabe6cb667ab2df3f1ab493b56d406ec840058351bb6b7d2cb8a9b6251bb76694ed5dd4aaec06c1f
+EBUILD pangox-compat-0.0.2-r1.ebuild 809 BLAKE2B f520d1d91be00638258119c482f9f927ac1da65a87d5bf89eda1c0f46d15f7e2a196de9bd9423a729b94f63884d4b3e185e81650d0bd9660292eeb6d0e9c472e SHA512 16d8c6c633824cd288cad691e743ab58e19ab85d023107975d12ff5c6f1929e238950100419edf16c9e6dfdb739e417dd45c8a26c14feb9995c350090ef2f967
 EBUILD pangox-compat-0.0.2.ebuild 657 BLAKE2B f1232c58b686630086e57db3a396b30af233710be816d1cad67c33e93993d009dbd1a193f042bbf4f1656d659e619aa93a72270a82dce38b50c3e0e7a8ee55cf SHA512 afa7f9f7cdec3aad745c95f9a6f63ebe869ec7253c7661d2b6ec06b1a5d717b142a63f92fa0beb90ed67e1491e0e6e00d25a4ae62f4cecd61fe910a31fdf0228
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 052e36a4474b..82aed893e05d 100644
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -17,10 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig