gentoo auto-resync : 26:07:2022 - 08:58:19

16 files changed, 13 insertions, 296 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 41c2840cc050..f98c15fdfad0 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 3639e09dee71..66f6f56f1aa6 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,7 +1,4 @@
-DIST Botan-2.19.1.tar.xz 6088380 BLAKE2B 7a2d50bb66ea4a1875857bea769bcc30f397170a10a70377c3963d92e33321a079271c1e235a7892e33ec5b1bc19e4df8336b2586548ccd849f52ebfa47d9c8f SHA512 e604be0e7e82da89e3e1949d3035a87dc63314bd9854d5fe5129ccb3ed5bc78edb0406c7f8ad1a152b59a63b6d98ba207a0851a08428c3452cce794614b5eef5
-DIST Botan-2.19.1.tar.xz.asc 488 BLAKE2B 36f27e294fed60ea4d9ee9d919a58fc431a1bf9bdec8c12d30f2cba537a70b0e22f6a7c882cf7a80dc10aeee256f9f4a32129b55d2ab5df192d16759638feaa4 SHA512 2cd57bf97630d8f79cc0a87da79d3b338bd3b33b02ded16f6b60d5fd6cb3ea62105f577deb3b8d061f56a09ff902ff553ea3a0c603d5c3bd53a905024a2f457b
 DIST Botan-2.19.2.tar.xz 6063336 BLAKE2B a46fa49c61846e718197ab3a8431a5bdcab0f4cc5e42aec04fd22932ecdbfa2b755cae53c125eee8248ecae237671ec6f0533f99289068ed81e6cd34886d8b88 SHA512 52b9c80a240457e46a299480338472f7d0c0b56df7b1709fdef52c5be3afca5b474fe143801c9a332ae884eaf033e60461c9d3e0b2f7b069f4fe8b4c45932abf
 DIST Botan-2.19.2.tar.xz.asc 488 BLAKE2B 94d22dff9de02871560649b1d961f4c7ae5fa37a847141554f8da9f0a726d4497cd23e0d84197beb4d176f29aa3a478118d94cd52d2c04733d115828f85d400d SHA512 e25a03ac437a08737ecde541ead4b841ccb507d3198683a1755dab1d4f82e9ce0278473db7c7041a4b808f9dff9927106e30bbad79b1674615254ee78f0b6a06
-EBUILD botan-2.19.1.ebuild 4145 BLAKE2B c9f3428f8b5c3b163f5de138b5b72b2300b7d05f1e1ce321b2086676e872a9cda5470e117a57c0ff0c8ccd964fcc1bf3caa851856c656076713cc0736745aeb5 SHA512 aa89b9cab9813fd21f7c504725ff32fbad660441e373ca73f7329ac67fceacada5b228393146be151d409af8415e03155bfd74e7fca32e11c7f5e161147a2886
 EBUILD botan-2.19.2.ebuild 4386 BLAKE2B f98ec10d9f5f564ee5c7bc41c6ca7ecd674af8ab92b023d7837a058b63f59b1fb1b9d93f4c251a26f7b34fa93c6f113f6bbd25251ed527060f370001305e0436 SHA512 997a8051d6de89c8ccd271f6b3872ab81954a0895d226500d3f72575fac82bb07852c8e12df7b8bcf2879880613436a4fbcf550ad6c4fe20bdf8e63479405983
 MISC metadata.xml 587 BLAKE2B 8d46466fee633fda0f81549a6e512e4ef5963eda31d7c882cee2fe2bfae8b0379509f046d0bdfdb1fe9481eea0585f1754753ed6b509c4f922b8fbf9ae089f39 SHA512 258e04098b9db5821a66e38d02ffb195b57378621fd2a549c8892744cf257be857ebf75c8e4a2f041cd267f07c2f1c3a5fca8df61db0538d8282507cf03a029d
diff --git a/dev-libs/botan/botan-2.19.1.ebuild b/dev-libs/botan/botan-2.19.1.ebuild
deleted file mode 100644
index 15696ea8fbc9..000000000000
--- a/dev-libs/botan/botan-2.19.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/botan.asc
-inherit python-r1 toolchain-funcs verify-sig
-
-MY_P="Botan-${PV}"
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
-IUSE="doc boost bzip2 lzma python ssl static-libs sqlite zlib"
-
-CPU_USE=(
-	cpu_flags_arm_{aes,neon}
-	cpu_flags_ppc_altivec
-	cpu_flags_x86_{aes,avx2,popcnt,rdrand,sse2,ssse3,sse4_1,sse4_2}
-)
-
-IUSE+=" ${CPU_USE[@]}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
-	boost? ( >=dev-libs/boost-1.48:= )
-	bzip2? ( >=app-arch/bzip2-1.0.5:= )
-	lzma? ( app-arch/xz-utils:= )
-	python? ( ${PYTHON_DEPS} )
-	ssl? ( dev-libs/openssl:= )
-	sqlite? ( dev-db/sqlite:3= )
-	zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-	verify-sig? ( sec-keys/openpgp-keys-botan )
-"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-# https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-
-python_check_deps() {
-	if use doc ; then
-		has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
-	fi
-}
-
-src_configure() {
-	python_setup
-
-	local disable_modules=(
-		$(usev !boost 'boost')
-	)
-
-	if [[ -z "${DISABLE_MODULES}" ]] ; then
-		elog "Disabling module(s): ${disable_modules[@]}"
-	fi
-
-	local chostarch="${CHOST%%-*}"
-
-	# Arch specific wrangling
-	local myos=
-	case ${CHOST} in
-		*-darwin*)
-			myos=darwin
-		;;
-
-		*)
-			myos=linux
-
-			if [[ ${CHOST} == *hppa* ]] ; then
-				chostarch=parisc
-			elif [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
-				chostarch="sparc32-v9"
-			fi
-		;;
-
-	esac
-
-	local pythonvers=()
-	if use python ; then
-		_append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-
-		python_foreach_impl _append
-	fi
-
-	local myargs=(
-		# Intrinsics
-		# TODO: x86 RDSEED (new CPU_FLAGS_X86?)
-		# TODO: POWER Crypto (new CPU_FLAGS_PPC?)
-		$(usev !cpu_flags_arm_aes '--disable-armv8crypto')
-		$(usev !cpu_flags_arm_neon '--disable-neon')
-		$(usev !cpu_flags_ppc_altivec '--disable-altivec')
-		$(usev !cpu_flags_x86_aes '--disable-aes-ni')
-		$(usev !cpu_flags_x86_avx2 '--disable-avx2')
-		$(usev !cpu_flags_x86_popcnt '--disable-bmi2')
-		$(usev !cpu_flags_x86_rdrand '--disable-rdrand')
-		$(usev !cpu_flags_x86_sse2 '--disable-sse2')
-		$(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
-		$(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
-		$(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
-
-		# HPPA's GCC doesn't support SSP (presumably due to stack direction)
-		$(usev hppa '--without-stack-protector')
-
-		$(use_with boost)
-		$(use_with bzip2)
-		$(use_with doc documentation)
-		$(use_with doc sphinx)
-		$(use_with lzma)
-		$(use_enable static-libs static-library)
-		$(use_with ssl openssl)
-		$(use_with sqlite sqlite3)
-		$(use_with zlib)
-
-		--cpu=${chostarch}
-		--docdir=share/doc
-		--disable-modules=$( IFS=","; echo "${disable_modules[*]}" )
-		--distribution-info="Gentoo ${PVR}"
-		--libdir=$(get_libdir)
-
-		# Don't install Python bindings automatically
-		# (do it manually later in the right place)
-		# https://bugs.gentoo.org/723096
-		--no-install-python-module
-
-		--os=${myos}
-		--prefix="${EPREFIX}/usr"
-		--with-endian="$(tc-endian)"
-		--with-python-version=$( IFS=","; echo "${pythonvers[*]}" )
-		--without-doxygen
-	)
-
-	tc-export CC CXX AR
-
-	${EPYTHON} configure.py "${myargs[@]}" || die "configure.py failed with ${EPYTHON}"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-
-	# Manually install the Python bindings (bug #723096)
-	if use python ; then
-		python_foreach_impl python_domodule src/python/botan2.py
-	fi
-}
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index de3a9a3760b4..3ed69b6f10b8 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,5 +1,4 @@
 AUX libtomcrypt-1.18.2-slibtool.patch 4038 BLAKE2B 5fe1dadfc6afbc8f85f104299ff7b45706df3df5698f3375c83f4f573ea662a61158602e03b4c89da57969896181865f1f6b29ae6695ad71a3ab19adf4c559d8 SHA512 9486ae1abfe429d1dbe54185bb8b1fb1dc0550ae1089a000baf7afa4b6aa5011a4f1ad1b404b87a90fdae078125fcfd809298a46962a3cbba44d233231a834f7
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r3.ebuild 3201 BLAKE2B b83c6bfb36a8bf22d704dc6f474283c49a29d59234df4c2c62ba16a8752cef6fc03199941600f6576e72f8e5c55846cbe048a05790acf35e2ff65c41000c38ee SHA512 63a526071754eab16b3609457018a389712e80d6e13ef0c5d8a1fbdeddc32f8110b7ca4ac6b966b60801112987669cd7f972f07d8a3274ef0e662229a5ed03dd
 EBUILD libtomcrypt-1.18.2-r4.ebuild 3199 BLAKE2B 4e30db89cb1579650fc6d4998169bcd019d6d2708518e639bc5cf6e984345c1fbc8c4184b5fe57372cd12536f70a7b00df6fb855bb4b322aa239e3fab38813ba SHA512 d8da9cadde97af3d0d9ef3dfca484ccd0e3447a7d8e7243aa125f1f86c77af9e806ec5c262d7eed5a645c3ba4a3478e5a2770e1e5dec309d0d21ccdb476a6f48
 MISC metadata.xml 644 BLAKE2B 112aa0ed4b144bc52466f2e247814612bca0ddae22539aa4262826f5bba0c7daac8810939fff61cb3330bc6f921a606a81dae06db9200d22d722a3b6586c17e5 SHA512 2e2fcc358f5f2d0f3ae6566e1af4a5eb4dc40b8eede752bc408d0d77177c6d0540ef5c7b4ed6ca0ebd9822b3260fca3e367b59c1c52d8e7133cd0f92e2b1c957
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
deleted file mode 100644
index 6626d0895985..000000000000
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="LibTomCrypt is a comprehensive, modular and portable cryptographic toolkit"
-HOMEPAGE="https://www.libtom.net/LibTomCrypt/ https://github.com/libtom/libtomcrypt"
-SRC_URI="
-	https://github.com/libtom/${PN}/releases/download/v${PV}/crypt-${PV}.tar.xz
-		-> ${P}.tar.xz"
-
-LICENSE="|| ( WTFPL-2 public-domain )"
-# Current SONAME is 1
-# Please bump when the ABI changes upstream
-# Helpful site:
-# https://abi-laboratory.pro/index.php?view=timeline&l=libtomcrypt
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+gmp +libtommath tomsfastmath"
-
-# Enforce at least one math provider
-# bug #772935
-REQUIRED_USE="|| ( gmp libtommath tomsfastmath )"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-DEPEND="
-	gmp? ( dev-libs/gmp:= )
-	libtommath? ( dev-libs/libtommath:= )
-	tomsfastmath? ( dev-libs/tomsfastmath:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch
-)
-
-mymake() {
-	# Standard boilerplate
-	# Upstream use homebrewed makefiles
-	# Best to use same args for all, for consistency,
-	# in case behaviour changes (v possible).
-	local enabled_features=()
-	local extra_libs=()
-
-	# Build support as appropriate for consumers (MPI)
-	if use gmp; then
-		enabled_features+=( -DGMP_DESC=1 )
-		extra_libs+=( -lgmp )
-	fi
-	if use libtommath; then
-		enabled_features+=( -DLTM_DESC=1 )
-		extra_libs+=( -ltommath )
-	fi
-	if use tomsfastmath; then
-		enabled_features+=( -DTFM_DESC=1 )
-		extra_libs+=( -ltfm )
-	fi
-
-	# For the test and example binaries, we have to choose
-	# which MPI we want to use.
-	# For now (see src_test), arbitrarily choose:
-	# gmp > libtommath > tomsfastmath > none
-	if use gmp ; then
-		enabled_features+=( -DUSE_GMP=1 )
-	elif use libtommath ; then
-		enabled_features+=( -DUSE_LTM=1 )
-	elif use tomsfastmath ; then
-		enabled_features+=( -DUSE_TFM=1 )
-	fi
-
-	# IGNORE_SPEED=1 is needed to respect CFLAGS
-	EXTRALIBS="${extra_libs[*]}" emake \
-		CFLAGS="${CFLAGS} ${enabled_features[*]}" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		LIBPATH="${ESYSROOT}/usr/$(get_libdir)" \
-		INCPATH="${ESYSROOT}/usr/include" \
-		IGNORE_SPEED=1 \
-		PREFIX="${EPREFIX}/usr" \
-		"${@}"
-}
-
-src_compile() {
-	# Replace hard-coded libdir=${exec_prefix}/lib.
-	sed -i -e "/libdir=/s:/lib:/$(get_libdir):" libtomcrypt.pc.in || die
-
-	mymake -f makefile.shared library
-}
-
-src_test() {
-	# libtomcrypt can build with several MPI providers
-	# but the tests can only be built with one at a time.
-	# When the next release (> 1.18.2) containing
-	# 1) https://github.com/libtom/libtomcrypt/commit/a65cfb8dbe4
-	# 2) https://github.com/libtom/libtomcrypt/commit/fdc6cd20137
-	# is made, we can run tests for each provider.
-	mymake test
-	./test || die "Running tests failed"
-}
-
-src_install() {
-	mymake -f makefile.shared \
-		DATAPATH="${EPREFIX}/usr/share/doc/${PF}" \
-		DESTDIR="${D}" \
-		install install_docs
-
-	find "${ED}" '(' -name '*.la' -o -name '*.a' ')' -delete || die
-}
diff --git a/dev-libs/modsecurity/Manifest b/dev-libs/modsecurity/Manifest
index ada76158e736..5768cd3799ab 100644
--- a/dev-libs/modsecurity/Manifest
+++ b/dev-libs/modsecurity/Manifest
@@ -1,3 +1,3 @@
 DIST modsecurity-v3.0.7.tar.gz 3333372 BLAKE2B f391e2057b95a26a16efaa5f9d86acdd030b2f32d3da3ebac4e5eccdae7c9c6453bdb6b4e2d7f49ce189760d5c5de7d656aa5796fe2723e2e6f5493c93420913 SHA512 d8caf5946b598b16c4481938f22c1116595286811cfdb01d95db95ab061f7045751f2aa98e515df239bceb3f1a6dce2ecd5b24c954bddc27997fa64e9e429730
-EBUILD modsecurity-3.0.7.ebuild 1932 BLAKE2B 32f767e8e5d4b967b0443ab6c1cda7871684cf85afa3d49af4ed00d59a27344014409502ca53799e8f4b06b7519c05fa7ed8ac009290401f354e2f6eb5b5bc6c SHA512 db0d79a93265cad710ead4ede42e1b046844fc3ebd6e5a9129329277e7fd7f824dd5ad76c8c7f7dd995b3fc81cc32e24756561b9e5d206b391b8040cb7e01392
+EBUILD modsecurity-3.0.7.ebuild 1937 BLAKE2B 27dbec0cb4a09f395c350dac4d21e9668ddb2b69cc9775b5abce82c7cb236f377cd359409d589db720611ffe0415667af6e58e6d5f428c2e857004ab9fbed970 SHA512 8b6dd8cab9020738413844b5e8cdd9b978ded3eb4a3ae66254e83489966172f0a54764bc37729a11758c97d2e780db154f07c84dde03d000f61f2d0bf3160b74
 MISC metadata.xml 1019 BLAKE2B 0873fbb1c328dea3378abbe280dc7adacf389a9f1085614057e328ca7258afb4553c2a37bb527eb80b995d69e428ac7fcb3306e65a84c0e3d17acb6ace270b0b SHA512 549b1dc80684fff950148598807b866ab9400c619d2ecb32f2e7f90f8f298dd47daadd4c33f76af40983ed22ffbbb017c110253d810bab931344dd6f80d8f2ce
diff --git a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
index c01151fbfb3a..5eed83999703 100644
--- a/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
+++ b/dev-libs/modsecurity/modsecurity-3.0.7.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
 IUSE="doc fuzzyhash geoip geoip2 json lmdb lua pcre2"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index f9b53b29e021..2d58820466ec 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,5 @@
 DIST mxml-3.3.1.tar.gz 1554784 BLAKE2B e0d599fd947dfef72edae40c1e70ea76c92105128dd46e772a7c71f9293cab3339c980396dffe105246cad64d0474935cc1939005ad9a2bffc8e8107f025a466 SHA512 43e6a92806d9c3f5db39fbf960c15ebfa6d92ef98274b7ce39b57724d6c26ad4362d6d8f3c1023efda92e6a815df068e5038a0cd479562b6be9dbdda8e827a41
 DIST mxml-3.3.tar.gz 1550358 BLAKE2B 2b815cd8c2031099e2767caad93cc389962ec547fadade92b0a7fb48a2352fd0940c9e434c2081b7419e0cfb489266d7116dacefd6fb9d7ce40d6de0f49cb2a6 SHA512 5a8453bec17e46afc9b100df03dba2219353a076152f34a5dc41b7f042fa570723effc3472680a4380674c412c3ab31e017f6704b1e8308227a4d9b3f13cb197
-EBUILD mxml-3.3.1.ebuild 1349 BLAKE2B 0df503d97d6c95b10e070472cc3da4db0f404d3d7f9a2e226f8b57dd3c7635ad53e906fe588ede2f66ef28ffa667409e9b851a830e10c6b829e97e96303ab347 SHA512 b0459b71a912ace9e9fb6c51ebe2b0e4725d1607e5fcf9f339716cf5805ba94ea5f6dd2079e5ac9f79e1a15c364150acb38e23aba0a29e730ac711b7f0359455
+EBUILD mxml-3.3.1.ebuild 1347 BLAKE2B 00a189eb66c0d3845046ca4fde69f136612290c51612c39f275b10a9240e7ecaa09f6165f6d89e49d1e9b3b5074303f1bed5a01b1ed4298de0c88eabac1f4b71 SHA512 b35daaf4c071a63d6c073d3484533e894992387a4e3b45fcced90a906619e3f9a56e0d7e4b0f0b9366e5cae1fceacd4c4f85c7b19087f0d90950c42060b2439a
 EBUILD mxml-3.3.ebuild 1347 BLAKE2B 5a90de864906aaf60f3b3c685de49033cbb170e92b82ef9281a110706c08c9cfb1f7374668e859c2a86fc7e89f78f96cca3ec3f516a9611d0c3131ffe0e11f26 SHA512 d745e253e43e9a49a4eb63fabb1698e925a82127a6ab2e545512e4a2248cd50e52a090992243d8ac1ee42938f86a11911794b3af81fe481e1e24633b831649e1
 MISC metadata.xml 1380 BLAKE2B ba169e7d7bf4572b56e2cc8923a48fce4b31af61107bd908d77f4a211aa096b4f0adfed9ae1d52cbad6b4309793f545cbd562a553e0c5aa1d0786b088f472cd7 SHA512 2895d86c62cb799302ba1515a3b638d52ca253f78e07bcc542bbb99338b84bc2079d48f42fb85a627e9252a545a853629943f9a904ead600aff161a24e1f1658
diff --git a/dev-libs/mxml/mxml-3.3.1.ebuild b/dev-libs/mxml/mxml-3.3.1.ebuild
index e7c70782ab52..b1d9680dc6ab 100644
--- a/dev-libs/mxml/mxml-3.3.1.ebuild
+++ b/dev-libs/mxml/mxml-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index ac71a7d688dd..3b8f5c782f7b 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
 DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
-EBUILD ocl-icd-2.3.0.ebuild 1586 BLAKE2B f01515e00516937cae99afaf6bc7637cbfd53117c8e05f5c101c223b9e9a1fa3dcd58f89f83c5aabe533634199da1ab21ab8eca16cc30b9766ed99e37408e469 SHA512 00e44abe6073cfece37eeaf349861c901c420e0c9b80df13f0a0a7ea8ffc73a33968b3c96ea8fa5099247a36b27196b67711ab68ff6588520b39b181768650ba
+EBUILD ocl-icd-2.3.0.ebuild 1593 BLAKE2B 7dfb66e1e7bf7f086fffd3287ef99cfb8f0190f3890614b59fb214d0e766c048121d178ba5750a6c0a072574dc243eb957962f2f19421150c14a20b9f9f6292e SHA512 e822ffeb32ac80fac2774f0050d055b213af4e59fd1bbe398b9ad0b99370be5e2fac0874948af96377b9a52fdf36272da341d2e53a96cc96de4e93af962e9805
 EBUILD ocl-icd-2.3.1.ebuild 1551 BLAKE2B b8e10636ff4744bfeb50e6f9eb99b9a41c846761dfe02f86ca29c2a1d94474fd4b9ae55e03a9f95818a47abfcb84fbb9f19343b3645c93e14866216453f92053 SHA512 2447ced77634f796d6fe31e0e505dba7968164eedc32e62910d412521f2d7846f50b9b6bd9ee09216de9c84226ceb5b36680906ba6bfb424aefae2fbf3f0ec79
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 84890c9fc9b8..e4d106dd1969 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
 SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index e86544385e30..a4af3a8b3993 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,7 +1,7 @@
 DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd61997d2c3e44f523613b3da4b9c4a20ae764e4be47b00e656f6f79e371dc32174c6be0a827e3a1a8830af92ab552799e2837f62c66 SHA512 baee7fa33fe654034aae60cf9886d79a04f4dc61a1546bfa1016c66bfba103caa9fb7b55ee79854f2f7435afb40c82b1b6ff8022507279dea271ab4d96b0076e
 DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
 DIST opencl-icd-loader-2022.05.18.tar.gz 86968 BLAKE2B 24931d9f59e885ea5673c774c30632735392a9994545d87737ac392566af991385f25a5b71a8f79b4dd271c6675667088123d25c015fbc843378641f19791ffa SHA512 a02cfef224f552294f029ad5ffda8901cc486cedaab8e7b47723eec59d215488bce4d255bd6350980e8fbcf7f71c73939b10ebb2b7cfd51c5b8051079e2b3af7
-EBUILD opencl-icd-loader-2021.06.30.ebuild 887 BLAKE2B 152f167a5385e89f7e6929f78186aa8472abca2bfac911ffa223200f3c8231455b9e9d83de56ec36f9708f7a4d27df7c169e01061db30c0b6a4a342c777d3d2d SHA512 1d26f1fb0fde5932ed82a935b6893e0762d7ff8aa419f0ed1afbb69f02b7e72f31c0ebccae5aa7255ecf717b7d1d70dcfaa400e258b298615c93245e38fa60dd
-EBUILD opencl-icd-loader-2022.01.04.ebuild 887 BLAKE2B 50f97b3dc2211ebbbba28ad436bc40527e4e5e50e5962bb3dc3ea1a65c48a1eaf2aed843f9b82af66259e672a52bbdfbfd5aa986f806d4aa4fb891c8d8be6ecb SHA512 35084b36b4d681c70d0df9895fd46873ec1f997aaf6700d0e4bc863936adc88c961b1e948568d2dbcc91898ac3714914f834f6bf80bfb0e4cf3d58f078302ea2
+EBUILD opencl-icd-loader-2021.06.30.ebuild 894 BLAKE2B 46bf167e1bfcd2fea1bf44fac0d38a775faa61f2ad39d7f7a197daf57da981db4d026715a5d0847986aa5f7bcb3af30c16ce36b8ca433a15e3dbef1d45cce48c SHA512 72d031f344ecfa5ffaa0aac118bbae6bfece8aa83321363bb81a94b617349a879d24aa17519b8d37d893bc7dc56dd78fcb018035c66ee84479590ff453e18e4c
+EBUILD opencl-icd-loader-2022.01.04.ebuild 893 BLAKE2B 7939c4ac7291afae8e3085015043b91838642c5d570ba57782170a4baf2a4236178ec8c0a8ae377f6abe6d7aa29fd6649d002fb556a65d7c62952eac1c3b1cb4 SHA512 0604cfcd8306e52d9e51410ea0cdd99018cbf81998e7bf04613a982804232435e7f770240aa08c3d5d1c12f480b0bda685f7394dfe5fac5d33abca5c7b54a47f
 EBUILD opencl-icd-loader-2022.05.18.ebuild 891 BLAKE2B 932a62970522c0f4bf4a0c193fce9e8c6abc76dc9be95b9a33227a829fd6cf538c46d28101bdba69a3483bb03e37b6d37758ff1f48700ce0596b598e0d5cbafb SHA512 a98b6d3d4c7b6f5b92ab36079d46d4aee8d4885246a713488007f119b6e9d41c1b4dd6ccb7743572d1251402ec60a755a8c82ed534ac63ef1e8f6adaa3e04628
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
index 3a69e3949bbb..086fc4486004 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2021.06.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
index be0c974d8632..639f6fb14035 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 2c91e7c9924d..81b1ea004311 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -4,5 +4,5 @@ AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72
 DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d
 DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
 EBUILD pocl-1.8-r2.ebuild 3121 BLAKE2B 23434ed062197c4e656febf58cb286deb8e14b3f98eb99c4b624d09545117203171378b954fa25557313b1fc22288aa4fde435b3d4e900aad83e499b2bf27469 SHA512 68a4ae0feb2e6e3e87b25ce8ef7064ec428bb1fd4fbffd2dc6b78dd79e6146b31b617c6ff1fa2e9236e6c38ce5c472a585d2178be30202efe348c9ba2a2f70f0
-EBUILD pocl-3.0.ebuild 3663 BLAKE2B 320c9c2ee8f12d57d0f763aa6d19ccc52813bd05d9fa639f77a63c5c64eadb597b225bd7e0d67f69df42136df8276b943405eed0a9b3d2964bf51521af16cbad SHA512 86626470cb4ae17a809a8bb2bdc7933d5a59d3ea88723169c6422705ca8fb0c6f3ed0d522871252d3a57005520c02c8e137324e1860f45852320ae361d9098e6
+EBUILD pocl-3.0.ebuild 3661 BLAKE2B 5d4b1a3802eb3b7d19b09b8845475951e3832826b722c5c899017c67a87475eee76dc85b3b782a9ed33d01929cf14f5a08d4d84f5346dfbb5c62f1496d9eede2 SHA512 9450cdb92f0c82cf0543f0ef59b2483ebe4c523e13ef71a32c9a57015caff6ba583da0d571a2cea1a24ff36532896a6d32942ef39e340a20bb876a5bd1656ba9
 MISC metadata.xml 1265 BLAKE2B 857cd7ad6dae95355a8102678be5ac4628eecc4b3135ed910b06e9bb5cb5df4473ba6228cd54908717ec87386e7ae41322e8546403648f5d90cd1db57eec8861 SHA512 800fdb1d3c430cd4c4cf3a9792297708cf7779863da2e477327d0bc21c2f4ed83b599f1b703efa31b144140cd2c657a18fc76ce0a7dc5db51e7e27f202ac0e0b
diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
index 2b61340eae95..ea851bab85ab 100644
--- a/dev-libs/pocl/pocl-3.0.ebuild
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 # TODO: hsa tce
 IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
 # Tests not yet passing, fragile in Portage environment(?)