gentoo resync : 21.06.2021

23 files changed, 291 insertions, 530 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1b7acd332fe2..52c3b77ba569 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 717d93aee3f1..7ee2cba9a0d3 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,12 +2,9 @@ AUX boost-1.71.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b48
 AUX boost-1.71.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
 AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0
 AUX boost-1.73-boost-mpi-python-PEP-328.patch 396 BLAKE2B 5f08ce2eab46f2d108166afef086382dc9cd9a5305435cf437fa3ae505736979664357aa23cc51b2a74bee6aae46d94a671056037578562846e900fd2c7e65e8 SHA512 fa55d1da17bd110db2c9a16dce4da267a62ef10c13a6dc3aa6afd3b33e9a18499266b4411d292533b1c691e3bf0309fa1aab8ec19e7775a7835d89275183e6f2
-AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f366ad0d9a392bb36e6b9e4c7ac13a262eedea668fb58667f41cd089c91f43fee4a6a68e442c2e627ffa2341c44274b4f4f7f644db SHA512 a18fa18388b74371aa3d3826621df90e8c8f6d2c6b9cf25bc9f7761e98817cc9252ccd43fa5a374136f257e9a0c1f927eb9912d0715bb1de94b3e92af957d84a
 AUX boost-1.74-CVE-2012-2677.patch 4965 BLAKE2B 74cef075cd0aa4d4425e75d437a59c19e20325cc33c9c8fb206bdcf87efbafa6d28c6ebcd8b70f88f12e32b68b492ac6b985ccef703c61439661a194983b9ad9 SHA512 c8e6758840b58358b676226ef9f498b9e72cbeedee83cd6c8ea0608a6bc1466bedeba5b7a92d1a608c3a2788cb3c0444203e70995e3b3123198bf68081b477b9
 AUX boost-1.76-boost-numpy.patch 910 BLAKE2B 6f0b8fdf908e7be43556ba61301d0465f0b8464120d342b6ddbd053eecc432bf2c4a60e84eced622bd3fe0da468c5941fa2d5b9592490c453193ef3eaf239a8a SHA512 245cb97c493e85eae3567a720eebac7eb53d1691d22015edc27f7a56e379c9f59f5a89c49889149ec203c28ede2ed1b9853c742e604fa4b60f7a83f8b2698fba
 AUX boost-1.76-sparc-define.patch 1026 BLAKE2B ad88b1c5231c0cbbd6bfb1f01d050ff20fbee145a656a439b2920f23f116693e6a999dce9db6bb0cac94ad2f98580f0669198d026b28c05fe7a82b5887fbadff SHA512 62d63bc3db7352daf6ad47a25bbeef2bed3405e4e43650d4c34ad8535a96ae13f875837b727082c8a5b7671c35a67a20978baf44d59f15a57053308a31827373
-DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
-EBUILD boost-1.75.0.ebuild 11103 BLAKE2B c8b74a302e399613bc23bc8d3e78977113721dd64554db1371f58a3f36d47933c09903ca94fddaa7fe81af0f45105059b51da9c2b6fd3edc6e4a4e9684d8f3b1 SHA512 b1eb508b1f1060bf5f5e91b1c43492fb1374880290d0874afd9e3a4c7cbd9dd4f909ba1b7b7cb40fe447b15eba19cebbd5da9d8263c26209c89661d513a629b5
 EBUILD boost-1.76.0-r1.ebuild 10966 BLAKE2B e71f1c19e051bc7d79093f23647d9358143f8c1fd06e73afa48e2cc5e8eb22104111a4605ca1844eb160b17623653985a49b0305266b0d8f8dc4aee542d5f8bc SHA512 e813b5407aee56f3a5734b185eb1a6cf6129210027794c735e25d2266040b56d2709d21d57a2d14ddbd843d59744b0497885f7e615d925311ce027164c3d0c5d
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.75.0.ebuild b/dev-libs/boost/boost-1.75.0.ebuild
deleted file mode 100644
index eafcc5779bbd..000000000000
--- a/dev-libs/boost/boost-1.75.0.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-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 ~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 )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	!<dev-libs/leatherman-1.12.0-r1
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-	# Boost.MPI's __init__.py doesn't work on Py3
-	"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
-	# Remove annoying #pragma message
-	"${FILESDIR}"/${PN}-1.73-property-tree-include.patch
-	"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if use python; then
-		if use mpi; then
-			move_mpi_py_into_sitedir() {
-				python_moduleinto boost
-				python_domodule "${S}"/libs/mpi/build/__init__.py
-
-				python_domodule "${ED}"/usr/$(get_libdir)/boost-${EPYTHON}/mpi.so
-				rm -r "${ED}"/usr/$(get_libdir)/boost-${EPYTHON} || die
-
-				python_optimize
-			}
-			python_foreach_impl move_mpi_py_into_sitedir
-		else
-			rm -r "${ED}"/usr/include/boost/mpi/python* || die
-		fi
-	else
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the Boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/files/boost-1.73-property-tree-include.patch b/dev-libs/boost/files/boost-1.73-property-tree-include.patch
deleted file mode 100644
index 539388275bcc..000000000000
--- a/dev-libs/boost/files/boost-1.73-property-tree-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d1c8825a45a0717e1ad79583d3283b0e5e32831e Mon Sep 17 00:00:00 2001
-From: Andrey Semashev <Lastique@users.noreply.github.com>
-Date: Tue, 28 Apr 2020 22:03:04 +0300
-Subject: [PATCH] Fix usage of deprecated Boost.Bind features
-
-This fixes deprecation warnings generated by boost/bind.hpp.
-
-Also, use a more actual include path for ref.hpp.
----
- boost/property_tree/json_parser/detail/parser.hpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/boost/property_tree/json_parser/detail/parser.hpp b/boost/property_tree/json_parser/detail/parser.hpp
-index 5554990fb..6cf636394 100644
---- a/boost/property_tree/json_parser/detail/parser.hpp
-+++ b/boost/property_tree/json_parser/detail/parser.hpp
-@@ -3,8 +3,8 @@
- 
- #include <boost/property_tree/json_parser/error.hpp>
- 
--#include <boost/ref.hpp>
--#include <boost/bind.hpp>
-+#include <boost/core/ref.hpp>
-+#include <boost/bind/bind.hpp>
- #include <boost/format.hpp>
- 
- #include <iterator>
-@@ -214,7 +214,7 @@ namespace boost { namespace property_tree {
-         void process_codepoint(Sentinel end, EncodingErrorFn error_fn) {
-             encoding.transcode_codepoint(cur, end,
-                 boost::bind(&Callbacks::on_code_unit,
--                            boost::ref(callbacks), _1),
-+                            boost::ref(callbacks), boost::placeholders::_1),
-                 error_fn);
-         }
- 
-@@ -517,7 +517,7 @@ namespace boost { namespace property_tree {
-         void feed(unsigned codepoint) {
-             encoding.feed_codepoint(codepoint,
-                                     boost::bind(&Callbacks::on_code_unit,
--                                                boost::ref(callbacks), _1));
-+                                                boost::ref(callbacks), boost::placeholders::_1));
-         }
- 
-         Callbacks& callbacks;
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 162f41de9edc..c8ba6a1efb86 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -1,4 +1,7 @@
 DIST cudnn-10.2-linux-x64-v8.0.5.39.tgz 706337907 BLAKE2B 1dda021f7c313b53fe6024bd7c0eccf3746a55b7399a63cf3160f2a474fd36e33273d8714dc099fed901b6be3dfac51d14033cdb0fe85c2019222127b695c9ef SHA512 867fc7ff9336656431069f01d5f59bb5da09d51dc38ba723d066a1b338646b704969a5c7595551b357b98e7d2204863d4d2b7a84708480e16dc3dbb604f26339
+DIST cudnn-10.2-linux-x64-v8.2.1.32.tgz 1006613938 BLAKE2B 2051cb6594a523ac3e4e67e43bb8f6a43baf8aff5a1059101a11303b8619a21cc620671c4d76ec3a5f1326f819096bc9162c2c772623a413b2424356f45dfedf SHA512 817dea2077e2cda7b5fb8e536d2db5db49597d8f9503ce86783c66ad6456be51c8dd3113c1485d21fac1287c46e76aba939f302506497f27f24ec3caf6436408
 DIST cudnn-11.1-linux-x64-v8.0.5.39.tgz 1548325637 BLAKE2B 6c846156b3d6b2c286ea2ec639dcaf887ca172b23d98bed5227c312a4cf79381d5b81c763e6237cb57f3ad47500042cef6d454d43755110defcb6f98b6e7a28a SHA512 f704df22336376a9053a7c1f22e650beab61c6829325e0c221416f38a867180a65f9aca7a6f14f5a61c0b450d24a1dff27df47d996d3d26ff1c300b9bedaacc6
+DIST cudnn-11.3-linux-x64-v8.2.1.32.tgz 1879325034 BLAKE2B 0ffe082cd0ae6aff5897fb833054218dfb57a1b43ff420d7e95e948a763d19f38a9927026e990a3fbb3d2ce6e0194c7a3b813e3484a330b642581ba7163f9c8a SHA512 7d88846b69ca523dd2e631c7be7a7deae09c433da94e9c4167dc5e115b2c93b3256cd0e32241e2aa5c2b836d8f1097e207bc7af8bcf4e55a222c8cbf50be831b
 EBUILD cudnn-8.0.5.39.ebuild 851 BLAKE2B 3ab0bde4a416c7c83623604cd86cab09237cb39ce780a44e12dbe34dd88c771e042439bbd78c423c18b61dd2f2c54e08cecfc6f359689dd02e0de5f144fbfb06 SHA512 f9871dbd87ecfa60baa5a789245f1ff828b1547831b3e04575e1c760a35225567761a79f630d8fe86df1c499943397398eb625c178db97fafbf2f3f2bcfb14d4
-MISC metadata.xml 384 BLAKE2B b0f6f04f6a0e59747517b7c29c6786e9c709e511300cd17d0372a1bf5c29d9c201a7e640600fce6209ee4d589073622818a7802565e11120efdda21d5e82d947 SHA512 f09119c58f68b6142947f477f42ebe51ebc71f71f2d189bc6d8080ce06bbfcba285df9d6664d603e43e5aab047f085c66015682f491e78e8ffc174e4146cba6e
+EBUILD cudnn-8.2.1.32.ebuild 841 BLAKE2B d7f3d381088e47757354e59c8826daf1c77d93b1219c5b9eaf5a71348df26764afc6146a88164bbb9f96078e1d96da77db010d7f4d28ccc8b5c766b5cd0b8366 SHA512 4381465f9120fae9e83f484b7e063a742d6e26c331a1a7e6b8715b9f1dcb36794e69bbab07581e8fb86ce4f5dfba1b1d48203318298b5bddb169d583646911ba
+MISC metadata.xml 436 BLAKE2B 74e90d0f7ba5ae86ba14112208ca07ed2ac1982369f587c6ae782b2c0c06b2d47882dd469313d2791eb0a8ab76e0bae5090a3fd0d3d3eca4df405a032ef267b5 SHA512 19716b040efe129ecb580902a4ba4f98241cccaa0897134caf9cbbc757f8255fd56b75916afad3383eee3cb565aac13c6597e4acfe65f7bc9ec1f3deb93aa984
diff --git a/dev-libs/cudnn/cudnn-8.2.1.32.ebuild b/dev-libs/cudnn/cudnn-8.2.1.32.ebuild
new file mode 100644
index 000000000000..0af221aaec39
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-8.2.1.32.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+SRC_URI="
+	cuda11? ( cudnn-11.3-linux-x64-v${PV}.tgz )
+	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )"
+
+LICENSE="NVIDIA-cuDNN"
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="cuda10-2 +cuda11"
+REQUIRED_USE="^^ ( cuda10-2 cuda11 )"
+RESTRICT="fetch"
+
+DEPEND="
+	cuda11? ( =dev-util/nvidia-cuda-toolkit-11* )
+	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux
+	doins -r cuda/include
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib64/.
+}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index 61e3b0310e2b..b0b4c4f095d0 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -8,5 +8,6 @@
   <use>
     <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
     <flag name="cuda11-1">On nVidia CUDA 11.1.</flag>
+    <flag name="cuda11">On nVidia CUDA 11.x.</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-libs/distorm3/Manifest b/dev-libs/distorm3/Manifest
index 771333634122..06ef2cea6989 100644
--- a/dev-libs/distorm3/Manifest
+++ b/dev-libs/distorm3/Manifest
@@ -1,3 +1,4 @@
+AUX distorm3-3.5.2-under.patch 216 BLAKE2B 771f718b28623bd41d9ae967dc2f5d17fd575502e250b0b4f24a5b07aa5acbdf9d9b75ea630df57c087eb10a3aa60743f28cb09e5f1a92accdffb1d9df8af555 SHA512 577f7cea69ce350087095821c602f46db9061e0c3b4440fe8f6fa103bd1f42b7ac5a5b118b0493301b877cd91c0a203c4b6a0299529822552b0bd7bca5779f53
 DIST distorm3-3.5.2.tar.gz 138371 BLAKE2B 76cc9c987d53a5c7336632ee96878df62865a862bba9b3d07fa95cd585aff428a0187033b78e0731f14a24cc37d7d19f290b2ca06a5a3dd6ee8116a0e68678c8 SHA512 bc08a12f87e6bf22ff9bbba8a34b88b0988b80ddec405c669ba5cd863545128f8b3df4b122a69f4849af3d08818c836b368332e6546871bdfee99e611b3f8d19
-EBUILD distorm3-3.5.2.ebuild 531 BLAKE2B d3324e35aaff4aee8644473a4e742711d18a7470d3ab21fba35201e1e212037d1976eb29b60a7b0a3d4734ab861dd753bf2f6a9113a2ba9aa68f9b26f97e7625 SHA512 3abcf8bac7f73609c550fa86cbdfc663e950c65c232954b957c25f23612ca84dd7a6d37cea5329a9a1f9bfa13dd31ba29c7e8566336e51c991fb6d0f88d84464
+EBUILD distorm3-3.5.2.ebuild 969 BLAKE2B 25faea3df10f5f326138125ea5af93168b59621b5761c566d52ebc7beaa2481bf88894947e46d2d34336561c7446e25917cb9cde8343d6fc704375ae16f93c8c SHA512 99b39728dfca121e273ef4ce823ed2c38fee1ed4254142cc771270ac7c68ee079f090f4a27c2f6769ef6a26091f7fa702d688fd932ca195fcdef32d42670370d
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm3/distorm3-3.5.2.ebuild b/dev-libs/distorm3/distorm3-3.5.2.ebuild
index ae5d013926ab..6c9bc4aa2c0d 100644
--- a/dev-libs/distorm3/distorm3-3.5.2.ebuild
+++ b/dev-libs/distorm3/distorm3-3.5.2.ebuild
@@ -11,13 +11,20 @@ DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
 HOMEPAGE="http://www.ragestorm.net/distorm/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-DEPEND=""
-RDEPEND=""
-
 LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="test? ( dev-lang/yasm )"
+
+distutils_enable_tests pytest
+
+PATCHES=("${FILESDIR}"/${P}-under.patch)
 
 python_install() {
 	distutils-r1_python_install
@@ -25,3 +32,14 @@ python_install() {
 	# don't know why it does not happen by default
 	python_optimize
 }
+
+python_test() {
+	local exclude=(
+		# outdated tests? API udage mismatch
+		# https://github.com/gdabah/distorm/issues/173
+		python/test_distorm3.py::Test::test_dummy
+		python/test_distorm3.py::InstBin::test_dummy
+		python/test_distorm3.py::Inst::test_dummy
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-libs/distorm3/files/distorm3-3.5.2-under.patch b/dev-libs/distorm3/files/distorm3-3.5.2-under.patch
new file mode 100644
index 000000000000..3a7971d55be3
--- /dev/null
+++ b/dev-libs/distorm3/files/distorm3-3.5.2-under.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/797283
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -4,7 +4,7 @@ compile = 1
+ optimize = 1

+ 

+ [bdist_wininst]

+-user-access-control = auto

++user_access_control = auto

+ 

+ [egg_info]

+ tag_build = 

diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index da939a761ad3..186985c1c43d 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,5 @@
 DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B 441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6 SHA512 8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
+DIST flatbuffers-2.0.0.tar.gz 1538022 BLAKE2B ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c SHA512 26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89
 EBUILD flatbuffers-1.12.0.ebuild 709 BLAKE2B 570b8680fe48220728539d9bee3d5bc2c851e4105b4f2d8926d5564359c32dbafee39aed662c311621610f75f64bc4464ded9ecd0571f541eed883d053cb9b8a SHA512 fd7652dc1a6a721965027ffcbfcee9826e2c1728fcc94e69735d14487be1b073c388baa1c56c98de6e5989e7feed3b908ed73fb4941365a9e5aff4a23ca69c0b
+EBUILD flatbuffers-2.0.0.ebuild 712 BLAKE2B 94fbf6d6d7afde14699b7449fb0ac6ae4205ac938a5fd5565bfddbec17e3e72da73a562d042dbfc6de138d33ab1e944b9eb7925a89f666a36cb8b0346a032cc2 SHA512 3548e283f6879f8acb9a9f60b235f96499d4878a287d475c15eef1e97b0ad3f2529132a4b354a4524df144dd7bf5b93f1394a639fe52157dc39a20a84eee7ca9
 MISC metadata.xml 332 BLAKE2B d8d0407f0bf9b22966b551396238765d83d830aa9d70efc8de522fc58a0424ace05025bdc30732c96af91d69202cbfd417f4775805e630b728550dec44a2598e SHA512 005454078e3fbb9fa650dd6ab4eeeb69708338e5c1b0a3595937365ce5d93174e352d9f8bda055127feb6b80644c91f6f3e82e85b5c162ffad09ff19aaf1dbf1
diff --git a/dev-libs/flatbuffers/flatbuffers-2.0.0.ebuild b/dev-libs/flatbuffers/flatbuffers-2.0.0.ebuild
new file mode 100644
index 000000000000..59a0c5212cab
--- /dev/null
+++ b/dev-libs/flatbuffers/flatbuffers-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Memory efficient serialization library"
+HOMEPAGE="https://google.github.io/flatbuffers/"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( readme.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
+		-DFLATBUFFERS_BUILD_SHAREDLIB=ON
+		-DFLATBUFFERS_BUILD_TESTS=$(usex test)
+	)
+
+	use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
+
+	cmake_src_configure
+}
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 6979bfd44fe4..f2fc3e4c58b9 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -4,5 +4,5 @@ AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
 EBUILD hiredis-0.14.1.ebuild 1897 BLAKE2B f247584df6ce3646f5fe5a9e014910d0a1392679b596ab54bc0879914ec63e45a9d0e0e8d27c29ffc41143bd7f033cacf24ca3103fb56cec816fd0e2455bbe87 SHA512 4a2f9e9f98f842a30051744892647fa3b2c9e91b0a8c117215609ad4ffd66a599c2b6603b3b4fab5815b21488176d103d9fa29026b9f1cf437ffb30c1db67167
-EBUILD hiredis-1.0.0.ebuild 1921 BLAKE2B abbfe4ad5d4d1eb5956c119fd8ba1c25e0782ca2421f1fea033a84a1af4f98763863459786cd216d97301bab0ac23ee4e9addf2076951613f510dc1d27587540 SHA512 2bf2265d384b9bde244d94fcbedbe16c6a91a09f4fd8465f50e9bae9fed6dfa5f7fbad299d5bbd43a5829ac4eed2ac721b45eaa069e5990342c5325b14b112c1
+EBUILD hiredis-1.0.0-r1.ebuild 1950 BLAKE2B e59b51ef33c1da3b06eaccd7612f319e9d3ee921af692fa4432288837db1a0e5585ffd3ba083e003bdc10486fb199dd7347eee08d7dd7fc052379f3f2d7118bc SHA512 4506c6aa49e3e7fc8a5c246ded7b8d05def2addc73d8e9815660c5322603404cf93f4502e45df3950c0337fa9343fb36f24489b5839300818440a10c1e607460
 MISC metadata.xml 403 BLAKE2B 77095f90219f95263b17fa5413af441651aa6a56e8bb4f5a4c763ffa7d0524f1ecf2c2fa0819f214fd519fc783071da31cff6d2c329b36befa9cbac64ccd9072 SHA512 08e5981022c6e6b88243dca594b48733707d12ebbeefd3f41d7818d2bd46c362dc0869aad5757b8909d292493f4732834bec1e34cc438e401d57ee871421192a
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0-r1.ebuild
index b66961f6faf0..3b7f0a53ba6d 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0-r1.ebuild
@@ -15,10 +15,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-sola
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	ssl? ( dev-libs/openssl )
-	test? ( dev-db/redis )
-"
+DEPEND="ssl? ( dev-libs/openssl:= )"
+RDEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-db/redis )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.0-disable-network-tests.patch
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 036cbae5bcf9..c64789b359d9 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,6 +1,4 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
-DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
-EBUILD icu-layoutex-68.2.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
 EBUILD icu-layoutex-69.1.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
deleted file mode 100644
index 1f04fa03da06..000000000000
--- a/dev-libs/icu-layoutex/icu-layoutex-68.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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="External layout part of International Components for Unicode"
-HOMEPAGE="http://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/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 42cfa17c75a8..39214b8d3eac 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -1,3 +1,5 @@
 DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
+DIST libconfig-1.7.3.tar.gz 3026416 BLAKE2B 94301be4d6e472fc9daeac7a04074855737ddda94bb5748cd0087fafe192cf674ea1c020808ebf855372188b6b27a57ed185323fa26988bb1fccde0566617cba SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4
 EBUILD libconfig-1.7.2.ebuild 1048 BLAKE2B 5418b1b083ccee6a1669e5495ab1dcc200054b0e899603e55748842cfef1020b040284e7439e46f44056e7ca03ada1dc1264875328d74fdeaa864624daf5cca4 SHA512 c4826d32f5b89f4f59341cf63bcffad92f7ab5fe470f0ee7d19f7b6f136e158638ba3638e4e2f608c471ede9e0e975071f2c9d09e508d00ded606830f742c1ec
+EBUILD libconfig-1.7.3.ebuild 1052 BLAKE2B 939121f32cb48aae0e2f0f9d8654eda64b95dccfda1b0537c01c1fb7a6fec7a82a56c7ab33334062de1b8f6366b0d65c57c7a9b5f44b8f64e13dabc4d9d84ec6 SHA512 a8d792ba5252fbed97f9e5d20e661b44aab990e5e5a06128dafc6eebd04be36ea7ffae2393eea5b4ee8a943f577c2586934ab67f54ba12374476c07a840787eb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/libconfig-1.7.3.ebuild b/dev-libs/libconfig/libconfig-1.7.3.ebuild
new file mode 100644
index 000000000000..a8f84e82f152
--- /dev/null
+++ b/dev-libs/libconfig/libconfig-1.7.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
+HOMEPAGE="
+	http://www.hyperrealm.com/libconfig/libconfig.html
+	https://github.com/hyperrealm/libconfig
+"
+SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="+cxx static-libs"
+
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/bison
+	sys-devel/libtool
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/sleep 3/d' \
+		configure.ac || die
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable cxx) \
+		$(use_enable static-libs static) \
+		--disable-examples
+}
+
+multilib_src_test() {
+	# It responds to check but that does not work as intended
+	emake test
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 3827560efde3..0e8c256b8326 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,4 +1,6 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.7.3-r1.ebuild 2362 BLAKE2B a6abf14b651094f901fec91e009d8bee5929eb9e9559c5bc3fd1c7a7f76549ce79308c33043bbddc6b93085268e39970a454dbd50ef2cc09c5fe0291fffee0fa SHA512 47bd0d59f32c3c6cd45f1230ce9f312d69d9625ad7cad6791bac76fef69e28349f6e3b674170c593100b78f9a7b6bb581a64f52893f9f8615b5998a61e2202b9
+DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
+EBUILD libzip-1.7.3-r1.ebuild 2420 BLAKE2B a2ddb2e1d5ef8c9e15d09bf99914092cd209ecf7123aa61683ddbc6b8dfcd280c5b6bbcb0c8aab8ad07f3e1eeec7c3640033350c8c65c0ff432e016ef754d4fe SHA512 637dc2793f2e54383221bfa2048e0c26df8788e62f9d1f078ecf7cd5a0878cb1bfea67f8e37b6913bf496778c8aa1a90b6ee6c78218eac99358fb9ca731f5957
+EBUILD libzip-1.8.0.ebuild 2361 BLAKE2B def152e6e6bde5bbe9fd78b6ad9a552c5890aa944e28817da2b1be0667e852625a369d2db190e351de094c4afb9f96f846fce2f9c5c2cf7cb9a2ae9688d1c7a3 SHA512 b20271f5aac03fd1388c7695dd62ffe860daf0807b2067cd4e340d63170c4e531e0e3a32f854e30662d04b2cebc78e3ac41636d4422c76b39d01c8a26cb0838c
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
index 4426e7855d14..889bec7371ec 100644
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
@@ -104,7 +104,11 @@ src_compile() {
 }
 
 src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
 }
 
 src_install() {
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
new file mode 100644
index 000000000000..858fde7ef4d3
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? ( dev-libs/openssl:0= )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index f33ae5fd7afa..3a2c5c1a7e1b 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,5 +1,5 @@
 DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
 DIST nsync-1.24.0.tar.gz 155132 BLAKE2B 9a914b408faf8fff96a57fd3868c34aa96b4243ef2acd30dbdbe1fc90a1818d58ffc96bc6d016f5539c0e266fc1fb633952edba0a51b115904c9d6b06a35f7f8 SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f
 EBUILD nsync-1.20.1.ebuild 586 BLAKE2B 9a0099263c78063713e26a23d31c9b33d9e9bf46011f49a9e672b9b17de7f9404a9ea0a5d135032a6b4fad05fd01282753a773214a3e25512e15ebe774026577 SHA512 32bb674b7cea9bdbce54b615aeddfb95383f06831eff4f4ae32cb76218bec43a633ecf2dc2925a17867cec9bac66698656f09454b444e76f3c03ab2be7793026
-EBUILD nsync-1.24.0.ebuild 588 BLAKE2B fa49fcfc23ee8c9239bb01ae5d17f73aa92fe7f2359f7ce7950d0469332938674ee133598913663f4b7de93baf0980d3090da8bdb02e5bc2dd811c3f913c6b39 SHA512 32870c2134775d0389b813d4ab6fea89b9493f81711bb97da865165b10a3b0fea7669ac349193124207ab4162c30362a052364f9b92988cb9173db640c4d4933
+EBUILD nsync-1.24.0.ebuild 586 BLAKE2B 9a0099263c78063713e26a23d31c9b33d9e9bf46011f49a9e672b9b17de7f9404a9ea0a5d135032a6b4fad05fd01282753a773214a3e25512e15ebe774026577 SHA512 32bb674b7cea9bdbce54b615aeddfb95383f06831eff4f4ae32cb76218bec43a633ecf2dc2925a17867cec9bac66698656f09454b444e76f3c03ab2be7793026
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/dev-libs/nsync/nsync-1.24.0.ebuild b/dev-libs/nsync/nsync-1.24.0.ebuild
index ef961974705e..f71c5b73ae19 100644
--- a/dev-libs/nsync/nsync-1.24.0.ebuild
+++ b/dev-libs/nsync/nsync-1.24.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"