gentoo resync : 10.11.2019

58 files changed, 202 insertions, 839 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 2c7193fcd076..094fe2b29129 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index e1eae6490356..3a8698de0b6e 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,3 +1,3 @@
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
-EBUILD bglibs-2.04.ebuild 1663 BLAKE2B 8435eacaf2494ef267fe5f6b9b8d54b70229df63a5d4c86bcb218428d6c01bc673e15b955659267fa52c7c417be8719e32a8b1d22bfa4bd34fb77f8b7bb98787 SHA512 8e792b58d91a3b4158dde65f5548bcaac7a4a12d87d4bb221fe76c1c396fdd3069633e68b4180352255d36feb9cc9777d34c2db6c0db793a536a0dd933eda45a
+EBUILD bglibs-2.04-r1.ebuild 1685 BLAKE2B d30e5e9a9951145377a18f636517b1d83f775a2412e3415f5eca9be8854a6b0865f12361f3dc56fa8c2a4b76264d7b75b5209a7a22d04a82691c94398e75c632 SHA512 da676ec549ba3e42c56545feced2a8a10a0d5889737b5cfe74ef6a62fd70bb02f669c263578f11e39c232b16b24d40da8aed2c90bc15e54d9f4e91d248ce7ad3
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-2.04.ebuild b/dev-libs/bglibs/bglibs-2.04-r1.ebuild
index 3362b9fa56b5..4b3a3f1f7c4c 100644
--- a/dev-libs/bglibs/bglibs-2.04.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND=""
 BDEPEND="sys-devel/libtool
 	doc? (
 		app-doc/doxygen
-		dev-tex/xcolor
+		dev-texlive/texlive-latexrecommended
 		dev-texlive/texlive-latex
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 9a87d4f02b41..b296452391cb 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,5 +8,5 @@ DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c2
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 EBUILD boost-1.65.0.ebuild 12413 BLAKE2B 46cecac07c7772137d690212714fa54f29b1afd623ca17270565ac75960408e54185f1b8e70883397084e761cfbaeabf2b5d83879d2e5f81f5693101a911a896 SHA512 d1d91b697c7027587dd90f0ecdc07e0c5af1a3ab922fc33caa7a2850f597e4cf4c67603dd8ba651c0afc02ef09451ee2417c869c64ea16ccbced9151380acf19
 EBUILD boost-1.70.0.ebuild 10140 BLAKE2B 3248ad7f134f001c8a626d0062ce39c72ab00ea451d57c4d78c82f2994a490df20798ebedff5d8e072999abbf5ca7b93b8340f1be9ae411072434720440f7e33 SHA512 8934c3d1ec1f4e35d58779e440db7da9403fe57a49c2bbb3bb87b6bd0f5d2c5f08e3138e96c14dfa99b183f9e67c5e35b87db89b8879b3b243e5112172f4ff2a
-EBUILD boost-1.71.0.ebuild 10631 BLAKE2B 3a19da69011852882e86923f7c36cd47c9732d6103bc9d5e05cefcd91e682755304a557337903fe5531aaa02e6811612331fc0d9d66ca8dc17710951b67f2b8f SHA512 097b83a4503a6f1520b88128e6a55bee9d17eb98d8e9181c9484fa879c7bc8de3d4a78e25e5f46910b1d1e114bc4fdd55c1c828d4246eda4f002c41ad81f0002
+EBUILD boost-1.71.0.ebuild 10629 BLAKE2B 652eff310a718fbe573126b7266437166d335e9966f0c6ee3b5432e4e376871b65597356585fe8f88b9922e4507e96a3f2778a65aea3e28784d81e14a0b90e79 SHA512 50c3e617bb34ffd62c5950823c045e2ea3262aeca58298f9efcb13277db37761b20fd850524393be4bc783a12d424f9c7f22b44e3410252318670b1b365b0327
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 2113074e74e3..0b088001803d 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 38f0426d69c8..8f1a5b492982 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,9 +1,5 @@
-DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
-DIST efl-1.23.1.tar.xz 77466768 BLAKE2B a8507777f84ee356bb53982d2b102eb6413ab274ce98dbd87b62a11b6a89eb7d12e0d858b5dfcbbe3da0e1bcc753c338d4c4b7060c569ee621e71afa2477397d SHA512 9c81f28bb0d87e1a3e5d2204c0e2401d9b3f6dcc34f47cb2b41711ef033b3134f4cd283e87a216a0ce4ee903f721a1f8c2f003577444c5781e7f47ce827201e6
 DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed
-EBUILD efl-1.22.2.ebuild 6910 BLAKE2B 992fb4fe1844bcda988b88071d7e09573d3b4d697387a05f532e3fe784adeeadd3f8ba461289396bb1cb5a55eac237c5858a10ff4755d95888ec0a4fb60eb0b2 SHA512 9492793263d7fbb32da95d393ea8a54df31e81c04581c54f80e69f5a9567207455754db4abd194c25f827ca95933b47f2b773321a83def2e12f659f469ef92f0
-EBUILD efl-1.22.6.ebuild 6912 BLAKE2B b10cd975207ab13a1d3172273c37e08fbaecb6f545599c86f0bc88576250f53d4d040df197aee81d300c511dbaba7c0d7650147b2bf92250b21e195421ad8f32 SHA512 02bafb8642f3605167bc74f3c4b79d991cd8d7c33e44c133587eed2418d0d0c4f6875a422e676a35150bdaf411c521af8ef9718e8d56906e2ff752b4434ba442
-EBUILD efl-1.23.1.ebuild 7480 BLAKE2B 0a404c51fc2984ffbaca4df3a8f6e19adb54838dd67163ab64296b8b9259f6956e48c14b512d881f9a9b1d38fc8d8db9befb2f0b9009ed30a5be34c02bc386a9 SHA512 a8a7eb785323e12f236a3390a7c9041a3aaf2c383089969315047213134d8bf887bbd9cb7e9abe9b361512ef90aa1d73ab29a9da853a87cf525619d0e62ec1be
-EBUILD efl-1.23.2.ebuild 7458 BLAKE2B 98221bada550fdacbb9d379e4f1499887c96b9e52d931f9bb4cdc37b13256409bf00087c8c90ece4693da0c815f519bd2bd939bf3d8d8e8ddd1f5af14c9f7da6 SHA512 81e09ac146a3e585aeb6bfaf821e6da28e27205779579e5c04ca63a012a238004af4d4be7b5b5394b5fa843cc1adfe530d2beb6b4cf30952b6c1a13b9297036b
+EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
+EBUILD efl-1.23.2.ebuild 7474 BLAKE2B bc053b6d6fec7b7fb88acddaa68e83688a7cdb4f4c02fcbf8c2711c4a8261496ba815c4bf0b3de8d11bda772d82a09b334b862a361bcbc0a46a05949a4f1b04b SHA512 3f3f59ebfca187633e641b7e49da7907e825aebada2f70916b8ad4bb51ebac31500857473294b80d94fc0d38d424d937fae8aa017a4b6931b98452e42c538c42
 MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.22.2.ebuild b/dev-libs/efl/efl-1.22.2.ebuild
deleted file mode 100644
index 1b17f116ce8d..000000000000
--- a/dev-libs/efl/efl-1.22.2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-RDEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/jpeg:0=
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? ( sys-auth/elogind )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	nls? ( sys-devel/gettext )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cxx-bindings
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-quick-launch
-		--enable-threads
-		--enable-xinput22
-
-		--disable-cancel-ok
-		--disable-cocoa
-		--disable-csharp-beta
-		--disable-csharp-bindings
-		--disable-doc
-		--disable-ecore-buffer
-		--disable-ecore-drm
-		--disable-ecore-wayland
-		--disable-eglfs
-		--disable-g-main-loop
-		--disable-gesture
-		--disable-gstreamer
-		--disable-pixman
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable elogind)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		$(use_enable xpresent)
-		$(use_enable zeroconf avahi)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake
-}
-
-src_install() {
-	V=1 emake install DESTDIR="${D}"
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.22.6.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
index b4a90ad0d777..946104590533 100644
--- a/dev-libs/efl/efl-1.22.6.ebuild
+++ b/dev-libs/efl/efl-1.22.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.23.1.ebuild b/dev-libs/efl/efl-1.23.1.ebuild
deleted file mode 100644
index 9b1afbddc390..000000000000
--- a/dev-libs/efl/efl-1.23.1.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
-	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
-	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
-	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
-	tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
-	xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2 opengl )
-	^^ ( lua luajit )
-	ssl
-	gles2? ( || ( wayland X ) )
-	pulseaudio? ( sound )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/check
-	net-misc/curl
-	media-libs/giflib:=
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-libs/zlib
-	virtual/jpeg:0=
-	X? (
-		media-libs/freetype
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		dev-libs/wayland
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? (
-		sys-auth/elogind
-		virtual/libudev
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gles2? (
-		media-libs/mesa[egl,gles2]
-		virtual/opengl
-	)
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	json? ( media-libs/rlottie )
-	lua? ( dev-lang/lua:* )
-	luajit? ( dev-lang/luajit:* )
-	mono? ( dev-lang/mono )
-	opengl? ( virtual/opengl )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? ( media-libs/libsdl2 )
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? ( gnome-base/librsvg )
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	v4l? ( media-libs/libv4l )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	local emesonargs=(
-		--buildtype=release
-
-		-D buffer=false
-		-D cocoa=false
-		-D drm-deprecated=false
-		-D g-mainloop=false
-		-D install-eo-files=false
-		-D mono-beta=false
-		-D pixman=false
-		-D wl-deprecated=false
-		-D xgesture=false
-
-		-D edje-sound-and-video=true
-		-D eeze=true
-		-D libmount=true
-		-D native-arch-optimization=true
-		-D xinput2=true
-		-D xinput22=true
-
-		$(meson_use X x11)
-		$(meson_use debug debug-threads)
-		$(meson_use drm)
-		$(meson_use elogind)
-		$(meson_use examples build-examples)
-		$(meson_use fbcon fb)
-		$(meson_use fontconfig)
-		$(meson_use fribidi)
-		$(meson_use glib)
-		$(meson_use gstreamer)
-		$(meson_use harfbuzz)
-		$(meson_use hyphen)
-		$(meson_use luajit elua)
-		$(meson_use nls)
-		$(meson_use physics)
-		$(meson_use pulseaudio)
-		$(meson_use sdl)
-		$(meson_use sound audio)
-		$(meson_use systemd)
-		$(meson_use tslib)
-		$(meson_use v4l v4l2)
-		$(meson_use vnc vnc-server)
-		$(meson_use wayland wl)
-		$(meson_use xpresent)
-		$(meson_use zeroconf avahi)
-
-		$(meson_use !system-lz4 embedded-lz4)
-	)
-
-	if use opengl; then
-		emesonargs+=( -D opengl=full )
-	elif use gles2; then
-		emesonargs+=( -D opengl=es-egl )
-	else
-		emesonargs+=( -D opengl=none )
-	fi
-
-	if use gnutls; then
-		emesonargs+=( -D crypto=gnutls )
-	else
-		emesonargs+=( -D crypto=openssl )
-	fi
-
-	if use connman; then
-		emesonargs+=( -D network-backend=connman )
-	else
-		emesonargs+=( -D network-backend=none )
-	fi
-
-	if use static-libs; then
-		emesonargs+=( -D evas-modules=static )
-	else
-		emesonargs+=( -D evas-modules=shared )
-	fi
-
-	local disabledEvasLoaders=""
-	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
-	! use dds && disabledEvasLoaders+="dds,"
-	! use eet && disabledEvasLoaders+="eet,"
-	! use gstreamer && disabledEvasLoaders+="gst,"
-	! use ico && disabledEvasLoaders+="ico,"
-	! use jpeg2k && disabledEvasLoaders+="jp2k,"
-	! use json && disabledEvasLoaders+="json,"
-	! use pdf && disabledEvasLoaders+="pdf,"
-	! use pmaps && disabledEvasLoaders+="pmaps,"
-	! use postscript && disabledEvasLoaders+="ps,"
-	! use psd && disabledEvasLoaders+="psd,"
-	! use raw && disabledEvasLoaders+="raw,"
-	! use svg && disabledEvasLoaders+="rsvg,svg,"
-	! use tga && disabledEvasLoaders+="tga,"
-	! use tgv && disabledEvasLoaders+="tgv,"
-	! use tiff && disabledEvasLoaders+="tiff,"
-	! use webp && disabledEvasLoaders+="webp,"
-	! use xcf && disabledEvasLoaders+="xcf,"
-	! use xpm && disabledEvasLoaders+="xpm,"
-	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
-	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
-	local disabledImfLoaders=""
-	! use ibus && disabledImfLoaders+="ibus,"
-	! use scim && disabledImfLoaders+="scim,"
-	! use xim && disabledImfLoaders+="xim,"
-	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
-	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
-	local disabledEmotionLoaders="gstreamer,"
-	! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
-	! use vlc && disabledEmotionLoaders+="libvlc,"
-	! use xine && disabledEmotionLoaders+="xine,"
-	disabledEmotionLoaders=${disabledEmotionLoaders::-1}
-	emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
-
-	local disabledGenericEmotionLoaders=""
-	! use vlc && disabledGenericEmotionLoaders+="vlc"
-	emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
-
-	local bindingsList="cxx,"
-	use luajit && bindingsList+="luajit,"
-	use mono && bindingsList+="mono,"
-	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
-	emesonargs+=( -D bindings="${bindingsList}" )
-
-	local luaChoice=""
-	if use luajit; then
-		luaChoice+="luajit"
-	else
-		luaChoice+="lua"
-	fi
-	emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-
-	if use doc; then
-		cd doc/ || die "Failed to switch into doc/ dir."
-		doxygen . || die "Doxygen failed to run."
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	meson_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples/
-		doins -r "${BUILD_DIR}"/src/examples/.
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.23.2.ebuild b/dev-libs/efl/efl-1.23.2.ebuild
index 14721b4005ef..22e657b9eff3 100644
--- a/dev-libs/efl/efl-1.23.2.ebuild
+++ b/dev-libs/efl/efl-1.23.2.ebuild
@@ -24,6 +24,7 @@ REQUIRED_USE="
 	?? ( gles2 opengl )
 	^^ ( lua luajit )
 	ssl
+	drm? ( gles2 )
 	gles2? ( || ( wayland X ) )
 	pulseaudio? ( sound )
 	wayland? ( gles2 !opengl )
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 6d2820c37229..a1ec5708bbcf 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,8 +1,8 @@
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
 DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf831524fac5170ce8e55d939d19ecb747b7bc4bb900e978d29fd987d592a0e16982a248adc5b085503ccb2b43 SHA512 2764f339c4b5744330c60fa5c8c902a06952d6c5a38589d236fe290f9934b9128527658d8aa99d42806255403b90f55ea1a85e5bd09da4b3a8f7c48be4d94f51
-EBUILD girara-0.3.1.ebuild 1055 BLAKE2B 31476edfd1e68fc846b2eb339d098d82dbb2fb04d8751b57568661b357d1016b44abafe5a8fe6871120d4807dfd6415da5187b4a00ba98801d6c01eb1912b835 SHA512 1c5f4296473db9674a97be80f7bbd8ec697230853196d175ddf542fc96e2ba215c28f60a1475798c5bcb92eff220cc888eaf458b33d05190a03cac8035f390bc
-EBUILD girara-0.3.2.ebuild 1049 BLAKE2B 042c375f57bf86f8c8af4b57b7e167ca41367238690dbb55aad6b5144e8ba4ab2dbe9d9b83b987e8763b49a8e0a98ec1bfcedc71ad45b94dd348f9b5777bdb4e SHA512 cc415478c8b086aa8a6ebb0296ec5c1b3d276b64dd5251f173002ec414ff3ad34f4f19dab9cb6c7f145a50090c119f79060cdb7400be0a92710677748313eb9c
-EBUILD girara-0.3.3.ebuild 1062 BLAKE2B b6f9471c622831ed7df8e2582ea49515145d2ee16d74912ef2e8e7a94e8e7ea10500fcaa80289f71cc005c3014ef787a122648fe0f69776da91cd9d5042cd4e8 SHA512 927718908e48bfe659a325f21e4ad9c746a180851dc47a455e297af98524559122b565413bdc6d3b1e0fb9c33ea11ddb33a7013fc5c2b63ac730117a4caf2d42
-EBUILD girara-9999.ebuild 1065 BLAKE2B 94991dc72369eb26fe7b9f42c3f0238d4fb6f809f5ff8afb915ab833b96a0ad1e9e5259d51ef5234701a7cdbf5e70fd105f3d75fe9ecc15c2497a6e8678d0c67 SHA512 af8ae37289f3708d7c97dca7bed33a1e985392429ebf5dad35fcf739a9650dca391a9e2fadda1fe4da6524c3c433d925d0bb2047ade3be3070cff57f8e1ce702
+EBUILD girara-0.3.1.ebuild 1083 BLAKE2B c9ee97c48f5913e23aa56863341a37e9c1599eb3d0fae707d00486927cc475208b3d3f6e43e0eaf64958b940cad5740380cf659677dd9b7a02d0621d47f7b368 SHA512 31727a23a627fd6b48911d6319e69bcef3ec763d064ac035b0e3494b2551935327f2e800e8fb94fbf80a272fb5ede4a585dfa88cc7ba52e5c6cc5d9797aefacb
+EBUILD girara-0.3.2.ebuild 1077 BLAKE2B 89e2e2e59facb53bd15a3e9ef8b1c2c30ca9caf57487eb6e9cf3cf1d5479ff12cae8bb690e9b8a66dca280da896e10ac504c95731ae4bf89ba1e0ef8a69b6639 SHA512 0ffbf0888981ff105220e900acea9c77d466ca10fc34c2c99da552888000a555b3939f75aca8fd0fbbd26e870c9ed372b3327c729438e6ca8e2f5409b28b1b0d
+EBUILD girara-0.3.3.ebuild 1090 BLAKE2B b203bcae62b7ff78315dadfef1b2af05940b674eb4e419545f76c681e015b4981087e27aed5856a27c0d9e25b029349dc5b377f480243ac799ebf4c6ac7d791c SHA512 5dbccfe1093db8dc02e52c443a6209e925fe18d16ff01fa4bb1c96c227524e17b54948da9147c17afa2814b998a238ca3f3a4f91e66c3012620b293e4a3e7583
+EBUILD girara-9999.ebuild 1093 BLAKE2B 0a62f68c47c162d367315463e9630bcda7d7a2ccc68b371734d0cfaab65d4f5047afb1f0caa9d34d2e047dc411197764a764e20050a6751e63666168f12e93ad SHA512 16e945dfee00040368ccc5e025cc613a36682020529afb9013d4a9533583d340a318c692f4877b7e8acbcb42fa8f500bb15c96e0b55268313928f26101e9f86c
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.1.ebuild b/dev-libs/girara/girara-0.3.1.ebuild
index 46f9c356cc93..7c63532c0a51 100644
--- a/dev-libs/girara/girara-0.3.1.ebuild
+++ b/dev-libs/girara/girara-0.3.1.ebuild
@@ -21,6 +21,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="doc libnotify test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/glib:2
 	 dev-libs/json-c
 	 >=x11-libs/gtk+-3.20:3
diff --git a/dev-libs/girara/girara-0.3.2.ebuild b/dev-libs/girara/girara-0.3.2.ebuild
index 8e5a35185bb7..c1c097b8d7b9 100644
--- a/dev-libs/girara/girara-0.3.2.ebuild
+++ b/dev-libs/girara/girara-0.3.2.ebuild
@@ -21,6 +21,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="doc libnotify test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/glib:2
 	 dev-libs/json-c
 	 >=x11-libs/gtk+-3.20:3
diff --git a/dev-libs/girara/girara-0.3.3.ebuild b/dev-libs/girara/girara-0.3.3.ebuild
index 2555ff2cb3af..a94eb0fea972 100644
--- a/dev-libs/girara/girara-0.3.3.ebuild
+++ b/dev-libs/girara/girara-0.3.3.ebuild
@@ -21,6 +21,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="doc libnotify test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/glib:2
 	 dev-libs/json-c
 	 >=x11-libs/gtk+-3.20:3
diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild
index 6aba9061dfb2..683a2b54d613 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -21,6 +21,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="doc libnotify test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/glib:2
 	 dev-libs/json-c
 	 >=x11-libs/gtk+-3.20:3
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index 1fd274f2c451..27f4e2aac961 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,3 +1,5 @@
 DIST hsa-ext-rocr-dev_1.1.9-112-g3d9d98f_amd64.deb 1120410 BLAKE2B 653480e4209f7f6a0d8dfe0f8a8948ef44d2aa2a415f33ce9c4ca8ec8dc3b3e0dd78dac9a3d80bb45f5202df49dc2aa5b329e285968853e0bcaf6673f76d714e SHA512 28fb2ecedb2094782376efcab2a5292cb4f3e58dbdd8ba8b520dfca7d230d30326939dc3964f6e1be841e41829bef44b96573ffdbcad187f02adb11ac70401fd
+DIST hsa-ext-rocr-dev_1.1.9-122-ge5c4efb_amd64.deb 1120322 BLAKE2B 40c60058c2b6d6debf80503c36f6b0ddc72747c7327e411121f99fa2e507e5e9414cb91c80be0acf283bff23a6a029b3ef199577846b694b2e2e11696cc7d225 SHA512 60dad492cc66f249d48fb057b2ecec1719525a871d38f39a403a55de98e8cdea5f00f672fa3ea697490c287ba7e5c3be035f1f2861a7fc97d9b949f575e51ad7
 EBUILD hsa-ext-rocr-1.1.9.112.ebuild 1161 BLAKE2B c0892ada0cdcb0bbc511755218382809b3fc266230e4d41a495a4d63ad83bb5d144b67808ca55889fc6b96ca506ce3de56d3505c98e2c28407a91a6d192c66e2 SHA512 347291970514118859262e1b3357bc7b65c9d142e020653a4069a632345efbdd5c93d11459ce07f2f622a667a0147b171a1911bc2e307e2d2ecce0f6535dbeff
+EBUILD hsa-ext-rocr-1.1.9.122.ebuild 1161 BLAKE2B f80763569f5f6524de62b94e0f1907d38d53592360fd736d9b01c7800dc89cae05b93f522cf853121295f2016743eb1e1f2a810cec170f1b1ddbf57cdbd1f545 SHA512 dcafb018921d836207078d7a61ebe7b8639738bfc916e6a46e471795781e34172bb978c28c89de7e715f787598aa6506d46445ebd5996c9f82fd6d1c1cf383d3
 MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild
new file mode 100644
index 000000000000..cb5e5cc16994
--- /dev/null
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.122.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker
+
+MY_PV=$(ver_rs 3 '-')
+
+DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
+SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-ge5c4efb_amd64.deb"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="-deprecated"
+
+RESTRICT="bindist strip"
+
+QA_PREBUILT="/opt/${PN}/lib*/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	local destdir="/opt/${PN}"
+	local soversion=$(ver_cut 1-3)
+	local somajor=$(ver_cut 1)
+
+	local solibs_to_install=( "libhsa-ext-image64.so" )
+	if use deprecated; then
+		solibs_to_install+=( "libhsa-runtime-tools64.so" )
+	fi
+
+	into "${destdir}"
+	for solib in ${solibs_to_install[@]}; do
+		dolib.so "opt/rocm/hsa/lib/${solib}.${soversion}"
+		dosym "${EPREFIX}${destdir}/$(get_libdir)/${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${soversion}"
+		dosym "${solib}.${soversion}" "${EPREFIX}usr/$(get_libdir)/${solib}.${somajor}"
+	done
+}
diff --git a/dev-libs/libexecinfo/Manifest b/dev-libs/libexecinfo/Manifest
deleted file mode 100644
index 4e947164b822..000000000000
--- a/dev-libs/libexecinfo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libexecinfo-1.1-build.patch 479 BLAKE2B e6649b91cf56df3ed21de5a1b5af38c3fd5893fc0b1f4736da22c950ffd24e6aba09184df7ae0603a6093130422e44e56066268670ae70479d145afd0a82b313 SHA512 0eb8fe9ffc9220fb8b97508be39055999a4cb4924c2b1f770abbbdcc435deab689a95656e5de968d6ece89b4a573e7e6c3f73f6e18385467d70ca168338f6f0f
-DIST libexecinfo-1.1.tar.bz2 4841 BLAKE2B c17bf0c0188c951f0cc2b8f902b5aac018cd6f7fa9666de261995605ce6b48c1692320a0f0e03ff0eb9e2b449a03b625ab88eb4a57ba5e87ed33df03838964ac SHA512 51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c
-EBUILD libexecinfo-1.1.ebuild 555 BLAKE2B ee617b7cea3b1e06933c135716153f35f93762c42d60a7efbf11b09d35a8404eb52cc898e959c79850b341e45cb1fa8fbeffe9b1ef04e830267b9d0700be5371 SHA512 f8a8345ae9aa72cd4ee734ad4fac6f18159434c3b4d476dc1c8eb27c851e7a8ebd6bf520015fa835a5ea6867d052f1719fbd1560d750f69f754d651ffc94f28e
-MISC metadata.xml 430 BLAKE2B 7b7596e14b6fc876bbcf929fb3ffd3e8c7bc24286813d3ab3b7a69d759e2bffa8c4e4afdf7987df68d17a589ef284fa7ae35d79f688b8cc7cef560548c3162cf SHA512 09b97a52302b21ce78e0d928d00c07691941dca2d81c3f91fb85b53f94ee1f6d032a3cca389b947c17b153dcfba3e246120f9f8afd398ceb7715820a12684614
diff --git a/dev-libs/libexecinfo/files/libexecinfo-1.1-build.patch b/dev-libs/libexecinfo/files/libexecinfo-1.1-build.patch
deleted file mode 100644
index b295cf71bfd0..000000000000
--- a/dev-libs/libexecinfo/files/libexecinfo-1.1-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libexecinfo-1.1/execinfo.c
-===================================================================
---- libexecinfo-1.1.orig/execinfo.c
-+++ libexecinfo-1.1/execinfo.c
-@@ -78,7 +78,7 @@ backtrace_symbols(void *const *buffer, i
-     rval = malloc(clen);
-     if (rval == NULL)
-         return NULL;
--    (char **)cp = &(rval[size]);
-+    cp = &(rval[size]);
-     for (i = 0; i < size; i++) {
-         if (dladdr(buffer[i], &info) != 0) {
-             if (info.dli_sname == NULL)
diff --git a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild b/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
deleted file mode 100644
index 41fb6b56fa7f..000000000000
--- a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="A library for inspecting program's backtrace"
-HOMEPAGE="http://www.freebsdsoftware.org/devel/libexecinfo.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="sys-freebsd/freebsd-mk-defs"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-build.patch" )
-
-src_install() {
-	mymakeopts="${mymakeopts} LIBDIR=/usr/$(get_libdir)"
-	freebsd_src_install
-	dodoc README
-}
diff --git a/dev-libs/libexecinfo/metadata.xml b/dev-libs/libexecinfo/metadata.xml
deleted file mode 100644
index 52378006fe3d..000000000000
--- a/dev-libs/libexecinfo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-	This is a quick-n-dirty BSD licensed clone of backtrace facility found
-	in the GNU libc, mainly intended for porting linuxish code to BSD
-	platforms, however it can be used at any platform which has a gcc
-	compiler.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
index ca209dd56de6..629df7a97322 100644
--- a/dev-libs/libffi-compat/Manifest
+++ b/dev-libs/libffi-compat/Manifest
@@ -7,5 +7,5 @@ AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f5826524659
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-compat-3.2.1-r3.ebuild 1617 BLAKE2B ea2bb90bb51b833dc1fb743f800cb44265fb4707d419e5ad71dd221c2bbcf12acd6b57df08742bf8fb62ef8b9b9f530e5d3212393de31259e128fa30f14ec2fc SHA512 4230d44ddea461a5fc8243fb1626b1514f13506391bccd88e6a0a7581dabc9bf63abdfe12ea0285bcf96132be266d735f270573498daf90420699662c0c3993e
+EBUILD libffi-compat-3.2.1-r3.ebuild 1645 BLAKE2B bf2a1406771fe74f5066651ca73ccaa294c52fe6fda93afc25580ab83ede64a68bbb50da3dbdd85adf0b32ba8c42cd32f7acb657cd4d9413eae755d1c56c4a00 SHA512 e3d78317684cd4d5076fc75b25d5930d1d0f1e97d8b190ca4e186bd495b2dde9f0a18f0631074e928af05387c06c52e440814740973cffe5067ca26bd42613a0
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
index 7a2f341bd1cf..3aeec76d338a 100644
--- a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -13,6 +13,8 @@ SLOT="6" # libffi.so.6
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="!dev-libs/libffi:0/0" # conflicts on libffi.so.6
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 0ea36920fc8c..5b9a00093340 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -11,10 +11,12 @@ AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 DIST libffi-3.3-rc1.tar.gz 1122483 BLAKE2B c849f3c20bfb899f6659303bc739e894b842a3e0d85138a73915eafb8b2fe25b8d491f7eb023c735a9acd83933a9aa6cec562ca035513d774f5754c22a786fea SHA512 e1421d1bff8b71433dc06f6397f2f47894180b4f85e0a80b465b3a3edb904921e74be19d8ea15ef40f13275050e4b2c1432b6059372127c74560a4c73f18e18f
-EBUILD libffi-3.2.1-r1.ebuild 2247 BLAKE2B af3fe29f0a3bed8dc2796651bee68f94133f1a3e7aebeab9fed8f2ab1e956e678e36dc746e5e19cb60707e0b8cc122a82c45229750b2b628a39c8d7665605fec SHA512 3d4f77b9d81d6963b34aed7a2677825187f811a49f0189114bdc94b358860913268dce3cbc27b9b4f862a23f18b226610f0c74c0d0ac54c1d3cac491b5dd89ac
-EBUILD libffi-3.2.1-r2.ebuild 2306 BLAKE2B 2aab5739ecccb926509487d44c113df73113f393c37ad55ab546b43172767ee93bf4e8d927831dc5d5ee406b4674cb73ca0a6b4503bf5190327cac9f2e2f42e7 SHA512 5f531fa8a5231a653e7a6dc1037cb6c3c37b7961a175d3ac3b346ac68f6030e266f1d8745e2ca29600965b03691146a545862a73ad59d189d5120509cc28278c
-EBUILD libffi-3.2.1-r3.ebuild 2358 BLAKE2B d9b06232210d47d8f46ec3d5ccecef1c01bdc434df74a521500dadb6879eb091c9954cff2277035676503318d50a8e30eb0d7626f1a1f2b0fa2f62a68646fb8f SHA512 6f05734cc0fdbdb82b869847c248aaae89aadd97f1aad87356002e020cf52464d0db311fdc37bebea8aa15aa4ccd3fa5c5017cabd1f6e18af06a7e49642f3ae1
-EBUILD libffi-3.2.1.ebuild 1946 BLAKE2B 064f5d08503166205bd4f7b655e36611703055e7b5a7e0313a406ffff6f20ca17f8ead0c5c4276e05b23cf6e73cd050b7953a2b279001359c96b30a106a7c5c1 SHA512 55c6e14e2a5ae1b9f1b2e3645fc8d4ddfa590b62d4fc1ad64b01de069e5c0b8bafedfdf3568239899141a20dbe3d87990f9890af9372b81f96c439e2141f3ef0
-EBUILD libffi-3.3_rc0.ebuild 2019 BLAKE2B 7f49078d36f4590c9aca7aa8a4b2c9b32a0f2504df9bc95ac8e7721b98123c081147e65efd05a33eae30bc34cdc47af5e0a37b4532b78b946f4724848a4a6a54 SHA512 48aca67191e74b74295be91611708c264479c976ca575c0b6948750264753486a4d917b343056b667359cf0bdd5d9b6ab30aa1ff893b7d6c34fba581b2234a0b
-EBUILD libffi-3.3_rc1.ebuild 1978 BLAKE2B 207a1164b7297f07a35744670b4fc1d237a81f0bf695012b769077ee0f9bf07349fcf8b18072e4b0e5a9a13bd10dbe00eef3b3d2598ffe1edbcc9aa204aa1399 SHA512 0cecab97db7b2e6f7d9d35f57043899c4403e30d0ab2707c2b5f44afe51f440bf544c2f5c4b90aab9381e2021b82e35baa8c4ae98dee502b6ddbcc70733659c3
-MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
+DIST libffi-3.3-rc2.tar.gz 1126497 BLAKE2B 40960c8e8bfb6b266192436a8cbfa7cf5d5e5290b753b3360f965ef28b99fa51fa887845b6a2646b02f4ca4c1472d381df0c63cb64d1412ace737a064c2bbf57 SHA512 d792fea8252e68178ba87a0a53087e46c126129e5c9094ea77ad1b4863e009904bd53f213eaa7f78133e7c5645c280a7523343a7e0b79607a61af90ded4cd36a
+EBUILD libffi-3.2.1-r1.ebuild 2272 BLAKE2B b954d489dbc91b6e96bfd6184c769721c07a5d42b724b28d7302aea956a787a31267e2fd3fcadc76cd4e5f5b987150da7dceef16cb2f8cd66312a8ad0e444b9c SHA512 ed2e6c8bb1fdb8fcfbb6462deb5488aa8551f431c20f96787eafb9e56ae909a3494203908aa79fbb504b8c27a3c57bdb4c085068abd79c14d6e50640a4c17927
+EBUILD libffi-3.2.1-r2.ebuild 2331 BLAKE2B eddb0fbdd95f528bdac1739e7d401eb595bac249d322e3f59a7409869d8a33cf19d29356c22286afec4fbfc2f05d5249fbc265c48f9b3332b87ef87aef43c6a5 SHA512 d802ce84be1a8da75315c2291f97a48d0cdb7f2f1f39b6bda9a1b52623e0c36c86405a7129fb168a759e6834aeabcb87e86a0af9314ebf0b92539901811b01b3
+EBUILD libffi-3.2.1-r3.ebuild 2386 BLAKE2B 5b3e0429fa498c23aeb3950604089cf51f677229085e7d60b0b02c3413ae3328f6cfd78bdc399bf973d4f56412fde4399ede5584357c92282ea003d1f1712145 SHA512 bf4dbcceecce19e59f197383deb95967482f408f7ee02e2a0f32bb3f62a1a73b1115c0c60774376671aeaa51d03d225d481730f13f4688c697ae74417261d82e
+EBUILD libffi-3.2.1.ebuild 1971 BLAKE2B c0f52976c95a892d9537d9834b4b1624f9ad99054990f3cb83548778eb05f882c79483be9ad900397e19c42d05c5d3038effaaffefc4a13f32d19d25ba07f23b SHA512 2d784dc96c51b78238a02de4570ef479aa54bca77e2b704f030c05a3e534285cb4dae44979c2c684b60aa030df5676a02ced2b3ad4e945e58697d8a872e46ba5
+EBUILD libffi-3.3_rc0.ebuild 2046 BLAKE2B ff84c9c3acd60f0fb191c0447987cdb3410e739456c94d8248e0a66b721fa74e5c5518a24a8edb008e1606e2d8b32b251154d9b6a8eeb84edb86c7b9bee9c4d6 SHA512 f8ca97d42cdb4da9c372424f64d4246fc85d0bbd8c2422a0c577e7d1db3759dc68c316a277b7fe6911ea1b8c56135a0297a01a4b59e5f3265f6bc3e79651f6e2
+EBUILD libffi-3.3_rc1.ebuild 2006 BLAKE2B ed7da466fbf5ff5d0736544ef4d656f869c57472289a4e130d44e4d77757947427c1ae1d603a3f5a972c3bda1cb4b2347d7a1655c70b236fc621275dc10ce346 SHA512 cebfc9c5c6aa0a0b99832d482afcef6f78f12cfe1b7c61b9dd353b7c120ae5b2c2317f5a6b2154d5e886e5f324381bfdfd15f52337732b204f00f4f72a83ced8
+EBUILD libffi-3.3_rc2.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
+MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 3d1b61e0fd72..e5cf6d05c70e 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index ef3e0d216648..103bb3c379fb 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1-r3.ebuild b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
index 34d55005928a..f49ffaf9ea2f 100644
--- a/dev-libs/libffi/libffi-3.2.1-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 8143d37df311..f94e70f728b8 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index 2033740cda01..e5b3dcaffd89 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,9 +13,11 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND=""
 BDEPEND="test? ( dev-util/dejagnu )"
diff --git a/dev-libs/libffi/libffi-3.3_rc1.ebuild b/dev-libs/libffi/libffi-3.3_rc1.ebuild
index f926011c2803..aeadeb0dc4bf 100644
--- a/dev-libs/libffi/libffi-3.3_rc1.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc1.ebuild
@@ -16,6 +16,8 @@ SLOT="0/7" # SONAME=libffi.so.7
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND=""
 DEPEND=""
 BDEPEND="test? ( dev-util/dejagnu )"
diff --git a/dev-libs/libffi/libffi-3.3_rc2.ebuild b/dev-libs/libffi/libffi-3.3_rc2.ebuild
new file mode 100644
index 000000000000..8e60ade28961
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3_rc2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use test-bhaible; then
+		# These tests are very heavyweight (hours of runtime)
+		rm -v testsuite/libffi.bhaible/bhaible.exp || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 6e9a28c5ac88..ee959783eead 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,6 +35,7 @@
 	</longdescription>
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="test-bhaible">Run extended regression tests (very slow).</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index c703bd7b9569..6c5f68e1c63b 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,5 +6,5 @@ DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02ad
 EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
 EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
 EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
-EBUILD libgcrypt-1.8.5.ebuild 2290 BLAKE2B 5b30e13295593ebc9a866f1cef12dcb11e56429f067311e07bc616f14f7fb412f3d58b36d4b5fa03b678d00e3913f12739be3b19f4115f66dae1db5134f645cf SHA512 da7094afa0bcaf653427ee91e8ae6806c8008573dd15e66db1afeaa5937815692f2c6955cc814c90fc8a95752868883e89c3042fba033ae93aa1276e01d4220a
+EBUILD libgcrypt-1.8.5.ebuild 2289 BLAKE2B f1c1497fa83f56cff96e22e63395911b231faea4b8eba4936b7759013b60ef08b8c2a023274a0be2b31ac4f50902897114b94ea7fff44303c733cde0b6b3d991 SHA512 4aca14090f0f2809e858e81826d0ac4f489b0c735fd4afe4d75ca3308808e29cb704aad0c5c950a1ef64df4a3a486d15ef355fea59f0a42f6f7ac06e25b789a9
 MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 22a611ebfeec..58a9e654361e 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 20eea7160d9e..95bd0fa323a1 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
 EBUILD libical-3.0.5.ebuild 2063 BLAKE2B de5f7497391cd3be77755b00b034ea61d584cc68c7ac10f6270d14387a237b753f0ca8eceb2fde5ef9e6d1fb5b2fb479dcf0770f37b8959f6e094fb53f16ff00 SHA512 7fc2aef6bb07ecacccf61471b7f3ba429b11d2026cadec9e531ab70fc40bf1a6843b214002f52a5e8295258613b6c5bb21ee7816a1f8cf2df6fc269fada0131b
-EBUILD libical-3.0.6.ebuild 2285 BLAKE2B 4398e1640e6b1619d812fdf520113cdb9c676fa6041e478f33a6351e940d9aa8fcd98d62f12f9201d9e04fdf5bf9355c5e85fe93039c99bb4526c44ba5c2386a SHA512 bae6aa954d4735ee357567ea3e1e3a7037bb1bd8e378c3361d2752a1de3a723cbf09c14773ca5af3b1e891f87411f5123fb86c3cfffaefefb46c4a7e8d58fc0b
+EBUILD libical-3.0.6.ebuild 2284 BLAKE2B c7a023ea2f55a07bfcd1bd4ae01595bedfcc114e67e99f382b340654989707339bc5f24f4509e2c6fa66d2ab0f758442b9d09c616970a0df1cbb6b658e7b0fea SHA512 ec6fcca1bd101b87e16d9e0487c1aafde113e2b6740fc3832a37fe8ec247328304810def0ba52ef73268b0c77c02b7e769732159403042a22defa39559657f04
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index 2c44b3a5d404..2cd4dc69c9ee 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 2b2f75bbf144..0a8c10ccb96e 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,4 +1,3 @@
-AUX libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch 697 BLAKE2B b7afbecfa66af17004ca9d8280ef491b08269eee834c3bfead44c1237ff35aeede455514301c31eb46c6cfd6431b68cbaea8cbe6993957e8883dbeb43220c8d8 SHA512 9c30bf1061666ce3659ec1a0ac00a4b5368213e8ebe338fab287740ae08ce1840f0bf80448ec2545e5d1269e25a2223b41bf91ce00d2f7e3c1b64ff6e5231a10
 AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
 EBUILD libofx-0.9.15.ebuild 1003 BLAKE2B a665c10d613b4d69fbf71c7c952b6a7e7de11fe368d62389e219dd4157ece94d101e47d7b3c60f93e2ab5fa14945eb2d829b346ae5e297102fe281a6918b7b41 SHA512 3d4d1189a88063b6b52e6b49fec5633727f1edacc5e95ac8d8aa2e56140fe90bf0b0be0b870c307d0d9decb556a7b2d947cac47194be5125285479d8cfc76ab9
diff --git a/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch b/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch
deleted file mode 100644
index b4e68e43ec34..000000000000
--- a/dev-libs/libofx/files/libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a8f965718de5c046fa64344b6bae521cbd5a6a20 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 21 Aug 2019 10:50:46 +0200
-Subject: [PATCH] Makefile.am: remove INSTALL from docs
-
-Gentoo specific: Remove the missing INSTALL file from Makefile.am
-This could have been copied by eautoreconf, but unfortunately isn't.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3a83560..fd81144 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,6 @@ docdir = $(datadir)/doc/libofx
- doc_DATA = \
-   AUTHORS \
-   COPYING \
--  INSTALL \
-   NEWS \
-   README \
-   ChangeLog \
--- 
-2.22.0
-
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index f77461e0b55b..72a0faf2d5c4 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -2,6 +2,6 @@ DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beaf
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
-EBUILD libpcre2-10.33-r1.ebuild 2508 BLAKE2B 2bda27974d2cf8a1cb407003cd9a07097d3754b5c6fa46415db2f0b6b7e7fbde2ba8743b4c71f4afe7ed21a6ae5f16c08f18d468d8a68850d7f8e45640b42465 SHA512 b39653dc491a8ba9b23bc551f7754a838608c32257056617313942904bc543401fc4dd67e64988cc80c507984f6be31b6d628f4d47730a09e4a0b845fc3604cd
+EBUILD libpcre2-10.33-r1.ebuild 2514 BLAKE2B b2402d7df16c96fe58648f776533d111898c35467d21bd0a47a03b232ea5d76f4666a141d25bbe3a9b750c56fc87404c4f761d643fe5995caca230fdec238cd7 SHA512 8633819d9741a2d08631367c0d7bf6cc2a4cd9b70dcc8b77e1640a7e9c46248bb7cbc54d8c6b3411de99bdb802b77d08e21195a49476e13e6d484f44392a1a2e
 EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index b19e0e4b8f80..405ebf5cca5c 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -21,17 +21,17 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
+BDEPEND="virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 RDEPEND="bzip2? ( app-arch/bzip2 )
 	zlib? ( sys-libs/zlib )
 	libedit? ( dev-libs/libedit )
 	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index e49ee986ddd0..e07c69b5c103 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1.ebuild 721 BLAKE2B 2f9429905121407fb191298ab7c12683fbbe7fa735775998ec9483fa9846da2fed5fc989429c35469a655e8eaa88809cab59936446a96f1f00a21ab103cdab09 SHA512 9e024de086ad128e7506c79bd0c49fef685b5c3348f0bdb7d57fff8c9224027f00b8a4683a3a1e20958dd86f4a9ee0265f63fe92e5af3e21d7e7a1709bb43da0
+EBUILD libstroke-0.5.1-r1.ebuild 701 BLAKE2B 960e732f58528ad34b5af48de682662699e4eb97e3676b0f54ffed08bcf49875d5488acfbd3473ed5ed5c00e3f7f57f626a5a263f5e18b84c58c2b6ecd3ef90a SHA512 f5657c406550e181708e8acbf5d8585ea3eb4f2876a8a86061a88b2675cd2affd466f9780fb28d4e1b7f78477519ea6fb4f21eb9549cebb15079d6e90a7e40b1
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index 8255b7317818..d800a7013d9e 100644
--- a/dev-libs/libstroke/libstroke-0.5.1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit eutils autotools
 
@@ -18,16 +18,15 @@ RDEPEND="x11-libs/libX11"
 DEPEND="x11-base/xorg-proto
 	${RDEPEND}"
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4_syntax.patch
-	epatch "${FILESDIR}"/${P}-no_gtk1.patch
-	epatch "${FILESDIR}"/${P}-autotools.patch
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-m4_syntax.patch
+	eapply "${FILESDIR}"/${P}-no_gtk1.patch
+	eapply "${FILESDIR}"/${P}-autotools.patch
+	eapply_user
 	eautoreconf
 }
 
 src_install () {
-	emake DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install
 	dodoc CREDITS ChangeLog README
 }
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ffe62145f711..ee201adfbc01 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,6 +5,6 @@ DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4
 EBUILD libuv-1.28.0.ebuild 1198 BLAKE2B e10d86b654ee8671e588dbcf0a509770c828d512a2c7476362c18518254946c52da758549fc20ffcc356349b758cfb518557249e1557211de670bba9cb1162d6 SHA512 cd2c514b8939ca68d0e2c7313dfa3878bce8b2b73e4ceadfe9f7e57024463ab08234e60be2451be1cb7b937e33614de70d91877da8b6001d374e37bd55c766ef
 EBUILD libuv-1.31.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
 EBUILD libuv-1.32.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
-EBUILD libuv-1.33.1.ebuild 1217 BLAKE2B 19c28f94ec1133567c3dbf27830ce5cdcab5c2e9f296fc63e131b70e5c113d76efbdb05e59fe07e5d123d28c5a8035b0feba43a36c8849b4e52245b21472d297 SHA512 7a025451d3a7cf50bcabed7dca36cfcdc3f815702eb40d4d4f1e575dd6145f7a7b733f85352be1596e57b70dfd16ab6dd464089079734727739a81045fe629a2
+EBUILD libuv-1.33.1.ebuild 1216 BLAKE2B c62ac4f3cfa40721d0ba1769abd9d2c7a6571abd6eb8d6587dea8ed44d4366b0b975401308c3cfaa7a4f3a51a464850e1d5847a5288e579c0fb494b797ee9540 SHA512 19f7c0ad8c85c8c23c3b4b11244a23514a5247b087f783599906bd93dbd08554fff7cb9b53693aa95b48282fbbf235d2b73796ee098af4ae53cdec912b6ae095
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.33.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index 37a077b4e010..974f7290cdd8 100644
--- a/dev-libs/libuv/libuv-1.33.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-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 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 70bc4ff43900..3e84f3b11f12 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,5 +1,5 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 AUX libxls-1.4.0-infinite.patch 583 BLAKE2B 2d3dbe60123e6005d6c71fd24e0fee43f82137b2bb47e0240d8cda53bc56f970272bc9324c12ac7eeccd3cf90ddbd7a776c15a212723f3cdde874d8193150e5f SHA512 04ab1274723fbfc485d45a1fafd8fb21ccef0af3670b07ad8e4248a442d98a478a944dcaa0f40343026e3c22ae2dee26c27fcc37e73ba9a0cfb48d475446d00d
 DIST libxls-1.4.0.zip 428782 BLAKE2B 52b67eff4ae315dfde42abd276ace7adaecdd4d88d971a97f9aca1f0cce0c874cbcfa6a060880f1101e4fa685fa566475e753eb34ee621e509fbee8c427e6d52 SHA512 e55c0faa25b17a42d53ca939c80e1d3fd0c0e91de7f73d3d10d1fb6658e58e8f38f4e6288a3e3ecb9ae53ea681629ee66ec173229325eea69e01cbd038e68c95
-EBUILD libxls-1.4.0-r1.ebuild 665 BLAKE2B 3cb64d41eb10dd5d43df0a93b9f465d98e8527fd6eaeb6ebef50e785618990c738fca67c877277b22ceef84ee941ff05c9acd6b7390279d99fa639bb5e2e83aa SHA512 5cf6a129b79b2ca631da4ecf8981a39bb1e0107b343697c31ccd0354d30667eb262b34f4e71bbd7b47dcc9baa350c52d4d7305b46a7a58f66d3c2400791f8e2c
+EBUILD libxls-1.4.0-r1.ebuild 680 BLAKE2B 1f7ca33de37e6ff3e1c5531c9c6ea457ea7bc317cb2e5c1e642e1a184ea3270b05b71000dae6a5af92596503309833ba97e768a782eaf3e9b436939ed8beaad4 SHA512 82929d5fd4bc84f1b5af04a58d3bbca4a51accacdcbc17ea393260eca6cfc43d0c80253c859613e2cad98065b391d86ce14501176d2fdb783fcac6c4d3076cb9
 MISC metadata.xml 337 BLAKE2B d83ec5bbbb5d64ad33a946df5fd82206062d9e443363bdbbb4ffbbfd3217cde0e026aa86db0ae1bf2da14fd8dbc435b22c6b0b6c4b1d6eadd3e23ccc8253cc68 SHA512 6cb16eae4b9d04f9cbb1442854c5d827fa19023c2c69e6de5d0eef7d5f7772b4202101b489136e9813f6598d80cae0963b8eca1e736a9a9218d6b8b532bc0c7d
diff --git a/dev-libs/libxls/libxls-1.4.0-r1.ebuild b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
index fd8b84de8c06..eb6a52506754 100644
--- a/dev-libs/libxls/libxls-1.4.0-r1.ebuild
+++ b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils
 
@@ -15,8 +15,11 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND=""
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
 
 RESTRICT=test # test driver is missing
 
diff --git a/dev-libs/luise-bin/Manifest b/dev-libs/luise-bin/Manifest
index 68afa59649cb..61446292325d 100644
--- a/dev-libs/luise-bin/Manifest
+++ b/dev-libs/luise-bin/Manifest
@@ -1,4 +1,3 @@
 DIST LUIse_0.1.1.tar.gz 393815 BLAKE2B be7e35e1f4d5f6227f92bfeb5ed414593215c194e8d7ab67036ac7316cf6faeada839bbef15d8569b6fc276f3bddf41bdaf66e7315f6e8ff1341f8d697327895 SHA512 821b62ed476088c3818cb478a3c525e1d92e9879ef4059da0eb534852a294f802550ad7169066fe439f0cb3645e98656f405594db633061029ae9d7eff86f31d
 EBUILD luise-bin-0.1.1-r1.ebuild 1000 BLAKE2B 5f2f5c5f7d1a75499bb27313931a4dd046c032e3e4f7ac69c211b1fb886c842b2e407a86034cecc2d0d75a91dc106629ac4595a187ffa2da6f6deb429879b127 SHA512 be7a2113830d898804813d778cec3e91200f294afbdc114ce868e86f64ed6e249fe462e6e612d446541591e3665a43739e96b5e6a606ac0d0930dec8702740bd
-EBUILD luise-bin-0.1.1.ebuild 956 BLAKE2B 8f6bae020414fb375dc2cb533c95424635c799afa2780569d233cfa51bf94aed84118eaeeff607ec36c84c3dccbc02fdc583622838f541d9ab2b4e86b0bfabe7 SHA512 1a43b77112f275ddfb7ef16b9a8e006e888b38e725e9f742a670440434157207cad18f52c75dc7078b4cb053eda601e178c5a895e8c49e8d7a0814a14288779f
 MISC metadata.xml 1313 BLAKE2B 18110903546bc63acdabc23a02b0acc5e74a6ae34912a8224e6a7c57b6c235278b3469c9620ea8dc55e461c9aafdeb7d7b53961d8324d5c4d716884c5875b219 SHA512 cf23b2da2f293cbb12caffb1dfa4bc228acdc0eb9ebf454319e1c6875619b43aa64bcbcefb1f50330b135268132f05c0e5ae446b948a8a00960bcded46b80448
diff --git a/dev-libs/luise-bin/luise-bin-0.1.1.ebuild b/dev-libs/luise-bin/luise-bin-0.1.1.ebuild
deleted file mode 100644
index c1ffd9dd703c..000000000000
--- a/dev-libs/luise-bin/luise-bin-0.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib
-
-MY_PN="LUIse"
-
-DESCRIPTION="Programming interface for the Wallbraun LCD-USB-Interface"
-HOMEPAGE="http://wallbraun-electronics.de/downloadssite/"
-SRC_URI="http://www.wallbraun-electronics.de/downloads/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="doc examples"
-
-DEPEND="=virtual/libusb-0*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}_${PV}"
-src_install() {
-	if use x86 ; then
-		insinto /usr/include
-		doins 32bit/luise.h
-		dolib.so 32bit/libluise.so.0.1.1
-	fi
-	if use amd64 ; then
-		insinto /usr/include
-		doins 64bit/luise.h
-		newlib.so 64bit/libluise_64.so.0.1.1 libluise.so.0.1.1
-	fi
-	dosym /usr/$(get_libdir)/libluise.so{.0.1.1,}
-
-	newdoc doc/readme README
-	use doc && dodoc doc/docu_luise011_Linux.pdf
-	if use examples ; then
-		docinto examples
-		dodoc samples/luise-test/*
-	fi
-}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index bbc6f6fb29b3..3d99cb9c301d 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -4,5 +4,5 @@ DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.3-r2.ebuild 1045 BLAKE2B d633849f8800b5ceafa524fcb2f01dbaae5eb04898667f902303af6bd439da3f7acad1f95946e083e90b41bdf4c1d3095d9ad76ecd748a8fb9035fe7c6f8cd19 SHA512 2e3af6ce3b2c0cd2dc670bb689087ffa84eacb31b96f373e8e621b6a628e4fffa3ca9386e81c93b07c19343e9cb7f9806198ba7ad7265a3dae3f7c6cef10b7ca
 EBUILD mpc-1.0.3.ebuild 955 BLAKE2B b81c6d279157a3a47c6e78cf40b625d29226b79ef587c22cf1e25095bd1605823c94207cf75b8a0271dc988bd8bac1b6ebb2915080171322e0ba50f4b55aeead SHA512 aed001c22031eca558034bc9deac4d235c9aba28e9c9187a75b71bfcf91f65d7be18d722b29abebb781df72ef8442febe7e40ed5241c1ed3c768d2bf9d6e5509
-EBUILD mpc-1.1.0-r1.ebuild 921 BLAKE2B 9b5ce8dde55c2dc56349401903ffa310672692b7bf7d03241b38b4bfa8a6025fcc89d185141d316615a29e3e9b22081eab15c6f46bc7bdc0907fc0503ca91d68 SHA512 56a5aee92077f5582b5679d3de9bf0c14f1a6ecf64ea24205b7c4d7b01b4a975f8a90970134c2fcac45acb05e154e6b02da65f7dbe144e71fd574b9d5f011aab
+EBUILD mpc-1.1.0-r1.ebuild 919 BLAKE2B 2f1aaea8d1b94e565d9d0dae800b98b9afdbfb634703d8f42bf6039303cade232752ac5f202f404583b8799adde5a8f4345e66e26cae4745eb6bbcc4f1228d75 SHA512 e3bb382c716a0b798298174e0476bc4d84b69aee1eb0a2635447da6dada7472499a940654afef5634331e3f106d21d00c5f7ff2caad2fd0d3b3ef263a9ad2eaa
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 7ef0ffad3077..d08903a02d24 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 7afce2a93393..227436542dcf 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -17,5 +17,5 @@ EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0
 EBUILD mpfr-3.1.6.ebuild 1591 BLAKE2B e83822443f4cefba6133397afadd04771cd4e5fb93598bf64fa9d94bde0bed823bc61114fe315488dd82a03c969ff78825d772a04e2fc643fd41f1d03a4f613b SHA512 3e2871fd594f7799f28e67e25223febdadbfec6fc96928d13ef1e0a394d69a88634a8ac490f22df9ec6827b0aab7926e377f10830d7bd74d87df163d64fd106e
 EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
 EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.2.ebuild 1699 BLAKE2B b782b7e801f9aa0ab13cae133681f1ffb88b5cc1bff56cb07c610e4835b74cd7b67cd599096fde6d45114a107d31b3198eb4a886b758672c69381bf36ea5ce16 SHA512 d34c254190ef3443df8086c5962ac199294c8c3b466f0970f779f89bba37e916b27b372b1b363f958a7963060fe270b5826bd5b6b5d9ad790e74e4e0c2d166f6
+EBUILD mpfr-4.0.2.ebuild 1697 BLAKE2B 72ba1a6325edc37a5dab6f270611efd228332e18235253cf48d2602bdc0924b6b038f9e8f883184cc103d8f8f5b96dd12144cca922372703ff33c6a002c58e61 SHA512 730dd767ddd903b6c04231a0b7768d5a8e40e7ad823027435bdf2df0e4e806d92b24d1ee1210d03e8b0e0fcd5b5a1a50be49734060f13ef70b7a910327670684
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index d8195afe3b1e..1a33a370780d 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index 05e8b3aca79d..f74bf80f72d6 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -3,6 +3,6 @@ AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82
 DIST serdisplib-1.97.9.tar.gz 293190 BLAKE2B f11406acaedb724d51266510d10f5cbae7e3bf1a69e3378ed8a0f8c4551336e3d662eb104ccc938f72821aec3406e1eed27754c990e17940d8dbe7dd8c5d6805 SHA512 ab45202fd1fd85b12f1ebf7a7e1a4575ad363f6faffd45949300840456e26dd521c70b67ff57c32e1ff6c0a9f2668b3be6a653afb57ba6da701fbae6e8db3118
 DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9
 EBUILD serdisplib-1.97.9.ebuild 689 BLAKE2B 046e5cbc15c905f6e9ce98cd91798a7b08e93f0ab5409d3ca46a0f52f2cf5c600d53521720e584146c001dcf1a414ae65c98f469cfd203a89b427193cdbad07d SHA512 f1d713fc3c1005ad81b074a4b75638015f06b57141d2f83e02c4cf11a2b2cdaac56b89f1c3fbfc1b3e38d33f2c48e0e22a7ac6af31c47e50b1d4431231c613a9
-EBUILD serdisplib-2.01-r1.ebuild 2553 BLAKE2B 31e2264b9067da35325471efd106c4d9821a9e5fc3ec5b20eb935b56b31d76ce60c1a38ec052cc139ceede0100877b4e8168cf56b8c2f0a235f20bf9693ba9bd SHA512 44480f59bbe65481df51461bdf461171f62445a5285efb89e1272338ae32c962d778fdf00ac58108844ae8a7ae81b6399b43bff13e202208dc9012c69e5bb2a9
+EBUILD serdisplib-2.01-r1.ebuild 2560 BLAKE2B 1857bbcc27ae21c882f30309047b0e82ed95e971683e996ce3f79a54aa61aee9ae7d0f7086be2a5635649f4ee68ded50e9522b82516150f0997c3a02a2bf6ff4 SHA512 e14108c215f9690e0d931bf328b086cca420ef5eaafaab85f1274d3176903202fdd4fd4a51a52316dee360b96a9b99b012939509a08f6bb9ef6234ee62b075e7
 EBUILD serdisplib-2.01.ebuild 2508 BLAKE2B 4efd666b305375c65be803c8e79d91b9f8caf72cc74d2f655a6ccd790e80099fb44749d46749a8504b0f74902187fb2501402c330301e01d3de62e9b721cfe65 SHA512 cf3279873e09b74ef7c3c357c94fd8bc2a23840d4f606011c2cecad5a3a3972337c4f5ae4c9ca93afe1200aad54b0f8b958e9f80aa2591c525412286c1b9dc26
 MISC metadata.xml 781 BLAKE2B 39a77b8c97974cdd41d31afa7bc47def2f23f1137b00f79f6574c4f4236702f2ac12219520c7afb7346c4b51dafce61ae901f64da618972fdc44d80b918ab5bd SHA512 fd9814780e1fde17eacd0424f757b9d2b905cbf2116d44cc0966d703cbfe7878580a1afe7b2da4e02d641617922b3e057e9daf8213091a69b0820bd7d92186fd
diff --git a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
index 8a7fa4dd1e17..3511b8bfa006 100644
--- a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.
diff --git a/dev-libs/xplc/Manifest b/dev-libs/xplc/Manifest
deleted file mode 100644
index 072a5cfa3882..000000000000
--- a/dev-libs/xplc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xplc-0.3.13-as-needed.patch 561 BLAKE2B 585e22f03e0958581763d2f8d34731732b6008896690902e14393d14d3fbe89ad6d11ba39793eb44692d5ed818ea6df1c8bf6e32219def24d342ce4b9935fc30 SHA512 105fd3d6a2452ceace8c2de20f6ba16141e232126f9947c95b5ca6ba25a5a71f86eb40502ab895c1d78421cdb5888086f9e2bffc052ed800ad0a07a7db2c26ca
-DIST xplc-0.3.13.tar.gz 175431 BLAKE2B fb013a3e1a3c75b9de0ee8af43fce161811e5b99e5386a1ea5d0a19c36db3ec70d1cbad5d0848bb76857ecf37ee5b3006315a4663b1eb463b1915a8958ababbd SHA512 6969ed16c282589ddc285678e1c02016810f83c4c0fea373d8b7a72c97474e6cc21ca3f8f7a7a6aae814037dfae51c3a41bd39f13a67445552b6a7c1b698195d
-EBUILD xplc-0.3.13-r1.ebuild 1098 BLAKE2B b51dd5a7abd2ad038cbd1c4e1c037f4981c9612cb03c1e23aaadc4e36f9a42908233e246dfa28e1dd969f3b05feecc9f46d165e660ba7778a6bc46bcdafc9a7f SHA512 9769d4c9353d2914f94e94b9deee43495a8dfdc4a8b54e8d945c8914a01d6d5ec77112d9e4adf12fd96060900558647cc70d422beb61f1f95b78636cb03b5e7f
-MISC metadata.xml 331 BLAKE2B 2927fd0e6a80b933c0e904d8e3a409d71bd6cb01c58ce2c845dcb9794cf7f5d27c2ab35f6b91df1228ce33ccdd9138513883e396cc1ad267de6304d270c7952c SHA512 8925223a2eec9ef58a1e7f018e40e982e76f507c1fe30605a72e8042fde736ffeedd18ce9f56e6b9967d0de8d45c18dc4f289c3eb4daafab55faa556709202a0
diff --git a/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch b/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch
deleted file mode 100644
index 3e002db2ad00..000000000000
--- a/dev-libs/xplc/files/xplc-0.3.13-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- config/rules.mk.orig	2006-05-06 19:28:46.000000000 +0200
-+++ config/rules.mk	2006-05-06 19:28:53.000000000 +0200
-@@ -44,7 +44,7 @@
- 	$(RANLIB) $@
- 
- %.so:
--	$(LINK.cc) $(SHARED) $^ -o $@
-+	$(LINK.cc) $(SHARED) $^ $(LDLIBS) -o $@
- 
- %.dll:
- 	$(LINK.cc) $(SHARED) $^ -o $@
---- xplc/vars.mk.orig	2006-05-06 19:32:06.000000000 +0200
-+++ xplc/vars.mk	2006-05-06 19:32:12.000000000 +0200
-@@ -32,7 +32,7 @@
- 
- ifneq ("$(enable_loader)", "no")
- ifneq ("$(with_dlopen)", "no")
--libxplc.so: LDFLAGS+=$(with_dlopen)
-+libxplc.so: LDLIBS+=$(with_dlopen)
- endif
- endif
- 
diff --git a/dev-libs/xplc/metadata.xml b/dev-libs/xplc/metadata.xml
deleted file mode 100644
index 6f5064e23b85..000000000000
--- a/dev-libs/xplc/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>cross platform lightweight components library for C++</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xplc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/xplc/xplc-0.3.13-r1.ebuild b/dev-libs/xplc/xplc-0.3.13-r1.ebuild
deleted file mode 100644
index 3a4f3279917b..000000000000
--- a/dev-libs/xplc/xplc-0.3.13-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="cross platform lightweight components library for C++"
-HOMEPAGE="http://xplc.sourceforge.net"
-SRC_URI="mirror://sourceforge/xplc/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	#solve conflict with uuidgen utility installed by sys-fs/e2fsprogs (#116699)
-	sed -i -e "s/uuidgen/xplc-uuidgen/g" -e "s/uuidcdef/xplc-uuidcdef/g" \
-		uuid/{rules.mk,vars.mk} config/rules.mk \
-		uuid/bin/*.1 include/xplc/*.h && \
-			mv uuid/bin/uuidgen.1 uuid/bin/xplc-uuidgen.1 &&
-			mv uuid/bin/uuidgen.c uuid/bin/xplc-uuidgen.c ||
-			die "uuidgen rename failed"
-}
-
-src_test() {
-	make tests || die "at least one test has failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dosym /usr/lib/pkgconfig/${P}.pc /usr/lib/pkgconfig/${PN}.pc
-	dodoc LICENSE README NEWS CREDITS
-}