Updating liguros repov21.1.3

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-27 18:53:03 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-01-27 18:53:03 +0000
commit: 3482ddf943eff7b8848f1fb31350b99ce349e86a (patch)
tree: 9c9bb6ec6679e9dc44a84d87ba611989409b12ca /dev-libs
parent: 8e8120eabdd28020aa69c7a60505cce2edd20adc (diff)
download: baldeagleos-repo-21.1.3.tar.gz
baldeagleos-repo-21.1.3.tar.xz
baldeagleos-repo-21.1.3.zip
133 files changed, 1539 insertions, 2658 deletions
diff --git a/dev-libs/aml/Manifest b/dev-libs/aml/Manifest
new file mode 100644
index 000000000000..4b5e3e0dab4e
--- /dev/null
+++ b/dev-libs/aml/Manifest
@@ -0,0 +1 @@
+DIST aml-0.2.0.tar.gz 20358 BLAKE2B 4be63726ea9069cbfe36fbf04e3a0b2229066d7df039aea1a41fdca27700d012fda9eda348115f8c0ef9d3f201640123722d0b96bc7b171841d920357a292152 SHA512 196cd891fdbaad47340d8b4ca9eb62a7f9e6b0969ae9ad744a3c9ea110a532691d53a1e39fde583bad0f8fdae4b51c3a4243bbdab65e952e5fc79ceb6efc3262
diff --git a/dev-libs/aml/aml-0.2.0.ebuild b/dev-libs/aml/aml-0.2.0.ebuild
new file mode 100644
index 000000000000..db62c0b53724
--- /dev/null
+++ b/dev-libs/aml/aml-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="event timer executor loop"
+HOMEPAGE="https://github.com/any1/aml/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/any1/aml.git"
+else
+	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/aml/aml-9999.ebuild b/dev-libs/aml/aml-9999.ebuild
new file mode 100644
index 000000000000..db62c0b53724
--- /dev/null
+++ b/dev-libs/aml/aml-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="event timer executor loop"
+HOMEPAGE="https://github.com/any1/aml/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/any1/aml.git"
+else
+	SRC_URI="https://github.com/any1/aml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use examples)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/aml/metadata.xml
index e0d78dc64d4c..d6e7cc6b2e24 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/aml/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sven.eden@prydeworx.com</email>
-		<name>Sven Eden</name>
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-<use>
-	<flag name="ustr-import">Install ustr-import developer program and source code for bundling.</flag>
-</use>
+	<use>
+		<flag name="examples">Build and install examples</flag>
+	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-libs/boost/boost-1.74.0-r2.ebuild b/dev-libs/boost/boost-1.74.0-r2.ebuild
index 569e79d1a467..2734f29323de 100644
--- a/dev-libs/boost/boost-1.74.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r2.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
index 29b542819d00..e82fe2ecc59b 100644
--- a/dev-libs/boost/boost-1.75.0.ebuild
+++ b/dev-libs/boost/boost-1.75.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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-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/botan/Manifest b/dev-libs/botan/Manifest
index 541d3f352269..f749e3fb8067 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,2 +1 @@
-DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e SHA512 12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
 DIST Botan-2.17.3.tar.xz 5937596 BLAKE2B 605e71c959889b459bc26f17d310a33f26c9a51fe00db91db407ac5b96c9ff57bef67a401f71826e83e0d4eda2289c22685957289e6bb357f3693a1bce60f44d SHA512 ead0f144dfb9eca66d0e81e376d0d49f4b0b6bc1599f8cf52299e1753645b5b20100efa004ef5f9571f7bea88958f35db38367fc26f2603890f8f199cc890dbc
diff --git a/dev-libs/botan/botan-2.16.0.ebuild b/dev-libs/botan/botan-2.16.0.ebuild
deleted file mode 100644
index a848b03a02ae..000000000000
--- a/dev-libs/botan/botan-2.16.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit python-r1 toolchain-funcs
-
-MY_P="Botan-${PV}"
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-
-RDEPEND="${DEPEND}"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	if use doc ; then
-		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling module(s): ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	local chostarch="${CHOST%%-*}"
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]] ; then
-		chostarch="sparc32-v9"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*) myos=darwin ;;
-		*) myos=linux  ;;
-	esac
-
-	case ${CHOST} in
-		hppa*) chostarch=parisc ;;
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	# Don't install Python bindings automatically
-	# (do it manually later in the right place)
-	# https://bugs.gentoo.org/723096
-	local myargs=(
-		$(use_enable static-libs static-library)
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_with sqlite sqlite3)
-		$(use_with ssl openssl)
-		$(use_with zlib)
-		$(usex hppa --without-stack-protector '')
-		--cpu=${chostarch}
-		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
-		--docdir=share/doc
-		--libdir=$(get_libdir)
-		--os=${myos}
-		--distribution-info="Gentoo ${PVR}"
-		--prefix="${EPREFIX}/usr"
-		--with-endian="$(tc-endian)"
-		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
-		--without-doxygen
-		--no-install-python-module
-	)
-
-	tc-export CC CXX AR
-
-	./configure.py "${myargs[@]}" || die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan2.py
-	fi
-}
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3.ebuild
index d3f7da0aa334..8c7a2d9bab02 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
 SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/cvector/cvector-1.0.3.1.ebuild b/dev-libs/cvector/cvector-1.0.3.1.ebuild
index 7d7c08e9d3bd..39e058bded71 100644
--- a/dev-libs/cvector/cvector-1.0.3.1.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3.1.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit base eutils toolchain-funcs versionator
+inherit toolchain-funcs
 
 MY_PN=CVector
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="An ANSI C implementation of dynamic arrays (approximation of C++ vectors)"
 HOMEPAGE="https://sourceforge.net/projects/cvector/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(get_version_component_range 1-3)/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(ver_cut 1-3)/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-LDFLAGS.patch
 	"${FILESDIR}"/1.0.3-dynlib.patch
-	)
+)
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
 		CFLAGS="${CFLAGS}" \
 		all
 }
 
 src_install() {
-	ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so.$(get_major_version) || die
-	ln -sf libCVector.so.$(get_version_component_range 1-3) libCVector.so || die
-	dolib.so libCVector.so*
+	ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so.$(ver_cut 1) || die
+	ln -sf libCVector.so.$(ver_cut 1-3) libCVector.so || die
 
+	dolib.so libCVector.so*
 	doheader *.h
 
 	dodoc README_CVector.txt
diff --git a/dev-libs/cvector/files/1.0.3-dynlib.patch b/dev-libs/cvector/files/1.0.3-dynlib.patch
index 219f258136ed..072453e3067e 100644
--- a/dev-libs/cvector/files/1.0.3-dynlib.patch
+++ b/dev-libs/cvector/files/1.0.3-dynlib.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 865db81..2691108 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -96,8 +96,8 @@ BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(IN
diff --git a/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch b/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
index 8bed3ab01546..3bbc65f40789 100644
--- a/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
+++ b/dev-libs/cvector/files/cvector-1.0.3.1-LDFLAGS.patch
@@ -1,5 +1,5 @@
---- Makefile	2009-07-08 04:02:56.000000000 +0200
-+++ Makefile.new	2009-07-25 11:59:27.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -89,10 +89,10 @@
  endif
  
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
deleted file mode 100644
index 240827a94f2d..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
-
-SASLAUTHD_CONF_VER="2.1.26"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
-HOMEPAGE="https://www.cyrusimap.org/sasl/"
-#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
-
-CDEPEND="
-	net-mail/mailbase
-	virtual/libcrypt:=
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	java? ( >=virtual/jdk-1.6:= )"
-
-REQUIRED_USE="ldapdb? ( openldap )"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sasl )"
-
-DEPEND="${CDEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
-	"${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
-	"${FILESDIR}/${PN}-2.1.27-as_needed.patch"
-	"${FILESDIR}/${PN}-2.1.25-auxprop.patch"
-	"${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
-	"${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
-	"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
-	"${FILESDIR}/${PN}-2.1.27-memmem.patch"
-	"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
-		configure.ac || die
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	# #486740 #468556
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# getpassphrase is defined in /usr/include/stdlib.h
-		append-cppflags -DHAVE_GETPASSPHRASE
-	else
-		# this horrendously breaks things on Solaris
-		append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Java support.
-	multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myeconfargs=(
-		--enable-login
-		--enable-ntlm
-		--enable-auth-sasldb
-		--disable-cmulocal
-		--disable-krb4
-		--disable-macos-framework
-		--enable-otp
-		--without-sqlite
-		--with-saslauthd="${EPREFIX}"/run/saslauthd
-		--with-pwcheck="${EPREFIX}"/run/saslauthd
-		--with-configdir="${EPREFIX}"/etc/sasl2
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
-		--with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-		--with-sphinx-build=no
-		$(use_with ssl openssl)
-		$(use_with pam)
-		$(use_with openldap ldap)
-		$(use_enable ldapdb)
-		$(multilib_native_use_enable sample)
-		$(use_enable kerberos gssapi)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-		$(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
-		$(use_enable srp)
-		$(use_enable static-libs static)
-
-		# Add authdaemond support (bug #56523).
-		$(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-		# Fix for bug #59634.
-		$(usex ssl '' --without-des)
-
-		# Use /dev/urandom instead of /dev/random (bug #46038).
-		$(usex urandom --with-devrandom=/dev/urandom '')
-	)
-
-	if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
-		myeconfargs+=( --enable-sql )
-	else
-		myeconfargs+=( --disable-sql )
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myeconfargs+=( --with-dblib=gdbm )
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myeconfargs+=(
-			--with-dblib=berkeley
-			--with-bdb-incdir="$(db_includedir)"
-		)
-	else
-		einfo "Building without SASLdb support"
-		myeconfargs+=( --with-dblib=none )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	if multilib_is_native_abi && use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		if use sample ; then
-			docinto sample
-			dodoc "${S}"/sample/*.c
-			exeinto /usr/share/doc/${P}/sample
-			doexe sample/client sample/server
-		fi
-
-		# Default location for java classes breaks OpenOffice (bug #60769).
-		if use java; then
-			java-pkg_dojar ${PN}.jar
-			java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
-			# hackish, don't wanna dig through makefile
-			rm -rf "${ED}/usr/$(get_libdir)/java" || die
-			docinto "java"
-			dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-			dodir "/usr/share/doc/${PF}/java/Test"
-			insinto "/usr/share/doc/${PF}/java/Test"
-			doins "${S}"/java/Test/*.java
-		fi
-
-		dosbin saslauthd/testsaslauthd
-	fi
-}
-
-multilib_src_install_all() {
-	doman man/*
-
-	keepdir /etc/sasl2
-
-	# Reset docinto to default value (#674296)
-	docinto
-	dodoc AUTHORS ChangeLog doc/legacy/TODO
-	newdoc pwcheck/README README.pwcheck
-
-	newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-	edos2unix "${ED}/usr/share/doc/${PF}/release-notes"
-
-	docinto html
-	dodoc doc/html/*.html
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-	systemd_dounit "${FILESDIR}/pwcheck.service"
-
-	newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-	systemd_dounit "${FILESDIR}/saslauthd.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
-
-	# The get_modname bit is important: do not remove the .la files on
-	# platforms where the lib isn't called .so for cyrus searches the .la to
-	# figure out what the name is supposed to be instead
-	if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	elog "pwcheck and saslauthd home directories have moved to:"
-	elog "  /run/saslauthd, using tmpfiles.d"
-}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index f03d111d2036..9eaef70f35bd 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -217,7 +217,9 @@ multilib_src_install_all() {
 	docinto html
 	dodoc doc/html/*.html
 
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+	if use pam; then
+		newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+	fi
 
 	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
 	systemd_dounit "${FILESDIR}/pwcheck.service"
diff --git a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
index 9c7771ceb1ad..526f84f258a4 100644
--- a/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
+++ b/dev-libs/d0_blind_id/d0_blind_id-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -15,11 +15,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="dev-libs/gmp:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 DOCS=( d0_blind_id.txt )
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch"
+)
+
 src_prepare() {
 	default
 
@@ -44,8 +50,5 @@ src_configure() {
 
 src_install() {
 	default
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
new file mode 100644
index 000000000000..62ae318315fa
--- /dev/null
+++ b/dev-libs/d0_blind_id/files/d0_blind_id-1.0-slibtool.patch
@@ -0,0 +1,43 @@
+From 0d3d1f2655901776b2fc3e911eb78478412f789a Mon Sep 17 00:00:00 2001
+From: Lyberta <lyberta@lyberta.net>
+Date: Sat, 7 Oct 2017 19:26:40 +0300
+Subject: [PATCH] Fixed version-info.
+
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d21887d..07338eb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,7 +5,7 @@ blind_id_SOURCES = main.c
+ blind_id_LDADD = libd0_blind_id.la
+ 
+ lib_LTLIBRARIES = libd0_blind_id.la
+-# versioninfo:
++# version-info:
+ #   - compatible interface change: c:r:a -> c+1:0:a+1
+ #   - incompatible interface change: c:r:a -> c+1:0:0
+ #   - internal change: c:r:a -> c:r+1:a
+@@ -29,7 +29,7 @@ libd0_blind_id_la_SOURCES += d0_bignum-gmp.c
+ endif
+ endif
+ endif
+-libd0_blind_id_la_LDFLAGS = -versioninfo 7:1:7
++libd0_blind_id_la_LDFLAGS = -version-info 7:1:7
+ libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_includedir = $(includedir)/d0_blind_id
+ library_include_HEADERS = d0_blind_id.h d0.h
+@@ -40,7 +40,7 @@ if ENABLE_RIJNDAEL
+ lib_LTLIBRARIES += libd0_rijndael.la
+ libd0_rijndael_la_SOURCES = d0_rijndael.c \
+                             d0_rijndael.h
+-libd0_rijndael_la_LDFLAGS = -versioninfo 0:0:0
++libd0_rijndael_la_LDFLAGS = -version-info 0:0:0
+ libd0_rijndael_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+ library_include_HEADERS += d0_rijndael.h
+ pkgconfig_HEADERS += d0_rijndael.pc
+-- 
+2.20.1
+
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
new file mode 100644
index 000000000000..0c861a1221bb
--- /dev/null
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a C++ API for D-BUS"
+HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
+SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ecore glib test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	ecore? ( dev-libs/efl )
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-util/cppunit[${MULTILIB_USEDEP}]"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/lib${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-4.7.patch #424707
+	"${FILESDIR}"/${PN}-gcc7.patch #622790
+)
+
+multilib_src_configure() {
+	# TODO : add ecore multilib support if/when it is multilibified
+	ECONF_SOURCE="${S}" econf \
+		--disable-examples \
+		--disable-static \
+		$(multilib_native_use_enable doc doxygen-docs) \
+		$(multilib_native_use_enable ecore) \
+		$(use_enable glib) \
+		$(use_enable test tests) \
+		PTHREAD_LIBS=-lpthread
+	# ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
+
+	if multilib_is_native_abi; then
+		# docs don't like out-of-source builds
+		local d
+		for d in img html; do
+			ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( doc/html/. )
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 05cb447af809..88f8db91499e 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,4 +1 @@
-DIST ding-libs-0.4.0.tar.gz 827058 BLAKE2B aa6e1cef9747646ece2643495eaa720254a964ea1adf8695f0a8a2d9c401b141a72e0c81d9d9cd44aaa81feed73118b7c7e52a24121d4ee0f71928dcf4ecf43d SHA512 e062e104f4ad75eea0b59bb113b7a6a4044a42230d96b9b9dda611535835cd0809635b1da1408ae58e97f9ff9a9f4fd48f751365901f9b066b465df3523730a0
-DIST ding-libs-0.5.0.tar.gz 868840 BLAKE2B dc89dbd0951d8505776ae98a10bbfb54f4a2106da0a5b76f3d08556f7df0e85093862813ceb12f0190709ca71fe75eceb2c373dd95a0437f15ceec0bd70cf171 SHA512 d79db6794dbb59b518db15c51c3f981e8873e478a156ca8ae766a61107796968eeed36cf21bd20f5e6f04c5b460d3a40ab114a482754e2f3976c53bb82fe1fcb
-DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e2758ddc42338556a2c697e83ec4c57aa60867d5d2dc6add935266c8a4404f59d089fe52507d52783aed8bbe967503 SHA512 7218b6825bc078bdc35f149bd17944f427af0e32fa4d94026c00ecd14037598959ad7e1dee46af6fd3736424cdb499720fd8e1a0d1dfd173a5bc0085f8f986b2
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
deleted file mode 100644
index b64fddba5b07..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="Library set needed for build sssd"
-HOMEPAGE="https://pagure.io/SSSD/ding-libs"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="test static-libs"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-	"
diff --git a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
deleted file mode 100644
index cdb31fb55d87..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-multilib
-
-DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://pagure.io/SSSD/ding-libs"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
-IUSE="test static-libs"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
deleted file mode 100644
index 654721bc0024..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://pagure.io/SSSD/ding-libs"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
-IUSE="test static-libs"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..5ab407b043ee
--- /dev/null
+++ b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="set of utility libraries (mostly used by sssd)"
+HOMEPAGE="https://pagure.io/SSSD/ding-libs"
+SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch
+	"${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch
+	"${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch
+)
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/efl/efl-1.25.1-r10.ebuild b/dev-libs/efl/efl-1.25.1-r10.ebuild
index 05a1d3433f70..8f3fd8cce754 100644
--- a/dev-libs/efl/efl-1.25.1-r10.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r10.ebuild
@@ -6,6 +6,7 @@ EAPI=7
 DOCS_BUILDER="doxygen"
 DOCS_DIR="${S}/doc"
 
+LUA_REQ_USE="deprecated(+)"
 LUA_COMPAT=( lua5-{1..4} luajit )
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
@@ -18,7 +19,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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug drm +eet efl-one elogind examples fbcon
 	+fontconfig fribidi gif gles2-only gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 10c7d6da0887..acea5894292f 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
new file mode 100644
index 000000000000..7d40a9d6bc3a
--- /dev/null
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+# If github is desired, the following may be used.
+#EGIT_REPO_URI="https://github.com/signal11/hidapi.git"
+#EGIT_BRANCH="master"
+EGIT_COMMIT="d17db57b9d4354752e0af42f5f33007a42ef2906"
+
+DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
+HOMEPAGE="https://www.signal11.us/oss/hidapi/"
+SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tgz"
+# When 0.8.0 is officially available the following link should be used.
+#SRC_URI="https://github.com/downloads/signal11/${PN}/${P}.zip"
+
+LICENSE="|| ( BSD GPL-3 HIDAPI )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc fox"
+
+RDEPEND="
+	virtual/libusb:1[${MULTILIB_USEDEP}]
+	virtual/libudev:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	fox? ( x11-libs/fox )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${P}-autoconf-2.70.patch )
+
+src_prepare() {
+	default
+
+	if ! use fox; then
+		sed -i -e 's:PKG_CHECK_MODULES(\[fox\], .*):AC_SUBST(fox_CFLAGS,[ ])AC_SUBST(fox_LIBS,[ ]):' configure.ac || die
+	fi
+
+	# Fix bashisms in the configure.ac file.
+	sed -i -e 's:\([A-Z_]\+\)+="\(.*\)":\1="${\1}\2":g' \
+		-e 's:\([A-Z_]\+\)+=`\(.*\)`:\1="${\1}\2":g' configure.ac || die
+
+	# Portage handles license texts itself, no need to install them
+	sed -i -e 's/LICENSE.*/ # blank/' Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		$(multilib_native_use_enable fox testgui)
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		doxygen doxygen/Doxyfile || die
+		HTML_DOCS=( html/. )
+	fi
+
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 4838621448ee..7051b66f002a 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,3 +1 @@
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
deleted file mode 100644
index 3d991c2a006d..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="https://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
deleted file mode 100644
index 08e0802289dc..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-68.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="External layout part of International Components for Unicode"
-HOMEPAGE="https://www.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
-	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN/-layoutex}/source"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-)
-
-src_prepare() {
-	# apply patches
-	default
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Use C++14
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--enable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	pushd layoutex &>/dev/null || die
-	emake -j1 VERBOSE="1" check
-	popd &>/dev/null || die
-}
-
-multilib_src_install() {
-	pushd layoutex &>/dev/null || die
-	default
-	popd &>/dev/null || die
-}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 4838621448ee..7051b66f002a 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,3 +1 @@
-DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
-DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
deleted file mode 100644
index 1f12ed0dcfb3..000000000000
--- a/dev-libs/icu/icu-67.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="https://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
deleted file mode 100644
index fa0bdf7cdf7d..000000000000
--- a/dev-libs/icu/icu-68.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
-
-DESCRIPTION="International Components for Unicode"
-HOMEPAGE="https://site.icu-project.org/"
-SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
-
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="debug doc examples static-libs"
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-"
-
-S="${WORKDIR}/${PN}/source"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/icu-config
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
-	"${FILESDIR}/${PN}-64.2-darwin.patch"
-	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
-)
-
-src_prepare() {
-	default
-
-	local variable
-
-	# Disable renaming as it is stupid thing to do
-	sed -i \
-		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
-		common/unicode/uconfig.h || die
-
-	# Fix linking of icudata
-	sed -i \
-		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
-		config/mh-linux || die
-
-	# Append doxygen configuration to configure
-	sed -i \
-		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14
-
-	if tc-is-cross-compiler; then
-		mkdir "${WORKDIR}"/host || die
-		pushd "${WORKDIR}"/host >/dev/null || die
-
-		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
-		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
-		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
-		"${S}"/configure --disable-renaming --disable-debug \
-			--disable-samples --enable-static || die
-		emake
-
-		popd >/dev/null || die
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-renaming
-		--disable-samples
-		--disable-layoutex
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable examples samples)
-	)
-
-	tc-is-cross-compiler && myeconfargs+=(
-		--with-cross-build="${WORKDIR}"/host
-	)
-
-	# icu tries to use clang by default
-	tc-export CC CXX
-
-	# make sure we configure with the same shell as we run icu-config
-	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
-	export CONFIG_SHELL="${EPREFIX}/bin/sh"
-	# probably have no /bin/sh in prefix-chain
-	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-multilib_src_test() {
-	# INTLTEST_OPTS: intltest options
-	#   -e: Exhaustive testing
-	#   -l: Reporting of memory leaks
-	#   -v: Increased verbosity
-	# IOTEST_OPTS: iotest options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	# CINTLTST_OPTS: cintltst options
-	#   -e: Exhaustive testing
-	#   -v: Increased verbosity
-	emake -j1 VERBOSE="1" check
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc; then
-		docinto html
-		dodoc -r doc/html/*
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	docinto html
-	dodoc ../readme.html
-}
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 1aaaa3165040..e9979c395b76 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,7 +1 @@
-DIST jemalloc-3.6.0.tar.bz2 338964 BLAKE2B a5edacc85c5bebf3b373e7fc8bafd9449273ff58c2e44e94eb9900f54b11f2d8b837a3a8ee76cce46777ccc40dea23905b7ff81eef5af39ea1d3f98017b27111 SHA512 ebe7c64558a87a735b5906d5cb7527c241664eeae7328538675a12eabe7a1004be0f8766a3bd2a78e61334b196ca7ffc0ee8b8ff59167922a35f126cd1e76e43
-DIST jemalloc-4.4.0.tar.bz2 440144 BLAKE2B 6acb91c5be6c5b17c209341dd08e6973e3ad5ecdfe7ebe5d8c78181cddca1fccba3c11628e736d66acd7698f7813f38077033d39093bf2e4bd704c8b4de60e7b SHA512 2f88fb17ede3bf87e334e9c80949870e0dd85b5adcdd89a1750ccf6df5240f35293159ac0a360d3a29cf0b1d17edf86dcc7997c6bf3190ae7da7442d3a3cc14e
-DIST jemalloc-4.5.0.tar.bz2 449992 BLAKE2B 6141c71f7f5f9cee91a59eeed9c69b0a69b3cc39666aa608445073c11ee3ca9b4777a851c5cb5adac80d42bfbf10a6726e5dc1340ffe85ea1ee884d87c7865da SHA512 76953363fe1007952232220afa1a91da4c1c33c02369b5ad239d8dd1d0792141197c15e8489a8f4cd301b08494e65cadd8ecd34d025cb0285700dd78d7248821
-DIST jemalloc-5.0.1.tar.bz2 499300 BLAKE2B 551933fcd93315968cbf89bfadc40313717ff216141af8a131f2333d10090438ddf36fbfdc0ee831cbec6f930ae15aa9cfaafae72ed4f38dd97b00712ca918e8 SHA512 8cb5957a5724eb2bbad120cf0028ea8b2b14b4a416c1751b7c967351a7fd51135058ea0d3c4dc1d127c86f3aa7e9fd5ef101857110aabfdb7789427791c432c3
-DIST jemalloc-5.1.0.tar.bz2 515622 BLAKE2B 3c8b35d30fca0018e3e32452e6fa41c7ac59f9f2f7d4bc243237fde95025ab5a7562fb86b5afe2ca9b7bb072f7baf6ac7589a4862d9ebaafddae187d93e20da0 SHA512 d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f
-DIST jemalloc-5.2.0.tar.bz2 543892 BLAKE2B 042dd32452713d0524ae8aedbd3aa96a420037ae3ff0345bbf56a7839ae6ba9e0c700034fab9d5c7b6f4cbb43e2d8199b412901afce16c2785a816d439166e6d SHA512 e3be4d534770126caf10f2684aed9fe4ba1422dd47625fe50343cfb750f26eff869fcc7d1e30a96dd6c73f6614c4bbcd560fd24fc26b55ac731c43e60fd05234
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch
deleted file mode 100644
index 30cbd501ec5d..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1-no-pprof.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2014-02-25 18:49:15.000000000 -0600
-+++ b/Makefile.in	2014-03-07 18:24:10.978141932 -0600
-@@ -73,7 +73,6 @@
- LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
- 
- # Lists of files.
--BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
- C_HDRS := $(objroot)include/jemalloc/jemalloc$(install_suffix).h
- C_SRCS := $(srcroot)src/jemalloc.c $(srcroot)src/arena.c \
- 	$(srcroot)src/atomic.c $(srcroot)src/base.c $(srcroot)src/bitmap.c \
-@@ -273,13 +272,6 @@
- build_lib_static: $(STATIC_LIBS)
- build_lib: build_lib_shared build_lib_static
- 
--install_bin:
--	install -d $(BINDIR)
--	@for b in $(BINS); do \
--	echo "install -m 755 $$b $(BINDIR)"; \
--	install -m 755 $$b $(BINDIR); \
--done
--
- install_include:
- 	install -d $(INCLUDEDIR)/jemalloc
- 	@for h in $(C_HDRS); do \
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
deleted file mode 100644
index cc8736b84123..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1-strip-optimization.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN a/configure.ac b/configure.ac
---- a/configure.ac	2014-02-25 18:49:15.000000000 -0600
-+++ b/configure.ac	2014-03-07 18:19:53.718147847 -0600
-@@ -639,23 +639,6 @@
-   AC_DEFINE([JEMALLOC_IVSALLOC], [ ])
- fi
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" -a "x$no_CFLAGS" = "xyes" ; then
--  dnl Make sure that an optimization flag was not specified in EXTRA_CFLAGS.
--  optimize="no"
--  echo "$CFLAGS $EXTRA_CFLAGS" | grep '\-O' >/dev/null || optimize="yes"
--  if test "x${optimize}" = "xyes" ; then
--    if test "x$GCC" = "xyes" ; then
--      JE_CFLAGS_APPEND([-O3])
--      JE_CFLAGS_APPEND([-funroll-loops])
--    elif test "x$je_cv_msvc" = "xyes" ; then
--      JE_CFLAGS_APPEND([-O2])
--    else
--      JE_CFLAGS_APPEND([-O])
--    fi
--  fi
--fi
--
- dnl Enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--disable-stats],
diff --git a/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
deleted file mode 100644
index 1ce5ad2ede95..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-3.5.1_fix_html_install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2014-02-25 18:49:15.000000000 -0600
-+++ b/Makefile.in	2014-03-07 18:26:23.074138895 -0600
-@@ -317,7 +317,7 @@
- 	install -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: install_doc_html install_doc_man
-+install_doc: install_doc_man
- 
- install: install_bin install_include install_lib install_doc
- 
diff --git a/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch b/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch
deleted file mode 100644
index 159702e6230c..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.5.0-fix_html_install.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c04d0b954adef2d3f1a30d91dc687f6a03b108eb Mon Sep 17 00:00:00 2001
-From: 
-Date: Mon, 29 May 2017 00:58:32 -0500
-Subject: [PATCH 2/2] Do not install html doc
-
----
- Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index e49a871..733932a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -381,7 +381,7 @@ install_doc_man:
- 	$(INSTALL) -m 644 $$d $(MANDIR)/man3; \
- done
- 
--install_doc: install_doc_html install_doc_man
-+install_doc: install_doc_man
- 
- install: install_bin install_include install_lib install_doc
- 
--- 
-2.13.0
-
diff --git a/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch
deleted file mode 100644
index 8b346be86c06..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-4.5.0-strip-optimization.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c568271163445e380679788388f1cb1edbdeaf88 Mon Sep 17 00:00:00 2001
-From: 
-Date: Mon, 29 May 2017 00:57:15 -0500
-Subject: [PATCH 1/2] Strip all optimization, let portage handle.
-
----
- configure.ac | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 20a8a64..d8af618 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -851,18 +851,6 @@ if test "x$enable_ivsalloc" = "x1" ; then
-   AC_DEFINE([JEMALLOC_IVSALLOC], [ ])
- fi
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" ; then
--  if test "x$GCC" = "xyes" ; then
--    JE_CFLAGS_ADD([-O3])
--    JE_CFLAGS_ADD([-funroll-loops])
--  elif test "x$je_cv_msvc" = "xyes" ; then
--    JE_CFLAGS_ADD([-O2])
--  else
--    JE_CFLAGS_ADD([-O])
--  fi
--fi
--
- dnl Enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--disable-stats],
--- 
-2.13.0
-
diff --git a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch b/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch
deleted file mode 100644
index 523badf5775b..000000000000
--- a/dev-libs/jemalloc/files/jemalloc-5.0.1-strip-optimization.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1551ded8..2f470672 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -976,21 +976,6 @@ if test "x$enable_debug" = "x1" ; then
- fi
- AC_SUBST([enable_debug])
- 
--dnl Only optimize if not debugging.
--if test "x$enable_debug" = "x0" ; then
--  if test "x$GCC" = "xyes" ; then
--    JE_CFLAGS_ADD([-O3])
--    JE_CXXFLAGS_ADD([-O3])
--    JE_CFLAGS_ADD([-funroll-loops])
--  elif test "x$je_cv_msvc" = "xyes" ; then
--    JE_CFLAGS_ADD([-O2])
--    JE_CXXFLAGS_ADD([-O2])
--  else
--    JE_CFLAGS_ADD([-O])
--    JE_CXXFLAGS_ADD([-O])
--  fi
--fi
--
- dnl Enable statistics calculation by default.
- AC_ARG_ENABLE([stats],
-   [AS_HELP_STRING([--disable-stats],
diff --git a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild b/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
deleted file mode 100644
index 8ce36018c664..000000000000
--- a/dev-libs/jemalloc/jemalloc-3.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="debug static-libs stats"
-
-HTML_DOCS=( doc/jemalloc.html )
-
-PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
-	"${FILESDIR}/${PN}-3.5.1-no-pprof.patch"
-	"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-src_configure() {
-	myeconfargs=(
-		$(use_enable debug)
-		$(use_enable stats)
-	)
-	use sparc && append-cppflags -DLG_QUANTUM=4 -mcpu=ultrasparc
-	# The configure test for page shift requires running code which fails
-	# when cross-compiling.  Since it uses _SC_PAGESIZE, and the majority
-	# of systems use 4096 as the base page size, just hardcode 12 here.
-	tc-is-cross-compiler && export je_cv_static_page_shift=12
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.1.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild b/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
deleted file mode 100644
index a29b9a70a122..000000000000
--- a/dev-libs/jemalloc/jemalloc-4.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-build multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="debug hardened static-libs stats"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-3.5.1-strip-optimization.patch"
-	"${FILESDIR}/${PN}-3.5.1_fix_html_install.patch"
-)
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable stats) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-4.5.0.ebuild b/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
deleted file mode 100644
index 871dc4d89f32..000000000000
--- a/dev-libs/jemalloc/jemalloc-4.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="debug hardened static-libs stats"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-4.5.0-strip-optimization.patch"
-	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
-)
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable stats) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.1.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild b/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
deleted file mode 100644
index fe1a4f800445..000000000000
--- a/dev-libs/jemalloc/jemalloc-5.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened +hugepages lazy-lock prof static-libs stats xmalloc"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
-	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
-)
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable lazy-lock) \
-		$(use_enable hugepages thp) \
-		$(use_enable prof) \
-		$(use_enable stats) \
-		$(use_enable xmalloc) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild b/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
deleted file mode 100644
index 95f65a34b8c1..000000000000
--- a/dev-libs/jemalloc/jemalloc-5.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-5.0.1-strip-optimization.patch"
-	"${FILESDIR}/${PN}-4.5.0-fix_html_install.patch"
-)
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable lazy-lock) \
-		$(use_enable prof) \
-		$(use_enable stats) \
-		$(use_enable xmalloc) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild b/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
deleted file mode 100644
index 1e36165f8cbd..000000000000
--- a/dev-libs/jemalloc/jemalloc-5.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools toolchain-funcs multilib-minimal
-
-DESCRIPTION="Jemalloc is a general-purpose scalable concurrent allocator"
-HOMEPAGE="https://jemalloc.net/ https://github.com/jemalloc/jemalloc"
-SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
-HTML_DOCS=( doc/jemalloc.html )
-PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jemalloc/jemalloc.h )
-# autotools-utils.eclass auto-adds configure options when static-libs is in IUSE
-# but jemalloc doesn't implement them in its configure; need this here to
-# supress the warnings until automagic is removed from the eclass
-QA_CONFIGURE_OPTIONS="--enable-static --disable-static --enable-shared --disable-shared"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use hardened ; then
-		myconf+=( --disable-syscall )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf  \
-		$(use_enable debug) \
-		$(use_enable lazy-lock) \
-		$(use_enable prof) \
-		$(use_enable stats) \
-		$(use_enable xmalloc) \
-		"${myconf[@]}"
-}
-
-multilib_src_install() {
-	# Copy man file which the Makefile looks for
-	cp "${S}/doc/jemalloc.3" "${BUILD_DIR}/doc" || die
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fixup install_name, #437362
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libjemalloc.2.dylib \
-			"${ED}"/usr/$(get_libdir)/libjemalloc.2.dylib || die
-	fi
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 1218bedea825..3118b1a8d3ab 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
 	<use>
-		<flag name="hugepages">Enable transparent huge page support</flag>
 		<flag name="lazy-lock">Enable lazy locking (only lock when multi-threaded)</flag>
 		<flag name="prof">Enable allocation profiling</flag>
 		<flag name="stats">Enable statistics calculation/reporting</flag>
diff --git a/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
deleted file mode 100644
index 3913fc320bca..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba692ff..fc2edff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,6 +65,7 @@ include(GNUInstallDirs)
- include(CMakePackageConfigHelpers)
- 
- option(BUILD_SHARED_LIBS  "Default to building shared libraries" ON)
-+option(BUILD_STATIC_LIBS  "Default to building static libraries" OFF)
- 
- # Generate a release merge and test it to verify the correctness of republishing the package.
- ADD_CUSTOM_TARGET(distcheck
-@@ -383,7 +384,7 @@ add_library(${PROJECT_NAME}
- set_target_properties(${PROJECT_NAME} PROPERTIES
-     VERSION 5.0.0
-     SOVERSION 5)
--
-+list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
- # If json-c is used as subroject it set to target correct interface -I flags and allow
- # to build external target without extra include_directories(...)
- target_include_directories(${PROJECT_NAME}
-@@ -392,7 +393,33 @@ target_include_directories(${PROJECT_NAME}
-         $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
- )
- 
--install(TARGETS ${PROJECT_NAME}
-+# Allow to build static and shared libraries at the same time
-+if (BUILD_STATIC_LIBS)
-+    set(STATIC_LIB ${PROJECT_NAME}-static)
-+    add_library(${STATIC_LIB} STATIC
-+        ${JSON_C_SOURCES}
-+        ${JSON_C_HEADERS}
-+    )
-+
-+    # rename the static library
-+    set_target_properties(${STATIC_LIB} PROPERTIES
-+        OUTPUT_NAME ${PROJECT_NAME}
-+    )
-+    list(APPEND CMAKE_TARGETS ${STATIC_LIB})
-+endif ()
-+
-+# Always create new install dirs with 0755 permissions, regardless of umask
-+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
-+	OWNER_READ
-+	OWNER_WRITE
-+	OWNER_EXECUTE
-+	GROUP_READ
-+	GROUP_EXECUTE
-+	WORLD_READ
-+	WORLD_EXECUTE
-+   )
-+
-+install(TARGETS ${CMAKE_TARGETS}
-     EXPORT ${PROJECT_NAME}-targets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/dev-libs/json-c/files/json-c-0.14-object-limitation.patch b/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
deleted file mode 100644
index ebd7ca805065..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 519dfe1591d85432986f9762d41d1a883198c157 Mon Sep 17 00:00:00 2001
-From: Eric Haszlakiewicz <erh+git@nimenees.com>
-Date: Sun, 10 May 2020 03:32:19 +0000
-Subject: [PATCH 01/13] Issue #599: Fix the backwards check in
- lh_table_insert_w_hash() that was preventing adding more than 11 objects. Add
- a test to check for this too.
-
----
- linkhash.c           |  2 +-
- tests/test4.c        | 29 +++++++++++++++++++++++++++++
- tests/test4.expected |  1 +
- 3 files changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/linkhash.c b/linkhash.c
-index 51e90b1..f930efd 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -582,7 +582,7 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
- 
- 	if (t->count >= t->size * LH_LOAD_FACTOR) {
- 		/* Avoid signed integer overflow with large tables. */
--		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
-+		int new_size = (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2);
- 		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
- 			return -1;
- 	}
-diff --git a/tests/test4.c b/tests/test4.c
-index bd964ec..fd2f3be 100644
---- a/tests/test4.c
-+++ b/tests/test4.c
-@@ -3,8 +3,10 @@
-  */
- 
- #include "config.h"
-+#include <assert.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "json_inttypes.h"
- #include "json_object.h"
-@@ -24,6 +26,30 @@ void print_hex(const char *s)
- 	putchar('\n');
- }
- 
-+static void test_lot_of_adds(void);
-+static void test_lot_of_adds()
-+{
-+	int ii;
-+	char key[50];
-+	json_object *jobj = json_object_new_object();
-+	assert(jobj != NULL);
-+	for (ii = 0; ii < 500; ii++)
-+	{
-+		snprintf(key, sizeof(key), "k%d", ii);
-+		json_object *iobj = json_object_new_int(ii);
-+		assert(iobj != NULL);
-+		if (json_object_object_add(jobj, key, iobj))
-+		{
-+			fprintf(stderr, "FAILED to add object #%d\n", ii);
-+			abort();
-+		}
-+	}
-+	printf("%s\n", json_object_to_json_string(jobj));
-+	assert(json_object_object_length(jobj) == 500);
-+	json_object_put(jobj);
-+}
-+
-+
- int main(void)
- {
- 	const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\"";
-@@ -52,5 +78,8 @@ int main(void)
- 		retval = 1;
- 	}
- 	json_object_put(parse_result);
-+
-+	test_lot_of_adds();
-+
- 	return retval;
- }
-diff --git a/tests/test4.expected b/tests/test4.expected
-index 68d4336..cb27440 100644
---- a/tests/test4.expected
-+++ b/tests/test4.expected
-@@ -1,3 +1,4 @@
- input: "\ud840\udd26,\ud840\udd27,\ud800\udd26,\ud800\udd27"
- JSON parse result is correct: 𠄦,𠄧,𐄦,𐄧
- PASS
-+{ "k0": 0, "k1": 1, "k2": 2, "k3": 3, "k4": 4, "k5": 5, "k6": 6, "k7": 7, "k8": 8, "k9": 9, "k10": 10, "k11": 11, "k12": 12, "k13": 13, "k14": 14, "k15": 15, "k16": 16, "k17": 17, "k18": 18, "k19": 19, "k20": 20, "k21": 21, "k22": 22, "k23": 23, "k24": 24, "k25": 25, "k26": 26, "k27": 27, "k28": 28, "k29": 29, "k30": 30, "k31": 31, "k32": 32, "k33": 33, "k34": 34, "k35": 35, "k36": 36, "k37": 37, "k38": 38, "k39": 39, "k40": 40, "k41": 41, "k42": 42, "k43": 43, "k44": 44, "k45": 45, "k46": 46, "k47": 47, "k48": 48, "k49": 49, "k50": 50, "k51": 51, "k52": 52, "k53": 53, "k54": 54, "k55": 55, "k56": 56, "k57": 57, "k58": 58, "k59": 59, "k60": 60, "k61": 61, "k62": 62, "k63": 63, "k64": 64, "k65": 65, "k66": 66, "k67": 67, "k68": 68, "k69": 69, "k70": 70, "k71": 71, "k72": 72, "k73": 73, "k74": 74, "k75": 75, "k76": 76, "k77": 77, "k78": 78, "k79": 79, "k80": 80, "k81": 81, "k82": 82, "k83": 83, "k84": 84, "k85": 85, "k86": 86, "k87": 87, "k88": 88, "k89": 89, "k90": 90, "k91": 91, "k92": 92, "k93": 93, "k94": 94, "k95": 95, "k96": 96, "k97": 97, "k98": 98, "k99": 99, "k100": 100, "k101": 101, "k102": 102, "k103": 103, "k104": 104, "k105": 105, "k106": 106, "k107": 107, "k108": 108, "k109": 109, "k110": 110, "k111": 111, "k112": 112, "k113": 113, "k114": 114, "k115": 115, "k116": 116, "k117": 117, "k118": 118, "k119": 119, "k120": 120, "k121": 121, "k122": 122, "k123": 123, "k124": 124, "k125": 125, "k126": 126, "k127": 127, "k128": 128, "k129": 129, "k130": 130, "k131": 131, "k132": 132, "k133": 133, "k134": 134, "k135": 135, "k136": 136, "k137": 137, "k138": 138, "k139": 139, "k140": 140, "k141": 141, "k142": 142, "k143": 143, "k144": 144, "k145": 145, "k146": 146, "k147": 147, "k148": 148, "k149": 149, "k150": 150, "k151": 151, "k152": 152, "k153": 153, "k154": 154, "k155": 155, "k156": 156, "k157": 157, "k158": 158, "k159": 159, "k160": 160, "k161": 161, "k162": 162, "k163": 163, "k164": 164, "k165": 165, "k166": 166, "k167": 167, "k168": 168, "k169": 169, "k170": 170, "k171": 171, "k172": 172, "k173": 173, "k174": 174, "k175": 175, "k176": 176, "k177": 177, "k178": 178, "k179": 179, "k180": 180, "k181": 181, "k182": 182, "k183": 183, "k184": 184, "k185": 185, "k186": 186, "k187": 187, "k188": 188, "k189": 189, "k190": 190, "k191": 191, "k192": 192, "k193": 193, "k194": 194, "k195": 195, "k196": 196, "k197": 197, "k198": 198, "k199": 199, "k200": 200, "k201": 201, "k202": 202, "k203": 203, "k204": 204, "k205": 205, "k206": 206, "k207": 207, "k208": 208, "k209": 209, "k210": 210, "k211": 211, "k212": 212, "k213": 213, "k214": 214, "k215": 215, "k216": 216, "k217": 217, "k218": 218, "k219": 219, "k220": 220, "k221": 221, "k222": 222, "k223": 223, "k224": 224, "k225": 225, "k226": 226, "k227": 227, "k228": 228, "k229": 229, "k230": 230, "k231": 231, "k232": 232, "k233": 233, "k234": 234, "k235": 235, "k236": 236, "k237": 237, "k238": 238, "k239": 239, "k240": 240, "k241": 241, "k242": 242, "k243": 243, "k244": 244, "k245": 245, "k246": 246, "k247": 247, "k248": 248, "k249": 249, "k250": 250, "k251": 251, "k252": 252, "k253": 253, "k254": 254, "k255": 255, "k256": 256, "k257": 257, "k258": 258, "k259": 259, "k260": 260, "k261": 261, "k262": 262, "k263": 263, "k264": 264, "k265": 265, "k266": 266, "k267": 267, "k268": 268, "k269": 269, "k270": 270, "k271": 271, "k272": 272, "k273": 273, "k274": 274, "k275": 275, "k276": 276, "k277": 277, "k278": 278, "k279": 279, "k280": 280, "k281": 281, "k282": 282, "k283": 283, "k284": 284, "k285": 285, "k286": 286, "k287": 287, "k288": 288, "k289": 289, "k290": 290, "k291": 291, "k292": 292, "k293": 293, "k294": 294, "k295": 295, "k296": 296, "k297": 297, "k298": 298, "k299": 299, "k300": 300, "k301": 301, "k302": 302, "k303": 303, "k304": 304, "k305": 305, "k306": 306, "k307": 307, "k308": 308, "k309": 309, "k310": 310, "k311": 311, "k312": 312, "k313": 313, "k314": 314, "k315": 315, "k316": 316, "k317": 317, "k318": 318, "k319": 319, "k320": 320, "k321": 321, "k322": 322, "k323": 323, "k324": 324, "k325": 325, "k326": 326, "k327": 327, "k328": 328, "k329": 329, "k330": 330, "k331": 331, "k332": 332, "k333": 333, "k334": 334, "k335": 335, "k336": 336, "k337": 337, "k338": 338, "k339": 339, "k340": 340, "k341": 341, "k342": 342, "k343": 343, "k344": 344, "k345": 345, "k346": 346, "k347": 347, "k348": 348, "k349": 349, "k350": 350, "k351": 351, "k352": 352, "k353": 353, "k354": 354, "k355": 355, "k356": 356, "k357": 357, "k358": 358, "k359": 359, "k360": 360, "k361": 361, "k362": 362, "k363": 363, "k364": 364, "k365": 365, "k366": 366, "k367": 367, "k368": 368, "k369": 369, "k370": 370, "k371": 371, "k372": 372, "k373": 373, "k374": 374, "k375": 375, "k376": 376, "k377": 377, "k378": 378, "k379": 379, "k380": 380, "k381": 381, "k382": 382, "k383": 383, "k384": 384, "k385": 385, "k386": 386, "k387": 387, "k388": 388, "k389": 389, "k390": 390, "k391": 391, "k392": 392, "k393": 393, "k394": 394, "k395": 395, "k396": 396, "k397": 397, "k398": 398, "k399": 399, "k400": 400, "k401": 401, "k402": 402, "k403": 403, "k404": 404, "k405": 405, "k406": 406, "k407": 407, "k408": 408, "k409": 409, "k410": 410, "k411": 411, "k412": 412, "k413": 413, "k414": 414, "k415": 415, "k416": 416, "k417": 417, "k418": 418, "k419": 419, "k420": 420, "k421": 421, "k422": 422, "k423": 423, "k424": 424, "k425": 425, "k426": 426, "k427": 427, "k428": 428, "k429": 429, "k430": 430, "k431": 431, "k432": 432, "k433": 433, "k434": 434, "k435": 435, "k436": 436, "k437": 437, "k438": 438, "k439": 439, "k440": 440, "k441": 441, "k442": 442, "k443": 443, "k444": 444, "k445": 445, "k446": 446, "k447": 447, "k448": 448, "k449": 449, "k450": 450, "k451": 451, "k452": 452, "k453": 453, "k454": 454, "k455": 455, "k456": 456, "k457": 457, "k458": 458, "k459": 459, "k460": 460, "k461": 461, "k462": 462, "k463": 463, "k464": 464, "k465": 465, "k466": 466, "k467": 467, "k468": 468, "k469": 469, "k470": 470, "k471": 471, "k472": 472, "k473": 473, "k474": 474, "k475": 475, "k476": 476, "k477": 477, "k478": 478, "k479": 479, "k480": 480, "k481": 481, "k482": 482, "k483": 483, "k484": 484, "k485": 485, "k486": 486, "k487": 487, "k488": 488, "k489": 489, "k490": 490, "k491": 491, "k492": 492, "k493": 493, "k494": 494, "k495": 495, "k496": 496, "k497": 497, "k498": 498, "k499": 499 }
--- 
-2.26.2
-
diff --git a/dev-libs/json-c/files/json-c-0.14-security-fix.patch b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
deleted file mode 100644
index 69a0bc754716..000000000000
--- a/dev-libs/json-c/files/json-c-0.14-security-fix.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:41:16 +0200
-Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
-
-If the assignment of stop overflows due to idx and count being
-larger than SIZE_T_MAX in sum, out of boundary access could happen.
-
-It takes invalid usage of this function for this to happen, but
-I decided to add this check so array_list_del_idx is as safe against
-bad usage as the other arraylist functions.
----
- arraylist.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/arraylist.c b/arraylist.c
-index 12ad8af6d3..e5524aca75 100644
---- a/arraylist.c
-+++ b/arraylist.c
-@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
- {
- 	size_t i, stop;
- 
-+	/* Avoid overflow in calculation with large indices. */
-+	if (idx > SIZE_T_MAX - count)
-+		return -1;
- 	stop = idx + count;
- 	if (idx >= arr->length || stop > arr->length)
- 		return -1;
-
-From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:46:45 +0200
-Subject: [PATCH 2/3] Prevent division by zero in linkhash.
-
-If a linkhash with a size of zero is created, then modulo operations
-are prone to division by zero operations.
-
-Purely protective measure against bad usage.
----
- linkhash.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/linkhash.c b/linkhash.c
-index 7ea58c0abf..f05cc38030 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -12,6 +12,7 @@
- 
- #include "config.h"
- 
-+#include <assert.h>
- #include <limits.h>
- #include <stdarg.h>
- #include <stddef.h>
-@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
- 	int i;
- 	struct lh_table *t;
- 
-+	/* Allocate space for elements to avoid divisions by zero. */
-+	assert(size > 0);
- 	t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
- 	if (!t)
- 		return NULL;
-
-From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Mon, 4 May 2020 19:47:25 +0200
-Subject: [PATCH 3/3] Fix integer overflows.
-
-The data structures linkhash and printbuf are limited to 2 GB in size
-due to a signed integer being used to track their current size.
-
-If too much data is added, then size variable can overflow, which is
-an undefined behaviour in C programming language.
-
-Assuming that a signed int overflow just leads to a negative value,
-like it happens on many sytems (Linux i686/amd64 with gcc), then
-printbuf is vulnerable to an out of boundary write on 64 bit systems.
----
- linkhash.c |  7 +++++--
- printbuf.c | 19 ++++++++++++++++---
- 2 files changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/linkhash.c b/linkhash.c
-index f05cc38030..51e90b13a2 100644
---- a/linkhash.c
-+++ b/linkhash.c
-@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
- {
- 	unsigned long n;
- 
--	if (t->count >= t->size * LH_LOAD_FACTOR)
--		if (lh_table_resize(t, t->size * 2) != 0)
-+	if (t->count >= t->size * LH_LOAD_FACTOR) {
-+		/* Avoid signed integer overflow with large tables. */
-+		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
-+		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
- 			return -1;
-+	}
- 
- 	n = h % t->size;
- 
-diff --git a/printbuf.c b/printbuf.c
-index 976c12dde5..00822fac4f 100644
---- a/printbuf.c
-+++ b/printbuf.c
-@@ -15,6 +15,7 @@
- 
- #include "config.h"
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
- 
- 	if (p->size >= min_size)
- 		return 0;
--
--	new_size = p->size * 2;
--	if (new_size < min_size + 8)
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (min_size > INT_MAX - 8)
-+		return -1;
-+	if (p->size > INT_MAX / 2)
- 		new_size = min_size + 8;
-+	else {
-+		new_size = p->size * 2;
-+		if (new_size < min_size + 8)
-+			new_size = min_size + 8;
-+	}
- #ifdef PRINTBUF_DEBUG
- 	MC_DEBUG("printbuf_memappend: realloc "
- 	         "bpos=%d min_size=%d old_size=%d new_size=%d\n",
-@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
- 
- int printbuf_memappend(struct printbuf *p, const char *buf, int size)
- {
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (size > INT_MAX - p->bpos - 1)
-+		return -1;
- 	if (p->size <= p->bpos + size + 1)
- 	{
- 		if (printbuf_extend(p, p->bpos + size + 1) < 0)
-@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
- 
- 	if (offset == -1)
- 		offset = pb->bpos;
-+	/* Prevent signed integer overflows with large buffers. */
-+	if (len > INT_MAX - offset)
-+		return -1;
- 	size_needed = offset + len;
- 	if (pb->size < size_needed)
- 	{
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 2b170e079f49..6af4c18dc352 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,2 +1,3 @@
 DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a
 DIST libbytesize-2.4.tar.gz 437416 BLAKE2B 4739b6ce5bf852112a5c662e3b5a29428df4a6b0fdd933293a1352e7f81f7ca3c274ed160ade38a705e9858bd2c37131a7409126d28d12ba0d47b64f88c78e31 SHA512 faa546823c95576516a5f4250ea51b381fe5ff6b9d09fc49346e65278e9be42fffd2566dcc24b4e0045cee15dcaead05c1fd1f5f51048c87c382298f7340e1d6
+DIST libbytesize-2.5.tar.gz 439194 BLAKE2B 8d2cd82cea1e95f3368eed5855abfbc89b410fe1d627f7cbe69974f0d1fc89b600c93ad242816a37c3585b8318fcce77ef0fe6ab349d10f34a8be4c69303e343 SHA512 730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
diff --git a/dev-libs/libbytesize/libbytesize-2.5.ebuild b/dev-libs/libbytesize/libbytesize-2.5.ebuild
new file mode 100644
index 000000000000..0f0a53cb57e7
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-2.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python test tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4-no_Werror.patch"
+)
+
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
+	)
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
index fe7665a16bff..18f74a5e02e1 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0/2" # soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index cbbe4ac59f02..6e8adc1e93eb 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/11"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="+cxx static-libs"
 
 DEPEND="
diff --git a/dev-libs/libevent/libevent-2.1.12.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild
index abbe39edb784..8947961800ba 100644
--- a/dev-libs/libevent/libevent-2.1.12.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 HOMEPAGE="
@@ -37,6 +38,12 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 S=${WORKDIR}/${P/_/-}-stable
 
+src_prepare() {
+	default
+	# bug #767472
+	elibtoolize
+}
+
 multilib_src_configure() {
 	# fix out-of-source builds
 	mkdir -p test || die
diff --git a/dev-libs/libfastjson/Manifest b/dev-libs/libfastjson/Manifest
index 3b7b2dfd27e7..d05dabe0f415 100644
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@@ -1 +1,2 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
+DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
diff --git a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
new file mode 100644
index 000000000000..6da78b3bb964
--- /dev/null
+++ b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Fork of the json-c library, which is optimized for liblognorm processing"
+HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/4.3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-compile-warnings=yes
+		$(use_enable static-libs static)
+		--disable-rdrand
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog )
+	default
+
+	find "${ED}"usr/lib* -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 1b13a22dbe13..9df3efab4b70 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,2 +1,3 @@
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
 DIST libgcrypt-1.8.7.tar.bz2 2985660 BLAKE2B cb2132b826f3f3af240e6c9ac5fd992808aa17ce64144d17452591a5b1e402564af82c021b58f5fd620ebeb5894ac9654835f6d8376ec05ee41fc02189dd6825 SHA512 6309d17624d8029848990d225d5924886c951cef691266c8e010fbbb7f678972cee70cbb91d370ad0bcdc8c8761402a090c2c853c9427ec79293624a59da5060
+DIST libgcrypt-1.9.0.tar.bz2 3183699 BLAKE2B 6969d8dc8e3b5f0a1816c007b78bbf2e2a6f50f8f4505535294d87de6eb54dc4f0e3d0bbe95bab43feb070538a2956801f28d745a233880e769e24fb9061e02f SHA512 cdfb812f387e4bac598fe5701eafb284ee326cce6b20fce08b92262e371e0d95a1ab529dfa3232255869e27787c102aa817f7a70bd5fbbf8d490025a01e40429
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
new file mode 100644
index 000000000000..480186909639
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asm doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		--enable-noexecstack
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+		$(use_enable o-flag-munging O-flag-munging)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 32c66156dbfb..7661ac2b3971 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -9,6 +9,7 @@
     <remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
 </upstream>
 <use>
+  <flag name="asm">Enable assembly for optimization</flag>
   <flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 </use>
 	<origin>gentoo-staging</origin>
diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild
index c6bf35769fac..1f9f00feb250 100644
--- a/dev-libs/libgusb/libgusb-0.3.5.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 481d2c743b14..4766dbe8f81f 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1 +1,2 @@
 DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
+DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
new file mode 100644
index 000000000000..bcb10216b73d
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+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-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	introspection? ( dev-libs/gobject-introspection )
+	test? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+	dev-libs/icu:=
+	berkdb? ( sys-libs/db:= )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-libs/timezone-data
+"
+
+DOCS=(
+	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+	doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.4-tests.patch"
+	"${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use examples || cmake_comment_add_subdirectory examples
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
+		-DICAL_GLIB=$(usex glib)
+		-DGOBJECT_INTROSPECTION=$(usex introspection)
+		-DSHARED_ONLY=$(usex !static-libs)
+		-DLIBICAL_BUILD_TESTING=$(usex test)
+		-DICAL_GLIB_VAPI=$(usex vala)
+	)
+	if use vala; then
+		mycmakeargs+=(
+			-DVALAC="${VALAC}"
+			-DVAPIGEN="${VAPIGEN}"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile docs
+}
+
+src_test() {
+	local myctestargs=(
+		-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+	)
+
+	cmake_src_test
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+	cmake_src_install
+
+	if use examples; then
+		rm examples/CMakeLists.txt || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libjcat/libjcat-0.1.4.ebuild b/dev-libs/libjcat/libjcat-0.1.4.ebuild
index 0db958a93496..edd9cbf39553 100644
--- a/dev-libs/libjcat/libjcat-0.1.4.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libmpack/libmpack-1.0.5.ebuild b/dev-libs/libmpack/libmpack-1.0.5.ebuild
index c31fbb838b6e..4885407e7e55 100644
--- a/dev-libs/libmpack/libmpack-1.0.5.ebuild
+++ b/dev-libs/libmpack/libmpack-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 7cd2c9d067ae..020b39511de6 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,2 +1,3 @@
 DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e1f41051279c15033fecd5f33d7381e9be8403f2e639c007ca6aca1d53cf651e057c9842350772c2296b92c436 SHA512 b7767088701e22a2eba072c365d379987c6e9b2403888550068d6f62f48eaee7935e5355fa6ec97ac7a79bb847c833552250c0bd3065f9274b209585a7884f1d
+DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
diff --git a/dev-libs/libofx/libofx-0.10.1.ebuild b/dev-libs/libofx/libofx-0.10.1.ebuild
new file mode 100644
index 000000000000..1b4d6cf7be8e
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.10.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( app-crypt/gnupg )
+"
+RDEPEND="
+	>app-text/opensp-1.5
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# Not included in the tarball
+	sed -i -e '/INSTALL/d' Makefile.am || die
+	# Use correct location for docs
+	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
+
+	eautoreconf
+	append-cxxflags -std=c++14 # bug #566456
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.a' -type f -delete || die
+}
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
new file mode 100644
index 000000000000..73cd2854d371
--- /dev/null
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Library of simple functions that are optimized for various CPUs"
+HOMEPAGE="https://liboil.freedesktop.org/"
+SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0.3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="+examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="examples? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-amd64-cpuid.patch )
+
+src_prepare() {
+	has x32 $(get_all_abis) && PATCHES+=( "${FILESDIR}"/${PN}-0.3.17-x32.patch )
+	default
+
+	if ! use examples; then
+		sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \
+			-i Makefile.in || die
+	fi
+
+	if ! use test; then
+		sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \
+			-i Makefile.in || die
+	fi
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -O?
+	append-flags -O2
+
+	# For use with Clang, which is the only compiler on OSX, bug #576646
+	[[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions
+
+	multilib_src_configure() {
+		ECONF_SOURCE="${S}" econf --disable-static
+	}
+	multilib-minimal_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc BUG-REPORTING HACKING
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if ! use examples; then
+		ewarn "You have disabled examples USE flag. Beware that upstream might"
+		ewarn "want the output of some utilities that are only built with"
+		ewarn "USE='examples' if you report bugs to them."
+	fi
+}
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
new file mode 100644
index 000000000000..f1dda1390539
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-gcc11.patch
@@ -0,0 +1,72 @@
+From 50506d534230d90de2b0a2af3fb072428c942a4e Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:30:16 +0000
+Subject: [PATCH] Update orcus_xlsx.cpp to build with gcc-11
+
+---
+ src/liborcus/orcus_xlsx.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/orcus_xlsx.cpp b/src/liborcus/orcus_xlsx.cpp
+index 6df72a32..a59b2b9d 100644
+--- a/src/liborcus/orcus_xlsx.cpp
++++ b/src/liborcus/orcus_xlsx.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <cstdlib>
+ #include <iostream>
++#include <limits>
+ #include <string>
+ #include <cstring>
+ #include <sstream>
+-- 
+GitLab
+
+From 3bfa1a000e4639fe68781c584356ceea7c6b1a72 Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:32:53 +0000
+Subject: [PATCH] Update xls_xml_context.cpp to build with gcc-11
+
+---
+ src/liborcus/xls_xml_context.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp
+index 538f5607..ca3dc4d0 100644
+--- a/src/liborcus/xls_xml_context.cpp
++++ b/src/liborcus/xls_xml_context.cpp
+@@ -16,6 +16,7 @@
+ #include <mdds/sorted_string_map.hpp>
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+ namespace ss = orcus::spreadsheet;
+-- 
+GitLab
+
+From 5e8fb255dc6bc9b7084a05b8dc24f31417542e5e Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Fri, 8 Jan 2021 07:34:17 +0000
+Subject: [PATCH] Update xlsx_revision_context.cpp to build with gcc-11
+
+---
+ src/liborcus/xlsx_revision_context.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/liborcus/xlsx_revision_context.cpp b/src/liborcus/xlsx_revision_context.cpp
+index edfd9eed..0b6ec0af 100644
+--- a/src/liborcus/xlsx_revision_context.cpp
++++ b/src/liborcus/xlsx_revision_context.cpp
+@@ -16,6 +16,7 @@
+ #include "orcus/global.hpp"
+ 
+ #include <iostream>
++#include <limits>
+ 
+ using namespace std;
+ 
+-- 
+GitLab
+
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index dc46c1f48176..be293ba69bd3 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,10 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:1/1.5
 "
 
-PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130
+PATCHES=(
+	"${FILESDIR}/${P}-bashism.patch" # bug 723130
+	"${FILESDIR}/${P}-gcc11.patch" # bug 764035
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild b/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
index 39985dd5afe2..89523ebcd22f 100644
--- a/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
+++ b/dev-libs/libpeas/libpeas-1.26.0-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
index 1ba3a1afd409..c25bbb458b3f 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index dfcdf4dd6241..8d495da7b96c 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,3 +2,4 @@ DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee498
 DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
 DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
 DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
+DIST librdkafka-1.6.0.tar.gz 2909665 BLAKE2B 64b9098531febc0c4b06ce8d6d6cc65b9895cda9b40c9d9fd8b70d5febbb2c851856fb71a355d606074dae9e026277da5e65d0e9ed44a3dfd76b2b55cc142651 SHA512 b58d701f71342eb2c29ecd5aa0514af351b5a5d2282768e034b5995300fcbe2c416d6b4e15dfaddaacf2ec3b7571a320bf5356ade3fe33598d3f05f99f6553ba
diff --git a/dev-libs/librdkafka/librdkafka-1.6.0.ebuild b/dev-libs/librdkafka/librdkafka-1.6.0.ebuild
new file mode 100644
index 000000000000..d98a6a5b4361
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.6.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
index 9f50b7f5a3e2..2c0169fa8b56 100644
--- a/dev-libs/libretls/libretls-3.3.1-r1.ebuild
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 1562739aca4f..a782dfc4d6f2 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,4 +1 @@
-DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
-DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST libsecp256k1-v0.1_pre20190401.tgz 166663 BLAKE2B 68c9fc3fda6af56452f32edeae5dcb5a92f68bc3fb39a397c532951c6392347df14ea0347bbe05cab43158512e0d9f5ea87bd8f69bece1b04440860ebb8065ee SHA512 8c4945e93cb5ff241482ba4426b25162a7ae3b26860edc10c91d06b1c396887202ad971f4d38e035828352531b87fc29087a12b675e43da44f23c9ea3b6c0cc8
-DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
deleted file mode 100644
index af6109a499dd..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/secp256k1"
-COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( amd64 )
-	ecdh? ( experimental )
-	schnorr? ( experimental )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-benchmark \
-		$(use_enable test tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$(usex asm auto no) \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		$(use_enable schnorr module-schnorr) \
-		--disable-static
-}
-
-src_install() {
-	if use doc; then
-		dodoc README.md
-	fi
-
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
deleted file mode 100644
index a413717963df..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils ltprune
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/secp256k1"
-COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
-SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( virtual/jdk )
-	test-openssl? ( dev-libs/openssl:0 )
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local asm_opt
-	if use asm; then
-		if use arm; then
-			asm_opt=arm
-		else
-			asm_opt=auto
-		fi
-	else
-		asm_opt=no
-	fi
-	econf \
-		--disable-benchmark \
-		$(use_enable experimental) \
-		$(use_enable java jni) \
-		$(use_enable test tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	dodoc README.md
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
deleted file mode 100644
index b8f02347f60a..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
-COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
-SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test-openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( virtual/jdk )
-	test-openssl? ( dev-libs/openssl:0 )
-"
-
-S="${WORKDIR}/${MyPN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local asm_opt
-	if use asm; then
-		if use arm; then
-			asm_opt=arm
-		else
-			asm_opt=auto
-		fi
-	else
-		asm_opt=no
-	fi
-	econf \
-		--disable-benchmark \
-		$(use_enable experimental) \
-		$(use_enable java jni) \
-		$(use_enable test tests) \
-		$(use_enable test-openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	dodoc README.md
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 9acc943a3897..a4089e86ecec 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -15,7 +15,6 @@
     <flag name="endomorphism">Enable endomorphism</flag>
     <flag name="experimental">Allow experimental USE flags</flag>
     <flag name="recovery">Enable ECDSA pubkey recovery module</flag>
-    <flag name="schnorr">Enable Schnorr signature module</flag>
     <flag name="test-openssl">Enable OpenSSL comparison tests</flag>
   </use>
   <upstream>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 0b2dd87dbdf4..8d41655bf0fd 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,3 +1,4 @@
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
+DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
new file mode 100644
index 000000000000..444e6596071e
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic gnome.org meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+BDEPEND="sys-devel/m4
+	doc? ( app-doc/doxygen[dot] )"
+
+multilib_src_configure() {
+	filter-flags -fno-exceptions #84263
+
+	local -a emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dbenchmark=$(usex test true false)
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
+		-Dbuild-examples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+	# We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+	if use doc; then
+		docinto examples
+		dodoc examples/*.cc
+	fi
+}
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 53dbd9711bce..f7c8fdd51bfe 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1 +1,2 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
+DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
diff --git a/dev-libs/libslz/libslz-1.2.0.ebuild b/dev-libs/libslz/libslz-1.2.0.ebuild
new file mode 100644
index 000000000000..60bc81b42440
--- /dev/null
+++ b/dev-libs/libslz/libslz-1.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="stateless, zlib-compatible, and very fast compression library"
+HOMEPAGE="https://1wt.eu/projects/libslz"
+SRC_URI="http://git.1wt.eu/web?p=${PN}.git;a=snapshot;h=v${PV};sf=tbz2 -> ${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="static-libs tools"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local -a opts=(
+		CC="$(tc-getCC)" \
+		OPT_CFLAGS="${CFLAGS}" \
+		USR_LFLAGS="${LDFLAGS}" \
+		shared \
+		$(usex static-libs static '')
+	)
+
+	if multilib_is_native_abi ; then
+		opts+=(
+			$(usex tools tools '')
+		)
+	fi
+
+	emake "${opts[@]}"
+}
+
+multilib_src_install() {
+	local -a opts=(
+		STRIP=":" \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		install-headers
+		install-shared \
+		$(usex static-libs install-static '')
+	)
+
+	if multilib_is_native_abi ; then
+		einstalldocs
+
+		opts+=(
+			$(usex tools install-tools '')
+		)
+	fi
+
+	emake "${opts[@]}"
+}
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index aabf12d29620..c4dbbd88ed9d 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -17,7 +17,7 @@ LICENSE="|| ( WTFPL-2 public-domain )"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="+gmp +libtommath tomsfastmath"
 
 BDEPEND="
diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest
index 7a59462c88ef..cafeede126c9 100644
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@@ -1,2 +1,3 @@
 DIST libwbxml-0.11.2.tar.bz2 354176 BLAKE2B bedc86dc269c876d788b682b67fbc021a50ee6742dad4424a118edee061e5f745941dff5589c2b4da562822f655b277c09858382615564831317bcb5b51a4c16 SHA512 1eb01e35b1fab548163caca8ba024216926995adaf2e3bd7a001927858c51a792620eb7e9ca111fc6bdf5af5c1a1cbd3eac3fe53d427cd1a6d9e8aadfc51bf1f
 DIST libwbxml-0.11.6.tar.bz2 360001 BLAKE2B 96fca6a457369b7546c50bb4459490e2dc7b2bf97c3c198abc386e099695a3a1912b7292bb541b841fe63a225d8c387bb13100b458ca17a4daf252751a9a861d SHA512 534c647bae41bf703bb48158d63dc0dd168ead5c4bcd6e775e2ce2588e1bce82f3f9f94ebd863fea2a40f0e9d4af39849a673093e66d7b26f77ab012cf6f108d
+DIST libwbxml-0.11.7.tar.gz 427429 BLAKE2B 1ec456032d4d343f5b11c60dfe5fa5dfb8750c87f1e05c48b1671257822ce7ec121a7006ed9749aacd84d4ce9f5dfa0c358cf3f3581a4a24a34db1c91338f74a SHA512 fc855650661593596a158527682d2c40d800c1fa44169d79e9ca9c6d64d67b6c660807ed89b1bddd644f114c27711356627ac919af91fd7f19d409879505512f
diff --git a/dev-libs/libwbxml/libwbxml-0.11.7.ebuild b/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
new file mode 100644
index 000000000000..55fd805f9931
--- /dev/null
+++ b/dev-libs/libwbxml/libwbxml-0.11.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library and tools to parse, encode and handle WBXML documents"
+HOMEPAGE="https://github.com/libwbxml/libwbxml"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/expat
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+DOCS=( BUGS ChangeLog README References THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_INSTALL_DOC=OFF
+		-DENABLE_UNIT_TEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libyaml/libyaml-0.2.5.ebuild b/dev-libs/libyaml/libyaml-0.2.5.ebuild
index a06f6338b29e..15024cc5efbc 100644
--- a/dev-libs/libyaml/libyaml-0.2.5.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
index 5e703f0cfac9..d7185b1a686a 100644
--- a/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
+++ b/dev-libs/log4cplus/log4cplus-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( Apache-2.0 BSD-2 )"
 SLOT="0/1.2-5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="iconv qt5 threads working-locale working-c-locale"
 REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 7b74a4a17fd6..39bedf160fd2 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,4 +1,4 @@
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
 DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
-DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
+DIST nss-3.61.tar.gz 82034245 BLAKE2B f04dd0dd79d44abd335799ee53bb2229ab0c65f5b9d5bf5b61e49fb33ae2eb5c061c278d5e03328e697a6f0f461411ca35df79afb9ab51df9b555cb410c0167b SHA512 b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
diff --git a/dev-libs/nss/nss-3.60.ebuild b/dev-libs/nss/nss-3.61.ebuild
index 7ac46a177d7a..7ac46a177d7a 100644
--- a/dev-libs/nss/nss-3.60.ebuild
+++ b/dev-libs/nss/nss-3.61.ebuild
diff --git a/dev-libs/opensc/opensc-0.21.0.ebuild b/dev-libs/opensc/opensc-0.21.0.ebuild
index 732336d18a8d..720d1aa3832e 100644
--- a/dev-libs/opensc/opensc-0.21.0.ebuild
+++ b/dev-libs/opensc/opensc-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 ~sparc x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 4fb3612be0fb..a37630ae7ddb 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -1 +1 @@
-DIST pegtl-2.8.3.tar.gz 201531 BLAKE2B 093d1b5f7d1f95fa00abdae9c24d24ba9ffd8510d6512c3460374f19b12d50403c19301645c5f6fc4d697cc687079c5b0d23c32b5775b30fbf05a154aeec2c19 SHA512 9f7644b86741dfe61716bbc43b2ea0a02cfc21eaf229c47cc71a49e2f08bf2c1ff37d2b2242a1bcf518b1893be6b82c27b0e9010a1b47ef8df87ffd90d280f71
+DIST pegtl-3.2.0.tar.gz 233138 BLAKE2B 9be2cfcd90249fd57e08944533cb336f0617957c5571ef3d5371aa6da756a350ccb192b6e4e35da22b7b4e88b07e42f54eb5296c496a6b0feb544269a490f928 SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch b/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
deleted file mode 100644
index 140e1f5cfbb8..000000000000
--- a/dev-libs/pegtl/files/pegtl-2.8.3-cmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
-+++ b/CMakeLists.txt	2020-12-27 00:00:15.886046938 +0100
-@@ -78,4 +78,3 @@
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pegtl-config-version.cmake DESTINATION ${PEGTL_INSTALL_CMAKE_DIR})
- install(DIRECTORY include/ DESTINATION ${PEGTL_INSTALL_INCLUDE_DIR})
--install(FILES LICENSE DESTINATION ${PEGTL_INSTALL_DOC_DIR})
---- a/src/test/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
-+++ b/src/test/pegtl/CMakeLists.txt	2020-12-27 00:07:19.122766830 +0100
-@@ -123,7 +123,7 @@
-   if(MSVC)
-     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
-   else()
--    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
-+    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
-   endif()
-   if(ANDROID)
-     add_test(NAME ${exename} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../.. COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_RESOURCES=src/test/pegtl/data;src/test/pegtl/file_data.txt;Makefile" -DTEST_RESOURCES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/../../.. -DUNITTEST=${CMAKE_CURRENT_BINARY_DIR}/${exename} -DTEST_PARAMETER=-all -P ${CMAKE_CURRENT_SOURCE_DIR}/ExecuteOnAndroid.cmake)
---- a/src/example/pegtl/CMakeLists.txt	2020-04-22 19:43:00.000000000 +0200
-+++ b/src/example/pegtl/CMakeLists.txt	2020-12-27 00:07:32.970832890 +0100
-@@ -48,7 +48,7 @@
-   if(MSVC)
-     target_compile_options(${exename} PRIVATE /W4 /WX /utf-8)
-   else()
--    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow -Werror)
-+    target_compile_options(${exename} PRIVATE -pedantic -Wall -Wextra -Wshadow)
-   endif()
- endforeach(examplesourcefile)
- 
diff --git a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch b/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
deleted file mode 100644
index ef418e44254e..000000000000
--- a/dev-libs/pegtl/files/pegtl-2.8.3-gcc-10.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a3a292c2ba66bf09b4adc4cee8fcdfb1b1386067 Mon Sep 17 00:00:00 2001
-From: Daniel Frey <d.frey@gmx.de>
-Date: Mon, 11 May 2020 22:19:31 +0200
-Subject: [PATCH] Repair warning from GCC 10
-
-* Backported patch thx to Fedora.
-
----
- include/tao/pegtl/contrib/rep_one_min_max.hpp | 21 +++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/include/tao/pegtl/contrib/rep_one_min_max.hpp b/include/tao/pegtl/contrib/rep_one_min_max.hpp
-index 7ec4639e..ee0a3782 100644
---- a/include/tao/pegtl/contrib/rep_one_min_max.hpp
-+++ b/include/tao/pegtl/contrib/rep_one_min_max.hpp
-@@ -45,6 +45,27 @@ namespace tao
-             }
-          };
- 
-+         template< unsigned Max, char C >
-+         struct rep_one_min_max< 0, Max, C >
-+         {
-+            using analyze_t = analysis::counted< analysis::rule_type::any, 0 >;
-+
-+            template< typename Input >
-+            static bool match( Input& in )
-+            {
-+               const auto size = in.size( Max + 1 );
-+               std::size_t i = 0;
-+               while( ( i < size ) && ( in.peek_char( i ) == C ) ) {
-+                  ++i;
-+               }
-+               if( i <= Max ) {
-+                  bump_help< result_on_found::success, Input, char, C >( in, i );
-+                  return true;
-+               }
-+               return false;
-+            }
-+         };
-+
-          template< unsigned Min, unsigned Max, char C >
-          inline constexpr bool enable_control< rep_one_min_max< Min, Max, C > > = false;
- 
diff --git a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild b/dev-libs/pegtl/pegtl-3.2.0.ebuild
index ba9a54cdf773..a3ac9ff58899 100644
--- a/dev-libs/pegtl/pegtl-2.8.3-r1.ebuild
+++ b/dev-libs/pegtl/pegtl-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,15 +13,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
-
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/PEGTL-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-gcc-10.patch" # bug 733678
-)
+S="${WORKDIR}/${P^^}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index d1e71d4e5020..98be55cc45e7 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/pugixml/pugixml-1.11.4.ebuild b/dev-libs/pugixml/pugixml-1.11.4.ebuild
index 0750359ebd79..1d132cd4eb53 100644
--- a/dev-libs/pugixml/pugixml-1.11.4.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
new file mode 100644
index 000000000000..19e11e35867a
--- /dev/null
+++ b/dev-libs/rccl/Manifest
@@ -0,0 +1 @@
+DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
diff --git a/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch b/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
new file mode 100644
index 000000000000..c129e80c62c7
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-2.7.0-change_install_location.patch
@@ -0,0 +1,33 @@
+--- a/CMakeLists.txt	2019-09-02 18:19:53.540736052 +0200
++++ b/CMakeLists.txt	2019-09-02 18:21:14.936735741 +0200
+@@ -162,15 +162,16 @@
+ 
+ rocm_install_targets(TARGETS
+                      rccl
+-                     PREFIX
+-                     rccl)
++#                     PREFIX
++#                     rccl
++			)
+ install(FILES ${PROJECT_BINARY_DIR}/rccl.h
+-        DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ rocm_export_targets(NAMESPACE
+                     roc::
+-                    PREFIX
+-                    rccl
++#                    PREFIX
++#                    rccl
+                     TARGETS
+                     rccl
+                     DEPENDS
+@@ -190,7 +191,7 @@
+   "<no-reply@amd.com>"
+   LDCONFIG)
+ 
+-rocm_install_symlink_subdir(rccl)
++#rocm_install_symlink_subdir(rccl)
+ 
+ if(BUILD_TESTS)
+   add_subdirectory(test)
diff --git a/dev-libs/rccl/metadata.xml b/dev-libs/rccl/metadata.xml
new file mode 100644
index 000000000000..13f0765e4a09
--- /dev/null
+++ b/dev-libs/rccl/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>candrews@gentoo.org</email>
+    <name>Craig Andrews</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ROCm-Developer-Tools/rccl</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-libs/rccl/rccl-4.0.0-r1.ebuild b/dev-libs/rccl/rccl-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..364e12bac665
--- /dev/null
+++ b/dev-libs/rccl/rccl-4.0.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="=dev-util/hip-$(ver_cut 1-2)*"
+DEPEND="${RDPEND}
+	dev-util/rocm-cmake"
+
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rccl-2.7.0-change_install_location.patch"
+)
+
+src_configure() {
+	addwrite /dev/kfd
+	addpredict /dev/dri/
+
+	export DEVICE_LIB_PATH="${EPREFIX}/usr/lib/amdgcn/bitcode/"
+	export CXX=hipcc
+
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
index 660ccbfbdbf7..908a2220df86 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="lua perl python php ruby test"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/rocclr/rocclr-4.0.0.ebuild b/dev-libs/rocclr/rocclr-4.0.0.ebuild
index ffa5203065d2..14d12c5c2f5d 100644
--- a/dev-libs/rocclr/rocclr-4.0.0.ebuild
+++ b/dev-libs/rocclr/rocclr-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_COMGR_LIBRARY=YES
 		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-		-DCMAKE_INSTALL_PREFIX="/usr"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
 }
@@ -40,5 +40,5 @@ src_install() {
 	cmake_src_install
 
 	# This should be fixed in the CMakeLists.txt
-	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${ED}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
 }
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 894e9fdb0cbd..f1845d55405d 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,3 +1,4 @@
 DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.2.tar.gz 6499824 BLAKE2B e0fa1dd2c7a7b03e561690c6ac16b15bfafeb27ce226765a591c365b4c2f665138170e0b37f3c65990d6a78a63dbab1f78b875c4a81ca63df46d9118aab34c00 SHA512 1471776a87f1136a7276fbc4c53a1b69ca40110adf49ac459d6f641c1ef8a75482cff3c9b89482ff4edaa186c9a6d0285d38c544c6abf2931508359cfe4cf1a9
+DIST rocksdb-6.15.4.tar.gz 6499986 BLAKE2B ab0d34f4e8a0b99f695380cc07c886ca292bc0ab3cf34d0b2bc6b6c24e42cb6f1b134997f13843d312964e25a66d62be615d19e005ac1e230172925552ca7bcb SHA512 2c8c7c031f368d329826d00f4e507b532b58dcfc6c75b792a027923b5d916c2a43fb2d4e336d3a6d047a90c0280fb80f0cad3311779d6c5e0d74bcd002cbb246
diff --git a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild b/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
new file mode 100644
index 000000000000..806cf0bcce0d
--- /dev/null
+++ b/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Embeddable, persistent key-value store for fast storage"
+HOMEPAGE="https://rocksdb.org https://github.com/facebook/rocksdb/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	app-arch/lz4:=
+	app-arch/snappy:=
+	dev-python/zstandard:=
+	sys-libs/zlib:=
+	jemalloc? ( dev-libs/jemalloc:= )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gflags
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DFAIL_ON_WARNINGS=OFF
+		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
+		-DPORTABLE=ON
+		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+}
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
index 125321094992..d3a5d3f5ef89 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake flag-o-matic
+inherit cmake flag-o-matic prefix
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
@@ -42,10 +42,9 @@ src_prepare() {
 	# Remove "clinfo" - use "dev-util/clinfo" instead
 	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
 
-	# Wrong position of a '"' results in a list of strings instead of a single string and the build fails...
-	sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt"
-
 	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
 }
 
 src_configure() {
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 1954e0f36179..206bc90aa0f7 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1,3 @@
+DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
 DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
 DIST serd-0.30.8.tar.bz2 590817 BLAKE2B 31a485fccfb13e54e124cde0626ad16f3cc7f9c1f8d8c051ace7a98bd2bd5d6a2d159943f15f5734e028a31ce5eeea9d602f55bf6cf1277d532ae799e0c1895f SHA512 d12c4dea1a15b2aed9fb9d640affae23a4fbfb53b7f873af30b462ce96f3c22ee464f5b111f87a221e6ac51f4885c23bba023892331ab10d0a8aa0e27fcbd0fa
diff --git a/dev-libs/serd/serd-0.30.10.ebuild b/dev-libs/serd/serd-0.30.10.ebuild
new file mode 100644
index 000000000000..2dc7801a9f1a
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="https://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 18e6617aa5fc..8410ab853252 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -2,3 +2,4 @@ DIST simdjson-0.4.7.tar.gz 4119328 BLAKE2B f19a603b83282081457f548bd9b609f4fc4b9
 DIST simdjson-0.6.0-ppc64.patch.xz 23704 BLAKE2B ab26e93960d3e3cc2c7782516ef2e6e36fb259c1bd83b967f32b0ba899ca9f80468a47cc3344dd9dc392898626a88b4a1de42899502a989511945e573bf7f259 SHA512 c8e1233c7e6f92cf0c92206ae1023cd30067004e4e53fed86d11e105490f281bf1b8a0806880d02427485fbade24aeb7a7b027b17c9f05552089cf867f3029eb
 DIST simdjson-0.6.1.tar.gz 7889048 BLAKE2B 35b40e5e278e5093f5f07ad9e27ae23417f206bf2f4f624a6130931882db49632fc5141d027deca4977a3efa1fdfc7d8fc0bc2149d938a985a850eff4250f5bf SHA512 df5f6c717b3c4cfcde7757dff74d51c93f4682729fdbcdaae89d82db13bba006fe0378bc601d5bdf1d4cf2f0fafce56eb88aba8ca9648787a64cf160cab479e4
 DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
+DIST simdjson-0.8.0.tar.gz 7993692 BLAKE2B f2f04b3f9815645fcb4fcf2d10b0a234177042a0f4e306b0e130d5136c627344201a1f7c4d1ba6cb1ce30debf44f00694bc9a5bb646040bb614e91ae31bf43bb SHA512 8c41e07dbc3668105131c5a22060891c54f7663ec512d6c12f18eed0971fe245c3adb8d27c27305827314ebff39d2c940bd3715fa12e1ce9332d9bf3693424f2
diff --git a/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
new file mode 100644
index 000000000000..6a76cf83ed98
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.8.0-dont-bundle-cxxopts.patch
@@ -0,0 +1,40 @@
+diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
+index 2c41169f..2f5d4436 100644
+--- a/dependencies/CMakeLists.txt
++++ b/dependencies/CMakeLists.txt
+@@ -129,15 +129,3 @@ endfunction()
+ if(SIMDJSON_COMPETITION)
+   competition_scope_()
+ endif()
+-
+-cmake_dependent_option(SIMDJSON_CXXOPTS "Download cxxopts (necessary for tools)" ON
+-        SIMDJSON_ALLOW_DOWNLOADS OFF)
+-
+-if(SIMDJSON_CXXOPTS)
+-  set_off(CXXOPTS_BUILD_EXAMPLES)
+-  set_off(CXXOPTS_BUILD_TESTS)
+-  set_off(CXXOPTS_ENABLE_INSTALL)
+-
+-  import_dependency(cxxopts jarro2783/cxxopts 794c975)
+-  add_dependency(cxxopts)
+-endif()
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index f1a82be7..b1b7b1a0 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-if(TARGET cxxopts) # we only build the tools if cxxopts is available
+   message(STATUS "We have cxxopts as a dependency and we are buiding the tools (e.g., json2json).")
+-  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers cxxopts)
++  link_libraries(simdjson simdjson-internal-flags simdjson-windows-headers)
+   add_executable(json2json json2json.cpp)
+   add_executable(jsonstats jsonstats.cpp)
+-  add_executable(jsonpointer jsonpointer.cpp)
++  add_executable(simdjsonpointer jsonpointer.cpp)
+   add_executable(minify minify.cpp)
+-else()
+-  message(STATUS "We are missing cxxopts as a dependency so the tools (e.g., json2json) are omitted.")
+-endif()
+\ No newline at end of file
++  install(TARGETS json2json jsonstats simdjsonpointer minify DESTINATION bin)
++
diff --git a/dev-libs/simdjson/simdjson-0.8.0.ebuild b/dev-libs/simdjson/simdjson-0.8.0.ebuild
new file mode 100644
index 000000000000..b97cc2e514e7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/findutils
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+		)
+	else
+		mycmakeargs+=(
+			-DSIMDJSON_JUST_LIBRARY=ON
+		)
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
index 844b7e312478..35113efd3c4e 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="Unlicense"
 # Helpful site:
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 
 BDEPEND="sys-devel/libtool"
 
diff --git a/dev-libs/udis86/files/udis86-1.7.2-python3.patch b/dev-libs/udis86/files/udis86-1.7.2-python3.patch
new file mode 100644
index 000000000000..b708072195c5
--- /dev/null
+++ b/dev-libs/udis86/files/udis86-1.7.2-python3.patch
@@ -0,0 +1,42 @@
+--- a/scripts/ud_opcode.py
++++ b/scripts/ud_opcode.py
+@@ -130,8 +130,8 @@
+             '/mod'   : lambda v: '00' if v == '!11' else '01',
+             # Mode extensions:
+             # (16, 32, 64) => (00, 01, 02)
+-            '/o'     : lambda v: "%02x" % (int(v) / 32),
+-            '/a'     : lambda v: "%02x" % (int(v) / 32),
++            '/o'     : lambda v: "%02x" % (int(v) // 32),
++            '/a'     : lambda v: "%02x" % (int(v) // 32),
+             '/m'     : lambda v: '00' if v == '!64' else '01',
+             # SSE
+             '/sse'   : lambda v: UdOpcodeTables.OpcExtIndex['sse'][v],
+@@ -227,7 +227,7 @@
+ 
+     def print_table( self, table, pfxs ):
+         print("%s   |" % pfxs)
+-        keys = table[ 'entries' ].keys()
++        keys = list(table[ 'entries' ].keys())
+         if ( len( keys ) ):
+             keys.sort()
+         for idx in keys:
+--- a/tests/oprgen.py
++++ b/tests/oprgen.py
+@@ -686,7 +686,7 @@
+     def generate_yasm( self, mode, seed ):
+         opr_combos = {}
+         random.seed( seed )
+-        print "[bits %s]" % mode
++        print("[bits %s]" % mode)
+         for insn in self.InsnTable:
+             if insn[ 'mnemonic' ] in self.ExcludeList:
+                 continue
+@@ -728,7 +728,7 @@
+                 else:
+                     operands = None
+             if operands is not None:
+-                print "\t%s %s" % (insn['mnemonic'], operands)
++                print("\t%s %s" % (insn['mnemonic'], operands))
+                 opr_combos[fusedName]['covered'] = True
+ 
+         # stats
diff --git a/dev-libs/udis86/udis86-1.7.2-r1.ebuild b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..9278d5fb1bfe
--- /dev/null
+++ b/dev-libs/udis86/udis86-1.7.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit autotools multilib-minimal python-any-r1
+
+DESCRIPTION="Disassembler library for the x86/-64 architecture sets"
+HOMEPAGE="https://sourceforge.net/projects/udis86/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		--enable-shared \
+		--with-pic \
+		--with-python="${PYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/udis86/udis86-1.7.2.ebuild b/dev-libs/udis86/udis86-1.7.2.ebuild
deleted file mode 100644
index 2936a267d2b9..000000000000
--- a/dev-libs/udis86/udis86-1.7.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-multilib eutils
-
-DESCRIPTION="Disassembler library for the x86/-64 architecture sets"
-HOMEPAGE="https://sourceforge.net/projects/udis86/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-		x86-fbsd? ( dev-lang/yasm )
-	)"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-static
-		--enable-shared
-		--with-pic
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
index 4930c05f9b6e..4d25b1e2a626 100644
--- a/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
deleted file mode 100644
index b35cbd287719..000000000000
--- a/dev-libs/ustr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
deleted file mode 100644
index 79fe818c8edf..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-make static lib build/install controllable so we can disable it by default
-
-punt the -debug lib variants ... if people want debug libs, they can rebuild
-the package using their desired build settings.
-
---- a/Makefile
-+++ b/Makefile
-@@ -291,8 +291,10 @@
- OPT_LIB_SHARED      = libustr-$(VERS_BSO).so.$(VERS_ESO)
- OPT_LIB_STATIC      = libustr.a
- 
--LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
--LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
-+LIB_SHARED = $(OPT_LIB_SHARED)
-+ifeq ($(USE_STATIC),yes)
-+LIB_STATIC = $(OPT_LIB_STATIC)
-+endif
- 
- DEPS_NONC_ALL  = $(SRC_HDRS) $(SRC_SRCS_H)
- DEPS_C_ALL     = $(SRC_HDRS)
-@@ -388,17 +390,14 @@
- 		install -d $(DESTDIR)$(bindir)
- 		install -d $(DESTDIR)$(libdir)/pkgconfig
- 		$(HIDE)echo Installing files
-+ifeq ($(USE_STATIC),yes)
- 		install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
-+endif
- 		install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
- 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- 		ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- 		-rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
- 		ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
--		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
--		ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
--		-rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
--		ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
--		$(LDCONFIG) -n $(DESTDIR)$(libdir)
- 		install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)
- 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
- 		install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
-@@ -406,7 +406,7 @@ endif
- 		install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
- 		install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
- 		install -m 755 -t $(DESTDIR)$(bindir) ustr-import
--		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
-+		install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
- 
- ustr-import-multilib: ustr-import-multilib.in
- 		sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
deleted file mode 100644
index aaed1503030a..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
-  * ustr-import generates one depending on the options. */
- 
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+#  define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
- 
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- *  because by the time we've included a libc header it's too late. */ 
-+ *  because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
deleted file mode 100644
index b38cf7829c9f..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/ustr-conf.h.in	2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in	2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,23 @@
- /* this is the custom version for the library itself, for everyone else
-  * ustr-import generates one depending on the options. */
- 
-+/* Ustr relies on GCC's traditional handling of inline functions, not
-+ * the version that was actually standardized in C99. GCC-compatible
-+ * compilers define __GNUC_STDC_INLINE__ when using the standard
-+ * behavior. When this is set we must restore the old inline behavior:
-+ */
-+#if defined(__GNUC__) \
-+ && defined(__GNUC_STDC_INLINE__)
-+#  define inline inline __attribute__ ((gnu_inline))
-+#endif
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
- 
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- *  because by the time we've included a libc header it's too late. */ 
-+ *  because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
deleted file mode 100644
index 31b67bdeeeab..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="https://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc_5-check.patch"
-	epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-	multilib_copy_sources
-}
-
-_emake() {
-	emake \
-		USE_STATIC="no" \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="${EPREFIX}/usr/share/man" \
-		SHRDIR="${EPREFIX}/usr/share/${P}" \
-		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		HIDE= \
-		"$@"
-}
-
-multilib_src_configure() {
-	# The included configure tests require execution.
-
-	# We require vsnprintf everywhere as it's in POSIX.
-	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
-	chmod a+rx autoconf_vsnprintf
-
-	# Always use stdint.h as it's in POSIX.
-	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
-	# Figure out the size of size_t.
-	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
-	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
-	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
-	chmod a+rx autoconf_64b
-
-	# Generate the config file now to avoid bad makefile deps.
-	_emake ustr-import
-}
-
-multilib_src_compile() {
-	_emake all-shared
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	if ! use ustr-import ; then
-		rm -r \
-			"${ED}/usr/bin/ustr-import" \
-			"${ED}/usr/share/man/man1/ustr-import.1" \
-			"${ED}/usr/share/${P}" || die
-	fi
-}
-
-multilib_src_test() {
-	_emake check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
deleted file mode 100644
index 3e9efa02cf13..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="https://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ustr-conf.h
-	/usr/include/ustr-conf-debug.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-inline-check.patch"
-	"${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-_emake() {
-	emake \
-		USE_STATIC="no" \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" \
-		mandir="${EPREFIX}/usr/share/man" \
-		SHRDIR="${EPREFIX}/usr/share/${P}" \
-		DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		HIDE= \
-		"$@"
-}
-
-multilib_src_configure() {
-	# The included configure tests require execution.
-
-	# We require vsnprintf everywhere as it's in POSIX.
-	printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
-	chmod a+rx autoconf_vsnprintf
-
-	# Always use stdint.h as it's in POSIX.
-	sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
-	# Figure out the size of size_t.
-	printf '#include <sys/types.h>\nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
-	 $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
-	printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
-	chmod a+rx autoconf_64b
-
-	# Generate the config file now to avoid bad makefile deps.
-	_emake ustr-import
-}
-
-multilib_src_compile() {
-	_emake all-shared
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	if ! use ustr-import ; then
-		rm -r \
-			"${ED}/usr/bin/ustr-import" \
-			"${ED}/usr/share/man/man1/ustr-import.1" \
-			"${ED}/usr/share/${P}" || die
-	fi
-}
-
-multilib_src_test() {
-	_emake check
-}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index be7ebfab1837..b0a10477dfe6 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,4 +1,2 @@
-DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060f80bdddaf358d222db63b1c2d167713ff9feec04fa9cbf35072a6cc153486078851319cf6631b7f18b346cd034 SHA512 1990f737673931580236e1765aabc2e47766f0bc1f6fef150fd2fb63dd459244ceb0fef99cea9ba1f1295a75daab0336400b7c6b367f694038849759e000adbc
 DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
 DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
deleted file mode 100644
index d0b6742a0906..000000000000
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit python-any-r1 verify-sig
-
-DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
-HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
-	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/foma
-	dev-libs/libvoikko"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libvoikko
-	verify-sig? ( app-crypt/openpgp-keys-voikko )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
-
-src_compile() {
-	emake vvfst
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
-	einstalldocs
-}
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index 95615560af70..13ce7d409bfd 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/foma
 	dev-libs/libvoikko"
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index fcc8d36a421d..4f98f5bcab67 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 136a50b10fea..14676a58327c 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,3 +2,4 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
+DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
index c5503707d062..e1272f2177b6 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17-r100.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -169,7 +169,9 @@ src_configure() {
 
 	}
 
-	lua_foreach_impl run_in_build_dir lua_configure
+	if use lua; then
+		lua_foreach_impl run_in_build_dir lua_configure
+	fi
 
 	php_configure() {
 		local myconf=(
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index f557a0eaaf88..7806bb6ff954 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,5 +1,3 @@
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
-DIST xapian-core-1.4.15.tar.xz 2988752 BLAKE2B d68d69cdc55c1b62a746620fc90f028819813bb98c0ad0cc130c399a4dd62231b920d24363b61e58d002f65a79a117598455779028de1b26b7a808367f5f2de4 SHA512 f28209acae12a42a345382668f7f7da7a2ce5a08362d0e2af63c9f94cb2adca95366499a7afa0bd9008fbfcca4fd1f2c9221e594fc2a2c740f5899e9f03ecad3
-DIST xapian-core-1.4.16.tar.xz 3041132 BLAKE2B 2c009bcdec05542ceae9354e47e8ff9b971ec87d04caf8058711fd6952135620c353f2feabcd869313f55194409944bc7374ce69d626f948461963a7790c3953 SHA512 3d319ab672485e840019ee28b54b1c59bbd535c1802874f58593fb999681c19bff3e776dc19ab5d5bd97734bf01f1408f36ae49e21ca9706ca187db49f8a18a6
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
+DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
deleted file mode 100644
index f6ae79205eb5..000000000000
--- a/dev-libs/xapian/xapian-1.4.14.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.16.ebuild b/dev-libs/xapian/xapian-1.4.16.ebuild
deleted file mode 100644
index 669d3eb246de..000000000000
--- a/dev-libs/xapian/xapian-1.4.16.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${D}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.15.ebuild b/dev-libs/xapian/xapian-1.4.18.ebuild
index 669d3eb246de..b33e8c6402c3 100644
--- a/dev-libs/xapian/xapian-1.4.15.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index 191c5558211e..edf4ee5ae861 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/metadata.xml
@@ -8,5 +8,8 @@
 		<flag name="nss">Install xmlsec-nss library</flag>
 		<flag name="openssl">Install xmlsec-openssl library</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">lsh123/xmlsec</remote-id>
+	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-libs/xxhash/xxhash-0.8.0.ebuild b/dev-libs/xxhash/xxhash-0.8.0.ebuild
index 5f9c467d1b20..66f2e8dfd118 100644
--- a/dev-libs/xxhash/xxhash-0.8.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-27 18:53:03 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-01-27 18:53:03 +0000
commit	3482ddf943eff7b8848f1fb31350b99ce349e86a (patch)
tree	9c9bb6ec6679e9dc44a84d87ba611989409b12ca /dev-libs
parent	8e8120eabdd28020aa69c7a60505cce2edd20adc (diff)
download	baldeagleos-repo-21.1.3.tar.gz baldeagleos-repo-21.1.3.tar.xz baldeagleos-repo-21.1.3.zip