gentoo resync : 11.05.2018

38 files changed, 178 insertions, 377 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index cd18fa949c15..9ca3a7f2b095 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
index b5422af2353f..140ebaf42810 100644
--- a/dev-libs/OpenSRF/Manifest
+++ b/dev-libs/OpenSRF/Manifest
@@ -1,7 +1,4 @@
-AUX OpenSRF-1.2.0-buildfix.patch 5565 BLAKE2B 1711b645bbd65d6081f4a30694a1c9b993d04caaa0546847bddac76800fde4af4665951302292d29a93a93d26f8b1ecc2dc8ca744534ff02338f95d23f30771c SHA512 febe3759fd4923f686bfc46f8d8f18bd463521e0ff930d0259533f173f11cb42842c3ddfe2930b52648873aad45b19eff1d5f328a8237f7e8f94eba63a35830f
 AUX OpenSRF-2.1.1-buildfix.patch 3436 BLAKE2B 9aff428ea42562bddbbc59f063d2902e55ee1c5f14fbb0a49b801840d8fc8ac02f703e8d4f95139bd90a54c689e1cd4fa9d5a4b23e9e56b8f16dbf4c6ad622db SHA512 5db2d704a3d539c1c57ee3b5d4e0965f60c23134c68746ab84655d698388e10b7d611dff0e25db4c633fce462816c4d76afae9d74acdee5a95baeb99528e2b5b
-DIST OpenSRF-1.2.0.tar.gz 1096952 BLAKE2B 87e1b125463db9cb90737b2c4b5821de6ea01d6229e936b8edd9f8883b72bf0b4006916243c06c31383e68a3b2a806207ca2385476e95b01c11ac810aa47a8b6 SHA512 f6ee045b32464316eefb457dc74bd08f3a613fcd22ea54ea719a1762b38ea14972d75802d2a542f3c7489c86cea25cb6a9de61662031104b0c0b3634e1d09cd1
 DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306
-EBUILD OpenSRF-1.2.0.ebuild 3583 BLAKE2B 203a53ce8b001e684170fac945ce1f77b07cb7c402dfa401899d5f6747a523d0bf75b31012816fbbddc83d3f16dd6958fd3f67976ac5e0912ee5a87baf6bffdf SHA512 594295b75ef2f9b12ac2383af47bfffc023c3016f8726dbd5d5bef3c4046ce99f091e607b2c9a25347700adbcda7341d4c8ab4d511a353c3aec614a7e4d5c904
-EBUILD OpenSRF-2.1.1.ebuild 3729 BLAKE2B 3f66f5f636cb75935a929ed6ca634e4da3b0b66e92319c4cecaaaedd3080b780b711181cce4d2e0ee142544692444b6a252b7d356e72ef705299a9cf7bc11a22 SHA512 5c1fd4aa3c3e66a7d434fa1d9b83b5bb8dfdd913bdee83ec8ab4b84192a2256fd4cb006c158b1ae71a9c5c1f947f69ade123ef874545137d91ecddb6068cd1c8
+EBUILD OpenSRF-2.1.1.ebuild 3650 BLAKE2B 1b4fce57366084438d4e5b9bd296a1fb26845deb22ffd3df580d5d39aa4484b04d6db7240465c691c6abb6facde8e4fb7949911ed0ac3e3bcb82fa5e6115cd44 SHA512 20a963a4ab4ebb19fb86920bff737967a73d4af15e82b5b2a22d5f1852f5b43bffec3bf823535d32cf2a49f2e6acfc226a207fa402fc91dc450b0350eeab80a6
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild b/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild
deleted file mode 100644
index b6ea23b6ef85..000000000000
--- a/dev-libs/OpenSRF/OpenSRF-1.2.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib flag-o-matic apache-module autotools perl-module
-
-DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
-HOMEPAGE="http://open-ils.org/"
-SRC_URI="http://open-ils.org/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="postgres +sqlite"
-DEPEND=">=www-servers/apache-2.2.9
-		>=dev-db/libdbi-drivers-0.8.2
-		>=dev-db/libdbi-0.8.2
-		net-im/ejabberd
-		dev-libs/libmemcache
-		dev-perl/Cache-Memcached
-		dev-perl/Class-DBI-AbstractSearch
-		sqlite? ( dev-perl/DBD-SQLite )
-		postgres? ( dev-perl/DBD-Pg )
-		virtual/perl-Digest-MD5
-		dev-perl/JSON-XS
-		dev-perl/Net-Server
-		dev-perl/UNIVERSAL-require
-		dev-perl/Unix-Syslog
-		dev-perl/XML-LibXML
-		"
-
-PERL_S="${S}/src/perl"
-
-APXS2_S="${S}/src/gateway/.libs/"
-APACHE2_MOD_FILE="${APXS2_S}/osrf_json_gateway.so ${APXS2_S}/osrf_http_translator.so"
-#APACHE2_MOD_CONF="42_${PN}"
-#APACHE2_MOD_DEFINE="FOO"
-#DOCFILES="docs/*.html"
-need_apache2_2
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	perl_set_version
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-buildfix.patch
-	eautoreconf
-}
-
-#src_compile() {
-#	LIBXML2_CFLAGS=$(xml2-config --cflags)
-#	LIBXML2_CFLAGS="${LIBXML2_CFLAGS//*-I}"
-#	LIBXML2_HEADERS="${LIBXML2_CFLAGS// *}"
-#	APR_HEADERS=$(apr-1-config --includedir)
-#	APACHE2_HEADERS=$(apxs2 -q INCLUDEDIR)
-#	sed -i \
-#		-e '/^export PREFIX=/s,/.*,/usr,' \
-#		-e '/^export BINDIR=/s,/.*,${PREFIX}/bin,' \
-#		-e "/^export LIBDIR=/s,/.*,\${PREFIX}/$(get_libdir)," \
-#		-e '/^export PERLDIR=/s,/.*,${LIBDIR}/perl5,' \
-#		-e '/^export INCLUDEDIR=/s,/.*,${PREFIX}/include,' \
-#		-e '/^export ETCDIR=/s,/.*,/etc,' \
-#		-e '/^export SOCK=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export PID=/s,/.*,/var/run/opensrf,' \
-#		-e '/^export LOG=/s,/.*,/var/log,' \
-#		-e '/^export TMP=/s,/.*,/tmp,' \
-#		-e '/^export APXS2=/s,/.*,/usr/sbin/apxs2,' \
-#		-e "/^export APACHE2_HEADERS=/s,/.*,${APACHE2_HEADERS}," \
-#		-e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
-#		-e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
-#		install.conf
-#	emake verbose || die "Failed to build"
-#}
-src_configure() {
-	econf \
-		--with-apxs=/usr/sbin/apxs2 \
-		--sysconfdir=/etc/opensrf \
-		--localstatedir=/var \
-		|| die "econf failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed"
-}
-
-src_compile() {
-	emake || die "main emake failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	einfo "Doing src_install"
-	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
-	emake install DESTDIR="${D}" || die "Failed to install"
-	apache-module_src_install || die "apache-module_src_install failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
-	cd "${S}"
-
-	# Docs
-	dodoc README doc/*
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
-}
-
-pkg_config() {
-	:
-	#JABBER_SERVER=${JABBER_SERVER:=localhost}
-	#JABBER_PORT=${JABBER_PORT:=5222}
-	#PASSWORD=${PASSWORD:=osrf}
-	#einfo "Using Jabber server at ${JABBER_SERVER}:${JABBER_PORT}"
-	#einfo "Adding 'osrf' and 'router' users with password ${PASSWORD}"
-	#cd "${ROOT}"/usr/share/doc/${PF}/examples
-	#for user in osrf router ; do
-	#	perl register.pl ${JABBER_SERVER} ${JABBER_PORT} ${user} ${PASSWORD} \
-	#		|| die "Failed to add $user user to server"
-	#done
-}
diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
index 66eff92d51a2..7080fd53a102 100644
--- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
+++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib flag-o-matic apache-module autotools perl-module
 
 DESCRIPTION="Framework for the high-level development of the Evergreen ILS software"
-HOMEPAGE="http://open-ils.org/"
+HOMEPAGE="https://open-ils.org/"
 MY_PN="opensrf" # upstream lowercased the tarball in 2.x
 MY_P="${MY_PN}-${PV}"
-SRC_URI="http://open-ils.org/downloads/${MY_P}.tar.gz"
+SRC_URI="https://open-ils.org/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="postgres +sqlite"
 DEPEND=">=www-servers/apache-2.2.9
 		>=dev-db/libdbi-drivers-0.8.2
 		>=dev-db/libdbi-0.8.2
 		net-im/ejabberd
-		dev-libs/libmemcache
+		dev-libs/libmemcached
 		dev-perl/Cache-Memcached
 		dev-perl/Class-DBI-AbstractSearch
 		sqlite? ( dev-perl/DBD-SQLite )
@@ -86,14 +86,14 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "main emake failed"
+	emake
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_compile || die "perl-module_src_compile failed"
 }
 
 src_install() {
 	einfo "Doing src_install"
 	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
-	emake install DESTDIR="${D}" APXS2_INSTALL="-i" || die "Failed to install"
+	emake install DESTDIR="${D}" APXS2_INSTALL="-i"
 	apache-module_src_install || die "apache-module_src_install failed"
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
 	cd "${S}"
@@ -103,7 +103,7 @@ src_install() {
 }
 
 src_test() {
-	emake check || die "emake check failed"
+	emake check
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_test || die "perl-module_src_test failed"
 }
 
diff --git a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch b/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch
deleted file mode 100644
index 33963fe30436..000000000000
--- a/dev-libs/OpenSRF/files/OpenSRF-1.2.0-buildfix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -Nuar OpenSRF-1.2.0.orig/Makefile.am OpenSRF-1.2.0/Makefile.am
---- OpenSRF-1.2.0.orig/Makefile.am	2008-10-27 05:07:06.000000000 +0000
-+++ OpenSRF-1.2.0/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -115,14 +115,14 @@
- SUBDIRS = src
- 
- jserver:
--	make -s -C src jserver
-+	$(MAKE) -s -C src jserver
- 
- jserver-install:
--	make -s -C src jserver-install
-+	$(MAKE) -s -C src jserver-install
- 
- javascript-install:
--	make -s -C src javascript-install
-+	$(MAKE) -s -C src javascript-install
- 
- install-data-hook:
--	cp @srcdir@/src/gateway/apachetools.h @includedir@/opensrf/apachetools.h
-+	cp @srcdir@/src/gateway/apachetools.h $(DESTDIR)@includedir@/opensrf/apachetools.h
- 
-diff -Nuar OpenSRF-1.2.0.orig/src/gateway/Makefile.am OpenSRF-1.2.0/src/gateway/Makefile.am
---- OpenSRF-1.2.0.orig/src/gateway/Makefile.am	2008-08-18 19:14:00.000000000 +0000
-+++ OpenSRF-1.2.0/src/gateway/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -16,16 +16,25 @@
- 
- AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)
- AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
-+APACHE_DEPS = apachetools.c apachetools.h
-+LIBS=libopensrf.so
-+TARGETS = osrf_json_gateway.la osrf_http_translator.la
- 
--install-exec-local: 
--	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
--		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
--		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
--	fi
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so
--	$(APXS2) -i -a @srcdir@/osrf_json_gateway.la
--	$(APXS2) -i -a @srcdir@/osrf_http_translator.la
-+all: $(TARGETS)
-+
-+osrf_json_gateway.la: osrf_json_gateway.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+	
-+osrf_http_translator.la: osrf_http_translator.c $(APACHE_DEPS)
-+	$(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) $^ $(LIBS)
-+
-+#install-exec-local:  $(TARGETS)
-+#	if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
-+#		then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-+#		>> `apxs2 -q SYSCONFDIR`/httpd.conf; \
-+#	fi
-+#	$(APXS2) -i -a osrf_json_gateway.la
-+#	$(APXS2) -i -a osrf_http_translator.la
- 
- clean-local:
- 	rm -f @srcdir@/osrf_http_translator.la @srcdir@/osrf_http_translator.lo @srcdir@/osrf_http_translator.slo @srcdir@/osrf_json_gateway.la @srcdir@/osrf_json_gateway.lo @srcdir@/osrf_json_gateway.slo
-diff -Nuar OpenSRF-1.2.0.orig/src/java/Makefile.am OpenSRF-1.2.0/src/java/Makefile.am
---- OpenSRF-1.2.0.orig/src/java/Makefile.am	2008-07-17 18:15:09.000000000 +0000
-+++ OpenSRF-1.2.0/src/java/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -48,8 +48,8 @@
- 	rm files;
- 
- install-data-local:
--	mkdir -p $(LIBDIR)/java
--	cp opensrf.jar $(LIBDIR)/java
-+	mkdir -p $(DESTDIR)$(LIBDIR)/java
-+	cp opensrf.jar $(DESTDIR)$(LIBDIR)/java
- 
- dep_clean:
- 	rm -rf deps
-diff -Nuar OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am OpenSRF-1.2.0/src/libopensrf/Makefile.am
---- OpenSRF-1.2.0.orig/src/libopensrf/Makefile.am	2009-04-08 02:48:02.000000000 +0000
-+++ OpenSRF-1.2.0/src/libopensrf/Makefile.am	2012-11-12 20:53:22.079732392 +0000
-@@ -99,6 +99,7 @@
- opensrf_c_SOURCES = opensrf.c
- opensrf_c_DEPENDENCIES = libopensrf.la
- 
-+osrf_json_test_DEPENDENCIES = libopensrf.la libosrf_json.la
- osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS)
- 
- noinst_LTLIBRARIES = libosrf_json.la
-diff -Nuar OpenSRF-1.2.0.orig/src/Makefile.am OpenSRF-1.2.0/src/Makefile.am
---- OpenSRF-1.2.0.orig/src/Makefile.am	2009-05-31 19:49:00.000000000 +0000
-+++ OpenSRF-1.2.0/src/Makefile.am	2012-11-12 20:53:52.475676800 +0000
-@@ -17,7 +17,7 @@
- export OPENSRF	= opensrf
- export BINDIR	= @bindir@
- export LIBDIR	= @libdir@
--jsdir = $(LIBDIR)/javascript
-+jsdir = $(datarootdir)/opensrf/javascript
- export OSRF_JAVA_DEPSDIR = @OSRF_JAVA_DEPSDIR@
- etcdir = $(ETCDIR)
- 
-@@ -33,7 +33,7 @@
- MAYBE_JA = java
- endif
- 
--SUBDIRS = libopensrf c-apps router srfsh jserver gateway perl $(MAYBE_PY) $(MAYBE_JA)
-+SUBDIRS = libopensrf c-apps router srfsh jserver gateway $(MAYBE_PY) $(MAYBE_JA) # perl is now seperate
- 
- dist_bin_SCRIPTS = @top_srcdir@/bin/opensrf-perl.pl
- bin_SCRIPTS = @top_srcdir@/bin/osrf_config @top_srcdir@/bin/osrf_ctl.sh 
-@@ -41,11 +41,11 @@
- dist_sysconf_DATA = @top_srcdir@/examples/opensrf.xml.example @top_srcdir@/examples/opensrf_core.xml.example @top_srcdir@/examples/srfsh.xml.example 
- 
- install-exec-local:
--	mkdir -p $(VAR)
--	mkdir -p $(PID)
--	mkdir -p $(LOG)
--	mkdir -p $(SOCK)
--	mkdir -p $(jsdir)
-+	mkdir -p $(DESTDIR)$(VAR)
-+	mkdir -p $(DESTDIR)$(PID)
-+	mkdir -p $(DESTDIR)$(LOG)
-+	mkdir -p $(DESTDIR)$(SOCK)
-+	mkdir -p $(DESTDIR)$(jsdir)
- 
- install-exec-hook:
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/opensrf.xml.example'
-@@ -54,9 +54,9 @@
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/opensrf_core.xml.example'
- 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
- 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
--	cp -r @srcdir@/javascript/* $(jsdir)/
-+	cp -r @srcdir@/javascript/* $(DESTDIR)$(jsdir)/
- 
- uninstall-hook:
--	rm @includedir@/opensrf/apachetools.h
--	rm -R $(jsdir)
-+	rm $(DESTDIR)@includedir@/opensrf/apachetools.h
-+	rm -R $(DESTDIR)$(jsdir)
- 
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 3552f5154dc9..6257971767c1 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,5 +1,5 @@
 DIST libffcall-2.0.tar.gz 938605 BLAKE2B 1e6fcae8f1dcaad52ca84d0dcf97f8dde5bb8153244bbb9047dbab5f6a1dade0a00f149507e6bb14225369a7081cadb069d23c8bc7cdcfaec937d7b9d47d08c1 SHA512 d75aa1df97b14692a9137745bae5b24c4d8f739cb1c7f854e7ed47e4a77a49759122abd6b0e445efa56381f47932c13cd21a154b2783649afb9c7a39e73fea04
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
 EBUILD ffcall-2.0.ebuild 1486 BLAKE2B 5d10f52e50730d59a1c6923fc04220e9335780279ff38568109585dd190ae26294a60ab70442f0102c44b230629337a1126ce11d7890e374039e383743891b50 SHA512 b3f368154157db13f660a1aa9cb1f7dca813c8d2921f1038b456cf3c15c79a9752eeb219dafc2753ba11e4891e1a47fd66692c76a8d25290b1f2c51102d07eb3
-EBUILD ffcall-2.1.ebuild 1523 BLAKE2B dd4e60e71b5b812f6a818d3acce35d0f4490994113c0d4ed7165512fc8213105b710dbe5e5c212f50aabf17e07576d6fe37f8a9d137707bdf927fd4ce762cfa7 SHA512 34a9f2ab5a6b508119c657175ea64cdeb1c90e1c2b36e4ac10ec9ab7778b231bf724c14e568f70b95c3ae0c26b0fecc1f8944644d27f005f4e7545fb9e437398
+EBUILD ffcall-2.1.ebuild 1522 BLAKE2B 09b4c6c157fc8a6963a4aac59d32e3142e848f5bf1552438bfdc075b8981cdcbb7529005aaf816b6727ddef9bd8b02c444aae18176a3d4093dce451c8b9b1c1c SHA512 31ce9f9bd6c896144ad2cee3af1bf1c232c75b3a307ad15c3e9dcba12300a535fde62284e1b34f8eac7a75e2c4c7c78107d43132fd3bd587d2633af27b1c47a5
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index b4762103c805..70c88eb5e84f 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 13dda2f1836c..d20689bd1bde 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -4,7 +4,7 @@ AUX fribidi-0.19.6-page-size-header.patch 852 BLAKE2B b0109ff6e21fd816e42afc568c
 DIST fribidi-0.19.5.tar.bz2 625034 BLAKE2B 74929614cc07a574ffaddcde4bcbfd09dd107362a9f82502b940f6be08bf61a2004237429695184d1c59667a3689d5e01787586cdbc536fb17c3c093b7fb22a2 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43
 DIST fribidi-0.19.6.tar.bz2 639022 BLAKE2B cf17ec580d93807e7720f7833bcac2e5ffaa16dd52505e1a3158d6d6fc6af5111ad11d75b15c7837185d04b48f18ca72b6b903962b084c5a7f5fbcc0bcf7f1bb SHA512 0661cf8e0985edfd5bf02c8de32432bf2faacadcaf35aef4e039a28f802a0468288e76b60231ebe7b54f909bd4d3ecc31a1fc94e83d434ae16dd21de6089629e
 DIST fribidi-0.19.7.tar.bz2 648299 BLAKE2B 496d010f29dd8fc3d349ad3f89d60a596dfceaa5350663442d5965cb09bc7a23e2ab8a876d7ca5b05ec3f4c5e178060cae2b493ccc46a6cdfc022d139e778259 SHA512 4bfdda43d961030a8a2ae2c98d2ca5d43c1b59633fa0987920c5537ec69f3f624204ceacc4c474d878cbb417ee2d9e708dfe169cfce6ad584d2f2d5122678b63
-EBUILD fribidi-0.19.5-r1.ebuild 1230 BLAKE2B cf5f46a1240ee129f9f1af9dc2323f2a9570ccab11b850951e1ebcbd11376e9530a506a5dd7fdf055c7083a12f79b414d0d0db4c84e91c3bbefec01c6b91872e SHA512 15eca6f872310d9696b0e0cb8e79db49a8da5cc85bba9e091e2f9df177a46b3426097f5b4053fe350a9ebd76061cb1050dc159787ef6ea29f29e59ecdf619b6f
-EBUILD fribidi-0.19.6.ebuild 1293 BLAKE2B 81200058d75a4c001988985ab0111e89f886c01bb992296aa3ac428751dcd1975d2415cbf3b15af0e902e21ce89cf64a06063308ab7fa0e60181abe7536b5b3f SHA512 71705b88c5c96e590f5a436908e820cae45a18ffeb8457e676ec24af689a06fa9b534e670677c48b4949e66b7c9a933b5c629eca561eeb301d8705c361de013c
-EBUILD fribidi-0.19.7.ebuild 1170 BLAKE2B afdbb051e88088c26ccb0d393206f40422237d79ffd3ef56afce10c634ad1775c75da066b3f868e64e01565c845345b19d3cc552640f84fefca043b50f2d89f0 SHA512 7b681b63fab1b860c6c60ed6c421d1342ecce37ff8c7b7c6816928e01a4d8bb9586aefefd7969da660d8f92d148154bf7c4742f89e597341299bdb97ea8f20f9
+EBUILD fribidi-0.19.5-r1.ebuild 1258 BLAKE2B 073108631a3d3db4e98a79e60dee5dabc34ed2701a819e814135fc223dc920d19e920b7447b995983fcdf2aa9d47b967142c0682124fbe72d93497b8e1357e48 SHA512 e428b8a0098b8a9b372c950cf12b539fa387a9e7708fc7331228f7e052c63fa6cb31152d35efba88c5cf89e96078322714c38f44577612a4b627cde8b9b64f36
+EBUILD fribidi-0.19.6.ebuild 1321 BLAKE2B 6ce0078d166db2c9dd60e8877211f097e50c4af20a118f70fae1a7418bca5e1079dcac3938340c9c415dee8b3b4d3f50269f5db509b706e0695364379177e793 SHA512 7b6e91b05f9a665330047817182d6b8e99b0c83c0fa76cc24b940cfffab49bf8d90504541076611d0f5331dd19ac07ac65c2fec656156f646be54f45137828ac
+EBUILD fribidi-0.19.7.ebuild 1195 BLAKE2B 839633ad0a00b4966d209938c35c46309467782c1ab96cee3a237376213f3ee20920c53a10e101224d10dc4399433f58363e414eee7d5b5ada52f632e5fa80fc SHA512 ac6acb636c2b9892d5fbe500e049ff9713cda7f78c090a1fd2e8237cf70f8e6819287326504d52e7e724b6ba2cf34865c7eb177f4562fb65650126348846b6d0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
index 5566b38636bd..f2f12390a25d 100644
--- a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
index e4c50be0f93a..c93bd2a36797 100644
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.6.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils autotools-multilib
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/fribidi/fribidi-0.19.7.ebuild b/dev-libs/fribidi/fribidi-0.19.7.ebuild
index 1146ef274f2a..058682947df5 100644
--- a/dev-libs/fribidi/fribidi-0.19.7.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.7.ebuild
@@ -9,11 +9,11 @@ inherit autotools autotools-multilib
 
 DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
 HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://fribidi.org/download/${P}.tar.bz2"
+SRC_URI="https://github.com/fribidi/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
index dc9f073480f8..46ed8f801df8 100644
--- a/dev-libs/injeqt/Manifest
+++ b/dev-libs/injeqt/Manifest
@@ -5,5 +5,5 @@ DIST injeqt-1.1.0.tar.gz 74112 BLAKE2B b8fda39422458d9b140081fd2362de5be5d7d030a
 DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
 EBUILD injeqt-1.0.1.ebuild 667 BLAKE2B bf427758c344c5ef1f2341d3c31c6dd77e18004ce6f858bea55c89c27832b879598b877a4c3083c5e4f005267a03f9a220406761406e6516e16bae9c0aa9cf09 SHA512 59e38fa2a8ba2f3bce52d7652ec2ca55aca09bd2714345b57dbc61a3bdd903346acc5752906a129e41d64983c3982c5ca9de9cd4c1f292d17df2613bba34c1b5
 EBUILD injeqt-1.1.0.ebuild 656 BLAKE2B b35e5a01851d29ccc04f27cd70d333353a973e0193cc3e1d3c22b6e2c55ae7e5067bae7123b427c9d8468a76f2f1671f59d2dbdd700000a014de6ec0cd23837c SHA512 46635b31b88ecde6be2d127ba94fee42a4725c146424e86bea433b752c31ca338973df9545ec3e3e60034197d7be00a6c9d4d838f36fd26dc63f36e48d67657e
-EBUILD injeqt-1.2.0.ebuild 699 BLAKE2B 736383629d9ae1dbf9268ecb6b4f62ef9be04ca3bf04c8038c5677ff567df948b6ca93732ec0430ab6699b56d1435701ef212e6937afb5c0a7259dd40ed0e29c SHA512 b50f139de0b13cde0832e9655596b0af258a0104cdcd0835cf3b5c410059033b1018849e1de4bb3a5e84ac868c4564593bee73053d07428b7b46e7e5ae4c715a
+EBUILD injeqt-1.2.0.ebuild 698 BLAKE2B 4004f3a7a258f54bdc0e586db3161b0c2561c29f17b6c7fdc63816fb63433cafb970f0ce4f41a6d8edfc1e9e943a16257ad519c70a08724730c502b13ee2c231 SHA512 855c31e77b6f0cf761e26c9c36c1438e6d268a927faeb6a3d1467f7d9eb140ce210c3ba11c9d4343b82c56d1a1eb22d4b724fcd3f0eed92cc693315afd0c466a
 MISC metadata.xml 328 BLAKE2B d23a1f7b8bd482bfec92060b9f20f94efee5ec28fae5cd8e8df35c8d80d2b93a8e6b7474138ae53762f3e1c96f5bdda99d93841bd5f5598ce0698f6f72024dd7 SHA512 b095ba0bbe9d89d1d7b18fc13b3c03c23a8c2ad38f9871f3814dc4595e88a93d7682d3f18c31fd810bffeae25cc04de9c2681e933a7de103b8d1bc1e1bf4c3b3
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
index 42e010b49f57..30decc181335 100644
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ b/dev-libs/injeqt/injeqt-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index 4ba3e16b9d68..5f31ff0907ba 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,5 +1,3 @@
-DIST kproperty-3.0.2.tar.xz 82556 BLAKE2B 57bde244b58d022c88cea6ff00776ebaecefbd865abd939d8a576f77ee8814077ed61f7576440185c71723e64b8a5d838b95f867df6c8892366d9c5f6bd52d06 SHA512 de37dbe3e0aa979c0c9fa75b0b26eef708b332a4b3f65d0b4c22926aa534c54b4f39643df107fabb136071940abd791b31ad8f864e40d514e20171af6fc16ea9
 DIST kproperty-3.1.0.tar.xz 123528 BLAKE2B 79d94bcdb83c343241d233b528f27e8fcabab587000562e695e03ac3877572c73be28574ecdb1fe2f538df9ea0ee20bc71e95f4c13943da585abccc7eeaf2f5d SHA512 6c6b9bc7db8e82b3c5ec216e42c439dfe30071804b2392026e6284ba7154338e2b6b108f0f14b5db556692de3230d8a780099e73349a740ce6edc68fd7fa54f5
-EBUILD kproperty-3.0.2.ebuild 629 BLAKE2B ee5132509ddcef9debf7b0ba7543fda77e07d1d519933c42e25e7f20008308bd4fe5ae3b12cfb87f4efee03dd6f999139009dcb171a2419fbc8455e195cc1a71 SHA512 767de6120290beec82a8c127c6788541c60f3106c6dbbd089729d17e62a0eb8c2d54c7ef8b480f5b95d5a724775b5724fc602f69ca77c65885f8337b3c5c0cbc
 EBUILD kproperty-3.1.0.ebuild 640 BLAKE2B 435646f298ba221b1279589e84ebb4bd67c30db5de0bcec2919d2c62b0ce7358dd326b9e4a45f8aa1ac13a3731f49c889d9e050db173cca38232bc981b71c896 SHA512 d9301c712d476ac605eaa785aed209444366088a07f05e5d2f64a1627a9a29b1ebb419565df7bcf23013177458b6dfe619fc190c491c2767d429f675d61ad247
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.0.2.ebuild b/dev-libs/kproperty/kproperty-3.0.2.ebuild
deleted file mode 100644
index 89b43279613d..000000000000
--- a/dev-libs/kproperty/kproperty-3.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Property editing framework with editor widget similar to Qt Designer"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-# tests require installed headers, bug 636108
-RESTRICT+=" test"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 8f25de89d044..3d7280a2596a 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,5 +1,3 @@
-DIST kreport-3.0.2.tar.xz 227508 BLAKE2B 48c2dae0ea13f513657780d9893c8ddb81c535757c376911fd01246694d55782f97039e8c13f7b2f04d535a91599f51068e0611c578b78602afa6472aab9d66d SHA512 25580783b1424d66608c48c6f0e254a9c27802b11157eaa199a50b05122f904b970b82cc747c7d8020ebede9bac1b30667e22a6b9c23a6e481055aa3c0a407ea
 DIST kreport-3.1.0.tar.xz 378980 BLAKE2B 9f6289a38e7fc0d6a7522e55dd5e769a52306edb4855efe79f933f47dbc87f367c865fede453c04402ec03046a9b5c5bb7b9055ff1ec6808319939328ef74862 SHA512 9f96d65ee420aab497b591a4a0d48da8df21f3c6a230ec742f4b2ff12f0e14a86a82e4fb114bb91ff334bcd8bdf3beec0f533507923bec31a6e79bba55213268
-EBUILD kreport-3.0.2.ebuild 1160 BLAKE2B 2e0dfd95c9b8ff921b40de80c51fbe251bc25e50f35994c5a836cf774bf2bc5dec7cf2319a11a8ed5e976f1c5d6fe46568186d0f1301677420bb8f936c0859d6 SHA512 ac73ef479ecbd1c377e5f7e4bde840dd8959f4c1a7f14194940c1e3234aedb853aabf063c35fe32823b02c4a297c73b34778e1ab0d88a01c5b8bc9dbfec59b18
 EBUILD kreport-3.1.0.ebuild 1211 BLAKE2B fc5786598331a6f068df448b4ccf1ca1ec8d07b4b6441931cf617970e379898f48b23d0a942389bebd057bca874a92b07857570ffeb1a3209f432ad01b72a9d3 SHA512 0535792c6b520c8a5cf3cba244ddeecad9e2ee390f89388ef9cb9183bec62181de3a1ab2e1b470d3b1945969ca74fc25683461294048793ef4e6aa163293c212
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.0.2.ebuild b/dev-libs/kreport/kreport-3.0.2.ebuild
deleted file mode 100644
index 03df9d44e7f3..000000000000
--- a/dev-libs/kreport/kreport-3.0.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Framework for creation and generation of reports in multiple formats"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="marble +scripting webkit"
-
-RESTRICT+=" test"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/kproperty
-	marble? ( $(add_kdeapps_dep marble '' '' '5=') )
-	scripting? ( $(add_qt_dep qtdeclarative) )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-		-DKREPORT_SCRIPTING=$(usex scripting)
-	)
-	kde5_src_configure
-}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index a8f7a3b4a41e..292794a1a32d 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,5 +1,5 @@
 DIST libebml-1.3.4.tar.bz2 606205 BLAKE2B d13c33777e9afbc4d370e0b8e68fdcb42597fbd62f61197a4aa72e2b229ef06819efc0864f9783c87c90f8fcfa572b02d9b1767b57c31c6bc22a020b9eace94e SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194
 DIST libebml-1.3.5.tar.xz 274184 BLAKE2B 954411bba6fc9ff3893a17a5147babff18352ac2c436523eecafac8e2921dd968e83f5672428f4f22e61cee97f7ce1a4f905781b4468cfd9f3ea7d8cd15d961f SHA512 cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
-EBUILD libebml-1.3.5.ebuild 834 BLAKE2B 36dfa9de1130a5f6d2d96291687749223d145c46b79d69fcf35e2f4baa165605e34249fcb9bf251fe213c4a7214f7c97b8a653efff9cc9304ef4203a1a0626b9 SHA512 28f8ad88af0af2132e977cbd65930661a5ce15bfe23b06ddbe2c1806328b5f536ef6646665a5c04192ba64437665bdfcff7ca512c4937b5d35c0c53147338acc
+EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.5.ebuild b/dev-libs/libebml/libebml-1.3.5.ebuild
index a5ce97e68807..be83f1d7e1a5 100644
--- a/dev-libs/libebml/libebml-1.3.5.ebuild
+++ b/dev-libs/libebml/libebml-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8d7d5a1ea479..d996b548b742 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,10 +1,12 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 BLAKE2B a9d72ff20ba52c74e932a347321dd6010c1e39a5e7149d201ce00377521471bf77fcc560c104ac2725892f4ba827ef7be2893dcd19a9df36b5bbad242ff09e5a SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e
 DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
 DIST libfilezilla-0.12.1.tar.bz2 397506 BLAKE2B 79f2009329195c51c81b6013b2ab14899a604cabd2a421888959690e57d67f1c0a30881bed5e7201f6a8d3f5ecdf56944f8f3ff7f2fab9bd8884cde6a0435a99 SHA512 3eeeb549eb5e07c712246a21c41e4ce076f4e9de8a65ad56f2a33bd7390a42950442cdb7113696b9673071f1f4253e847e4f961e97d4c8fad0a5369e790928dc
+DIST libfilezilla-0.12.2.tar.bz2 398156 BLAKE2B a7dee7d6cc14964b105f4c2227f67202d573d879c2428f815568ef0efcfda9349f372b07a10abbb735dfd44a9d52358985144e3b67388dd2ee2b65e8af33cd51 SHA512 8fb77ad2f55e5a2b9066b2923591d51408942ce4ade2b4f21d20ceb818d3b7e7f01da2e41693aba4f4044b1913b14d54719101734792bfec6fc5432593ffa92a
 DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
 DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
 EBUILD libfilezilla-0.11.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.12.1.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
+EBUILD libfilezilla-0.12.2.ebuild 923 BLAKE2B 5f1d1cc49e6d628f4fcd98dcc128b2c50ebaf418b3d3fcbcfd772a50a5873f03a2691c355b8f15e3d5518d8539598b74f038c4e8b86308b6af725f3564c4f728 SHA512 4eb269acc28260f573e10dc546f8a2f4cbb33d170457d0269ccbe5e0ac8014afb11df8e835c6e5ccc6d37fffccd51bddee7b308e5b47b79de46e148fb3472540
 EBUILD libfilezilla-0.9.1.ebuild 921 BLAKE2B 4c68ad50f7a65b85281194981fefad1dce5a958c4066312a57f1b492f5c5784ea0636ae32565a343674eba4bd06f389b019329ff9c88a5385bb80efab027b1ec SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8
 EBUILD libfilezilla-0.9.2.ebuild 1065 BLAKE2B 3c19a20507b7fb350bd3332104b51c91201b4e42935a3f93a3ec3cb41ae88f601ddc01c303f9a1a216c21a4d82a1ca780ecd9e2d5f63aa74b98df361e863c10b SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild
new file mode 100644
index 000000000000..b546fecc3c4b
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.12.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
+	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 893a0eec8a37..71f304acecc4 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -2,6 +2,6 @@ DIST libinput-1.10.5.tar.xz 497496 BLAKE2B c716bdd2620c044c7776f53fd368dc2e1e773
 DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 EBUILD libinput-1.10.5.ebuild 1442 BLAKE2B f4c62d9581129d6423549cf06a185a5a49623d562b6cc4067bb5db74ed3fe8c46cd9726061369bde74ee13878e8d9f892c8fe8ed13c3f8ab3be384d4a23471ed SHA512 bab217325a626c3f9e29d4bb9f86028d3257087d2db47e3de74ac3814496bb808e4ae36ce4060e2abb4cd94ba4351a9272b28695575a937f178c56dd9f75f314
-EBUILD libinput-1.10.6.ebuild 1450 BLAKE2B 38f14353e8d61575ca6286d6b2aeeb0e24f5cc1feddf56177d6c8fdd7c80100c26d19015223a00d88aad0fd339b3fc7973513468aeb6697a5e0d8e7105465ef7 SHA512 917200b05e8b3bd74a83f4c6324a64018fba2aa977c0e80d1e6465837811dc684b1f153e0298df29c27451e8563dd66a632ed57a036333a23fa67579fb221c1b
+EBUILD libinput-1.10.6.ebuild 1442 BLAKE2B f4c62d9581129d6423549cf06a185a5a49623d562b6cc4067bb5db74ed3fe8c46cd9726061369bde74ee13878e8d9f892c8fe8ed13c3f8ab3be384d4a23471ed SHA512 bab217325a626c3f9e29d4bb9f86028d3257087d2db47e3de74ac3814496bb808e4ae36ce4060e2abb4cd94ba4351a9272b28695575a937f178c56dd9f75f314
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.10.6.ebuild b/dev-libs/libinput/libinput-1.10.6.ebuild
index 5364b191c2fc..3e9391fbb243 100644
--- a/dev-libs/libinput/libinput-1.10.6.ebuild
+++ b/dev-libs/libinput/libinput-1.10.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index d852c757f6e0..037b8e2b22dc 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -7,6 +7,6 @@ DIST libnl-3.2.28.tar.gz 941954 BLAKE2B c36817832f36ef2f3e32af8703024c92c874a85f
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
 EBUILD libnl-3.2.28.ebuild 2486 BLAKE2B 2f99ac310c3777c72d36d7eb2ee3ca8d165fcef9385e67385297f384606bdc69675d23e85fb9b4cdadf0dca25639e51d677ce266005a0e9a405f9e069c61e789 SHA512 e6fc4f0076da3a41c6ec89cd52619f42ca5e966f2080e2150b5697612a4edad5c5f47fa34bb3188611fec7f04574db57cbbb1fd94ac3ca992771bd8f8086c30f
-EBUILD libnl-3.4.0.ebuild 2348 BLAKE2B 94e47e19d5b537b5817f936c074fe3cdd5b739a0b7be8dd7498d4d6a10223514ec2fa022b8740658651980d52f17f9b82222af109604b74a767898beeacdb7fd SHA512 bf25f057ad7b2407f6b2e8a5fe4c2c69fdf0a8d7ef1c8e94f00310842d080357acafb5bd3b6acceca87fe2886161db1f35cbee5c2d39198c566842207ad94306
-EBUILD libnl-99999999.ebuild 2130 BLAKE2B 479469457c0f614c6445590367911352de3d8216d9226bb9519f2825e7ab7613be2244d96ae614234df6c1cac66c13f885fa8a1d21be8967b109ae2d9a52a685 SHA512 ef42bbb3a85f3cdf23ae7bbdebaec5a52c60c609bcfecc9b9b2e88890784873c752fcab4a61145a7222d61af8f975b25b4f5ccb408495fb9feb0e3673974f59e
+EBUILD libnl-3.4.0.ebuild 2414 BLAKE2B 3de5f6dfb442f6bc4cc2313e9706e773add2de50cdf74adf6182b6df5615058f0914f7c05510032380cdb052e80e31ab4886a0b6dba81caf8653ecf850ca943f SHA512 7f5f69617af98312bc9ca985a8c4fef92518b39faa33a3ee99775eab2b528635931215d649725cfccd0eac52c4411b3f53a8a4c5ee7fddb8e9157376de1efa7b
+EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 96413581c263..fc9536f8ff28 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs python utils"
+IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
@@ -71,9 +71,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--disable-silent-rules \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
+		$(use_enable threads) \
+		--disable-silent-rules
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 65e5dfb9b481..f8aea0b33b55 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.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
@@ -14,7 +14,7 @@ EGIT_REPO_URI="
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 KEYWORDS=""
-IUSE="static-libs python utils"
+IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
@@ -67,9 +67,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--disable-silent-rules \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(multilib_native_use_enable utils cli)
+		$(use_enable threads) \
+		--disable-silent-rules
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ef8f441d4d78..3bccd6105943 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,7 +1,9 @@
 DIST libuv-1.10.2.tar.gz 1074184 BLAKE2B 81b5327684ae75ad1347730264f07f1106d9136b84956ac170ab99db9fa5fb574f52af9a786f7e2ce6c5bd8caaa0a28b1efc2ee7a23c015499b420feb9c329c5 SHA512 5d9a7c483c3504e10e17c29297d72dee1572dc657d261229cc68efe63cb3abb59f7e7768885ce3eb06f22691e73323158c06dcce29000c81e35ff9888853f080
 DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
 DIST libuv-1.20.2.tar.gz 1180957 BLAKE2B bbf29ea1ee989a5197daef92fee12aa83687002e14e8a4311b61c743cfbf6e4e8e9f0045b38fa5301afcc9981a5fcd59d12e0649515b2e1695ede62795929d4b SHA512 449dfd15e2953d2a8b9c6160ab39728a87799b3e8595f9e3013467daf69d3561e2c5602172a0596e7c884237cf0d52d3b0f00edde03a7b037dc90b61bce2057c
+DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
 EBUILD libuv-1.10.2.ebuild 1140 BLAKE2B a8dd07a2cb5bb9959099d681d9d711bb78afed0decff1f997735749c185540592212137735165989050ea59d6bc1795cf2e1fa82898bdd81fb7d55011ca63d4f SHA512 65f5e4e77ef871f8e40657981432a3bd51d54671b056cac25a2a268509f6f005df3ea73894ea29da3a4f1e1076c9e9c7f177e0e2a968df1d6df498ca14381be7
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B dfe520d4fe923974f9f0681646895e6644a29c8f03ae01ac0c8a0d3b9800c69fcd0dc77d08e32666f912ce9f951008a6efde4f43bcf85a5d857cc84d037a0f22 SHA512 af41bf16214e00e716f31b649232662b57464b3ec5418627ed322b827450fe8c8e6ca765d08548f2ad0813a16af7ff1be6935ee0f890d282f1ea711aab1a0d4a
 EBUILD libuv-1.20.2.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
+EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 MISC metadata.xml 1262 BLAKE2B 0bcb30d58c10147ecb831f1805c89a9cf8d4c8545c7fd8a834a5be6cdfe80e5d7d4b2e7c41df9c2e0b545e199dfcf5de26651f04131442ca8bddf86792fa3e48 SHA512 f95931c1bd8f6bdf6b06fa48e4c66e5bcc567f23fbce82ab46593a3e8b540a582b1e3ea023287ce02d42d3e013e85e3260a300b1d0609d95a98fcd5d7dbea668
diff --git a/dev-libs/libuv/libuv-1.20.3.ebuild b/dev-libs/libuv/libuv-1.20.3.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.20.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 86d12fa0285e..dd4f2bfc5a3d 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -7,5 +7,5 @@ AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
 DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
 EBUILD libxslt-1.1.30-r2.ebuild 3697 BLAKE2B 1ccf6efd66585d9331fcbdafe28cc95b447319160c92f4285199a839a6f7b40cee988d6cc0a9f2c60c30b56dd1a890909f4e1b1cc39178d1146a2a338436fa11 SHA512 51c36880c9f8a6a9882c4a5b8143ab96af96e0123d4a82767d0eb8e5fae9ce24d1ebc9be6692c842cdb049c34ae3f6757494d7e4bc6f2b7e090e33002ce69ec3
-EBUILD libxslt-1.1.32.ebuild 3286 BLAKE2B 812b28f581ab4c0e21f82f70f64e227985ffa424f8134a2f8ef4e0778a0253439835fb30d6c69e5da3fcc0994681d4d2df6688cf7381b8de8a8b793450562dfb SHA512 7daa095912c89ec849e87eb4f8ff569c9e33691fd6f56fece6ef50bf984cec74b9279ca1ada187c3e591bb2c0aa4b0337cdfdb92979bcd8f446ce5108c4379fa
+EBUILD libxslt-1.1.32.ebuild 3284 BLAKE2B 33fa441d3491a58312a1bfab57c7d73b980aff1f95057fca6327914178710d0a217a60201c371e95cd254c2ed3e629bbbbdbabe380a746a38a78e5a88d7992d2 SHA512 3da5e9aa110d04ed395dfbb461ddf45c5abe688cd89bf1ef1446132671425c169c42bca6d36c9c9dfee27cb9f650556836f57e23425b44cf188a990e493336cb
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.32.ebuild b/dev-libs/libxslt/libxslt-1.1.32.ebuild
index 0036428d5c7f..43b455821912 100644
--- a/dev-libs/libxslt/libxslt-1.1.32.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index b511f40ca1de..186ad163dced 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,5 +2,5 @@ AUX nettle-3.3-ecc-add-eh.patch 977 BLAKE2B c33cfc4c8903d92a98ef853f72772f7ad2e5
 DIST nettle-3.3.tar.gz 1887927 BLAKE2B 4bcf3c4bfb9f9dae97ea6780d146f3313e8b51182d9942e69581428d9f602d16467d37f993700a4e94e2e0dee17bdf354694c94d0383164c3de6e57e7e24de4e SHA512 271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
 EBUILD nettle-3.3-r2.ebuild 1776 BLAKE2B d95d5f8d9fcc9574bef63f41678ad8b86ce03dad9d1aae27fd3a8129aa59431f9ed3842b72cd330c1aad44ab159bce5c5bd6df9709f6342bebc4242df6d1874f SHA512 299663b4f58b51e66488fef27c78e0db0164e7bcfc3f990e811ee920dc9b09b952d1a69799cd5112fc97a911ba3c6f74962b9063e26a6cdbe5500556b27119e6
-EBUILD nettle-3.4.ebuild 1765 BLAKE2B 68252dec392580476f4ded485389a18df1f644532cac73a47d4ef88f1e17bfd8cb3f9120d251bc6fc0e2d076f61c3636f7fdaa9f313d413d1bb3a393cafef064 SHA512 0a80f9fbb31a5057d79c6a73cd732f6b237e83f372a415bd6414cc50d2250664d53db2e99bc3da4270eee4db9477b5ae96033c9782488b85886c42875fa1be15
+EBUILD nettle-3.4.ebuild 1764 BLAKE2B 4267304efbc214460e8aa8bb2f5863f1c4c3d90a45990ae3e86279321a1f86113129df29e89e9f6817f01934fbf85c2cf34b8b824f72208aac3dc70ea996af4d SHA512 9f83b35a86080ea931be0613033d5a79598f3f1e8c7f9f698f8e2bd71f2165ad0156b90c7e3e67a53550aa1b95198d090a94e54e0172a83bb36afcc214b6e3d7
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index 0466a635aad6..255c4da1857f 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 8eca89880732..90be64cbeefb 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -4,5 +4,5 @@ AUX pslib-lm.patch 317 BLAKE2B 4ee5ef10537a6535f8fd4b9a3c2dc65feead6d8ba4f41516d
 DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf
 DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
 EBUILD pslib-0.4.1-r2.ebuild 1031 BLAKE2B fdb5e5e99ee16ab15286a2049f0049f240e7d3264d4c3f7734e2a89d2ea62084068aedd7736e79a401c34791e191a0ffbabb1423a13b1e4105dba5330d04eec1 SHA512 9ac74edaf68a11c17dcc78ada74837cda8be00923544759df187e90eaac3ecdd0a3955b5ecd86c7f7f67039e00f26b08d21f9f7a0f38ee071f62b9b9ed546beb
-EBUILD pslib-0.4.5.ebuild 1059 BLAKE2B d95ccd5d1c65ddedde7059555819ff360530fa238aa7b0fa69ee39d8ed63de684106c7072726a30a4752c2da929803f76d4f6fc1d18a063ced9363c5b1bb1ecc SHA512 4f7b7c05a063e5b764ff620a3a7f47d23bbe7ec4dd0acf0271fe5e24085ac7e03d09e338e25e95d9084ec18ca4e298e052bb626d384f2245a77e1dcadc15f7f9
+EBUILD pslib-0.4.5.ebuild 1058 BLAKE2B adfda61c63d050870643b144db59576869ad3ff4257c50357dfd330ebe7390a8749874b2ac4139b456990e10a80098092b54919da8396663ebdce65cbbad2cfc SHA512 2e535a7cd988bb67614de27f7af194a091b7de426b8a32a235212d8429f4907943e4cbb7ab3e196fe15ea250cd24863e84e506b0016f5c2da136b7f9f34b52e4
 MISC metadata.xml 444 BLAKE2B 62c386b9fc2facb334d02520386624241580034bfb227c243f5b589eafef655084b84cb5e5f6dac3cfe73afbd0dfbf41c161261ede4e780bd84bec56a2302a14 SHA512 e50857e3a1c443849c5eafbeb72d41558c1bd8c6a58f22a4ab6b1590647db278e598bfb123eac6a8b50754d8bbd524dc574c3181c1e08bc24fdcce3f13a148bb
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild
index de5103baa121..4896e8951eab 100644
--- a/dev-libs/pslib/pslib-0.4.5.ebuild
+++ b/dev-libs/pslib/pslib-0.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug jpeg png static-libs tiff"
 
 RDEPEND="
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f6e6dad7b86c..58e8242f2eef 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,3 @@
 DIST quazip-0.7.3.tar.gz 439536 BLAKE2B 7b91d12f14e060f3554e6d9b4041aef56f269c3e5cc3a4e67eaa415cf990f474da8581a248037d2b741117c5f83c514f3dc4e30310dccc954cf363435acfc4c6 SHA512 d4b55bd040e47e97e7bd5d080399ae4aa5fbc4985d6ab5979b468abc852c91b2e3e5d35af90d4b4de3bb01ea9135d0247473d6eab0413392b1c8567dc799a9fe
-EBUILD quazip-0.7.3-r1.ebuild 1152 BLAKE2B abbf0e5b16ce4fb813f159983efca585c14cc68a60847d038b52ef3a71ea17f8964a9e3d78522ed8b2106c8813ba31590db7d16bc0d2ee4838e88c4f90e60130 SHA512 88d7e2e454419f19810ed5a1b4d96a57b9542e120ec7177b1791981686a37f01778d3421aa53694cd85112719d878e4ab3de363ea587b9532ffd10977b1b65ce
+EBUILD quazip-0.7.3-r1.ebuild 1153 BLAKE2B 8eade14de50d7cb1d107047a4499a729c3485b63401dcda2ac2582d189e8623873475ca4e26ee38f7fc9cc2826ed610f12ba56e39da07fe73da42eb6013a725c SHA512 c136346ee3d3da176fad5458a82cea7d9c98c0e78084238a6d17c308daf3a155244f83d01e318c36829233518632167819b15424fc9a0f27fcb7d2654556296b
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.3-r1.ebuild b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
index 781a9209c711..e12ecc1c0e4e 100644
--- a/dev-libs/quazip/quazip-0.7.3-r1.ebuild
+++ b/dev-libs/quazip/quazip-0.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index b977bdf6262b..7b3ad921c6a0 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,3 +1,5 @@
 DIST softhsm-2.3.0.tar.gz 992417 BLAKE2B dcb462a7d50be465c306e2208d2d446879ec093ce3a3233e338ba4df3b29a4f70050cd10ff513bff70ef37f98341230d061d48273a6fc54b668804311cb11bf8 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f
+DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84
 EBUILD softhsm-2.3.0.ebuild 998 BLAKE2B e966f3d60d0cc9ec1a3d8208d99387732480889d08c43068060d00029df4b4791b0b56695cc7bc1fd58ea1c629543fd4e4673e0fba6b54b051edb11956b1f4f4 SHA512 2d5e3d022faa02727b8bfbd887bc5f6ad55d66a2c3a7375e04406fb695f68721507bed4f713f8072f953ec0bbab8b3a61069c216f9d268f6221d87e74d67f2b2
+EBUILD softhsm-2.4.0.ebuild 1041 BLAKE2B d723f065d6b76ee5132af9f6b5c7e6d330a0ce283c71fd1b1a40187cfdf6d91e3d42edae2270ee71757b47e0ffc7b278a1d98b534be224c0e57c371fdeeffd8f SHA512 9442882ac0c14345d5c16b02f25fdf4eee75352c22f385c809973fca18edc5f15c4ef195d32dcf5793b5cceab719b8f9fa372ba38a72a09275a775a5c22e7be8
 MISC metadata.xml 322 BLAKE2B 64433451cd97495272e25d2bd1a4ad951781f7a61e47f1f048b13b4a1b4f577f9eb37f1145f1d9710969cfd9e38dd89aacc83641ec8b3bf0b36027c39a8dfe8b SHA512 b145c1ee8c20a9aad9c9b8e6f6526c596dd80a993faecb8e8caf6e930cf05e32f3e6ef5ad72c337a43c48cf57224f209e65d177567e3c5c577d3872eb11841a8
diff --git a/dev-libs/softhsm/softhsm-2.4.0.ebuild b/dev-libs/softhsm/softhsm-2.4.0.ebuild
new file mode 100644
index 000000000000..419485df8258
--- /dev/null
+++ b/dev-libs/softhsm/softhsm-2.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune
+
+DESCRIPTION="A software PKCS#11 implementation"
+HOMEPAGE="https://www.opendnssec.org/"
+SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bindist libressl migration-tool test"
+SLOT="2"
+LICENSE="BSD"
+
+RDEPEND="
+	sys-devel/gcc:=[cxx]
+	migration-tool? ( dev-db/sqlite:3 )
+	!libressl? ( dev-libs/openssl:=[bindist=] )
+	libressl? ( dev-libs/libressl )
+	!=dev-libs/softhsm-2.0.0:0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/cppunit )
+"
+
+DOCS=(
+	NEWS
+	README.md
+)
+
+src_configure() {
+	econf \
+		--disable-static \
+		--localstatedir="${EROOT}var" \
+		--with-crypto-backend=openssl \
+		--disable-p11-kit \
+		$(use_enable !bindist ecc) \
+		$(use_enable !libressl gost) \
+		$(use_with migration-tool migrate)
+}
+
+src_install() {
+	default
+	keepdir "${EROOT}/var/lib/softhsm/tokens"
+	prune_libtool_files --modules
+}