Sync with portage [Wed Sep 28 23:38:37 MSK 2022].

2 years ago · 19942d0a79
parent 66f3fab629
commit 19942d0a79
325 changed files with 4157 additions and 925 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/awscli-1.25.75.ebuild
+++ b/app-admin/awscli/awscli-1.25.75.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"

 # botocore is x.(y+2).(z-1)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1 +1 @@
-DIST exo-1.59.1.tar.gz 5613767 BLAKE2B 4de26b6fc25d8ad9aec7c956716d557e8ee57fe19fa4aa286482d928d85a7b3c1ebef75ecc73ce747769d9cbd600a8e59d98eafad246a2451ced0969f9b3067b SHA512 c9364ef68fd93454fbc38df2ddcc7ffcc1bffd188411a3f1f5096e15b9684b4f680872d9fa40bd8208532ec8a14656bbebaaff04511330c9db67229d961eac07
+DIST exo-1.59.2.tar.gz 5614063 BLAKE2B 358b3fa7935c092e5942d2864b4f25a6d78689558fbd4d11b7bacab29a2d93907e21e098f45896a2f2bca923d6f2addcc5fd04aa2aed56826ca78184dcc0c724 SHA512 7e935ff794a6c7e3236a6f2557f5a9c1d2662e7333d137bbbb866d4d1b889dc07b604643ffebaf20da4fa97bfe09fc1e84f57159c38edc2e4ea902a51b7cf680
--- a/app-admin/exo/exo-1.59.2.ebuild
+++ b/app-admin/exo/exo-1.59.2.ebuild
--- a/app-admin/sysklogd/sysklogd-2.4.4.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.4.4.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
 	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi

 LICENSE="BSD"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gcr/gcr-3.41.1.ebuild
+++ b/app-crypt/gcr/gcr-3.41.1.ebuild
@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"

-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"

 DEPEND="
 	>=dev-libs/glib-2.44.0:2
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/iso-codes/iso-codes-4.11.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.11.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"

 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
--- a/app-text/scdoc/scdoc-1.11.2-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.2-r1.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi

 LICENSE="MIT"
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
--- a/dev-ada/VSS/VSS-22.0.0.ebuild
+++ b/dev-ada/VSS/VSS-22.0.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-ADA_COMPAT=( gnat_2021 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
 inherit ada multiprocessing

 DESCRIPTION="A high level string and text processing library"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/atkmm/atkmm-2.36.2-r1.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.36.2-r1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
 SLOT="2.36"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="gtk-doc"

 DEPEND="
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/godot/Manifest
+++ b/dev-games/godot/Manifest
@ -1,2 +1,3 @@
 DIST godot-3.5-stable.tar.xz 24044340 BLAKE2B 9d77ecdfa6bd90065fff26c2334f13c32bbbc4b26aad111b5aab2563d1e4782457ea6cf2115f1a809e0d8aac3d3ee9a138ad224998068983ad36e54a577d89c3 SHA512 23785e39ccc7e1406c97ee33b5e90f7f397aa907d79d72ed08ea3f4b7e68788030a1bcdd07c9f782a21ee3a84636a2cea47a57dcfc94c24e327fa210ae0515b0
+DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f
 DIST godot-4.0-beta1.tar.xz 31113892 BLAKE2B b7adc96ea9d19b962833bb3244f464151a08befb1301dbd147f421c8fb649dcb645656e0982aebaec695988c29e763f52456fa7e23a52b64cfddf39866f2c0af SHA512 86babe6bcd960f3e911b309de39145535f8755ffb64ba024315eab253803d78049020a6f7362318b9e29ba27527e479fba95a20db686ec854ba0a377a276d467
--- a/dev-games/godot/godot-3.5.1.ebuild
+++ b/dev-games/godot/godot-3.5.1.ebuild
@ -0,0 +1,218 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 desktop python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor"
+HOMEPAGE="https://godotengine.org/"
+SRC_URI="https://downloads.tuxfamily.org/godotengine/${PV}/${P}-stable.tar.xz"
+S="${WORKDIR}/${P}-stable"
+
+LICENSE="
+	MIT
+	Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB
+	gui? ( CC-BY-4.0 ) tools? ( BitstreamVera OFL-1.1 )"
+SLOT="3"
+KEYWORDS="~amd64"
+# Enable roughly same as upstream by default so it works as expected,
+# except raycast (tools-only heavy dependency), and deprecated.
+IUSE="
+	+bullet debug deprecated +gui pulseaudio raycast +runner +theora
+	+tools +udev +upnp +webm +webp"
+
+# dlopen: alsa-lib,pulseaudio,udev
+RDEPEND="
+	app-arch/zstd:=
+	dev-games/recastnavigation:=
+	dev-libs/libpcre2:=[pcre32]
+	media-libs/freetype[brotli]
+	media-libs/libpng:=
+	<net-libs/mbedtls-3:=
+	net-libs/wslay
+	sys-libs/zlib:=
+	bullet? ( sci-physics/bullet:= )
+	gui? (
+		media-libs/alsa-lib
+		media-libs/libglvnd[X]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		pulseaudio? ( media-libs/libpulse )
+		tools? ( raycast? ( media-libs/embree:3 ) )
+		udev? ( virtual/udev )
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	tools? ( app-misc/ca-certificates )
+	upnp? ( net-libs/miniupnpc:= )
+	webm? (
+		media-libs/libvorbis
+		media-libs/libvpx:=
+		media-libs/opus
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="
+	${RDEPEND}
+	gui? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-musl.patch
+	"${FILESDIR}"/${PN}-3.5-scons.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "1,5s/ godot/&${SLOT}/i" misc/dist/linux/godot.6 || die
+	sed -i "/id/s/Godot/&${SLOT}/" misc/dist/linux/org.godotengine.Godot.appdata.xml || die
+	sed -e "s/=godot/&${SLOT}/" -e "/^Name=/s/$/ ${SLOT}/" \
+		-i misc/dist/linux/org.godotengine.Godot.desktop || die
+
+	sed -i "s|pkg-config |$(tc-getPKG_CONFIG) |" platform/{x11,server}/detect.py || die
+
+	# use of builtin_ switches can be messy (see below), delete to be sure
+	local unbundle=(
+		bullet embree freetype libogg libpng libtheora libvorbis libvpx
+		libwebp mbedtls miniupnpc opus pcre2 recastnavigation wslay zlib zstd
+		# certs: unused by generated header, but scons panics if not found
+	)
+	rm -r "${unbundle[@]/#/thirdparty/}" || die
+}
+
+src_compile() {
+	local -x BUILD_NAME=gentoo # replaces "custom_build" in version string
+
+	local esconsargs=(
+		AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+		platform=$(usex gui x11 server)
+		progress=no
+		verbose=yes
+
+		deprecated=$(usex deprecated)
+		#execinfo=$(usex !elibc_glibc) # libexecinfo is not packaged
+		minizip=yes # uses a modified bundled copy
+		pulseaudio=$(usex gui $(usex pulseaudio))
+		udev=$(usex gui $(usex udev))
+
+		system_certs_path="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+
+		# platform/*/detect.py uses builtin_* switches to check if need
+		# to link with system libraries, but ignores whether the dep is
+		# actually used, so "enable" deleted builtins on disabled deps
+		builtin_bullet=$(usex !bullet)
+		builtin_certs=no
+		builtin_embree=$(usex !gui yes $(usex !tools yes $(usex !raycast)))
+		builtin_enet=yes # bundled copy is patched for IPv6+DTLS support
+		builtin_freetype=no
+		builtin_libogg=yes # unused
+		builtin_libpng=no
+		builtin_libtheora=$(usex !theora)
+		builtin_libvorbis=$(usex !theora $(usex !webm))
+		builtin_libvpx=$(usex !webm)
+		builtin_libwebp=$(usex !webp)
+		builtin_mbedtls=no
+		builtin_miniupnpc=$(usex !upnp)
+		builtin_opus=$(usex !webm)
+		builtin_pcre2=no
+		builtin_recast=no
+		builtin_rvo2=yes # bundled copy has godot-specific changes
+		builtin_squish=yes # ^ likewise, may not be safe to unbundle
+		builtin_wslay=no
+		builtin_xatlas=yes # not wired for unbundling nor packaged
+		builtin_zlib=no
+		builtin_zstd=no
+		# also bundled but lacking a builtin_* switch:
+		#	cvtt, etc2comp, fonts, glad, jpeg-compressor, libsimplewebm,
+		#	minimp3, minizip (patched to seek in archives), nanosvg, oidn,
+		#	pvrtccompressor, stb_rect_pack, tinyexr, vhacd, and the misc
+		#	directory.
+
+		# modules with optional dependencies, "possible" to disable more but
+		# gets messy and breaks all sorts of features (expected enabled)
+		module_bullet_enabled=$(usex bullet)
+		module_mono_enabled=no # unhandled
+		module_ogg_enabled=no # unused
+		module_opus_enabled=no # unused, support is gone and webm uses system's
+		# note raycast is disabled on many arches, see raycast/config.py
+		module_raycast_enabled=$(usex gui $(usex tools $(usex raycast)))
+		module_theora_enabled=$(usex theora)
+		module_upnp_enabled=$(usex upnp)
+		module_vorbis_enabled=no # unused, non-theora/webm uses stb_vorbis
+		module_webm_enabled=$(usex webm)
+		module_webp_enabled=$(usex webp)
+
+		# let *FLAGS handle these, e.g. can pass -flto as-is
+		debug_symbols=no
+		optimize=none
+		use_lto=no
+		use_static_cpp=no
+	)
+
+	if use runner && use tools; then
+		# build alternate faster + ~60% smaller binary for running
+		# games or servers without game development debug paths
+		escons extra_suffix=runner target=release tools=no "${esconsargs[@]}"
+	fi
+
+	esconsargs+=(
+		# debug: debug for godot itself
+		# release_debug: debug for game development
+		# release: no debugging paths, only available with tools=no
+		target=$(usex debug{,} $(usex tools release_debug release))
+		tools=$(usex tools)
+	)
+
+	escons extra_suffix=main "${esconsargs[@]}"
+}
+
+src_install() {
+	local s=godot${SLOT}
+
+	newbin bin/godot*.main ${s}
+	if use runner && use tools; then
+		newbin bin/godot*.runner ${s}-runner
+	else
+		# always available, revdeps shouldn't depend on [runner]
+		dosym ${s} /usr/bin/${s}-runner
+	fi
+
+	newman misc/dist/linux/godot.6 ${s}.6
+	dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md
+
+	if use gui; then
+		newicon icon.svg ${s}.svg
+		newmenu misc/dist/linux/org.godotengine.Godot.desktop \
+			org.godotengine.${s^}.desktop
+
+		insinto /usr/share/metainfo
+		newins misc/dist/linux/org.godotengine.Godot.appdata.xml \
+			org.godotengine.${s^}.appdata.xml
+
+		insinto /usr/share/mime/application
+		newins misc/dist/linux/org.godotengine.Godot.xml \
+			org.godotengine.${s^}.xml
+	fi
+
+	newbashcomp misc/dist/shell/godot.bash-completion ${s}
+	bashcomp_alias ${s}{,-runner}
+
+	insinto /usr/share/fish/vendor_completions.d
+	newins misc/dist/shell/godot.fish ${s}.fish
+	dosym ${s}.fish /usr/share/fish/vendor_completions.d/${s}-runner.fish
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/dist/shell/_godot.zsh-completion _${s}
+	dosym _${s} /usr/share/zsh/site-functions/_${s}-runner
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/scala-bin/Manifest
+++ b/dev-lang/scala-bin/Manifest
@ -1 +1,2 @@
 DIST scala-2.13.6.tgz 23407489 BLAKE2B b65db49968dcbce2f5586aafaa4cd437156050050f209cce4a7d5edc18dfca3ebb60d2a726b4a26902723f993b78a673909c1139eb67e8eea4f35a4842b33c70 SHA512 445267cd7c1ddb8ef94d2edeb36567318c66429c88fcb183840998dc204a10253df09c33eb4de2f87b68b1a8cd4f557910fa3f061d4316314653eb64e91c0188
+DIST scala-2.13.9.tgz 23602967 BLAKE2B 93bbee93562143c72a4bdcfa3e7a8257064474cf38a2de448444bc5639f54e0ef17b9361e7144b39b3040b97683c2674bcc7611fc770c2fa985d9d0d9fd403d3 SHA512 da808ea65fe66c83dc55873662de92647675a2da15b87fb719f1c76d29588f725a466d8519c53f4c521d4defc7b66c023e52a6b264c58117f321ddcf50ebd2a6
--- a/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
+++ b/dev-lang/scala-bin/scala-bin-2.13.9.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-*}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Scala Programming Language"
+HOMEPAGE="https://scala.epfl.ch/"
+SRC_URI="https://downloads.lightbend.com/${MY_PN}/${PV}/${MY_P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	!dev-lang/scala"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	ebegin 'Cleaning .bat files'
+	rm -f bin/*.bat || die
+	eend $?
+
+	ebegin 'Patching SCALA_HOME variable in bin/ directory'
+	local f
+	for f in bin/*; do
+		sed -i -e 's#\(SCALA_HOME\)=.*#\1=/usr/share/scala-bin#' "$f" || die
+	done
+	eend $?
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	ebegin 'Installing bin scripts'
+	dobin bin/*
+	eend $?
+
+	ebegin 'Installing jar files'
+
+	cd lib/ || die
+
+	# Unversion those libs.
+	java-pkg_newjar jline-*.jar jline.jar
+	java-pkg_newjar scalap-*.jar scalap.jar
+
+	# Install these the usual way.
+	java-pkg_dojar scala-compiler.jar
+	java-pkg_dojar scala-library.jar
+	java-pkg_dojar scala-reflect.jar
+
+	eend $?
+
+	cd ../ || die
+
+	ebegin 'Installing man pages'
+	doman man/man1/*.1
+	eend $?
+
+	if use doc; then
+		ebegin 'Installing documentation'
+		java-pkg_dohtml -r doc/tools
+		eend $?
+	fi
+}
--- a/dev-lang/vala/vala-0.56.3.ebuild
+++ b/dev-lang/vala/vala-0.56.3.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va

 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"

 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"

 RDEPEND="
--- a/dev-libs/gjs/gjs-1.72.2.ebuild
+++ b/dev-libs/gjs/gjs-1.72.2.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"

 RDEPEND="
--- a/dev-libs/gmime/gmime-3.2.13.ebuild
+++ b/dev-libs/gmime/gmime-3.2.13.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"

 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"

--- a/dev-libs/imath/imath-3.1.5.ebuild
+++ b/dev-libs/imath/imath-3.1.5.ebuild
@ -13,7 +13,7 @@ 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): ~x64-macos ~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"

 LICENSE="BSD"
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@ -1 +1,2 @@
 DIST libcpuid-0.5.1.tar.gz 166522 BLAKE2B 3471c11bbe4b0eaac7b00ac20a27556a95991f1b678269ae6f142a0fe2db066ebb756722ae2e76f95158742c93e29a35da6e735226d32b746034acae3ec2a5b7 SHA512 d725bc82e5aa2db69cea7b3590afbe11d6028cf4802fde8d498b4f1cc6d823e73d71b89a453d81bf996d97b36a71f6c00d0f6e8292b72f2be8a64b5d59c01861
+DIST libcpuid-0.6.0.tar.gz 240709 BLAKE2B 6be56956d17aab774282b3e2be83b02f0180153af9cea665dbf8a8a216b35fd8c030b053184d09ac3946d163943281ecb906134290516d8063380749944339e8 SHA512 9f80f0d45f408d35d9ee657d8f53c99bb14e37d26a8a7b6a914546f0446f83a3d75eb06d261c7708a810ba10ce6fadaef54ba7c94cbf22cd113a9f2210c1a708
--- a/dev-libs/libcpuid/libcpuid-0.6.0.ebuild
+++ b/dev-libs/libcpuid/libcpuid-0.6.0.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..11})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/16"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
--- a/dev-libs/libgdata/libgdata-0.18.1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.18.1.ebuild
@ -33,7 +33,8 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.3 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5.0
+	test? (
+		>=net-libs/uhttpmock-0.5.0:0
 		>=x11-libs/gdk-pixbuf-2.14:2
 	)
 	vala? ( $(vala_depend) )
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@ -1,5 +1,6 @@
 DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
 DIST rocclr-5.0.2.tar.gz 853965 BLAKE2B a0d568eb3b230845970d8256a5a2f32018e4b9fb68e0f1aa13a1f3fc953e614025315b90cbe68c107f7150cf91b4b1ea438455429062c7dc06ef77d65dedd2ec SHA512 b30a57c09973d8ef624511f422babaf9722685b9f85643783aebc000671b41fd54f44b308cece0baab187e1ee00b10335c6d22b6bad6fb3468abe6ef0da97d73
+DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f801bfb2537eea6e640c65613eb57b37d942f465a9deb83d65735f51212dde5e4f77ba8239d1a6b7037e1800c SHA512 89fd2eca39ed84a1cf525b2c606089ef39f64c1f997c4880e10722da6de4864110752640e1508db1aeb9d15c48ba4e6fe5dbe7a9e56718853ece42548028b2ca
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@ -9,3 +10,4 @@ DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b43
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
 DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626 SHA512 6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
 DIST rocm-opencl-runtime-5.0.2.tar.gz 1004855 BLAKE2B e2c2beb987053204fbe8fda562ae65d6c1a58447e9e88bf1081aabeee6c9a10738fd8562114b564b647682438fdbd2c535db1008ac6e1cc4eb9a915998eeb3c7 SHA512 fa01d1fafc890181b9e67070353ee7c9100619494b7509cae1a3659f24ef1d00f650024cb24bdb0e6e7eacfdec1115e4683ec6f320228a19f41ae83321780780
+DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
--- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.1.3-remove-clinfo.patch
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-5.1.3-remove-clinfo.patch
@ -0,0 +1,24 @@
+Index: ROCm-OpenCL-Runtime-rocm-5.1.3/CMakeLists.txt
+===================================================================
+--- ROCm-OpenCL-Runtime-rocm-5.1.3.orig/CMakeLists.txt
+++ ROCm-OpenCL-Runtime-rocm-5.1.3/CMakeLists.txt
+@@ -16,7 +16,6 @@ option(EMU_ENV "Enable building for emul
+ set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+ add_subdirectory(khronos/icd)
+ add_subdirectory(amdocl)
+-add_subdirectory(tools/clinfo)
+ add_subdirectory(tools/cltrace)
+ if(BUILD_TESTS)
+   add_subdirectory(tests/ocltst)
+Index: ROCm-OpenCL-Runtime-rocm-5.1.3/packaging/CMakeLists.txt
+===================================================================
+--- ROCm-OpenCL-Runtime-rocm-5.1.3.orig/packaging/CMakeLists.txt
+++ ROCm-OpenCL-Runtime-rocm-5.1.3/packaging/CMakeLists.txt
+@@ -5,7 +5,6 @@ set(CPACK_COMPONENTS_ALL binary dev icd)
+ set(CPACK_DEB_COMPONENT_INSTALL ON)
+ set(CPACK_RPM_COMPONENT_INSTALL ON)
+ 
+-install(TARGETS clinfo DESTINATION bin COMPONENT binary)
+ install(TARGETS amdocl DESTINATION lib COMPONENT binary)
+ install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME} COMPONENT binary)
+ 
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.1.3.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake edo flag-o-matic prefix
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-${PV}
+	media-libs/glew
+	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-remove-clinfo.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+)
+
+S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+S1="${WORKDIR}/ROCclr-rocm-${PV}"
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+
+	sed -e "s/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g" -i packaging/CMakeLists.txt || die
+	# remove trailing CR or it won't work
+	sed -e "s/\r$//g" -i tests/ocltst/module/perf/oclperf.exclude || die
+
+	pushd ${S1} || die
+	# Bug #753377
+	# patch re-enables accidentally disabled gfx800 family
+	eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch"
+	popd || die
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DROCCLR_PATH="${S1}"
+		-DAMD_OPENCL_PATH="${S}"
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-DEMU_ENV=ON
+		# -DCMAKE_STRIP=""
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors
+	doins config/amdocl64.icd
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/lib64
+	doins amdocl/libamdocl64.so
+	doins tools/cltrace/libcltrace.so
+}
+
+# Copied from rocm.eclass. This ebuild does not need amdgpu_targets
+# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the
+# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid
+# pkgcheck warning.
+check-amdgpu() {
+	for device in /dev/kfd /dev/dri/render*; do
+		addwrite ${device}
+		if [[ ! -r ${device} || ! -w ${device} ]]; then
+			eerror "Cannot read or write ${device}!"
+			eerror "Make sure it is present and check the permission."
+			ewarn "By default render group have access to it. Check if portage user is in render group."
+			die "${device} inaccessible"
+		fi
+	done
+}
+
+src_test() {
+	check-amdgpu
+	cd "${BUILD_DIR}"/tests/ocltst || die
+	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
+	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
+	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
+	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
+		export DISPLAY=${OCLGL_DISPLAY}
+		export XAUTHORITY=${OCLGL_XAUTHORITY}
+		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
+		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
+			ewarn "${instruction1}"
+			ewarn "${instruction2}"
+			die "This display does not have AMD OpenGL vendor!"
+		fi
+		./ocltst -m liboclgl.so -A ogl.exclude
+		eend $? || die "oclgl test failed"
+	else
+		ewarn "${instruction1}"
+		ewarn "${instruction2}"
+		die "\${OCLGL_DISPLAY} not set."
+	fi
+	edob ./ocltst -m liboclruntime.so -A oclruntime.exclude
+	edob ./ocltst -m liboclperf.so -A oclperf.exclude
+}
--- a/dev-libs/vala-common/vala-common-0.56.3.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.3.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/va

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"

 RDEPEND=""
 DEPEND=""
--- a/dev-python/Levenshtein/Levenshtein-0.20.5.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.20.5.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="
+	https://pypi.org/project/Levenshtein/
+	https://github.com/maxbachmann/Levenshtein/
+"
+SRC_URI="
+	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-cpp/rapidfuzz-cpp-1.7.0
+"
+RDEPEND="
+	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@ -1,3 +1,4 @@
 DIST Levenshtein-0.20.3.gh.tar.gz 33573 BLAKE2B 2ba0b35cd15da645dae3e18ce7d57da685cc273bb3902e645bf6a0826f212fab0b91a5765fa6b9768fd6d5cca728a3f0e384f18a90e29fed571b71e03171dccb SHA512 3adde94e7f195aaae3361296d4ec2e7694c6afb92abcde866d659a827bfdfc2ab1fb28d92332966abd7da8392590cd96415b7f593bde8375b35bbe845e9ddfe3
 DIST Levenshtein-0.20.4.gh.tar.gz 34419 BLAKE2B ff15ef1d11d326d39a45781e729cc111cd8482ac2a2558b5623971dd8d5ae76833fc28e71afb0eed2f40b6a0d9323aeee4a3a3a77a172742239b70e70f65c775 SHA512 fef0f19e67ec5caae6a3ba42bba916fafcdc47c6ef5e5487cfe0a246ad0d9e393233269f986e3391a6443f707e64a9022531fa1a653597a952794ef402644dbe
+DIST Levenshtein-0.20.5.gh.tar.gz 35126 BLAKE2B b1322abdca5a4cd372bce74ce3f1d5e9f671783797830f0527282284fb1296be6ae9ef3fc68fe1f6867d1b1e9069c1c0c60106bd64f966f1333d087b52a9fe02 SHA512 d3afd384023537de5918e011e16395c7dc69ba61c4823eb64e938810dbf49cbf5379589a4cc13e7dd49f8a2e683498d3768717e52678ee01fb8d1dd55c304307
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@ -1,2 +1,2 @@
 DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
-DIST charset_normalizer-2.1.1.gh.tar.gz 86024 BLAKE2B d0da455ea32ccfada7da3a91e1163e0b52e398971384caed969b027ce430af6a3b2b32305d3137047af584f2ecd28c5471d6df3dacd2830f98e5e028149fae64 SHA512 688477fd251ea604fcafd08589c11de2cbe57c26bba7f88d7289db2604a091ca481ca9bf6117b17fa13d787d9aacba8304a82e0988548ad0a47612e2437db6db
+DIST charset_normalizer-2.1.1.gh.tar.gz 86023 BLAKE2B aefd9b5f78a5c75701b4239d443f0ca2f6ec755703c7b51ddecff5bf014c7e9203650a5f09ac791b76793c6ef999c31236dceb6721e81959c5df40d70c7cb20f SHA512 77df5bdf9ca2f6b2594cc6a5ff54d1d50fd17c2175f96d6853ef6b3a48cdfc0d2852e1dcffc4814fa9bba30ebc3e26ce992c7139b6b21dfaf46fd9c9e8b0c95e
--- a/dev-python/charset_normalizer/charset_normalizer-2.1.1-r1.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.1.1-r1.ebuild
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@ -1 +1,2 @@
 DIST emcee-3.1.2.tar.gz 2868985 BLAKE2B 8da142b7be3d4c5f2ab93081d27d7105e312f2ca9702c0f57b8aaf6cf98e4dfae141fc24342bb9c30049d4de747b4d744f689dbb1be780519c426ef343d73485 SHA512 11e4e6f90a3f039c8459963217d0699a953f23aff2ffc67e7da3696926dcf915fdb1f4bd3781b88cbab6f664c38cec50b3470316aa6ec49b0e617218e2a7b95d
+DIST emcee-3.1.3.tar.gz 2868872 BLAKE2B 0c665aa0cf4d96041b6627d849b40a906623724a8a51affc613e3e2da7910efb0016d17bbbc48b03e2d960873b6565c6c1345ceaffbfcda4cb16f0c56bf9534b SHA512 95b81b124183dd9f7df9381a4b792e1daa8154b2f187f0b5d2627d174371e01a6fcbc1a29e907efb1689065e8d037e3d98a40f1f35053a5dd400a922c30da38f
--- a/dev-python/emcee/emcee-3.1.3.ebuild
+++ b/dev-python/emcee/emcee-3.1.3.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="
+	https://emcee.readthedocs.io/en/stable/
+	https://github.com/dfm/emcee/
+	https://pypi.org/project/emcee/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
+
+src_prepare() {
+	# unnecessary dep
+	sed -i -e '/wheel/d' setup.py || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@ -1 +1,2 @@
 DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
+DIST exceptiongroup-1.0.0rc9.gh.tar.gz 19109 BLAKE2B b4a4c127909908aa2d9fb2bfff0f0ae6c6b9be88046a680b6b206164b0ec0d6bc325ec65ce3e61df2270e6b0397ff5f7f11c219a62dc4a3534b1564da64935b3 SHA512 43f0f7338f5e09d45a5b4e1723ecab6dcd1872a387eaf8483961b86db5f1b7c265798538726ec9f2d0d6bd289ff3124883f5095dd7f04fd9b64c9230ce454098
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc9.ebuild
@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit_scm
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Backport of PEP 654 (exception groups)"
+HOMEPAGE="
+	https://github.com/agronholm/exceptiongroup/
+	https://pypi.org/project/exceptiongroup/
+"
+SRC_URI="
+	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT PSF-2.4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@ -1,2 +1,3 @@
 DIST fakeredis-py-1.9.1.gh.tar.gz 86742 BLAKE2B aa3f0b05f486219cb6eb560f561ab3e39cc32286cdc3f4f9aba667e256528b9338dcc03f3ddb00c0db30ddb181afe535e209f6ee0e98c56a0cad445e2181ec67 SHA512 27b4c95e596fdd69cecc737897edfedd6f55e7c5610394b1532e4b2aededaed6ad15763582ce6cc20821ac7ea096f60204f7080d247359d8e8d0d360a61c8e39
 DIST fakeredis-py-1.9.2.gh.tar.gz 87038 BLAKE2B 89ae3059d58fc9649979b787339a98eaedccd2b29814090e1bf0cb2c54836ed722d829b9965d3d0a92ff4d8ee714f6a455b85f68b383a5ba6a67aefd20f70410 SHA512 6a4d90c0c327787b7505542a3615f383735bffb021cbfc0a2adf2cfb87326c517d67c1df2f318cd84b60b8d0f1dcb20faea05529a856bf81b0f3ae6cc16823ed
+DIST fakeredis-py-1.9.3.gh.tar.gz 87068 BLAKE2B ee657bd0b04f5701c9e6445ca646fcc510dc3235407372fec9891f7d1adc5cacbd7a52e2d520c930f53491c2a18f5578d1b5186337953439f93fbb69a5e65ef8 SHA512 5255a75bae15ac325a41a273c70a467c8622d5992d40967e4ac21920c0563dbad808e9b82af203e72e3404f74a7bbfd2c12f5d854f9d353defec5b0333843266
--- a/dev-python/fakeredis/fakeredis-1.9.3.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.9.3.ebuild
@ -0,0 +1,87 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	<dev-python/redis-py-4.4[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@ -1 +1,2 @@
 DIST flatbuffers-2.0.7.gh.tar.gz 2018943 BLAKE2B 0fa27c79986292da1e3721c061d845b4ff3db5209956345ddf655dbbcd8fa8f460160d2359a77211139597b4635fc65fdc762cd3c62e87b361d65fb414d9c538 SHA512 15696f5f691414d2266f8bad1137ccbcf1e43e8d4fc22e8b5ef5b90351f6034b553bff7febf0e6f93a1be145e0714d7d4cb752786d0f67665165b1b6e5c1db24
+DIST flatbuffers-22.9.24.gh.tar.gz 2091992 BLAKE2B 57130f412b4b1607a921f0101df687d987209cfa7174357967e9bc3b7aca3ef0433f56536a6c7e0763a2d3ba668ed52e50f1b99e933c2d894e5fda233b18b661 SHA512 4705ad08280f8a79694efee42c83395011c5e4513d42b3bb802e8c3fff82b1bef99a9667a1cdf76a646a7b79f083484aecc2b28a41b3933c648e7d5f5d40d45c
--- a/dev-python/flatbuffers/flatbuffers-22.9.24.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-22.9.24.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/google/flatbuffers/
+	https://pypi.org/project/flatbuffers/
+"
+SRC_URI="
+	https://github.com/google/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+S=${WORKDIR}/${P}/python
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@ -1,2 +1,3 @@
 DIST google-auth-2.11.0.tar.gz 205568 BLAKE2B 76f43804c117006141e46291eaa35b49e73f4eec81307b7c3c6fdf82faf1a1f3101ef1a652c5dff05ca6686ded0859c6a3bee8d38cd584fd5cacef9598aae9b1 SHA512 0b2c8653184d95b1f0981326721a8604bee6737e2e4fb68c12d695c74e03406e6d189b00740c34ee74d6ae4032581bd099018f8eaf1d65759e4c5fa4127305cf
 DIST google-auth-2.11.1.tar.gz 205716 BLAKE2B 06cf90b915c82bb53795427fc971c6a979baa34d3e32d43db20c0df86df9ef39d0ee80c4026dd502ff1d5233f1d80b0a4fa9750aafe9f0d427013a2d8ad34054 SHA512 f89fc2ec2d130156132f7e7290f4237ee9adf832f6b1914a39ea7d56943bb26fa02e940e826eb9c4e5351aa91ebf03cc5969c25e5020a89a09ea8f92535a0c07
+DIST google-auth-2.12.0.tar.gz 209325 BLAKE2B a6f754262dd7b75796dd63f4b7a2161ba959a3103c51cacb3d5f4ba3d17efdd36e1836ce360fa108b5dbce710743bfacf3b8b054de0e235590ba15eae8f3cdf3 SHA512 59209299631b7ea7d11e6787c33a304bbed5bca2173148d8c69595fc573f8915f6e3b601ed96686568f517cbbea71e18be228874334733629fbdd030976821cb
--- a/dev-python/google-auth/google-auth-2.12.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.12.0.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@ -1 +1,2 @@
 DIST iso8601-1.0.2.tar.gz 12653 BLAKE2B c7dbbe680f2828050b2ff32765da009b5f6dafdbc5182d5136f951f8604d7ff579b85050dbefae47d2b28ce88515b9dd73a8abf73b3419b4cdc4a4dd275b7228 SHA512 f28fbfe82c25575ad73a92df144c108ef3cf4e1a5a9af8362187014904073f26daa3b77dde689a23cfd87cdbf86196b241e925dd8cf5fd81728f0dbeee4836b7
+DIST iso8601-1.1.0.tar.gz 12836 BLAKE2B 7860d52002008a76c1d28ae94abe5100c3ea434f8e19dcb677dfc84366e898d2d277d88e6591d663579281c4ee668e77db96fd586edbe8b027433844462071e9 SHA512 f3f9621863abcbcde467d38416391cd8c98f59b7b863845b670e11060f0f81bcf4979fadc51c19eb55a5fe44ee1af922976b11cc97bf7b2dc090a485ad9979ac
--- a/dev-python/iso8601/iso8601-1.1.0.ebuild
+++ b/dev-python/iso8601/iso8601-1.1.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="
+	https://github.com/micktwomey/pyiso8601/
+	https://pypi.org/project/iso8601/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/jarowinkler/Manifest
+++ b/dev-python/jarowinkler/Manifest
@ -1,2 +1,3 @@
 DIST jarowinkler-1.2.1.tar.gz 85696 BLAKE2B 4e9c4dd4160a80fa600ae57c7cc97abd794bb0a49881137ed3f69c03549268bbf71dc410b86f8bd782b92df4eac63738ebd32dd716d682a0ce8aaaf039a38f61 SHA512 1337a5f67e54a0c0990dde7fc631c263b63c64c7dbefae82579842a639a85ea7214185489d56b6e2be5a6362773fbaea29a958f62dbfa270beefba516c325654
 DIST jarowinkler-1.2.2.tar.gz 85899 BLAKE2B f070be3b6fe69159c63cb37261bb8e837fc5f621b438405cd29de8f037f1848d0e27175c47a27a12895ca7ccf66681ed1ebc67c1f81d59e101c5acb1e665bcf6 SHA512 956eed36d4cdf36aefd1ca8ffedf61fdcf2567adbf3752ef3c7b3605c8851b97777132654ec14bb2ff66a4b737d2fa8bb1b81779a282d40cf5cf64980a8a6fde
+DIST jarowinkler-1.2.3.tar.gz 86021 BLAKE2B 6bce572b20538388c307a0da407198c725629a85e2114b7b9b91f24fd153102b0532275cbdf5d04138fe2b14c9a7936497bd1d72e7eb780411cb1032c97debb0 SHA512 3effd486f89a9973a8b1c41628555ab415b43a6aac426b9abf7a05d42ad697d18074ef43d4f50eab208980ae19e2efea68fb4d37b3a3ba13f52a39573809580b
--- a/dev-python/jarowinkler/jarowinkler-1.2.3.ebuild
+++ b/dev-python/jarowinkler/jarowinkler-1.2.3.ebuild
@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast fuzzy string matching using Jaro and Jaro-Winkler similarity"
+HOMEPAGE="
+	https://github.com/maxbachmann/JaroWinkler/
+	https://pypi.org/project/jarowinkler/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-cpp/jarowinkler-cpp
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export JAROWINKLER_BUILD_EXTENSION=1
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@ -1,2 +1,3 @@
 DIST jupyter_server-1.18.1.tar.gz 451117 BLAKE2B ac9088f8f5c5afa6455f41b4006c0d49286006574101b42dd8e28501c97dcf10d7ee534d54b8cf26a8f34c7d2ba446485ce273ce04e22c39a22e5346d55ea4f5 SHA512 7acf101f337af903318de263dcf78cf3b45b799bb6095bc79568fde7f3f56ca508d39a1d40ffe2a4ab0bdc0173f0ee2f4a7426f41e0855c1b7f9dfd86f7e6d73
 DIST jupyter_server-1.19.0.tar.gz 453227 BLAKE2B c411ea965bd1948cfff488be278e9d6d4374482f0017e8e6f0b557628f1b571735008db3217035344ee1d38bed45e9c74c16fb365899408e0565d31740ee1a78 SHA512 ba1316418662bf465f5252de97efa58ecea237b51dfd83b17643176f95382d47759b88a2a79945e6bbf688dcdb3f99d091a035ab0a8a04706c6e6ba0c8a7fcc8
+DIST jupyter_server-1.19.1.tar.gz 453411 BLAKE2B 800231e7e7ddfcf2a2c2f2725971983d754c76940623ce000e6b86ad503bc6ca68a27e55ca3766193e58184a7148471464dfa9c27076e53ac84b176b8ff65897 SHA512 f4228c73950e49fe26add11c61f3de425b963726908a2df7dae21bb38b986c2ebb6abfc3319ef9e3acbc2fef9579a1a70ac594920985977adf580a082d272368
--- a/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.19.1.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@ -30,7 +30,7 @@ SRC_URI="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~hppa ~riscv"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"

 # internal copy of pycxx highly patched
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@ -1 +1,2 @@
 DIST pyfuse3-3.2.1.tar.gz 509083 BLAKE2B 16ada8aec47d8049907ef2710e9bfdf7991a8127560e7264e4eb58f7062efde478d2914597333991be4a6ef67a2a83c470560456287c1298b2008454ac831fb0 SHA512 468ef4cf9e2caef346a108f481a4c6dca8909ff3ea5aed11187df4c70c72c6180af9004348d25648368598495e5a5d9be2ba95d37f4d6d8a8c982f4893471b04
+DIST pyfuse3-3.2.2.tar.gz 510868 BLAKE2B a6f11083a3ddec031fdfe5cb810be526cba26d7bc9599a64d28e9a45281aeb04fca8728ff3788e44f1736475c89e64c3c1fd7cb964ff81fc30ce441a5dda7fae SHA512 91787c4198592ff5f0c022141e6c3cb1701108a6635b4d26347c4f7efff2a83aec206e939b44879ad1fd5c6c85aa6731b7465c998ec55ec032a6db024ffee817
--- a/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
+++ b/dev-python/pyfuse3/pyfuse3-3.2.2.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 bindings for libfuse 3 with asynchronous API"
+HOMEPAGE="
+	https://github.com/libfuse/pyfuse3/
+	https://pypi.org/project/pyfuse3/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-fs/fuse:3
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/trio[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		sys-apps/which
+	)
+"
+
+distutils_enable_tests pytest
+
+python_configure() {
+	esetup.py build_cython
+}
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@ -1,2 +1,3 @@
 DIST pyscard-2.0.3.tar.gz 150092 BLAKE2B af7d58266044792987e6f9a2bc708ca043e32c4f87c8622b5662449254e7d6b630d5769479f3eaf59dc9a3a9fa294330953dea3383aee6c216f3d7dcfd26266a SHA512 2f5c762fe4a7d8d3292f335fda58f8f2f88729ea6d33a508e5f461692fef8d006ccc9b761a78750b8416dc5c1f7c6b06c069e3f6e7b19d91621226590bfef708
 DIST pyscard-2.0.4.tar.gz 150740 BLAKE2B 07849c265bfc764dd227bf041add7d24045f8f6669b596307d8a8644c847ee04a868b7df8e69139dc4d65f10b0406ef0083b833ed9e9dca5f11cb5d662d30801 SHA512 6eaae051f22079a73546c78f749dbeedaeee5f776e3f1718cf5ced3ed276d061e2210e2882f74bcaf75de9048fa8f512606a1b4ea0c0d4ecd0a5d6aeac482bc8
+DIST pyscard-2.0.5.tar.gz 150803 BLAKE2B c7d5ab17c3471b050a321c687e5faf33b5faad5a1afc60462b759280cff31bc55d86decdcb16dda9a4afe47848bc06f303c9697941dc212f01b28db6a8469a5e SHA512 bb2ef725e7dccefa640fe1568d1fee016bc5c639769d1b0d099067108e1369b8f7ccd3e48f985d657c5c7c33730eae891624f2c0ee2deaed491826b8c0eae2a5
--- a/dev-python/pyscard/pyscard-2.0.5.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.5.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Smart card support in python"
+HOMEPAGE="
+	https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard/
+	https://pypi.org/project/pyscard/
+"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	sys-apps/pcsc-lite
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-lang/swig
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/Pyro4
+}
+
+python_test() {
+	cd test || die
+	eunittest
+}
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@ -1 +1,2 @@
 DIST pytest-mock-3.8.2.tar.gz 27734 BLAKE2B feaa92ba63626d7510008c41491bd0ab649b2a0cb55c888a472a5f6100a18d8b4a232532b6b3a860483bfd1676fc1216ca368e215b8f11fc6211eeef62f5743f SHA512 039342de6a22921ebac3f54a1f217a7a5d4cf9833ce4b4bee0a18ba5409d46211cd2d9ff9620a1576560d32f5e5799483e6686e3b58d32123f41dcd7a862154b
+DIST pytest-mock-3.9.0.tar.gz 27883 BLAKE2B d1cf4599bdc3fa21df83874c26751791f9ec891184baa2a304a8d4e48e5a03194718afb80e9019f914150ef22c1b3a787ac17cfadf10deae5584b8e39e32e376 SHA512 ed918574852ac70d863589d976fd65ac57c61ee1fa072651b93ee58f2d1154cef6c0ae1c2cba822bb1c6a2bddd6442b49e256652e2bd55fd3b1bed73017ff7b6
--- a/dev-python/pytest-mock/pytest-mock-3.9.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.9.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-mock/
+	https://pypi.org/project/pytest-mock/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
+	local EPYTEST_DESELECT=()
+
+	if has_version dev-python/mock; then
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_mock.py::test_standalone_mock
+		)
+	fi
+
+	epytest --assert=plain
+}
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@ -1,3 +1,4 @@
 DIST rapidfuzz-2.10.0.tar.gz 782698 BLAKE2B f2b4ead136162fd3592b16978a58cd3a2d66489f05aefdf58fd137ebf34f347368f437b3ee836b36122b00863f0c238c8191307f6b586676db59ebfa2d370e1c SHA512 b704a535021924e436a1cebe397e747d3e39b6a4ec12718bbb2a91c326d1977c51bd7ca9a4b2c2d380fdc27ea76b1549d61dea511ed86054aceb1d2180716627
 DIST rapidfuzz-2.10.1.tar.gz 782833 BLAKE2B a8be0ad8c617d8389b5fd22bff06e3887665dedd73580ac6ed29c3f5b895c399ffa0ac6ea983cb0a12d279d5312514e645f75d1a09a40be7108097b74e78c2d5 SHA512 006c714c4c2b86d77682042c7bd3e7a19328a56ff12b42f01e96712c4a94db654d63607363cf68b746416f107927bdee9dee9d7d29c80eda7c7fa74e0c21b75d
+DIST rapidfuzz-2.10.2.tar.gz 788167 BLAKE2B 91264d83159ce91cac33138c2589d468ffb079daef06f1917596892b3c5fbb99f2012d79ca05f728e6d49c2241d83f68e0d3a44956cfdfafd38cae428496f507 SHA512 3d7610a2e4b32fbfaa0ac043847829bfc436e61c2d0c76d526fc0827cca4fd10a0b6ae659bd61ed48604695c4782bcb0984d2becaf84494b84a5d8e71c22e97a
 DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be
--- a/dev-python/rapidfuzz/rapidfuzz-2.10.2.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-2.10.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
+	>=dev-python/jarowinkler-1.2.2[${PYTHON_USEDEP}]
+"
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/jarowinkler-cpp-1.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export RAPIDFUZZ_BUILD_EXTENSION=1
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@ -1 +1,2 @@
 DIST tomlkit-0.11.4.tar.gz 187608 BLAKE2B f6920eb53c4b5dc13afd5ccd8b9ac5ae867e4b353e6bcc2be4d5e4d8774e2869f93f4c222931b2b3c505371b8812de5ef1797891ce828889a806e665ab32aa84 SHA512 b68b5d2c5f2ad7aa2cbeac308008467f22c0c9975862506bcabbfdf1de677dbaab1c5cead17c68f4bf2977a7077ddcc46ef6383bd8a87e2ac1252641ae463335
+DIST tomlkit-0.11.5.tar.gz 188079 BLAKE2B 5ef55255904d3393c5a0937b6df30d95c9a41892848abaafab844233bfe9c656cdf4348a468cf2c9afa912d14a334874ac7854a9e94a4ee9b0bab35021d18667 SHA512 71225787e3543f995358b288bf459256632a8cd72a52aae2a1c6ea04e7c0978fb9ccfa856fa5e96e6d6c9d416abcefccec3e94985421ea14e31a755ee85a3dec
--- a/dev-python/tomlkit/tomlkit-0.11.5.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.11.5.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@ -1 +1,2 @@
 DIST trio-0.21.0.gh.tar.gz 491228 BLAKE2B e5f65d3aa9e4bc0c449e3986048d63fe3001a2eee96dbe5d8c088e0fce786b1d50861b47170baa7cced097938b16c92f0efd51518404a5e0ea6a17a48d656823 SHA512 383b11f264ddf4c78eb75829472826ebacf32d063790e8d4681d5df2f21c4f9287884db1752fd19976b674643adf7299816d4404e3032193ef90f522ad9cfa79
+DIST trio-0.22.0.gh.tar.gz 517482 BLAKE2B ab1fcb22d8f0ed9c8de831a9384b55ab433811863974cb767cb0ea4eb3a0df7372b5ea2c2d4c2af3ca1d3c8c3144d5546ad8cc68276b17ecb3d20ea1858ba9e0 SHA512 45b813d6cc65f8d49f70cb0ea7f33593fed0cc5989c60ba449f0b38c4759604aa7360cd016758fd364438b92516be549edf1efd583c7f5ee2de8813334f182bc
--- a/dev-python/trio/trio-0.22.0.ebuild
+++ b/dev-python/trio/trio-0.22.0.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for async concurrency and I/O"
+HOMEPAGE="
+	https://github.com/python-trio/trio/
+	https://pypi.org/project/trio/
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/exceptiongroup-1.0.0_rc9[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/outcome[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/immutables \
+	dev-python/sphinxcontrib-trio \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests require internet access
+		trio/tests/test_ssl.py
+		trio/tests/test_highlevel_ssl_helpers.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Times out on slower arches (ia64 in this case)
+		# https://github.com/python-trio/trio/issues/1753
+		trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
+
+		# incompatible ipython version?
+		trio/_core/tests/test_multierror.py::test_ipython_exc_handler
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not redistributors_should_skip"
+}
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@ -1 +1,2 @@
 DIST Unidecode-1.3.4.tar.gz 192346 BLAKE2B 34edea805896022fa42f47929a55ba01850475cb49431c4c50329caa2f198455704224320887ac7dcad5fba3517ab42cafc8ade726e785be0d0141814a5ad455 SHA512 bdbf482abd0d93ea8d891b95aea9f95cca6f85dbe71cd2bef4664216b3aa1d672c2f4ecf3b8bf356cdb1d8e4a1141c296728498473d9d0067d9774d0a7de8d48
+DIST Unidecode-1.3.5.tar.gz 192386 BLAKE2B b5a92b2bdcd6e19e6f499a1a1cb46eb2fbb1d44030a6652ab2c2946c5ce9acb313a6f325e69862d72c19a620107ab31e8619cc77af4f73a10724571d16ceb9f9 SHA512 3188071077b08c8c3473ead56a36774590acd14e4e0441cf6f744f7947a8f03e4d6930894c19cf29962a307ac16828218a90231bee5758f9465e4cd52ec9cd65
--- a/dev-python/unidecode/unidecode-1.3.5.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.5.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=Unidecode-${PV}
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="https://pypi.org/project/Unidecode/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@ -1,4 +1 @@
-DIST yamlpath-3.6.4.gh.tar.gz 216016 BLAKE2B fc6537b7c80ecfb9f69c646970e43935374bb105df007c123cf837eb1de6827ac2cc443294b69500c966ea6bc5d7f56498aec13340238c7660118f17cc6685e5 SHA512 eb1ac0d5861818f4f4b57b07f9fa7f758846982abbb3ac4ec58a1adaca8ec36deba1e21ce3e13916e74a946512f4d66e341a9d45392ef7133d0293e5fd6f66c9
-DIST yamlpath-3.6.5.gh.tar.gz 216508 BLAKE2B df1d849840356eb75d9e19a5b53ec94ce140d7474be2fde19ab7f438229d347f247ee3c0f25cef4948f71d95d6935aebc0f8e58bc869083849820f9d641d7f22 SHA512 1d80514516eb573b0c644af7eaab7211714e271cc4334db5d965e2da58f06d26b3cdcb8c1412d03151a196e1b48aeb0c0d5038364a09907bb2af1efa71dd71f3
-DIST yamlpath-3.6.6.gh.tar.gz 222605 BLAKE2B b8e4345e68bb03b9aa48f31813ead149a1e547bab36deacfc255b6d8bb62148ed11bed6495e3e8db14b48859717ee87386e6d740c8b33dbf16bf4923bc19bbcf SHA512 3699cd2af82c77b29de60d0912dd5fc858a7b10ac960a8944dd0566073a7bdf5bccc6378d5aa6e52498482e51aa00cb2cae53f2a089308617d1358d744b5efcc
 DIST yamlpath-3.6.7.gh.tar.gz 219770 BLAKE2B 779b94f6aff7e6430c89508145d85d2b7b5ddb4bc1070fd68d402e27b7bf596c7e68f1bfb8683791ea2572ef6d01fe5f2de4fd646be32b8ab266747371f61f36 SHA512 7313d3eaa9268d4c2acb1bc87052068498840943be503fa160833c03f372e5c6d7604572d277b70c551784fd8c9507e084f12dd651b5c4f600f69e8ee7cefb62
--- a/dev-python/yamlpath/yamlpath-3.6.4.ebuild
+++ b/dev-python/yamlpath/yamlpath-3.6.4.ebuild
@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-ruby/hiera-eyaml
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -e '/ruamel\.yaml/d' \
-		-e '/pytest-cov/d' \
-		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install and optimize yamlpath/patches/aliasstyle.py
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}"
-}
--- a/dev-python/yamlpath/yamlpath-3.6.5.ebuild
+++ b/dev-python/yamlpath/yamlpath-3.6.5.ebuild
@ -1,50 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-ruby/hiera-eyaml
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -e '/ruamel\.yaml/d' \
-		-e '/pytest-cov/d' \
-		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install and optimize yamlpath/patches/aliasstyle.py
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}"
-}
--- a/dev-python/yamlpath/yamlpath-3.6.6.ebuild
+++ b/dev-python/yamlpath/yamlpath-3.6.6.ebuild
@ -1,52 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-ruby/hiera-eyaml
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -e '/ruamel\.yaml/d' \
-		-e '/pytest-cov/d' \
-		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
-		-i setup.py || die
-
-	touch yamlpath/patches/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install and optimize yamlpath/patches/aliasstyle.py
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}"
-}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/glade/glade-3.40.0.ebuild
+++ b/dev-util/glade/glade-3.40.0.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://glade.gnome.org https://gitlab.gnome.org/GNOME/glade"

 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/13" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"

 IUSE="gjs gtk-doc +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@ -1,9 +1,9 @@
 DIST git-2.35.1.tar.xz 6874520 BLAKE2B 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025 SHA512 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb
 DIST git-2.37.3.tar.xz 6987464 BLAKE2B b672ed0a99532b2e2e69babbea9155e39f05590a76f55791ffed6ce4ef8b68d8e306a0a23819af26f34fcf3d16211c3a10ec58d86d81262f7a1261d0e51b1305 SHA512 9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f
-DIST git-2.38.0.rc1.tar.xz 7053024 BLAKE2B 40f734e30679694d9749741512eadd5b7ef42d47e40529cadaf5b8cba01ed5caf4534dbfc5c8ba13e4fee511cec8a7f4ffe844667b8930d660497764a6a8ad06 SHA512 2be15be5c687f7c65f9381ee34bfca00063ca2568981a9713a220f05cb16f7a1c4fdf628ab1971399e77d0b4b39d71b47d73e93b937d00efd965cf4c49e34af2
+DIST git-2.38.0.rc2.tar.xz 7052848 BLAKE2B 48c3466568d3c69c519c7b989b1dd26f40e6475ca5e406a9d44abf0d9b64da4964ca209357f2b065df4bc70fb6de0407692681e934317ddaba0f28f89cace7dc SHA512 223ae2e2da38eed0c0f834defb50ea98069db2a79f60e52ec03c56a5cf125f1a35f10091c5c2c44fb70ad02ecfc5ab9cfdecfbcc9a7d1051bff42008bbae48cd
 DIST git-htmldocs-2.35.1.tar.xz 1410148 BLAKE2B 68c3d12341271b861f42135bd4bd6e68ebcc6466931d383378b49aac42f77187f3fadc237974349cb0b50e4c5fb7a8ab185114341dd3012d159e420405d9ef91 SHA512 52a40644a7cd38caddecc43182863ca2f456644fff918ed4c8f826cbf269352c73d6bdc9119d25fcf537bc2fa38750791013329e4b0e32c8d14f0769dab85804
 DIST git-htmldocs-2.37.3.tar.xz 1447620 BLAKE2B 4efb86fb5431fd96ec4bcad7ecd9d5ae1d3f81f57f17dab4d8343948758f66b549b2442330b20cdb4ecd96f2029f4e7a376de5561fd9eda70acc46d2cffd7090 SHA512 ecc483a1fecf8c056a57e14a59950dc8a00f7940453dd5e2ccfd8dab966a9fee47178a7bbf8988e2c9a67ea6d84ffc33be790c49f812fb0ba661b57b7ff7b6ef
-DIST git-htmldocs-2.38.0.rc1.tar.xz 1478420 BLAKE2B 1d1f8c961b637b24a7475880769e4b8d949912a7200c997269906fb06e133a6e8ed74cee340d559f072f48da46034ecfff6b806f7a9402fe25c2249585d19255 SHA512 c0c27f09fb2ac6a3108c0c9689539ffaab5fc3850a4f17aa90d7a13fbdec980778a62596041c9edcf1fa8ee256294ae3cd21af142d5a21e0ee1c46e4cabd97e5
+DIST git-htmldocs-2.38.0.rc2.tar.xz 1478292 BLAKE2B 562ec256ff7cc9d1887e7f63be34463cc7634c180d1e3a29e603c35f1e413cf3494151c25eb505b9cf65e1a7d02f166781649f9208f1f4c44eafba5f60bf3711 SHA512 eee3c62c8a6cdf4f1f926d102d21a73a2db4363fa053ee74aeed9116d0865c944db272ef08af3b0bacd74cfb4fc5e4799336b1d5b4d5b8ec1cd6f6d02b1f5c13
 DIST git-manpages-2.35.1.tar.xz 497284 BLAKE2B 2d0d633320982243316575cc278df6c6a9ef181bf45ea9c1c8288e2677e4e71a33af96bada9bd90b03310be7dd33f2762b6b95489e267e2c191dcc7d1a715fe7 SHA512 0f4c46880f0e6d493112dcd4753fbe3702c06aa68be09bcbfc90263a355deba080995a08916b1f2404e4e17d720ee0de46a55e450c6cabeb1c147dcb2cd919d5
 DIST git-manpages-2.37.3.tar.xz 510096 BLAKE2B 0bc0b8c1818a06a6c7126119c04d2936bd38e997027bb31be5ad6bea2b43d71c5e9a76a29c576d84bd00c11f09bca7a67aa78a72f0171b41b93f6322c3b23808 SHA512 b25d4925f64e4de220dc9133d6e3ed13a397b160c27550c8700b76226f2b3a1611aec9ee24110ae16ebaceedc6617c6a04aa1b44270c7a0f166dd40d8f2f1132
-DIST git-manpages-2.38.0.rc1.tar.xz 553876 BLAKE2B b5805f3206daf93aa80ed9718ef21637eac6807594359fe1aa1ed42954d29e5b47fe7729a07ff560a67b29ac47a25f8ebb54538e595069d5626b52d9f972cfcb SHA512 dd1a25ec5a3ee62e9daac683d73d92745587d7a601a15be2db2bb331842488afaddffefc1631eecbb9a910804476eff61e9e2b5a6e4dd98219b98f97e4750403
+DIST git-manpages-2.38.0.rc2.tar.xz 553852 BLAKE2B e171ce80d6873a372c79ad00ff96a3e271fb9e01579413dc4b51d347183a89632606471463f018e192ffa3ec2c176cbe38058bfdde830ed8743684924bb42119 SHA512 626ba41de828dc3d10b94c525077b7857f1438c57338332106c200955fa362864dea67e28e1348ed21e160822f1827313aae793376d930f9a143bbb01551468c
--- a/dev-vcs/git/git-2.38.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.38.0_rc2.ebuild
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.3-r1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.3-r1.ebuild
@ -27,7 +27,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.10:3
 "
 DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
+	test? ( net-libs/uhttpmock:0 )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild
@ -27,7 +27,7 @@ RDEPEND="
 	>=x11-libs/gtk+-3.10:3
 "
 DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock )
+	test? ( net-libs/uhttpmock:0 )
 "
 BDEPEND="
 	dev-util/gdbus-codegen
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
--- a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.6.ebuild
+++ b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.6.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/webp-pixbuf-loader-${PV}"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE=""

 RDEPEND="
--- a/gui-libs/gtk/gtk-4.6.7.ebuild
+++ b/gui-libs/gtk/gtk-4.6.7.ebuild
@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "

-KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"

 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
--- a/gui-libs/libwpe/libwpe-1.12.3.ebuild
+++ b/gui-libs/libwpe/libwpe-1.12.3.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"

-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"

 RDEPEND="
 	media-libs/mesa[egl(+)]
--- a/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
+++ b/gui-libs/wpebackend-fdo/wpebackend-fdo-1.12.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://wpewebkit.org/releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="1.0"

-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"

 RDEPEND="
 	media-libs/libepoxy[egl]
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@ -1,6 +1,2 @@
-DIST alpine-2.25-chappa-11.patch.gz 172996 BLAKE2B b6fe190d8f95ffa9d851d4760517c25262645e1b52bcdeee75f36fc16f4ae6da862e60b144a9a037a9544e4910ce2cba39ff6f311a7a7254de18fd604453ef3d SHA512 c99c511bae13fe991fddeddedce13a0f538f7422eccf7f326db8f7d1a5558023c9995c595ec1b83f188f218894b16011ea0990797c0ab056ed7d5da600e9c518
-DIST alpine-2.25-chappa.patch.gz 172963 BLAKE2B 5e306325beb46fd2f716620794894f563b93e116693a1af050ea5f61c203350d2aa72b67d7f66acc748caea6a73bdef85f45324eb01edf8a6035b07f8a50e2bb SHA512 b88ca58e42a72b2b92cf28e4cae492a5ee75d534821046645fcc358833e87287fc707d5bec5c3508942a0ef1ecffe64916f00f1a01e430048384838e5ca40358
-DIST alpine-2.25-ssl.patch 5431 BLAKE2B 0cf2fcb682fbee41aa988ff089c16b75ebd9bee321c1c130d0b5136e5ca521bded7e9a97cd3ade1c86b17e72136264d4405cc36427a347c9bee84ee8a64548d4 SHA512 698d2a3c3b7b588fe3fcfe0291f0aab05c42b5ea80de1f210c1985082651329b80447de4e8057bc7e962fe8ed5175ea8132bad413c02fb1f0cc67c84e9420642
-DIST alpine-2.25.tar.xz 7495372 BLAKE2B ce2587a309c87ba527d51c360ee0d9627453cce6585631f569eb26db04aa6c5cddb7c9599478092447a040c43e9234e78a942fef4b1186d07c608163f96236be SHA512 76c214cf66f4ac7af3de40357ad3a592ff2a119e327e5f6c256125b7865d46b09197435fe6ac8077ab7a498e4821925939f3f902431ca77baa786e149466a193
 DIST alpine-2.26-chappa-5.patch.gz 173031 BLAKE2B 8719d37fde313e190608489e6191d4f0456f8a00ea267712e1c078ab1bbd3a8542bab3cf498faa1482fde386c24bf5335c54c39595ffb7fb019d13e975bf697a SHA512 aa979825367b309d5726055620c6f8f3effff954863e648de25f768ffbc175c3f91c8d1917e89116f35195a5ae266a9dcac51eb7f744f119ad848ddc0d10b8cc
 DIST alpine-2.26.tar.xz 7517628 BLAKE2B fe156974462dd566ac3fbe25cc54a1b2a480b3af46c8356356a97426f3e42495853efdbfeedc6173537dc150d90592c3fd9109e7d37f16738922a4205fd2f9df SHA512 359b5cb30be78a341b76c0475a2d5268b643788f14c9b5b9457af6748034e1d2e70fd7ddf59e5c59ad596a36d8a10afa9c41cbd74241c780b8575d8186168fd2
--- a/mail-client/alpine/alpine-2.25-r1.ebuild
+++ b/mail-client/alpine/alpine-2.25-r1.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> ${P}-ssl.patch
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
-
-# alpine-2.25-ssl.patch can only be applied when not using the chappa patches.
-REQUIRED_USE="chappa? ( ssl )"
-
-DEPEND="sys-libs/ncurses:=
-	virtual/libcrypt:=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap:= )
-	spell? ( app-text/aspell )
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-src_prepare() {
-	default
-	if use !ssl; then
-		eapply "${DISTDIR}/${P}-ssl.patch"
-	fi
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_with spell interactive-spellcheck /usr/bin/aspell)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR="$(tc-getAR)"
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-	dodoc NOTICE README*
-	dodoc doc/brochure.txt
-	dodoc -r doc/tech-notes/
-	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-	newdoc "${S}/doc/mime.types" mime.types.sample
-	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-}
--- a/mail-client/alpine/alpine-2.25-r2.ebuild
+++ b/mail-client/alpine/alpine-2.25-r2.ebuild
@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa-11.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> ${P}-ssl.patch
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads"
-
-# alpine-2.25-ssl.patch can only be applied when not using the chappa patches.
-REQUIRED_USE="chappa? ( ssl )"
-
-DEPEND="sys-libs/ncurses:=
-	virtual/libcrypt:=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap:= )
-	spell? ( app-text/aspell )
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-src_prepare() {
-	default
-	if use !ssl; then
-		eapply "${DISTDIR}/${P}-ssl.patch"
-	fi
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_with spell interactive-spellcheck /usr/bin/aspell)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR="$(tc-getAR)"
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-	dodoc NOTICE README*
-	dodoc doc/brochure.txt
-	dodoc -r doc/tech-notes/
-	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-	newdoc "${S}/doc/mime.types" mime.types.sample
-	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-}
--- a/mail-client/alpine/alpine-2.25-r3.ebuild
+++ b/mail-client/alpine/alpine-2.25-r3.ebuild
@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools optfeature toolchain-funcs
-
-DESCRIPTION="An easy to use text-based based mail and news client"
-HOMEPAGE="http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/"
-CHAPPA_PATCH_NAME="${P}-chappa-11.patch"
-SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
-	https://repo.or.cz/alpine.git/patch/fb2217ac67706e4cbef69bea41041e2fb8b910e9 -> ${P}-ssl.patch
-	chappa? ( http://alpine.x10host.com/alpine/patches/${P}/all.patch.gz -> ${CHAPPA_PATCH_NAME}.gz ) "
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+chappa ipv6 kerberos ldap nls onlyalpine passfile smime ssl threads"
-
-# alpine-2.25-ssl.patch can only be applied when not using the chappa patches.
-REQUIRED_USE="chappa? ( ssl )"
-
-DEPEND="sys-libs/ncurses:=
-	virtual/libcrypt:=
-	kerberos? ( app-crypt/mit-krb5 )
-	ldap? ( net-nds/openldap:= )
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}
-	app-misc/mime-types
-"
-
-src_prepare() {
-	default
-	if use !ssl; then
-		eapply "${DISTDIR}/${P}-ssl.patch"
-	fi
-	use chappa && eapply "${WORKDIR}/${CHAPPA_PATCH_NAME}"
-	eautoreconf
-	tc-export CC RANLIB AR
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_configure() {
-	myconf=(
-		--without-tcl
-		--with-system-pinerc="${EPREFIX}"/etc/pine.conf
-		--with-system-fixed-pinerc="${EPREFIX}"/etc/pine.conf.fixed
-		$(use_with ldap)
-		$(use_with ssl)
-		$(use_with passfile passfile .pinepwd)
-		$(use_with kerberos krb5)
-		$(use_with threads pthread)
-		$(use_enable nls)
-		$(use_with ipv6)
-		$(use_with smime)
-	)
-
-	if has_version "app-text/hunspell"; then
-		myconf+=( --with-interactive-spellcheck=/usr/bin/hunspell )
-	elif has_version "app-text/aspell"; then
-		myconf+=( --with-interactive-spellcheck=/usr/bin/aspell )
-	fi
-
-	if use ssl; then
-		myconf+=(
-			--with-ssl-include-dir="${EPREFIX}"/usr/include/openssl
-			--with-ssl-lib-dir="${EPREFIX}"/usr/$(get_libdir)
-			--with-ssl-certs-dir="${EPREFIX}"/etc/ssl/certs
-		)
-	fi
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -j1 AR="$(tc-getAR)"
-}
-
-src_install() {
-	if use onlyalpine ; then
-		dobin alpine/alpine
-		doman doc/man1/alpine.1
-	else
-		emake -j1 DESTDIR="${D}" install
-		doman doc/man1/*.1
-	fi
-	dodoc NOTICE README*
-	dodoc doc/brochure.txt
-	dodoc -r doc/tech-notes/
-	newdoc "${S}/doc/mailcap.unx" mailcap.unx.sample
-	newdoc "${S}/doc/mime.types" mime.types.sample
-	docompress -x /usr/share/doc/${PF}/mailcap.unx.sample /usr/share/doc/${PF}/mime.types.sample
-}
-
-pkg_postinst() {
-	optfeature "Spell checking" app-text/hunspell app-text/aspell
-}
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
--- a/media-gfx/freecad/freecad-0.20.1.ebuild
+++ b/media-gfx/freecad/freecad-0.20.1.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then
 	S="${WORKDIR}/freecad-${PV}"
 else
 	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	S="${WORKDIR}/FreeCAD-${PV}"
 fi

--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-5.1.0.ebuild
@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 LICENSE="Old-MIT ISC icu"
--- a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
+++ b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
@ -0,0 +1,29 @@
+From 6f3c61b994e9a503fcc9649cba439d81f40901d0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 27 Sep 2022 07:29:11 +0200
+Subject: [PATCH] drop failing testDwaLookups
+
+On x86_32 testDwaLookups fails
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/test/OpenEXRTest/main.cpp
+++ b/src/test/OpenEXRTest/main.cpp
+@@ -65,7 +65,6 @@
+ #include "testDwaCompressorSimd.h"
+ #include "testRle.h"
+ #include "testB44ExpLogTable.h"
+-#include "testDwaLookups.h"
+ #include "testIDManifest.h"
+ 
+ #include "tmpDir.h"
+@@ -229,7 +228,6 @@ main (int argc, char *argv[])
+     TEST (testDwaCompressorSimd, "basic");
+     TEST (testRle, "core");
+     TEST (testB44ExpLogTable, "core");
+-    TEST (testDwaLookups, "core");
+     TEST (testIDManifest, "core");
+ 
+     // NB: If you add a test here, make sure to enumerate it in the
+-- 
+2.37.3
+
--- a/media-libs/openexr/openexr-3.1.5.ebuild
+++ b/media-libs/openexr/openexr-3.1.5.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-inherit cmake
+inherit cmake flag-o-matic

 MY_PN=OpenEXR

@ -14,7 +14,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/
 LICENSE="BSD"
 SLOT="0/30" # based on SONAME
 # -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
 RESTRICT="!test? ( test )"

@ -43,10 +43,18 @@ src_prepare() {
 	sed -e "s:/var/tmp/:${T}:" \
 		-i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"

+	if use x86; then
+		eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch
+	fi
+
 	cmake_src_prepare
 }

 src_configure() {
+	if use x86; then
+		replace-cpu-flags native i686
+	fi
+
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 		-DDOCS=$(usex doc)
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/mpg123/mpg123-1.30.2.ebuild
+++ b/media-sound/mpg123/mpg123-1.30.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"

 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
--- a/Show More
+++ b/Show More