gentoo resync : 07.05.2021

32 files changed, 410 insertions, 180 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 52be1c548719..32c5c523f276 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index e0f051023650..5c779c0ed005 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,5 @@
 DIST clhpp-2.0.12.tar.gz 96922 BLAKE2B ae4df7e2b65865fbaea8066d508e4058a076aace4598ca97594237541df44e5c2d20978274124cbc5d331c4983df3e0776b8afafb2204f0d96b6830999d72589 SHA512 521f0e6bd32f9bfdf764011d9e83691a574c27a9c27580601529a2665a2785ca5815407381adfa2e247547bdb79c6083d79b5d716d54e2aafa55bdd5751f1e78
+DIST clhpp-2.0.14.tar.gz 99791 BLAKE2B 4859f25359d09584bd96d63c06766ee8c8f05a09d2c79355489ab5554760511a9a500036b2988b0df85df04b591cc357f776097f91a3a9b9172ab45e8d385990 SHA512 f6b6a3c760292d0acad5eb2cb25b0d127c7615167f979c6138361376d03c66bb46735cf56716b3349f9d6691ac6557b983a767559ee5f94b163d85b90b046eb4
 EBUILD clhpp-2.0.12.ebuild 582 BLAKE2B 2c96261c0108b69e987cd7919d93d829eb5e26252cb5933debfc39e183cb353efeb22aadc6448ef57fcfb3cfafc8da894f16503696c9f557ee106d7f7f4de978 SHA512 fb82233e5cd9bbe43cdcacdf9be99d9c83fa45f5517cc7d8c9f1c6ce677446bbb22a226a7177859f0f28cb62dc69c4c7c21eb6940f9d44418ae6c06ef153d88b
+EBUILD clhpp-2.0.14.ebuild 584 BLAKE2B 4a2074580a6f558da632153a99e73efcf3063ae8f45cee20d8351a0b82cdb3062a70918fd1956dbca951cfa1d1b0193f4b6695d7e99a5f743382c8d5b1b2f984 SHA512 f846159cf9d795948042fe5d3a9e250e9786ddd7c1fd6a45bdf81180ec15c1efa2fb38df8eca8fd6e1dbc89b566dc62d90f70649f72a4ab9f9f0e8da7a7a882e
 MISC metadata.xml 332 BLAKE2B f42b8bf0c7184f9cc0d2a0164d0311c2fc75e390430119c602832bd6d791913de4669ed7583a5b1f2b67db401217a3bce9d967062e7f3ba0b27801f4ca5a9056 SHA512 d18a2df576e7732073eb8ebc40aea3e67e64a1872b10cdb2bd4bc9d53c803caf1acd7296cd0d5d4ea60867e14262fef88e87e6ba128eb35a2fe797b224fac0ef
diff --git a/dev-libs/clhpp/clhpp-2.0.14.ebuild b/dev-libs/clhpp/clhpp-2.0.14.ebuild
new file mode 100644
index 000000000000..cf474607c72b
--- /dev/null
+++ b/dev-libs/clhpp/clhpp-2.0.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/OpenCL-CLHPP-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e6071079042f..a8bfe4fa0a4e 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -18,4 +18,4 @@ AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
 EBUILD cyrus-sasl-2.1.27-r4.ebuild 8167 BLAKE2B b6b79c6487a1fecc4f85705b7b6c84450f50fb59ed3dfda98ac4c860eb736fecbf3bb166babc4a378f3876b43870e3d26f36f07f5843ee67ac7df13154fc5daf SHA512 c6313275fb70347ba826414a13564b7e64eb8fc908c3ca32317b6a0f5e8f3125169fb1c7019dc4cdf2220e04f9097b36660c035a3585fac5c19efee9b18c7fe0
-MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
+MISC metadata.xml 720 BLAKE2B 47731fefd662b4ede2aa37d2eb8ad4dc8cc58c31d2cafd4127f06276023e9f3c9379a780a9b6f064c05f3b8974cf8e389ee9c5ccf85c3d856dcf60b6eb8d5f59 SHA512 4a08ed3009ae32519bc78f4f84f8f50cd04b2ba48afde0528374b38e64f2e4d7d93f6bce97476e9871ba68d18f26f18a00002ccf22d06e8eb1bb9ea4d4dabe1b
diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index bcabb66dbd73..492dcc9bf890 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-  <flag name="authdaemond">Add Courier-IMAP authdaemond unix socket
-    support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
-    </flag>
-  <flag name="openldap">Add ldap support for saslauthd</flag>
-  <flag name="ldapdb">Enable ldapdb plugin</flag>
-  <flag name="sample">Enable sample client and server</flag>
-  <flag name="srp">Enable SRP authentication</flag>
-  <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="authdaemond">
+			Add Courier-IMAP authdaemond unix socket
+			support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
+		</flag>
+		<flag name="openldap">Add ldap support for saslauthd</flag>
+		<flag name="ldapdb">Enable ldapdb plugin</flag>
+		<flag name="sample">Enable sample client and server</flag>
+		<flag name="srp">Enable SRP authentication</flag>
+		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 350d93d16e30..8e5bcd4897cb 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,9 @@
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 DIST gjs-1.66.2.tar.xz 440184 BLAKE2B 8df23470c763d65733c6fb622a1de8b8fed3e16c1ba67883b6ae0e7150a5a30a334735be39f9c68217501b7674fee8bfce6ab704c0742ae639a1bc14cdce4cd8 SHA512 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
 DIST gjs-1.68.0.tar.xz 553044 BLAKE2B 6103299bb9ec67589393b0a863219b1bb08ebf141229574f07bb4984a2fb226f4daf4324038e9143f98048d0a2997805b93f7f408bae5ef727435c787e3b98f0 SHA512 65278ca345f2c786995bed7755dd86403b469eb6cceaa6db57dbd4af212025a3b1f01b7387f45dc9abc23d47ba2f39c5ab8a90ec95b1934f1471a68a06f0d82d
+DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
 EBUILD gjs-1.66.2.ebuild 1109 BLAKE2B ed052e7b9398fefedf71ee2cacff2e00702f1e6c7444ea37a218bf047c07f91d8c52002f12cbab4c2a322bf85eece5377686ec44273e6bb59eeae4de093172fa SHA512 b7418593774f5712eaef63a66beb01a15cab894b535b8ee91596dbf6b10351b5b23fb52175977ad641c11949320bff14d0fbd9439889de3b955e23c9160d33ff
 EBUILD gjs-1.68.0.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
+EBUILD gjs-1.68.1.ebuild 1118 BLAKE2B 78679339767d36002659ab6ace56b9764bd656941d3ef4634114a680d07f84a38f69f82b70b3cc70b97949cbb95000fadfcc7c73675c066f40e309e6a6a7ade6 SHA512 c02d12781c718e98512f535c6bd87676994cd6852ccb4e1ac8bb9311297f61f65e72acc2b08c5580e1464a53e509615b2e80448b44db91ea0aa0a76d1bed697a
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.68.1.ebuild b/dev-libs/gjs/gjs-1.68.1.ebuild
new file mode 100644
index 000000000000..69f56003cd50
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.68.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.66.1:=
+	dev-lang/spidermonkey:78
+	cairo? ( x11-libs/cairo[X,svg] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	test? ( sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/go-usb/Manifest b/dev-libs/go-usb/Manifest
deleted file mode 100644
index 25a03afdb643..000000000000
--- a/dev-libs/go-usb/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD go-usb-9999.ebuild 545 BLAKE2B bfc1e00d0a4f9d6b5d950fe4551bb639e47745d798626e36bd65e3f0d01ddeb87795a77fa4466f8546c9f7e089425d6dd8aa75ce89dbf6e736e5536fa716ca05 SHA512 3f525110b6a6657fd0559442725270323c21d27ba9c410c45c0fb4c39d4dd93407fd4a22c47410b02676e698cfd50fe0d54674ee9960438f49f201ca9ae1119d
-MISC metadata.xml 332 BLAKE2B 5015b049d96897d2a7969096f0ed50a6606139d982a16ab849d0a908576f4c5bd2f2c17b7fd1c26f5ba4161a9140e9126c531974d57c2cf899e44736253ff4df SHA512 72d224af53ac4c93a252eae5a518d76abf05052e9a268ee007cc7e03f96ec5e673b6c7e83e4de15ea9f6e1a2222f7fe687fd10834b45edb7e638d75f61bb9cb9
diff --git a/dev-libs/go-usb/go-usb-9999.ebuild b/dev-libs/go-usb/go-usb-9999.ebuild
deleted file mode 100644
index 1cc0b177b86e..000000000000
--- a/dev-libs/go-usb/go-usb-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3
-
-DESCRIPTION="CGO bindings for libusb"
-HOMEPAGE="https://github.com/hanwen/usb"
-EGIT_REPO_URI="https://github.com/hanwen/usb.git"
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND=">=dev-lang/go-1.4"
-
-# Tests require a connected mtp device
-RESTRICT="test"
-
-GO_PN="/usr/lib/go/src/github.com/hanwen/usb"
-
-src_test() {
-	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN} || die
-}
-
-src_install() {
-	insinto "${GO_PN}"
-	doins *.go LICENSE
-}
diff --git a/dev-libs/go-usb/metadata.xml b/dev-libs/go-usb/metadata.xml
deleted file mode 100644
index ac4b8fcb74df..000000000000
--- a/dev-libs/go-usb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hanwen/usb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
new file mode 100644
index 000000000000..df9be449f7ff
--- /dev/null
+++ b/dev-libs/imath/Manifest
@@ -0,0 +1,3 @@
+DIST imath-3.0.1.tar.gz 527715 BLAKE2B 45d8f6524fd2505bdb3318f571c44228c9baf6df869d194d4b90a9c045f1dbb8f905253aeaf6b6a9254e4b0c0c19d753b7e4ae068732f0367fc936d4a111520d SHA512 40cdae81d624636b3dd7eb456e6e205e5b7adf7aed17f6e9168374f8830f1b5755dcd32ac790f94e768513d06ab96d94a2bc57ec80a079e4ac94a3857e5e3988
+EBUILD imath-3.0.1.ebuild 1995 BLAKE2B a892bd2b5876b373e2f75e073ba2b459d9376b43072242e13eb95901da47028c964dd28d1711631b7b83d788021b571584cf6f722e5807932b58bef0e4900d49 SHA512 b6dd8b75e5c39b0f6641c51d117a0b2e5dba2b7e6446f0eeab23a8796203ac0d88198da377042cad88ec3a821942e10f21ce57c2562daf75a3ba37ee507283eb
+MISC metadata.xml 819 BLAKE2B 20d1b4527861c2c01c4e6b9f413f539b6119934932ec3c8d1a7a272f52a9579832f230279de518fee775e104c6f2f149479b6dc774567e28b612676b0ce6f399 SHA512 06d1832ce88a1a1c83ddd09687a242fb109c43e3d38d4d3d8cd236308d11a649a9f060c7fd7af7c69a209b560cf1e541e18212ce62309357186183d749304031
diff --git a/dev-libs/imath/imath-3.0.1.ebuild b/dev-libs/imath/imath-3.0.1.ebuild
new file mode 100644
index 000000000000..5fce7b3bf25b
--- /dev/null
+++ b/dev-libs/imath/imath-3.0.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake python-single-r1
+
+MY_PN=Imath
+
+DESCRIPTION="Imath basic math package"
+HOMEPAGE="https://imath.readthedocs.io"
+SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+# re-keywording needed for (according to ilmbase keywords):
+# ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x64-macos ~x86-solaris
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0/27"
+IUSE="doc large-stack python static-libs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# libImath.so conflicts with ilmbase
+RDEPEND="
+	!media-libs/ilmbase
+	sys-libs/zlib
+	python? (
+		!dev-python/pyilmbase
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python?,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_MULTI_USEDEP}]') )
+	python? ( ${PYTHON_DEPS} )
+"
+
+DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md docs/PortingGuide2-3.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
+		-DIMATH_INSTALL_PKG_CONFIG=ON
+		-DIMATH_USE_CLANG_TIDY=OFF
+	)
+
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+			-DPython3_INCLUDE_DIR=$(python_get_includedir)
+			-DPython3_LIBRARY=$(python_get_library_path)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		pushd "${S}"/docs 2>/dev/null || die
+		doxygen || die
+		emake html
+		popd 2>/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		HTML_DOCS=( "${S}/docs/_build/html/." )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/imath/metadata.xml b/dev-libs/imath/metadata.xml
new file mode 100644
index 000000000000..e33071a52354
--- /dev/null
+++ b/dev-libs/imath/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>waebbl-gentoo@posteo.net</email>
+		<name>Bernd Waibel</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<description>Gentoo Proxy Maintainers</description>
+	</maintainer>
+	<longdescription>
+	Basic, light-weight C++ library for efficient representation of 2D
+	and 3D vectors and matrices and data type common to computer graphics
+	applications.
+	</longdescription>
+	<use>
+		<flag name="large-stack">
+			Enables code to take advantage of large stack support
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">AcademySoftwareFoundation/Imath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 991c46941ace..548bf924c77a 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -3,6 +3,6 @@ AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e
 DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
 DIST libixion-0.16.1.tar.xz 482500 BLAKE2B 26075c819a952f48c4e136fa28b4ef5075b455dea52d51940e4fc55344e19e404d70b44222631d0b0f85280d09bb8a05955bfcbe0a228b97d72d8f00f1639248 SHA512 979c631e9536f6d2c3ae32f7892756ac8889d27c551d80eb9d519bf912bd323da4b6ecd363fe2719e74e04bc3661e5d56e03a582f68f5293ffcac59b74f4c7de
 EBUILD libixion-0.15.0.ebuild 1197 BLAKE2B 4e29a88f44a9d75b451213de6cd404675aa105cb3b838f06a604d4aae7cb935cfb464fd07e8f8c602d5224731274db509ea0fde95dbb0b51c9e6aaa39fe196e4 SHA512 7dffca8b8d82fc84b6888ffce3d3ef43c8307fe7148fd15b2ecceb1b661cd927fade9daf97fccedecdac15089b527ab6b3e2e6a6c5f645e3e4b2363c4dc32d91
-EBUILD libixion-0.16.1.ebuild 1239 BLAKE2B bf99e7b45b3e46abab4c99ce2a020067c5c58388c92aa887fe276e018eea59e4805aa46d85690dfb8e9c3e1680160919b18e2c1e26784c45b0508f1d25d5e14b SHA512 d10a3ccdabab34d7c4ffc6bb91ee10b67bd0623b87e636dce743e097bed28ef66c56810ca0748225203a79bc395a1f43a887116c3d681f283820dd7af7a8709b
+EBUILD libixion-0.16.1.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 EBUILD libixion-9999.ebuild 1210 BLAKE2B cc83586b6659d27d5c7113a7cd9af8c5f1670292596a013b8b8fcc880f3b54d2a9b6794f8e2697aab4fc5e10de1d3d009b125e3901157b195b17658538ed93c4 SHA512 7c6d6f088790607f6a1fc9582f7b94f9cdc09360e9666556db87cdd650285bb3e13ca1de4d9d6543a8eae6aefd1c7988fcff2974b338689337b0460008ad08d8
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index ab01ba54382e..96e5b7ce6f18 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" # no ~x86 to avoid blocked update
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 10e11e690b4e..56e4ac319753 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -3,6 +3,6 @@ AUX liborcus-0.15.4-gcc11.patch 1874 BLAKE2B b01e145fc9204e1504e34959c0c1c97101e
 DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
 DIST liborcus-0.16.1.tar.xz 1805436 BLAKE2B 7df89da5a175daa6fcf759d28f8a0eaebf3db6405af3b06a01b8dad41c7706acedc74876a0b68ff9cabd5780bb7cb311cd7c98390c9ecd265e62513eadde81eb SHA512 6d75591820af65181dd3a418f051a359695083f29c7d9c77edbcab3e89d9ea367824be0b19f27a31267525f446936145f5780a0ce3c6ee2d89823742837d4739
 EBUILD liborcus-0.15.4.ebuild 1330 BLAKE2B 1418857b75f7c98f4160430afca5fcfcc05540a01b1c9191e71701c8900f2937a6bc2632697778af6364b3995fb487b9307a376420b5f62a1572a62673abcffa SHA512 a1f0505fabb9d35f33d620f31add9c96ebdaeaee8fbecd20b1537c2e0a72cc1b1accba1171ba2b0c2cd6cca7de66a5be2dfe90b8b19a79221b74beee8e915a82
-EBUILD liborcus-0.16.1.ebuild 1392 BLAKE2B 22154af60194fac2b9f9ff50bf99bf29c86eb2bac68d4bc616ddbd43315c9e7477167f07585216166fb58667b2e11020e851f17f3f52bbbdc7850da1fae2b85a SHA512 37cbdef0e744cca3ce992c428a9f3e2b4a846efbf853bb6a283815c68cf40f62ceb9485450e8f2a3549479e8b26441a7d415c8a8c3a892e1bddc1f1ee298cbfa
+EBUILD liborcus-0.16.1.ebuild 1363 BLAKE2B 84ce1bb3d8e91578ac6a5658a1cf728097f09f85d59153de6bca210ccdd09aaa439eb122783f67ba9f3a0f675307a119827d78da1a7c7177b09a1938951cdbce SHA512 a324b201f1553a649c00a379cd4c5e851f2c3d688efbeb3e208608a7015d3961176c53a0dadf72c982290bdbce0090ce04551233f9a29eaf20f1ccfc160c14dd
 EBUILD liborcus-9999.ebuild 1298 BLAKE2B d36fecea100888f02258506873c9590989d7d8abadb2e03e97b0c80d1d3643fd462f13a7af52ca889c9ea91d44a8eed9b5764887f8a2c0b0d4fd78995b9e28cd SHA512 d7c070b9f43558abda76cd5602a0176ca4713abce69b458243edd089a114bef05ec189fa61384a158406427368463f5618f256d65c7177b04d59051a6ab954d0
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.16.1.ebuild b/dev-libs/liborcus/liborcus-0.16.1.ebuild
index e26df784f7e4..5d24f93374c8 100644
--- a/dev-libs/liborcus/liborcus-0.16.1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.16.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	MDDS_SLOT="1/1.5"
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" # no ~x86 to avoid blocked update
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index f270a1548baf..558dd38b4f22 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -1,9 +1,5 @@
 DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
-DIST libunibreak-4.1.tar.gz 642497 BLAKE2B 79a09cc19e72bcf98605f3c49649c2d0753774825e737e0682ff4b67d4908be748b81b6ba79827ccc2032b7c5284fc2dd932d61d6775cae841888d6ee4a77b70 SHA512 f02a94b1c1757c0321f112ef9b44a17fc9f73c9ec6041f263bb55fe8ec44e5599c6061c4e1f6f92ca9069b282e5a8e40d90dcceaf04b6e2ed6ae948f104e1ce2
-DIST libunibreak-4.2-1.tar.gz 643399 BLAKE2B 620e904113730078a8e74a09594b9e18c63768a926df433b4a251767fd492ae11c0954e97a4d94db577956a621f075bc6743535bdc67f9c5151243f304b33bf4 SHA512 26bbff1203dde9ffdc2b9046727ab7698f5693c1eb898c819ee83d0c97fbfd32b9dc7c4406dea29fff6642b2678fee74a1307aa5c9c3279f65484eb080ae1e2d
 DIST libunibreak-4.3.tar.gz 639886 BLAKE2B ec044b659f1a837b4e6627067b96a6f19ee8302602d635e1e32aab9533486b5cd063aa99114c6443ede9d76d3f382d7492eac8b52b84a4baa2ccd9c2129e79d8 SHA512 4b53fd169912033403b6ca09047b7b928211fab3607ef26070ab731054138b9a291f7d138d3a479f9cde8edb0fabf8da114da68aee32e60cddf45cc3baae1170
 EBUILD libunibreak-4.0.ebuild 1271 BLAKE2B c5f7d7a51ea9c2b7ff881ba8fcd0381f6f35671d6758ab17486d0311cd29d686fbb78ccc23190aa3952fb84fc45c6a4646cc8dce57670df40eeb7967a1c23000 SHA512 d47e18f51abc0f7497dfc97ed4cc81a3ef9b33c106687cc94d4954fb3987089cb37a0958d79ccc239b8fcaead0cfb32ccdf42b299ec292b532f09c1dd6438c66
-EBUILD libunibreak-4.1.ebuild 1230 BLAKE2B 20da26006ff9d4aabd415c0be02fdac518647421d40a7d8b5cc3e23e536d4c0326106cf8fff84d45060b17548825f31d05469362dae29bc133d6ce95cf657368 SHA512 e73b879b0b7792fdf74efa2155bdd59f1dc0402f8c015f47fca55a8e8635fe0e13d968c8e564418259732abcb82b9b1b5486a827eaeeb3e07af0128273bb488f
-EBUILD libunibreak-4.2.ebuild 1234 BLAKE2B 510ae17cef0028a398174b3a905bd30a2658cf431aaac7d0d4fac001750613c1f9afbf52d3b7de5baa487fe60b4bc87274689e50f5171e23ae36de99eb81c1b0 SHA512 05662c0d806159fc8d04f338d56ec6927c13926d518e3784c74e3d02dac13a2ba9a7bf4eb5f3cc407ed2b1a207cecb824fe5d69d86a3b3e5f2632187454bce21
-EBUILD libunibreak-4.3.ebuild 1197 BLAKE2B b2acb5779e56d5cfa2b343b3dc44b02bc655d825a5e4f65a4f52e354b069374ecf53067944f19f8d2e505abf004819fed97d30877893070542b063806a4ba891 SHA512 8f41bb2001e031b33ca9299abde2598bea6600b20fc6b6015b9adcb08d0940d7a15ed83c26cf995511a87e7723be4a36ffd5ec980d69bcbcb90e08d4bb28dc9d
+EBUILD libunibreak-4.3.ebuild 1195 BLAKE2B 5bf75bc9bcff1632f31c92b6b1f4d7ed8723c75a8406f37517b33e83e245668b96cc0cbe301107d5c5894dc28d1e73e7e5af4c66eaf99fb4e5742c739fc160a2 SHA512 7f859b573847358cfa86d142d209fe8311e978698c88232698b0612d431d9dbb25d48cbfd8f88fc4b3076c30ae3ef4dec589adb379c59cad12008ba6e10ddfe2
 MISC metadata.xml 555 BLAKE2B eb162dde2c8d6c9d3e5098ab2c7c983c5907345de68e067a09b820f1b430980502bad3c0271b59b0a971556bb7212868471b6d31c7aefc8d75d0b569b6de64e1 SHA512 44d76eef672e931f6d5b76d667af5f667cda9f8d15cad07ab7ac97fb785a34b7af21ba735ef692571e8a1364aab3b98dde787566f7db3eb2b4442924ebebe8d8
diff --git a/dev-libs/libunibreak/libunibreak-4.1.ebuild b/dev-libs/libunibreak/libunibreak-4.1.ebuild
deleted file mode 100644
index ad178e53f0e2..000000000000
--- a/dev-libs/libunibreak/libunibreak-4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Line and word breaking library"
-HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
-SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(ver_rs 1- '_')/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc +man static-libs"
-
-# Tests require internet access to www.unicode.org
-RESTRICT="test"
-
-BDEPEND="man? ( app-doc/doxygen )"
-RDEPEND="!dev-libs/liblinebreak"
-
-src_prepare() {
-	if use man; then
-		echo 'GENERATE_MAN=YES' >> Doxyfile || die
-		echo 'GENERATE_HTML=NO' >> Doxyfile || die
-	fi
-	default
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use man; then
-		doxygen || die 'doxygen failed'
-		pushd "${S}"/doc/man > /dev/null
-		mv man3 x || die
-		mkdir man3 || die
-		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
-			mv x/${h}.h.3 man3/ || die "man ${h} not found"
-		done
-		rm -rf x || die
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use man; then
-		doman doc/man/man3/*.3
-	fi
-}
diff --git a/dev-libs/libunibreak/libunibreak-4.2.ebuild b/dev-libs/libunibreak/libunibreak-4.2.ebuild
deleted file mode 100644
index 96cc401c5b2d..000000000000
--- a/dev-libs/libunibreak/libunibreak-4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Line and word breaking library"
-HOMEPAGE="http://vimgadgets.sourceforge.net/libunibreak/"
-SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(ver_rs 1- '_')-1/${P}-1.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc +man static-libs"
-
-# Tests require internet access to www.unicode.org
-RESTRICT="test"
-
-BDEPEND="man? ( app-doc/doxygen )"
-RDEPEND="!dev-libs/liblinebreak"
-
-src_prepare() {
-	if use man; then
-		echo 'GENERATE_MAN=YES' >> Doxyfile || die
-		echo 'GENERATE_HTML=NO' >> Doxyfile || die
-	fi
-	default
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	if use man; then
-		doxygen || die 'doxygen failed'
-		pushd "${S}"/doc/man > /dev/null
-		mv man3 x || die
-		mkdir man3 || die
-		for h in graphemebreak linebreak linebreakdef unibreakbase unibreakdef wordbreak; do
-			mv x/${h}.h.3 man3/ || die "man ${h} not found"
-		done
-		rm -rf x || die
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	find "${D}" -name '*.la' -delete || die
-	if use man; then
-		doman doc/man/man3/*.3
-	fi
-}
diff --git a/dev-libs/libunibreak/libunibreak-4.3.ebuild b/dev-libs/libunibreak/libunibreak-4.3.ebuild
index f4466edceb68..ddc86f6688d2 100644
--- a/dev-libs/libunibreak/libunibreak-4.3.ebuild
+++ b/dev-libs/libunibreak/libunibreak-4.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/adah1972/${PN}/releases/download/${PN}_$(ver_rs 1- '
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="doc +man static-libs"
 
 # Tests require internet access to www.unicode.org
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 87ce8b9a91c0..eda0f6351969 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,5 @@
 DIST opencl-icd-loader-2020.06.16.tar.gz 60478 BLAKE2B e80bb051868842356a22141dc624a93a9e473673dc5b78e01d54b76c309c1deea256ae1fdf1e1777ea8842ffc33d3b92ab8b6fbe64454cbbf2ea0306523f0bfd SHA512 3cba77a0334976e27aeb60f3f29919b7b8e70ed1ea1d53e278a2873149a6b291323b19292e7a51a1decb27b304395ced22d400c1f750088f8a006c21d42fe94c
+DIST opencl-icd-loader-2021.04.29.tar.gz 81650 BLAKE2B 399aa3cf3b3fd5fa5bef94302face8630f7b3485c01000960687f77c823311a28f9f867f929c4c03ec873b724ae02e1ecbbe974fe3ddddf4334064609cb61b51 SHA512 4b57a168fe75cced8162e173bc1f5d32fd11285a0443478f938ace1b88f6422007d05ab6bfb272a28838129122ffcd98d33634a55e82b9df84be0b6d4e609178
 EBUILD opencl-icd-loader-2020.06.16.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
+EBUILD opencl-icd-loader-2021.04.29.ebuild 902 BLAKE2B 3b7b796b20d0b6b72e61e3d70ce54c37dc7310279de952cd775fbc7aad1c7183fc62101a9fb4ccba203845cb61341a010ef375043ee716e24234150978888e26 SHA512 d398f787b041735c93eba3d62ed5fdd04ef1fff4062dec8b20fa5156d43f0388dc3d444822a548a4940af8a6f152cd8f0a718899ff9e4160c84b55c5449d32d4
 MISC metadata.xml 340 BLAKE2B ade1ca3014eb1b6b36aa11078944e4b13ecdc02ee889751c1c69bf85d320a75dc70c5f74bd24aa69ed4822f966ad218f4742c3249e2b2aa2f51f21ab9cf07064 SHA512 599a65843a54b48228a37ee4e8219e5b128bdf2e6f998fd397292e0aa6466a5b0b1ce3977c1aa8ce9341778975cace7ffb890ba66a2c1c7ac44934ce9891e906
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
new file mode 100644
index 000000000000..bf54d78a8604
--- /dev/null
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.04.29.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+MY_PN="OpenCL-ICD-Loader"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Official Khronos OpenCL ICD Loader"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-ICD-Loader"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-util/opencl-headers-2021.04.29
+	!dev-libs/ocl-icd"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DOPENCL_ICD_LOADER_HEADERS_DIR="${EPREFIX}/usr/include"
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	OCL_ICD_FILENAMES="${BUILD_DIR}/test/driver_stub/libOpenCLDriverStub.so" \
+	cmake_src_test
+}
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index d2222ab6d4a0..64afe3b7e273 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,5 +1,7 @@
+AUX openct-0.6.20-automake.patch 786 BLAKE2B f37d39bdbc0c1db10ec7058536d0d34ac3009e7ac2081f36ae9cea3f17f2d0558d50e2062fe60fb808df710887b290683374ada1c9301cb91480d67484008186 SHA512 baf7fae52aea4dae53ed1f3364eab207aeaa3cd2aad28b44dbf05f5632fa27530436a03748c285ed325360b6b62821c685cd0e05713db2f95a3177ba1b5749be
+AUX openct-0.6.20-slibtool.patch 1353 BLAKE2B b8a5747258cb7d5ac8bacda87c9eaf2f177e202490c162594aec6559f13c65e562b887e6c8d056c1ce5ab247e80c51ca6610654e61b2c593e7b13e22e458b43a SHA512 34ab2345b44424d9868c95a9af862d03603647b824e1d84a1f35a8171249b2beba7fae9ae3a4d0468d9029cf6c748c02fb2032e30462640eb42ff08d3cdd3868
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1734 BLAKE2B e9e193badd4a5236e18f6adb5ea278edcc7f3458000eca74191310fcbf9cd58dcc18bcd25533f5a0ef848a6545514572ca8c5425b368dcc7b10d689b65cd7fec SHA512 42ab456144313113ee22de1b6e643624f9f8c1a2057feedbf49021cd68e381818ab9e01a8650a9c6612b173b687d69d5cd612515209a3e44a88a7c4db264e51c
-EBUILD openct-0.6.20-r5.ebuild 1725 BLAKE2B a014f0a6706343c5b4b77baf23d1731533029cbd2a07e1ab289a07c95c6d7113df964bbe010e156dce36564c9af34770cfa01e7fa914fce38a4674787e08c575 SHA512 3259da10043b859c7f46f56b869b5c4408abcf2ee305b131a243b703bfbe56fd7f0d50dfdf129b49c68ce07a23ea1e09247369c16b2b14839c98226d768abd26
+EBUILD openct-0.6.20-r4.ebuild 1868 BLAKE2B ebbf993782fcd0d9e1d8d355a7896a85e26660e516c856c33677db34424f28a737f8d30ddbbf3ff292c16cb404247d02d6dd8b3f3d54140e1ba565d4c0fea6cb SHA512 1680b4bcf2ab446a6998af48a5a3abff32860620784403ec240e1962a2fee5163e810e67de601439720ea613f9de5433c007338a6923ee3a2889b440db240dba
+EBUILD openct-0.6.20-r5.ebuild 1859 BLAKE2B 87fee515cdcc320f0e10fbf1b071af52f8dd72e8547670b689a52fe6abcf82a0213c77977c0a4b4d6a0e0f52629a9b7b8a783d5935cb31bff7cfff3575e4f47a SHA512 a26d692b9d2da8ccea128beae188590fe245f8239e9059fad47da1a15a54568aa76c9d0d8852e99dc4866da0cfe470f5062b26661f130edd1deabf3fc26e4480
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/files/openct-0.6.20-automake.patch b/dev-libs/openct/files/openct-0.6.20-automake.patch
new file mode 100644
index 000000000000..451af6a8a50e
--- /dev/null
+++ b/dev-libs/openct/files/openct-0.6.20-automake.patch
@@ -0,0 +1,24 @@
+From 86abf3cbddbdc590dbb2ff5b0bda263e42595b88 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Wed, 10 Oct 2012 08:48:02 +0000
+Subject: [PATCH] build: fix issue with latest automake
+
+---
+ etc/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index ff66d4e..dc00f47 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -30,8 +30,8 @@ dist_noinst_DATA += openct.usermap
+ endif
+ 
+ 
+-sysconf_DATA=#required in order to create dir
+-install-exec-hook:	install-sysconfDATA openct.conf
++install-exec-hook:	openct.conf
++	$(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+ 	if [ -f "$(DESTDIR)$(sysconfdir)/openct.conf" ]; then \
+ 		$(INSTALL_DATA) openct.conf "$(DESTDIR)$(sysconfdir)/openct.conf.new"; \
+ 	else \
diff --git a/dev-libs/openct/files/openct-0.6.20-slibtool.patch b/dev-libs/openct/files/openct-0.6.20-slibtool.patch
new file mode 100644
index 000000000000..0c0af2e1bd94
--- /dev/null
+++ b/dev-libs/openct/files/openct-0.6.20-slibtool.patch
@@ -0,0 +1,34 @@
+From f329c2663bde748d4a8fc462a1ea7bbc4ab47b36 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 27 Sep 2013 23:27:24 +0300
+Subject: [PATCH] build: use newer libtool -shared option
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/ctapi/Makefile.am | 2 +-
+ src/pcsc/Makefile.am  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ctapi/Makefile.am b/src/ctapi/Makefile.am
+index 25627a3..c837820 100644
+--- a/src/ctapi/Makefile.am
++++ b/src/ctapi/Makefile.am
+@@ -8,4 +8,4 @@ libopenctapi_la_LIBADD = $(top_builddir)/src/ct/libopenct.la
+ libopenctapi_la_CFLAGS = $(AM_CFLAGS) \
+ 	-I$(top_srcdir)/src/include \
+ 	-I$(top_builddir)/src/include
+-libopenctapi_la_LDFLAGS = -avoid-version -no-undefined --module
++libopenctapi_la_LDFLAGS = -avoid-version -no-undefined -module -shared
+diff --git a/src/pcsc/Makefile.am b/src/pcsc/Makefile.am
+index 9986621..6aff8b8 100644
+--- a/src/pcsc/Makefile.am
++++ b/src/pcsc/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = openct-ifd.la
+ endif
+ 
+ openct_ifd_la_SOURCES = pcsc.c
+-openct_ifd_la_LDFLAGS = -module -avoid-version -no-undefined
++openct_ifd_la_LDFLAGS = -module -shared -avoid-version -no-undefined
+ openct_ifd_la_LIBADD = $(PCSC_LIBS) $(top_builddir)/src/ctapi/libopenctapi.la
+ openct_ifd_la_CFLAGS = $(AM_CFLAGS) \
+ 	-I$(top_srcdir)/src/include \
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index 7c44328e3709..f73005a37633 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic udev user
+inherit autotools flag-o-matic udev user
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
@@ -21,11 +21,21 @@ RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= )
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 pkg_setup() {
 	enewgroup openct
 	enewuser openctd
 }
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH
 
diff --git a/dev-libs/openct/openct-0.6.20-r5.ebuild b/dev-libs/openct/openct-0.6.20-r5.ebuild
index 12d4c000e8c6..6183a18acb12 100644
--- a/dev-libs/openct/openct-0.6.20-r5.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic udev
+inherit autotools flag-o-matic udev
 
 DESCRIPTION="library for accessing smart card terminals"
 HOMEPAGE="https://github.com/OpenSC/openct/wiki"
@@ -27,6 +27,16 @@ RDEPEND="
 "
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8380a5c9a67b..718641549435 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -28,6 +28,6 @@ EBUILD protobuf-3.15.4.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e59
 EBUILD protobuf-3.15.5.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.6.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
 EBUILD protobuf-3.15.7.ebuild 3183 BLAKE2B eda37f6af263ec0696e3c586cd3d94c1c2e5973d5ad2f2f7d5a1104c89f67dec76d42181045aa697a0d292a806ca781f77133b2e50e1b66dc31b18d4581f61f1 SHA512 1f55909e3b7025be75d81611459fbb701890a0514f6461e0436ae4cc105a74a6463d4fd173fc493937cc5f4902289691e70fb92a72e3adbabc59f6bfd75b8467
-EBUILD protobuf-3.15.8.ebuild 3182 BLAKE2B e9ab98472c43d55d4b6d42ecaa6aaed4e597c5b4140d9a7fd3b2160e283bd51e97f217e1ae1689c64b590b9a2a4f53f9faa497ce8cf01a10a7c239dd7a15febd SHA512 26f3bfedfe69f2470c1556cfdbedbcfc68da1c4c82ccbf81b1524bb67c03a28cf45bdd67c2d9c430562b36bd7b9221a1feb3f293d3c70105ed33904f73253d34
+EBUILD protobuf-3.15.8.ebuild 3181 BLAKE2B 6f0823f268356f55eeaffca71594104aa53d3f7f612744a4359cf227274005466bbf268166184ae0e58faa3bc5b90a3d2a3813c5887a66d9c595a7e412a09a2b SHA512 27b97bd974e55091ac08e06d8c7148f748e31295323e587c28aa52095f64f795bd53b0805f7c614c72717bd096d2f509a4dbdb410acdbafe14f539035ef0b0fa
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 6aade3fdee471f2548e673b72a1b2113bb3ecc484f03fc39fd73263f3dc117510bbf96733a4d0d8626a9622c4878c50bd3dbc8cf48d61e7f3c51b84f3f40eba4 SHA512 36c081fd688a7386f70d1e99b448fccee19d7fb99e7443f67e58511bad9221d85fea9c449ca17c7ed38ee047f9b3b24046dbf251e414ccf38497f9f46ce49402
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/protobuf-3.15.8.ebuild b/dev-libs/protobuf/protobuf-3.15.8.ebuild
index a17f6680b6a8..a761c4f71215 100644
--- a/dev-libs/protobuf/protobuf-3.15.8.ebuild
+++ b/dev-libs/protobuf/protobuf-3.15.8.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/26"
-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/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 579459cdd0f7..c918e1c2d3cb 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,8 @@
 AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08c26cb964a727876a1bc7a1b9e63f92056a0213d315a0accc94bb582d9224fcbe10ef0c95528f70f29d6d69a34fa5e342d SHA512 a1857ad89b0d4d20d92deda23112abac814b312525a662af85edc44150c78e58fe54142d0cc92857e01a14719e698a810585df350ea4844544328eb7848b4680
 DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
 DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
+DIST xmlsec1-1.2.32.tar.gz 1989258 BLAKE2B a1325f682efec42dbcdb066d3c242fb435daa721349905564b05829153e5337b772fbf6b996f4d249d669d76fa584055f8bec1630c4936c27fd330cda439522d SHA512 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
 EBUILD xmlsec-1.2.30.ebuild 1339 BLAKE2B 35fc887e954129bdeafd206a7bab29a04dce23b7d27b29b92bf0908f16a0393cf806423a932a8e0c4676d1b35c0f0d8ff3040cecbafb31aa4754dcbfdab517e2 SHA512 8f8680ef311ab24b814de101aeab5805f5b1da155bf799a0052334e516d301d22bbd2d33e51044902dee1f53a2dbdee840b6d6ac4e68315cef7a7c4fd68d0f82
 EBUILD xmlsec-1.2.31.ebuild 1391 BLAKE2B 1b0ae701f069e4826f2fa16244d286a39b97ad9b8a8a46025e19d6293acf99025779da6007d6e002f634f63dbbf399c92cff223cdf07f1c62e995cf5ed235d17 SHA512 2e61ab618f7c2fa7e8aa04c60af61d9728096b39dcdca288d1f2bace8108f5aa66e7b4e46204ac7ff0ffd78bd255606203c45f29ee6d80f9a7f3d6839c117176
+EBUILD xmlsec-1.2.32.ebuild 1344 BLAKE2B c2fd02ace7be596f7f836b20ab1e12c91396dbb5ff8a146ae99dc8e65ba4587ba2051051a8719a987ca633d54bde5500a7962042e5616e2b60313656409af44c SHA512 dcf6c13a8f83d9222bac78406f92e11cdbefe9e225d10368a214706058abdd4c3bd626642588b554b3daf39a9234971ff7c3d0cac4fe6845a24d23c45c4d9c61
 MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/xmlsec-1.2.32.ebuild b/dev-libs/xmlsec/xmlsec-1.2.32.ebuild
new file mode 100644
index 000000000000..d6a154c62367
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.32.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls nss +openssl static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+	>=dev-libs/libxslt-1.0.20:=
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
+	nss? (
+		>=dev-libs/nspr-4.4.1:=
+		>=dev-libs/nss-3.9:=
+	)
+	openssl? (
+		dev-libs/openssl:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)"
+
+src_configure() {
+	# Bash because of bug #721128
+	CONFIG_SHELL=${BASH} econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
+}
+
+src_test() {
+	SHELL=${BASH} emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}