gentoo resync : 25.01.2018

10 files changed, 6 insertions, 264 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d2236ddec56b..d8a722cc9995 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 0d2ebfa19ae5..d3659d0a1713 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,3 +1,3 @@
 DIST libfm-qt-0.11.1.tar.xz 127624 BLAKE2B a6651e5ffc79a49f17f4ab95dbb9e4f51bd8de08f9d207970e32e2732eec920eaba0edf404ef1fa2fcc1e9b7f14fbc869eeb1ba334dae4b2f5ef3a9f5b94c713 SHA512 e7cb545e81459f459aafdf491541c3de7cc91249c2179f74bc1ddab0f0c50467e82b731afce22b3a86a2462d331f55794f4336912ec607bfb5e2faa43ad58079
-EBUILD libfm-qt-0.11.1.ebuild 898 BLAKE2B 8d8faf902c623a619c45e3ea774f9064694da5b0435218a894ff3609a3005d97622e6674d40e1cb6f694c396ceb0d58379d97d7e9cd85104c8b510e295222c62 SHA512 9f5e7093b164fb03eeb27f5d0358b238ad4b78125d167b6b53bc16c6dd57a0bc3bf080916a30984adbebcaa88c1f15fbb4b716247526f7488744d261a63adf68
+EBUILD libfm-qt-0.11.1.ebuild 903 BLAKE2B e7b5b628c4a6bb14c8f715a928b4d4416aba07cb680862390bd45df97a7fbc54097c8ae8b2404d46ca9c4bdad09cd96a6423c0349eace4b5dd9baea11c08222f SHA512 7c40e6808dee6262f283fc274c9ac34d12fa30b30aed7fd8fad7b8970aead41c601e50b8eff0fd76db6c8e915cba91f23a0fbf853a36eb274790123d20307aba
 MISC metadata.xml 314 BLAKE2B f5c69c0ceba5528bc4a23c6ca3d6822a63abe530f699498ff65febec651ef3e0a58acd69e45a0d8fea9741b48d019cadda863602cb55a37a0e1241fc3954a427 SHA512 02353c6506b0fd39ae1fa1d848894e4b07543d77e90fbdd873ef1f480ca21c06d7bd856765b411c7326945bc22ccd72aa3256d7f0d1856aa27ee6396397475d6
diff --git a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild b/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
index ddf7d325f99a..d95c6f80deba 100644
--- a/x11-libs/libfm-qt/libfm-qt-0.11.1.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-0.11.1.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=6
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
 else
 	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index a15c070b3ef7..3a48ba103701 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,8 +1,3 @@
-AUX libyui-3.0.13-fix-qt-libs-check.patch 1352 BLAKE2B 5091d201f8d65266ca912f182665aa4a1c6b454982277b3ecf3b1f7c9a2d4b1c02e890a169da45a2323866669b2b686bedabff5db4f33ae79497e527a1394d0c SHA512 8e37ec5692ca49e21ccafc187d6bd7b97ee213d940f382835e7ab5436eacf8893479160659556f719154f59f895fe8dea4aa7072d8d5fc1143107472ed3c2299
-DIST libyui-3.0.13.tar.gz 204028 BLAKE2B e5b958807e98c7bf3b89412dd8669967469e8eba8b37f3629fc081c1d92eb81083577267b2aa6e5570d58aefa8b270369da1cd5a83add8c7ead8ba0c5398f6d5 SHA512 b698c4d44d9fa1d888b52f8d5e2216ff4a490ef97c153fac52674a237527807140663d87ceac7b36b0c6092e9035eaec7bfe7a2e1e93922de106873130a69c66
-DIST libyui-3.2.5.tar.gz 218517 BLAKE2B c84808eab5e23d62ffe871f916c99f0a5b9913c98f212c9c581258bdb25ae273ada14ae408dffea7a6442e8e5fb96533c9cd93f512c446f4b192b4619a952927 SHA512 174ec6893f749bc81495c2ee620e8c7d85e9cdb61db08d4f7d800c13306eb76e0f40d20a1eafeb579344b35d99f9735b65e63525ddd804cbe30ab7f4c18bec43
 DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
-EBUILD libyui-3.0.13.ebuild 1265 BLAKE2B c43e2f9995564df1580ed367dc1b72f2b8c8ced34b2b9e58e5d976f5e6262358bf395caaeb5aae9e8b2b1b77a1deeed9de9b4e22a290b7766447d153ceade1d0 SHA512 b074e88ea19f88741b1f0190a5df79e2f62e72fdfdb2e42e042289e6364c5367480281f9db336d302f66e95e1620c587302b9e17de7f51dac7e630ca969d3a1a
-EBUILD libyui-3.2.5.ebuild 1273 BLAKE2B 1bd753d7fcf458f13403d6a244420e22773d9f39a019baa8016a9cbbd118abb0e156b7e11959ba59d1a97e3d981a39520b900f65ec4141e92e10833e6c61dd73 SHA512 2af655bf748f39c720dec6904123cde97c4ada91c3ba7b22fd8c36d12ab9d9ed1fa0639386bc716944218212a553d4c2d5245654426d92e19cc9d152da5a8510
 EBUILD libyui-3.3.3.ebuild 1148 BLAKE2B dc00809cc001e612561cdc62dbfd7e56592f4601efb0cae01162c448aeeb44ca6ebaf8a745202a471c2e9c2b79d8e55219080bc03f132029d37ba553e475be11 SHA512 0e64747ebd1d178c75044d7ba0d7029384aab450e2e748c04547d4aa681e93737fb03607a08666edd7c6f460563b830cf30ca420c4d29ebb55991e629eaaaf02
 MISC metadata.xml 588 BLAKE2B d4cab879ff9b6cbd3bb12cf88c521c2e7b3723cce4c289260b1b56d94c5ff7e7f907fe76e8e0fd710cef85800a669020d7bdc5ffa71960536719ae844b3f2b58 SHA512 529890c10bc0fd3830c07851a525ccf695a2392718445e7a28ca6a6ec974faa0ae413ba43fa85546eb310bef04af6125f1ba583afb0a8f726c20b95b79c09aa8
diff --git a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
deleted file mode 100644
index 63ac43ee1af9..000000000000
--- a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- buildtools/LibyuiCommon.cmake	2014-02-10 19:41:45.000000000 +0400
-+++ buildtools/LibyuiCommon.cmake	2014-09-10 23:16:10.317115440 +0400
-@@ -245,12 +245,17 @@
- 
- MACRO( FIND_LINKER_LIBS )	# try to find all libs to be linked against
-   FOREACH( p ${LIB_LINKER})
--    FIND_LIBRARY( ${p}_LOOKUP "${p}" )
--    IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
--    ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
--      MESSAGE( STATUS "${p} found" )
--    ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    STRING(FIND "${p}" "Qt" ISQT)
-+    IF( ISQT GREATER -1 )
-+        FIND_PACKAGE(Qt4 4.8 REQUIRED ${p})
-+    ELSE( ISQT GREATER -1 )
-+        FIND_LIBRARY( ${p}_LOOKUP "${p}" )
-+        IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
-+        ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+          MESSAGE( STATUS "${p} found" )
-+        ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
-+    ENDIF( ISQT GREATER -1 )
-   ENDFOREACH()
- 
- ENDMACRO( FIND_LINKER_LIBS )
-@@ -616,6 +616,7 @@
- 
-     QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} )
-     QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" )
-+    LINK_DIRECTORIES( ${QT_LIBRARY_DIR} )
- 
-   ENDIF( QT_FOUND )
-
diff --git a/x11-libs/libyui/libyui-3.0.13.ebuild b/x11-libs/libyui/libyui-3.0.13.ebuild
deleted file mode 100644
index 5ed10cadaf74..000000000000
--- a/x11-libs/libyui/libyui-3.0.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${P}-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libyui/libyui-3.2.5.ebuild b/x11-libs/libyui/libyui-3.2.5.ebuild
deleted file mode 100644
index b5c8ddfa6166..000000000000
--- a/x11-libs/libyui/libyui-3.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="UI abstraction library"
-HOMEPAGE="https://github.com/libyui/libyui"
-SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="gtk ncurses qt4 static-libs"
-
-# Only Boost headers are needed
-DEPEND="dev-libs/boost"
-PDEPEND="
-	qt4? ( x11-libs/libyui-qt:${SLOT} )
-	ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
-	gtk? ( x11-libs/libyui-gtk:${SLOT} )
-	"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.13-fix-qt-libs-check.patch" )
-
-REQUIRED_USE="|| ( gtk ncurses qt4 )"
-
-S="${WORKDIR}/${PN}-${PN}-master-${PV}"
-
-src_prepare() {
-	cp buildtools/CMakeLists.common CMakeLists.txt || die
-
-	# TODO: set proper docs deps and USE flag for building them
-	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
-	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_WERROR=OFF
-		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DRESPECT_FLAGS=ON
-		$(cmake-utils_use_enable static-libs STATIC)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index cd02928a868f..0498a43b0c0e 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,12 +1,10 @@
 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.6.tar.gz 5725456 BLAKE2B 40f1af89e267de8d7603a7db81390286d52d1fd1ae1a7f45dae82b6d11f6a7c35e4214b9df0f3901781a9249632d40aff360b9d97cffc3218ca2d251693d9ae2 SHA512 65c2d7666a916ab38878008915072317752ee2657ebaff869d274f9f9d9fba3ebfbb82c26d2517f3b9035e059ac99a9bf46d4be8d123115e3b23589517d28e60
 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.6-r1.ebuild 3468 BLAKE2B 75be1e877dd39810cc656c62935512abe527cc5e602e125dd60586ebd16256b4b4948ec952a90c4e4ca8776d8b23a45e41bd589c8c0a291373b3333e54473fcc SHA512 31e3580fcc61f6e748e0464ca0b535483d16186c33065c5d6fb3041d4862a73e7d53d8007dce5085a0da9947f2c863eb5e7bf38ac2a0fa63d50a73336519c828
-EBUILD motif-2.3.7.ebuild 3476 BLAKE2B 04d82961f5e18636cf08ba3ae3549a6db6ee786b6bcbaac1950bf6a856efb2d4862b4c8a76ddde160ed2c59aa433e6bcfd650807e4444941fdb1574c4dbe99d6 SHA512 6c1341bbabcfbd7f27c700016e602592e5676b184b5db9391c8bb5357bb948e06419aa888ec066d70c767134e7a0e3c96e72b42be70d608dd85ef084247bdd00
+EBUILD motif-2.3.7.ebuild 3475 BLAKE2B e263486fea11744e213542d5b5ba2b38dc892dfc3464236a6c7f5f63e195beb5511e61ce79c825a173e691da0d000069b1833dde8e42a70cc90fd16f4f6fc4b8 SHA512 3df30f2bc144cce54876ad0e3dc4599a52faeefa095b3394332672c4b1d00cd3bcb46d1836f9cc71060a676214d2fdfb18afa5989e1897adadc931b61957e3d9
 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.6-r1.ebuild b/x11-libs/motif/motif-2.3.6-r1.ebuild
deleted file mode 100644
index 7ffa37ea1482..000000000000
--- a/x11-libs/motif/motif-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,117 +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/${P}-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.7.ebuild b/x11-libs/motif/motif-2.3.7.ebuild
index ae6c88aa397f..74bb1bc3b032 100644
--- a/x11-libs/motif/motif-2.3.7.ebuild
+++ b/x11-libs/motif/motif-2.3.7.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=6
@@ -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}]