Sync with portage [Fri Jun 16 15:37:21 MSK 2023].

11 months ago · fc8b06cf2e
parent 97d3bdc159
commit fc8b06cf2e
3789 changed files with 11683 additions and 10032 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@ -1,4 +1 @@
-DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
-DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 SHA512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre2
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
-	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
-	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF > "${T}"/pcre2-config
-	#!/usr/bin/env bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre2-config || die
-
-	# Only here for libtool and which patches
-	eautoreconf
-}
-
-src_configure() {
-	# Silly check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
-	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--without-pcre
-		--with-pcre2="${T}"/pcre2-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-
-	# econf overwrites the stuff from config.layout.
-	econf "${myeconfargs[@]}"
-
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
--- a/app-admin/apache-tools/apache-tools-2.4.55.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre2
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
-	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
-	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF > "${T}"/pcre2-config
-	#!/usr/bin/env bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre2-config || die
-
-	# Only here for libtool and which patches
-	eautoreconf
-}
-
-src_configure() {
-	# Silly check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
-	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--without-pcre
-		--with-pcre2="${T}"/pcre2-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-
-	# econf overwrites the stuff from config.layout.
-	econf "${myeconfargs[@]}"
-
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre2
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
-	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
-	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF > "${T}"/pcre2-config
-	#!/usr/bin/env bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre2-config || die
-
-	# Only here for libtool and which patches
-	eautoreconf
-}
-
-src_configure() {
-	# Silly check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
-	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--without-pcre
-		--with-pcre2="${T}"/pcre2-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-
-	# econf overwrites the stuff from config.layout.
-	econf "${myeconfargs[@]}"
-
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@ -1,12 +1,4 @@
 DIST awscli-exe-linux-aarch64-2.11.17.zip 56500418 BLAKE2B ced68deac081666c71d73bea7d48f19aa27c8a78835ad13acaa06dac65db8569e9cf446900c0a8ede169bf177168e47ad3bebd06ad295a5626d926d59e4ed57b SHA512 6424cfcd079007cf1519f0018555c589a154639c1f28596d51d227c9078abbcd16660488d9c7984468bd223a7e4a89296c42c8fbdb8b6d085e32163e71d1f641
-DIST awscli-exe-linux-aarch64-2.11.5.zip 56858691 BLAKE2B 8a798c59568d64e2c8104d780458567bc2ad3061de81a7f4de90c8658087e560cb108945fbc71aa23808efe211ac63063f246d903e515f1cad06b91049eb64c0 SHA512 195516fe488266b8131fc9959ff81fc88a9902adabb033ab7d76b44996e1af08e8d0244f806193d91604cdb22a6266b686b9d6411ca9caa5b3188562b7b1eec1
-DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
-DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4
-DIST awscli-exe-linux-aarch64-2.7.28.zip 46543587 BLAKE2B aba4c360ed9ce37406f552db1df9ddd69b46b2f87a9c12c46a5026d9259202ce485a25f7cc1d768ab9c3caff3165e56f13529f3ccc1e65935e327b5980a16af5 SHA512 b126bf26c52e2ab32bf4b7f425527960fcf5a07f0e446aaf2fe0deced802419e12cc48f9c87e0cbe4fc01430264a48b1103a9b5ea5e871a811b8e8b8c8a691d6
-DIST awscli-exe-linux-aarch64-2.9.23.zip 47582887 BLAKE2B 3159308e20f54462c04c9e290fdbcc1d0433973fba36ba53fe7886f9ecd16eac0ecea6ac10a1f1cf49eb71c1ee704b84a6cdf18373fc94a1f9c648741ac5bcf0 SHA512 4f407c722c38a4f6adfda4e938f1039208774a897d62e9ccceb52f905a751a4dcb022342180d74fa39dd0cfd2af6787c550f8a214707b922d7bd135465074179
+DIST awscli-exe-linux-aarch64-2.12.0.zip 56282131 BLAKE2B 147d200a134dc3f4ca3b6dff285b447d98eedb52207f923354cd748102ed0bf8e9bd4e883d59536f8bbe3a249de99102c8b5f239271cdef66d73df069add1491 SHA512 e0e72d951b0d3136b99b15d8abcc0b38492ef0c92a915e4f92a902318895ff580fface1ee202a5c06cf99a9f4ab935b2393e7318d1efc3df90152c18ed745b7f
 DIST awscli-exe-linux-x86_64-2.11.17.zip 57614965 BLAKE2B 0a711bc968b53dd08810ef857c9d51d332b016fd969491850f9dd8fc84e912f815e2b0a6e38223fe29c321ee784ad2ee41644b7027af3439742d3c2141f10098 SHA512 c05ada15a4e896850adbe04cc159141d84fabc955f3baf6d053200c6595cc77c8a75886ce5f1bd18370fe34a2c1c3d294312aa471a028104266fa45fa5aa4334
-DIST awscli-exe-linux-x86_64-2.11.5.zip 57429612 BLAKE2B 8d98afc07dc38600600b04e490018b0df46b7bd6ac23a782a6554642cd3d6302ea42baea4cee6631f5aee6a935d677c8a315e881e1d98267fb2cdcebaa67431b SHA512 89733d2c55de6eec06638032fb84be5c59b5d9d6589ae5437dee49466ba019c921ffc5e9eaabb1cae03afcae1e3322938cf525336ee4f89eb8a601ba9e2ccc13
-DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
-DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7
-DIST awscli-exe-linux-x86_64-2.7.28.zip 47299458 BLAKE2B 3ac11104ad062ccf70fe697406a65cc08949f9b89784c5cf3f8e80c33629f5fde44853c35f8160f1f285405e576e65a73d9ba9a42b3e31a11120ee50cfccd83c SHA512 a86a2b73a11b74fa7a9b30095adaacacc7ea3a84136a9d5d63bcd776b98a6f6e005cb815fa34451cee85b55e6d1693a906bb8601a1ded3a5eff0416dd79bbc28
-DIST awscli-exe-linux-x86_64-2.9.23.zip 49149732 BLAKE2B 3a2500dc6edd2de1747e49b123de67606fa64c41da9f7e364899ae3d23c81d07105102b0afbc858a68a7db189448b171dfdb1ce6ca9ead8f4d607cc896cfcc68 SHA512 ca379e527e4e82b9970b257367f3a5eaf5c59612a2661a6802a9695b96ca16806369b549bfb3203542ebf2948ba3d59ed816f893db34c8ed950eeb9f52ac386a
+DIST awscli-exe-linux-x86_64-2.12.0.zip 57965257 BLAKE2B 9c8fec1d30795af94807d60c62b28eeb84e682d99cbacc0c8ad5b022c569e310fe781d00a6e9bd0cc0222c0104d9e0d2521bf3fb2102f60fe76de75bfec90cf8 SHA512 c4688e09fa17ed89495c807ebb1826e0517c1a7e7e4e62981e17e86a11227434eb1c59b9e7fffbd8e9e7ff6cc05846bf6cf7cc1769e099c9c146d9d11c400ab5
--- a/app-admin/awscli-bin/awscli-bin-2.12.0.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.12.0.ebuild
--- a/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.7.20.ebuild
@ -1,90 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="command line interface for Amazon Web Services"
-HOMEPAGE="
-	https://aws.amazon.com/cli/
-	https://github.com/aws/aws-cli/
-	"
-SRC_URI="
-	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
-	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
-	"
-
-LICENSE="
-	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
-	openssl PSF-2 BSD-2 GPL-3+ public-domain
-	"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RDEPEND="!app-admin/awscli
-	sys-libs/glibc"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-# This code is based on the install script in the upstream archive.
-
-set_global_vars() {
-	ROOT_INSTALL_DIR=/opt/aws-cli
-	BIN_DIR=/usr/bin
-
-	EXE_NAME="aws"
-	COMPLETER_EXE_NAME="aws_completer"
-	INSTALLER_DIR="aws"
-	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
-	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
-	AWS_EXE_VERSION=${PV}
-
-	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
-	# INSTALL_DIR="${INSTALL_DIR}"
-	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
-	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
-	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
-	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
-
-	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
-	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
-	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
-
-	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
-	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
-}
-
-create_install_dir() {
-	dodir "${INSTALL_DIR}"
-	setup_install_dist
-	setup_install_bin
-	create_current_symlink
-}
-
-setup_install_dist() {
-	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
-}
-
-setup_install_bin() {
-	dodir "${INSTALL_BIN_DIR}"
-	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
-	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
-}
-
-create_current_symlink() {
-	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
-}
-
-create_bin_symlinks() {
-	dodir "${BIN_DIR}"
-	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
-	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
-}
-
-src_install() {
-	set_global_vars
-	create_install_dir
-	create_bin_symlinks
-}
--- a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
@ -1,90 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="command line interface for Amazon Web Services"
-HOMEPAGE="
-	https://aws.amazon.com/cli/
-	https://github.com/aws/aws-cli/
-	"
-SRC_URI="
-	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
-	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
-	"
-
-LICENSE="
-	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
-	openssl PSF-2 BSD-2 GPL-3+ public-domain
-	"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RDEPEND="!app-admin/awscli
-	sys-libs/glibc"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-# This code is based on the install script in the upstream archive.
-
-set_global_vars() {
-	ROOT_INSTALL_DIR=/opt/aws-cli
-	BIN_DIR=/usr/bin
-
-	EXE_NAME="aws"
-	COMPLETER_EXE_NAME="aws_completer"
-	INSTALLER_DIR="aws"
-	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
-	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
-	AWS_EXE_VERSION=${PV}
-
-	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
-	# INSTALL_DIR="${INSTALL_DIR}"
-	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
-	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
-	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
-	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
-
-	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
-	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
-	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
-
-	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
-	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
-}
-
-create_install_dir() {
-	dodir "${INSTALL_DIR}"
-	setup_install_dist
-	setup_install_bin
-	create_current_symlink
-}
-
-setup_install_dist() {
-	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
-}
-
-setup_install_bin() {
-	dodir "${INSTALL_BIN_DIR}"
-	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
-	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
-}
-
-create_current_symlink() {
-	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
-}
-
-create_bin_symlinks() {
-	dodir "${BIN_DIR}"
-	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
-	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
-}
-
-src_install() {
-	set_global_vars
-	create_install_dir
-	create_bin_symlinks
-}
--- a/app-admin/awscli-bin/awscli-bin-2.7.28.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.7.28.ebuild
@ -1,90 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="command line interface for Amazon Web Services"
-HOMEPAGE="
-	https://aws.amazon.com/cli/
-	https://github.com/aws/aws-cli/
-	"
-SRC_URI="
-	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
-	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
-	"
-
-LICENSE="
-	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
-	openssl PSF-2 BSD-2 GPL-3+ public-domain
-	"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RDEPEND="!app-admin/awscli
-	sys-libs/glibc"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-# This code is based on the install script in the upstream archive.
-
-set_global_vars() {
-	ROOT_INSTALL_DIR=/opt/aws-cli
-	BIN_DIR=/usr/bin
-
-	EXE_NAME="aws"
-	COMPLETER_EXE_NAME="aws_completer"
-	INSTALLER_DIR="aws"
-	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
-	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
-	AWS_EXE_VERSION=${PV}
-
-	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
-	# INSTALL_DIR="${INSTALL_DIR}"
-	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
-	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
-	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
-	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
-
-	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
-	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
-	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
-
-	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
-	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
-}
-
-create_install_dir() {
-	dodir "${INSTALL_DIR}"
-	setup_install_dist
-	setup_install_bin
-	create_current_symlink
-}
-
-setup_install_dist() {
-	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
-}
-
-setup_install_bin() {
-	dodir "${INSTALL_BIN_DIR}"
-	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
-	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
-}
-
-create_current_symlink() {
-	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
-}
-
-create_bin_symlinks() {
-	dodir "${BIN_DIR}"
-	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
-	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
-}
-
-src_install() {
-	set_global_vars
-	create_install_dir
-	create_bin_symlinks
-}
--- a/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.9.23.ebuild
@ -1,90 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="command line interface for Amazon Web Services"
-HOMEPAGE="
-	https://aws.amazon.com/cli/
-	https://github.com/aws/aws-cli/
-	"
-SRC_URI="
-	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
-	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
-	"
-
-LICENSE="
-	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
-	openssl PSF-2 BSD-2 GPL-3+ public-domain
-	"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-
-RDEPEND="!app-admin/awscli
-	sys-libs/glibc"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-RESTRICT="strip"
-S="${WORKDIR}"
-
-# This code is based on the install script in the upstream archive.
-
-set_global_vars() {
-	ROOT_INSTALL_DIR=/opt/aws-cli
-	BIN_DIR=/usr/bin
-
-	EXE_NAME="aws"
-	COMPLETER_EXE_NAME="aws_completer"
-	INSTALLER_DIR="aws"
-	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
-	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
-	AWS_EXE_VERSION=${PV}
-
-	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
-	# INSTALL_DIR="${INSTALL_DIR}"
-	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
-	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
-	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
-	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
-
-	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
-	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
-	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
-
-	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
-	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
-}
-
-create_install_dir() {
-	dodir "${INSTALL_DIR}"
-	setup_install_dist
-	setup_install_bin
-	create_current_symlink
-}
-
-setup_install_dist() {
-	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
-}
-
-setup_install_bin() {
-	dodir "${INSTALL_BIN_DIR}"
-	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
-	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
-}
-
-create_current_symlink() {
-	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
-}
-
-create_bin_symlinks() {
-	dodir "${BIN_DIR}"
-	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
-	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
-}
-
-src_install() {
-	set_global_vars
-	create_install_dir
-	create_bin_symlinks
-}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,4 @@ DIST aws-cli-1.27.146.gh.tar.gz 2430455 BLAKE2B 5e59ad0a5e97b4f218c694a6c9df3fb8
 DIST aws-cli-1.27.151.gh.tar.gz 2433265 BLAKE2B a26710e9af6cca92db87394c15415ade9aa1228d270386e96540d617b71b1531c15f3a0c5c65e9bd1ceca6ee7c49477b07e8fe7cdedee080c6c163e7aac9794c SHA512 80af195a72112e660db1ff958d4fc61f57a2781a007eb7ba945d6eb6d44589c1f505c9cc30d350d56e8cf376aa30de1d3a220efe0672941ed9ee57375b405502
 DIST aws-cli-1.27.152.gh.tar.gz 2434279 BLAKE2B 4c7ff9c0df3aee2eb8d195941f0d443a0904f7becbf6d9484425d940ca2f686520a28e9ab196a634663f6b1662905352ad7548ec4ba2bbde770af74970a5bf99 SHA512 8039ff55f967091649e74f4a827044ebddeff7beb28cc4bc47ed817941c64cd6f6e274c705fbeb49ce58331514b4bc4b6622689f1740a6ef676983cf0224e942
 DIST aws-cli-1.27.153.gh.tar.gz 2436062 BLAKE2B e9351f70b36ffb15fcab233ba2c6845675749b34a16ddb6baac25acb712f7ce42fa531683684fa7deb4bde38c896eca6f5e47d6637f10e45c56d7e20eb99145e SHA512 6e48dfed4c7d09acc1d567952e921a926ac2a63cbf4c0ab27856a17336cb517157ff5e7a3685b9f6c7d2f2edc2aad7dd52079ac3b5cbb13ad0da65a772dc3099
+DIST aws-cli-1.27.154.gh.tar.gz 2436624 BLAKE2B 79f55cc001ba3286a125002304c350dbecc6582b0e52b1ab1c1460b15406a82b397907ab11c7fd92c0db4e952856cf6f7b2c7a0022ff4ddddf836b5f49a86461 SHA512 366ddc5274631c70e2e5735ead4d54cecfdc7b115d8168aff6fff25b3f842731a2938cd66da1c6897833fae7ac534945c848551ca5a07c7a52fe7d6f9f2b55f7
--- a/app-admin/awscli/awscli-1.27.154.ebuild
+++ b/app-admin/awscli/awscli-1.27.154.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/calamares/calamares-3.2.60-r1.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r1.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kpackage:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt
-	>=sys-libs/kpmcore-4.0.0:5=
-	virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=OFF
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Skipped tests:
-		# load-dracut: tries and fails to find Dracut config
-		# libcalamaresnetworktest: needs network
-		# libcalamaresutilstest: inspects /tmp (expects namespace?)
-		#
-		# Need investigation:
-		# test_libcalamaresuipaste
-		# validate-netinstall
-		# validate-services-systemd
-		# localetest
-		# machineidtest
-		# packagechoosertest
-		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
--- a/app-admin/calamares/calamares-3.2.60-r4.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r4.ebuild
@ -55,7 +55,12 @@ RDEPEND="${COMMON_DEPEND}
 	app-admin/sudo
 	dev-libs/libatasmart
 	net-misc/rsync
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	|| (
+		sys-boot/grub:2
+		sys-apps/systemd[gnuefi(-)]
+		sys-apps/systemd[boot(-)]
+		sys-apps/systemd-utils[boot]
+	)
 	sys-boot/os-prober
 	sys-fs/squashfs-tools
 	sys-libs/timezone-data
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1 +1 @@
-DIST exo-1.69.0.gh.tar.gz 5679426 BLAKE2B 583a1bb405ec707b371c67f59240e7fc192b07c94698c86a0acb652bd946c817d581597b9dffe0d2276585e462cc67de840005e337c228d0fe779ce002c5e3b5 SHA512 79f8a54ff9baa09e2bfd3dd2cedfa605eec958838036c368394fd684f12eb805373fe44c5931a3c419bd829447736d94fdba3e14f71f3a4bbe9fc0e4e7c7cdad
+DIST exo-1.70.0.gh.tar.gz 5878972 BLAKE2B c62f5fad1552bfce99d4a171d44783add090792d151d6339415fbb3015a1085be1c9025a4a874910ff60bd2f03a0d84fdf858598fb0cfa5745e101489117cd9a SHA512 19320be04f409e4424c1451919873499a90570d73aa04a6e3106c6271febf62e126ccad7cb1f2514ec5724bdf03a3794f2aff3789d95b0ee85998f3c5602f263
--- a/app-admin/exo/exo-1.70.0.ebuild
+++ b/app-admin/exo/exo-1.70.0.ebuild
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/lxd/lxd-5.0.2-r2.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r2.ebuild
@ -177,6 +177,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full lxd-migrate support"
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/pluma/pluma-1.26.0-r1.ebuild
+++ b/app-editors/pluma/pluma-1.26.0-r1.ebuild
@ -11,7 +11,7 @@ DESCRIPTION="Pluma text editor for the MATE desktop"

 LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 IUSE="+introspection spell test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -2,4 +2,5 @@ DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d8111
 DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d
 DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
+DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22
 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf
--- a/app-emulation/virtualbox/files/virtualbox-7.0.9-python.patch
+++ b/app-emulation/virtualbox/files/virtualbox-7.0.9-python.patch
@ -0,0 +1,22 @@
+Virtualbox 7.x will only build a lib named VBoxPython3.so, regardless of the
+actual python version used when compiling.  Remove VBoxPython3m.so, we don't
+use it.
+
+Upstream added support for pyton up to 3.12.
+
+--- a/src/libs/xpcom18a4/python/Makefile.kmk
+++ b/src/libs/xpcom18a4/python/Makefile.kmk
+@@ -704,13 +704,6 @@
+    VBoxPython3_DEFS      = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
+    VBoxPython3_INCS      = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
+    VBoxPython3_LDFLAGS.darwin = -undefined dynamic_lookup
+-
+-   ifneq ($(KBUILD_TARGET),darwin)
+-    DLLS += VBoxPython3m
+-    VBoxPython3m_EXTENDS  = VBoxPythonBase_m
+-    VBoxPython3m_DEFS     = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
+-    VBoxPython3m_INCS     = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
+-   endif
+   endif
+  endif # VBOX_WITH_PYTHON_LIMITED_API
+ 
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@ -0,0 +1,761 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Important!
+# This compiles the latest svn version.
+# It also compiles the kernel modules.  Does not depend on virtualbox-modules.
+# It is not meant to be used, might be very unstable.
+# Upstream seem to have added support for python 3.12; I haven't checked it yet.
+#
+# USE=doc does not work for now.
+#
+#
+# To add a new Python here:
+# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic)
+#    Do NOT skip this part. It'll end up silently not-building the Python extension
+#    or otherwise misbehaving if you do.
+#
+# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python.
+#
+#  May need to look at other distros (e.g. Arch Linux) to find patches for newer
+#  Python versions as upstream tends to lag. Upstream may have patches on their
+#  trunk branch but not release branch.
+#
+#  See bug #785835, bug #856121.
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-mod-r1 multilib optfeature pax-utils \
+	python-single-r1 subversion tmpfiles toolchain-funcs udev xdg
+
+MY_PN="VirtualBox"
+BASE_PV=7.0.8
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+ESVN_REPO_URI="https://www.virtualbox.org/svn/vbox/trunk"
+SRC_URI="
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.10_pre20230615.tar.bz2
+	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) )
+"
+S="${WORKDIR}/trunk"
+
+LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
+
+unset WATCOM #856769
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-group/vboxusers
+	dev-libs/libtpms
+	dev-libs/libxml2
+	dev-libs/openssl:0=
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	net-misc/curl
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXt
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	lvm? ( sys-fs/lvm2 )
+	opengl? (
+		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+	pam? ( sys-libs/pam )
+	sdl? (
+		media-libs/libsdl2[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXt
+	)
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] )
+	vde? ( net-misc/vde )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )
+"
+# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
+# with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
+# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
+# based on *DEPEND doesn't work for BDEPEND at least right now.
+#
+# There's a comment in Config.kmk about it
+# ("With Java 11 wsimport was removed, usually part of a separate install now.")
+# but it needs more investigation.
+#
+# See bug #878299 to track this issue.
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/libxslt-1.1.19
+	virtual/libcrypt:=
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	gui? (
+		x11-base/xorg-proto
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+	)
+	java? ( virtual/jdk:1.8 )
+	opengl? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXmu
+		x11-libs/libXrandr
+		virtual/glu
+	)
+	sdl? ( x11-libs/libXinerama )
+	pulseaudio? ( media-libs/libpulse )
+	udev? ( >=virtual/udev-171 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	gui? ( x11-libs/libxcb:= )
+	java? ( virtual/jre:1.8 )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-arch/makeself
+	>=app-arch/tar-1.34-r2
+	>=dev-lang/yasm-0.6.2
+	dev-libs/libIDL
+	dev-util/glslang
+	>=dev-util/kbuild-0.1.9998.3592
+	sys-apps/which
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		app-text/docbook-xsl-ns-stylesheets
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+		dev-qt/qthelp:5
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+	nls? ( dev-qt/linguist-tools:5 )
+	java? ( virtual/jdk:1.8 )
+"
+
+QA_FLAGS_IGNORED="
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_TEXTRELS="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+QA_EXECSTACK="
+	usr/lib64/virtualbox/iPxeBaseBin
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug
+"
+
+QA_WX_LOAD="
+	usr/lib64/virtualbox/iPxeBaseBin
+"
+
+QA_PRESTRIPPED="
+	usr/lib64/virtualbox/VMMR0.r0
+	usr/lib64/virtualbox/VBoxDDR0.r0
+	usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0
+"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365
+
+	# This patch is needed to avoid automagic detection based on a hardcoded
+	# list of Pythons in configure. It's necessary but not sufficient
+	# (see the rest of the ebuild's logic for the remainder) to handle
+	# proper Python selection.
+	"${FILESDIR}"/${PN}-6.1.34-r3-python.patch
+
+	# 865361
+	"${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch
+
+	"${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch
+	"${FILESDIR}"/${PN}-7.0.9-python.patch
+	"${FILESDIR}"/${PN}-7.0.6-gcc-13.patch
+	"${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch
+
+	# Downloaded patchset
+	"${WORKDIR}"/virtualbox-patches-7.0.10_pre20230615/patches
+)
+
+DOCS=()	# Don't install the default README file during einstalldocs
+
+CONFIG_CHECK="~!SPINLOCK JUMP_LABEL"
+
+pkg_pretend() {
+	if ! use gui; then
+		einfo "No USE=\"gui\" selected, this build will not include any Qt frontend."
+	fi
+
+	if ! use opengl; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	if ! use nls && use gui; then
+		einfo "USE=\"gui\" also selects USE=\"nls\".  This build"
+		einfo "will have NLS support."
+	fi
+
+	# 749273
+	local d=${ROOT}
+	for i in usr "$(get_libdir)"; do
+		d="${d}/$i"
+		if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then
+			die "${d} should be owned by root, VirtualBox will not start otherwise"
+		fi
+	done
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	linux-mod-r1_pkg_setup
+}
+
+src_unpack() {
+	subversion_src_unpack
+	default
+}
+
+src_prepare() {
+	default
+
+	# Only add nopie patch when we're on hardened
+	if gcc-specs-pie; then
+		eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch
+	fi
+
+	# Remove shipped binaries (kBuild, yasm) and tools, see bug #232775
+	rm -r kBuild/bin || die
+	# Remove everything in tools except kBuildUnits
+	find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	if ! use pch; then
+		# bug #753323
+		printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \
+			>> LocalConfig.kmk || die
+	fi
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam; then
+		einfo "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	#856811 #864274
+	# cannot filter out only one flag, some combinations of these flags produce buggy executables
+	for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do
+		append-cflags $(test-flags-CC -mno-$i)
+		append-cxxflags $(test-flags-CXX -mno-$i)
+	done
+
+	# bug #843437
+	cat >> LocalConfig.kmk <<-EOF || die
+		CXXFLAGS=${CXXFLAGS}
+		CFLAGS=${CFLAGS}
+	EOF
+
+	if use sdl; then
+		sed -i 's/sdl-config/sdl2-config/' configure || die
+		echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die
+	fi
+
+	#443830
+	echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die
+
+	if tc-is-clang; then
+		# clang assembler chokes on comments starting with /
+		sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die
+
+		# clang does not support this extension
+		eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch
+	fi
+
+	# fix doc generation
+	echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die
+	# replace xhtml names with numeric equivalents
+	find doc/manual -name \*.xml -exec sed -i \
+		-e 's/&nbsp;/\&#160;/g' \
+		-e 's/&ndash;/\&#8211;/g' \
+		-e 's/&larr;/\&#8592;/g' \
+		-e 's/&rarr;/\&#8594;/g' \
+		-e 's/&harr;/\&#8596;/g' {} \+ || die
+
+	# fix help path #891879
+	echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die
+
+	# 489208
+	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
+
+	# 890561
+	echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die
+
+	if ! use nls && ! use gui; then
+		cat >> LocalConfig.kmk <<-EOF || die
+			VBOX_WITH_NLS :=
+			VBOX_WITH_MAIN_NLS :=
+			VBOX_WITH_PUEL_NLS :=
+			VBOX_WITH_VBOXMANAGE_NLS :=
+		EOF
+	fi
+}
+
+src_configure() {
+	tc-ld-disable-gold # bug #488176
+
+	tc-export AR CC CXX LD RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+
+		--disable-kmods
+
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
+	)
+
+	if use gui || use sdl || use opengl; then
+		myconf+=(
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
+		)
+	else
+		myconf+=(
+			--build-headless
+		)
+	fi
+
+	if use amd64 && ! has_multilib_profile; then
+		myconf+=( --disable-vmmraw )
+	fi
+
+	# not an autoconf script
+	edo ./configure "${myconf[@]}"
+
+	# Force usage of chosen Python implementation
+	# bug #856121, bug #785835
+	sed -i \
+		-e '/VBOX_WITH_PYTHON.*=/d' \
+		-e '/VBOX_PATH_PYTHON_INC.*=/d' \
+		-e '/VBOX_LIB_PYTHON.*=/d' \
+		AutoConfig.kmk || die
+
+	cat >> AutoConfig.kmk <<-EOF || die
+		VBOX_WITH_PYTHON=$(usev python 1)
+		VBOX_PATH_PYTHON_INC=$(python_get_includedir)
+		VBOX_LIB_PYTHON=$(python_get_library_path)
+	EOF
+
+	if use python; then
+		local mangled_python="${EPYTHON#python}"
+		mangled_python="${mangled_python/.}"
+
+		# Stub out the script which defines what the Makefile ends up
+		# building for. gen_python_deps.py gets called by the Makefile
+		# with some args and it spits out a bunch of paths for a hardcoded
+		# list of Pythons. We just override it with what we're actually using.
+		# This minimises the amount of patching we have to do for new Pythons.
+		cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die
+			print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)")
+			print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)")
+			print("VBOX_PYTHONDEF_INC=$(python_get_includedir)")
+			print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)")
+		EOF
+
+		chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die
+	fi
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS})
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+
+	local myemakeargs=(
+		VBOX_BUILD_PUBLISHER=_Gentoo
+		VBOX_WITH_VBOXIMGMOUNT=1
+
+		KBUILD_VERBOSE=2
+
+		AS="$(tc-getCC)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		TOOL_GCC3_CC="$(tc-getCC)"
+		TOOL_GCC3_LD="$(tc-getCC)"
+		TOOL_GCC3_AS="$(tc-getCC)"
+		TOOL_GCC3_AR="$(tc-getAR)"
+		TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GXX3_CC="$(tc-getCC)"
+		TOOL_GXX3_CXX="$(tc-getCXX)"
+		TOOL_GXX3_LD="$(tc-getCXX)"
+		TOOL_GXX3_AS="$(tc-getCXX)"
+		TOOL_GXX3_AR="$(tc-getAR)"
+		TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)"
+
+		TOOL_GCC3_CFLAGS="${CFLAGS}"
+		TOOL_GCC3_CXXFLAGS="${CXXFLAGS}"
+		VBOX_GCC_OPT="${CXXFLAGS}"
+		VBOX_NM="$(tc-getNM)"
+
+		TOOL_YASM_AS=yasm
+	)
+
+	if use amd64 && has_multilib_profile; then
+		myemakeargs+=(
+			CC32="$(tc-getCC) -m32"
+			CXX32="$(tc-getCXX) -m32"
+
+			TOOL_GCC32_CC="$(tc-getCC) -m32"
+			TOOL_GCC32_CXX="$(tc-getCXX) -m32"
+			TOOL_GCC32_LD="$(tc-getCC) -m32"
+			TOOL_GCC32_AS="$(tc-getCC) -m32"
+			TOOL_GCC32_AR="$(tc-getAR)"
+			TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)"
+
+			TOOL_GXX32_CC="$(tc-getCC) -m32"
+			TOOL_GXX32_CXX="$(tc-getCXX) -m32"
+			TOOL_GXX32_LD="$(tc-getCXX) -m32"
+			TOOL_GXX32_AS="$(tc-getCXX) -m32"
+			TOOL_GXX32_AR="$(tc-getAR)"
+			TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)"
+		)
+	fi
+
+	MAKE="kmk" emake "${myemakeargs[@]}" all
+
+	local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc:"out/linux.${ARCH}/release/bin/src" )
+	local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" )
+	linux-mod-r1_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	insinto /usr/lib/modules-load.d/
+	newins - virtualbox.conf <<-EOF
+		vboxdrv
+		vboxnetflt
+		vboxnetadp
+	EOF
+
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
+	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img
+
+	if use pam; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if use sdl; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+	fi
+
+	if use gui; then
+		vbox_inst VirtualBox
+		vbox_inst VirtualBoxVM 4750
+		for each in VirtualBox{,VM} ; do
+			pax-mark -m "${ED}"${vbox_inst_path}/${each}
+		done
+
+		for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		insinto /usr/share/${PN}
+		doins -r nls
+		doins -r UnattendedTemplates
+
+		domenu ${PN}.desktop
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]]; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java; then
+			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev; then
+		local udevdir="$(get_udevdir)"
+		local udev_file="VBoxCreateUSBNode.sh"
+		local rules_file="10-virtualbox.rules"
+
+		insinto ${udevdir}
+		doins ${udev_file}
+		fowners root:vboxusers ${udevdir}/${udev_file}
+		fperms 0750 ${udevdir}/${udev_file}
+
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \
+			> "${T}"/${rules_file} || die
+		doins "${T}"/${rules_file}
+	fi
+
+	if use vboxwebsrv; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	# Remove dead symlinks (bug #715338)
+	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
+
+	# Fix version string in extensions or else they don't get accepted
+	# by the virtualbox host process (see bug #438930)
+	find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die
+
+	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
+
+	if use vnc; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/VNC
+	fi
+
+	if use dtrace; then
+		insinto ${extensions_dir}
+		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
+	fi
+
+	if use doc; then
+		dodoc UserManual.pdf UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	elif use gui; then
+		dodoc "${WORKDIR}"/${PN}-help-${BASE_PV}/UserManual.q{ch,hc}
+		docompress -x /usr/share/doc/${PF}
+	fi
+
+	if use python; then
+		local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so"
+		if [[ ! -x "${python_path_ext}" ]]; then
+			eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python"
+			eerror "but none were installed. This may happen if support for a Python target"
+			eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
+			die "Incomplete installation of Python bindings! File a bug with Gentoo!"
+		fi
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	linux-mod-r1_pkg_postinst
+
+	xdg_pkg_postinst
+
+	if use udev; then
+		udev_reload
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process virtualbox-vboxusb.conf
+
+	if use gui; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "https://download.virtualbox.org/virtualbox/${BASE_PV}/UserManual.pdf"
+	elog ""
+
+	optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+	optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+	optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
+	if ! use udev; then
+		ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	use udev && udev_reload
+}
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -194,7 +194,6 @@ src_prepare() {
 	local patchinstallargs=(
 		--all
 		--no-autoconf
-		-W winemenubuilder-Desktop_Icon_Path #652176
 		${MY_WINE_STAGING_CONF}
 	)

--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@ -1,2 +1,3 @@
 DIST ruby.eselect-20220313.xz 2008 BLAKE2B aeeb70228ccaf163359cff4ba09e9417df7896f63748821b447b08f6fc57cfc760963ee231c82a03b33f24e01492d9305a68f29d00cd45d29d37e8ee4fb92afe SHA512 542ddb796b93e4b954f5fcfbc49e06b41218e1def73078b14c4d6505227bf08dc7fec20b11042058149af4939fd341c20bfc0c9dd13900a33d12f02ff761412f
 DIST ruby.eselect-20221225.xz 2012 BLAKE2B 6f4f3543f98d72a1cc3890bf3fe25d4a50935ff6dc050fdcd7e4d53d9b3d04ab619b61c103f2200919e4405adaffca7d7004aed4c0f1be7136ef2535dcbd881d SHA512 e064d215b0cfd5ee60d0b4d5bbb16cce12a070d734277fbd760e4da287120f285951a7140e378970b90204f872827ab115b683f9fbba2ba6819f08694b848d55
+DIST ruby.eselect-20230616.xz 1976 BLAKE2B 6f31e517a23672300032e9e5bd9edb3d6601b2b23c4a8997d436815d39d91218791b0d4ce172bcc45bf1ef3b4155580939823f7d061e804928a307320323a6ef SHA512 e2b5d30932914282749ddf31d85c8776240ead3a49f93d39c9833a4bc31beb6b53867bf0b86e575d4b88b7adf5aea709d9adb60b4436e3839ebd1c3a6c384111
--- a/app-eselect/eselect-ruby/eselect-ruby-20230616.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20230616.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Manages multiple Ruby versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Ruby"
+SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.2"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect
+}
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@ -4,3 +4,5 @@ DIST fzf-0.40.0-deps.tar.xz 16914048 BLAKE2B c095faee297e2226d595f961bd1362c41e1
 DIST fzf-0.40.0.tar.gz 236930 BLAKE2B bbdf8d62c5b9f2e1a85c54e55e42d7a93366ff7f25104d1eb3b28dc49933c10bbe9a8bda68a80597f2734ed6888da744000db5b359a9523b40007f04ede06252 SHA512 03a9aae215b06cd2d0c318e7fb13c6e39012091e9773f00cba702323c5fe3b2b0161f48fe552188689be307e2d308c47afed53e1046a7a767bcd49c98c1dbf60
 DIST fzf-0.41.1-deps.tar.xz 16902176 BLAKE2B 96f888a2b00d8156b3423b9074915934b8034183be652cfe0f251cd93b5a44358360a55012c85b07325b193b51dcb266ecb1ec03f966385dfb2d474c7b2065a7 SHA512 0049d82220db6e9fd20d885b3706d6a13dd341d6d6953a7e403d035360612fc594dcc147a01d875302cffeacb977461f385d31ca3020a45cbcb7033f1b661020
 DIST fzf-0.41.1.tar.gz 238333 BLAKE2B 3716cfa9d4001902e0901b837a7389c14a8ebb50c602f07cc6be1f345e085fa5a4bf5a6688cb1d15e927881b2eaa5565a49f700ee72d1abb96204e030c7c43e5 SHA512 2c9bf4f0e9b2772f2f911f5d2cb88715ce63b6029ad1a1eb066bdc670c05cf46a387ff8c019065b043858e82fb0234cce071b01f003f0c3f3f1c7720f1c6aa89
+DIST fzf-0.42.0-deps.tar.xz 16860372 BLAKE2B e2ba9a7deca036587e0f4ff40eabb849f834ca5429261ea365efa87b83eb4c8b62e4c24e27a35d29941c09cf7165fa6f408769132d9583527278fc7029e473c5 SHA512 43b09726e5c5d7d987e6bb905f077dfd2e355b7bbb65eb13f86dc1c586711c1331396ae3c8437990a6facab72aad0ba4aff99fe3f2b293554bbb6942799440d8
+DIST fzf-0.42.0.tar.gz 239469 BLAKE2B cdeb40d08345edaecc20082e5c9d487791260ae18dc824e585f522fdcb004dc645a9a59f8d26c01ffaaffffcee6ea9b7030b5e3a79d22098b3fad55e7ff2f9e7 SHA512 9587b8c9d37abcf1ae85b12d5cf3a1179f57241e3932db6801dee9bb952f83621b780d713c1793ccb4c5c36921b9078e156fe989b3e13664201ed729ea03d414
--- a/app-shells/fzf/fzf-0.42.0.ebuild
+++ b/app-shells/fzf/fzf-0.42.0.ebuild
@ -0,0 +1,72 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="General-purpose command-line fuzzy finder, written in Golang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+# For fancy versioning only. Bump on the next release!
+# MY_GIT_REV is the first 7 characters of release commit, we truncate it
+# after to make it easier to copy/paste.
+MY_GIT_REV=d471067e3f46f64e6401d1c5717424535fe4c96c
+MY_GIT_REV=${MY_GIT_REV:0:7}
+
+SRC_URI="https://github.com/junegunn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+src_prepare() {
+	default
+	sed -i 's/-s -w //' Makefile || die # bug #795225
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	insinto /usr/share/fzf
+	doins shell/key-bindings.bash
+	doins shell/key-bindings.fish
+	doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To add fzf support to your shell, make sure to use the right file"
+		elog "from ${EROOT}/usr/share/fzf."
+		elog
+		elog "For bash, add the following line to ~/.bashrc:"
+		elog
+		elog "	# source ${EROOT}/usr/share/bash-completion/completions/fzf"
+		elog "	# source ${EROOT}/usr/share/fzf/key-bindings.bash"
+		elog
+		elog "Plugins for Vim and Neovim are installed to respective directories"
+		elog "and will work out of the box."
+		elog
+		elog "For fzf support in tmux see fzf-tmux(1)."
+	fi
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.33.ebuild
@ -51,7 +51,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-libs/tinyxml[stl]
 		>=dev-db/mysql-connector-c++-8.0.27-r1
 		dev-db/vsqlite++
-		|| ( dev-db/libiodbc dev-db/unixODBC )
+		|| ( dev-db/libiodbc >=dev-db/unixODBC-2.3.11 )
 		dev-python/pexpect
 		>=dev-python/paramiko-1.7.4
 "
@ -62,7 +62,7 @@ RDEPEND="${CDEPEND}

 DEPEND="${CDEPEND}
 		dev-lang/swig
-		virtual/jre
+		>=virtual/jre-11
 		virtual/pkgconfig"

 S="${WORKDIR}"/"${MY_P}"
@ -83,8 +83,6 @@ src_prepare() {
 	sed -i -e 's/-Werror//' CMakeLists.txt || die
 	## Fix doc install directory
 	sed -i -e "/WB_INSTALL_DOC_DIR/ s/mysql-workbench/${P}/ ; /WB_INSTALL_DOC_DIR/ s/-community//" CMakeLists.txt || die
-	## Look for an existing header file
-	sed -i -e 's/unixodbc.h/unixodbc_conf.h/' build/cmake/Modules/FindUNIXODBC.cmake || die

 	## package is very fragile...
 	strip-flags
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@ -1,2 +1,2 @@
-DIST percona-toolkit-3.3.1.tar.gz 15348084 BLAKE2B 1bae3bc96144d23d51afca624b4ff4c7d5e118db857b5bf7721b8fa3fbc43e0ed87c52113e694e5defa0c70643a018ce1a7d2e437f097bac407344456f70ca1f SHA512 ee82613e15746820739042d34cf7cac0ba7e9f2825234ba39d7bfb8e0a52ab9b8d23ca47cb6a6afe2525c01f69fc81130a3be67b8a191c98d0d43e960a736cb0
 DIST percona-toolkit-3.5.1.tar.gz 14700246 BLAKE2B 58e1ae76a2fce32dd16fde3a9caae2a470882e737893cc22f67cf810533ceafa95c5b26ec390cc58b2b9f0db3a2323fe78c00a631da107e6dbbbef73e65c1bb4 SHA512 33ec22c2fc1c3cc855caead7ac7ca153328e280500f56e24e074cca6a2ba95572430369908cb557eedfcadfb7246fbb5670c943673aa41d5210dc38603aeb492
+DIST percona-toolkit-3.5.3.tar.gz 14673470 BLAKE2B f0eeaaf20924a75ff68eb623d4027fd8402169bbd8479e91ec174638f20109cee33a3e93b19dd88cd860a3f572db7e0a645fb1bd96e63f52c5d261167ad5eae8 SHA512 80abe6fe1d690d8faff01d72918c5b5da188819389d0fafe8f88f23489b609aa9730b0c7c2b284eb057e0cc3ae8ccb5b83849b31ff61291d8ab75d58abcdf85f
--- a/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-3.5.3.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="7"
+EAPI=8

 inherit perl-module

@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.g

 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 # Package warrants IUSE doc
 IUSE=""

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@ -1,2 +1,3 @@
 DIST dqlite-1.14.0.tar.gz 190757 BLAKE2B 5304ff10134c7775c4475f77bbe60cc6892cc35c3f2a7b4813743cd27fc1176a1d513d66ebf22b47ed7e83fa833be1408f44f781fbd8200bfd3f4465ea1d6011 SHA512 4305b289903766f00c26e278cce3f761c778b67105a6d7e51e66cc1cbf85564fd41f27689b6895c6f182968d851e10a40d052570d55e22007e9eb5c2929dabd9
 DIST dqlite-1.15.0.tar.gz 208833 BLAKE2B 41d2fced65c787381300aed1d0ee2393dc9e7aa371acd7efbee0744e00fed8a6ee7175eb3041f9cd198c1f0beef8951984e2a34646cbc069ea9d35753ba7568c SHA512 413f5aa7ad9d990638c6ffbdf5706ec69635ead0ad21314603b3c997608c696bd294bd5d15c092d1619509fc4d51c4038deaec82bd82cbbd4070f4a4020f9cc4
+DIST dqlite-1.15.1.tar.gz 216360 BLAKE2B 750c61616dfef548d7d96564f9c46765bbc4803b4af89e7df8573babe970ce05810fe11bb73dac9b98eb815016532c4ca20509b394a37e4143f5917fdd1b4a9b SHA512 3da0aa254747806f439eaf941cbe376d4376e0be351b39d9083c0d257f33750efef3210715b458f003e6a4508e248d3777c2584260e0e82ce10598ba9cfbe4d4
--- a/dev-libs/dqlite/dqlite-1.15.1.ebuild
+++ b/dev-libs/dqlite/dqlite-1.15.1.ebuild
@ -0,0 +1,49 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Embeddable, replicated and fault tolerant SQL engine"
+HOMEPAGE="https://dqlite.io/ https://github.com/canonical/dqlite"
+SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3-with-linking-exception"
+SLOT="0/1.15.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libuv:=
+	>=dev-libs/raft-0.17.1:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/raft-0.13.0[lz4,test] )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/dqlite-1.12.0-disable-werror.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-backtrace
+		--disable-debug
+		--disable-sanitize
+		--disable-static
+
+		# Will build a bundled libsqlite3.so.
+		--enable-build-sqlite=no
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@ -1,2 +1,3 @@
 DIST gjs-1.76.0.tar.xz 645364 BLAKE2B 9987033883e466c983af007c870cba4f2ef70ee08e276777e1b52103ddcebd1285ca9f3ce64c8ef52437a829157f58902cfb921eed06442e53fd9778d9cd9f2b SHA512 fa44431f431f14b82c648c388046b83722808db52d2bbe2deeb8d270d6fbeee9c4ee27feaa4fef425e1ab5ac65a1e68d7aa9457d543044362752810128064ea6
 DIST gjs-1.76.1.tar.xz 645888 BLAKE2B 8d37a23080cbacec616af66b482685a05d0dbbf481b6b8f16ac319da0630597aaee223098aea3866644a99bfc28f55933c8f1a6458d82e902c53d0f6dc957fa6 SHA512 30d1da0296a3ae4ec7e7a67a850d10dbc1bf6ac699d2a9d58280b98ee5506bc76b801d62a3c5f964b38995ceda669946df26af51c96417374ff283def7bc7bc1
+DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540
--- a/dev-libs/gjs/gjs-1.76.2.ebuild
+++ b/dev-libs/gjs/gjs-1.76.2.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+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 readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.71.1:=
+	>=dev-lang/spidermonkey-102.2.0:102
+	cairo? ( x11-libs/cairo[X,glib] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? (
+		sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.76.0-move_have_gtk4_to_the_appropriate_place.patch"
+)
+
+src_configure() {
+	append-cppflags -DG_DISABLE_CAST_CHECKS
+
+	# On musl, it's required that either gjs, pixman or gnome-shell to be built
+	# with a larger stack otherwise librsvg fails to render a particular SVG, as
+	# a result we fail to get gdm or gnome-shell running (greeted with a fail
+	# whale screen). The bug has been reported to librsvg. This is ideally just
+	# a temporary workaround until we understand what exactly needs a larger
+	# stack size, as it's not sufficient to do just librsvg.
+	#
+	# Please refer to:
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
+	#
+	# TODO: Find an actual fix instead of increasing the stack
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+		-Db_pch=True # TODO this has to go
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@ -1,5 +1,4 @@
-DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-3.1.1.gh.tar.gz 1633897 BLAKE2B a2bc394bfbf7916bc7743d3891b84eb3743cce2998242ecb427a7a3357986ea90c6ee546c3048aeb5629c9475f9ce862038f349ced51f684d199441632cca7ef SHA512 fb7d0963236c8fa692bf6c4ed2a66da5b29632c02e357894e0d5c604467e82f9a56cc7e8229769d9e401ed5bf5dfb25ae46f40fbe68605cedf58d763d03af93f
-DIST simdjson-3.1.6.gh.tar.gz 1643625 BLAKE2B 547eec2c332ffbc63a3878582b12b611447170c659e56e7d3e9c7a264427b5c8550f376cd2070b7f84f7603005ae4f9ef78a4ae7bd02df9b6813626b2ac2a6a9 SHA512 72f27b010e659025f9c8842daf79364d0d0f40cddd66858956ab4fa4f3f3a631fe342f440201d58ed9af42a4356aafafaac8d3caf3317dd1a6314dad3a71081a
 DIST simdjson-3.1.7.gh.tar.gz 1648370 BLAKE2B 46ca65569ba4fcf80bac1e1670bd0dea172c5d157f2ed05135c64c620bc7361f894d7227513545e0112643fd75d93bac02b3d0488ea0efe0401dbf5946d332b2 SHA512 6b54723720aa83333816e3bbd5cfe8dc71b087ac1d20d8982601563b70146bd63629a9f74cbc460a78ab2c83c689991586ef20a268fc67946b57dcc3f5486bc5
+DIST simdjson-3.2.0.gh.tar.gz 1653237 BLAKE2B b1745b2a96d9ff9f7187329191007e63a5f0c7051fb85a97212cf06076740ca01be035858bbb66805d10ba49ff90d05961a8b77750fc0d789e8dfe5865937f0b SHA512 02723d05fe88cfc69c1ec3eef92ae9e7da169a99645992829d4e40a00edecb98e21593dc9e04aeb2959cbcdbb8f40bb464daef9eb26cf3bd344c39271f6add2e
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
--- a/dev-libs/simdjson/simdjson-3.0.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.0.0.ebuild
@ -1,87 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs cmake
-
-DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
-DESCRIPTION="SIMD accelerated C++ JSON library"
-HOMEPAGE="
-	https://simdjson.org/
-	https://github.com/simdjson/simdjson
-"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${DATA_HASH}.tar.gz )
-"
-
-LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/14"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
-
-BDEPEND="
-	sys-apps/file
-	sys-apps/grep
-	virtual/pkgconfig
-"
-DEPEND="
-	tools? ( dev-libs/cxxopts:= )
-"
-
-REQUIRED_USE="test? ( tools )"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
-	"${FILESDIR}/simdjson-0.9.0-tests.patch"
-	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
-	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
-)
-
-DOCS=(
-	AUTHORS
-	CONTRIBUTING.md
-	CONTRIBUTORS
-	HACKING.md
-	README.md
-)
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
-	fi
-
-	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
-	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
-	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
-	mv tools/{,simd}jsonpointer.cpp || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
-	)
-	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
-	)
-
-	if use tools; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
-		)
-	elif ! use test; then
-		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
--- a/dev-libs/simdjson/simdjson-3.2.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.2.0.ebuild
@ -17,9 +17,9 @@ SRC_URI="
 "

 LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
-SLOT="0/15"
+SLOT="0/16"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test tools"
+IUSE="+all-impls test tools"

 BDEPEND="
 	sys-apps/file
@ -38,7 +38,7 @@ PATCHES=(
 	"${FILESDIR}/simdjson-0.9.0-tests.patch"
 	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
 	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
-	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+	"${FILESDIR}/simdjson-3.1.7-tests.patch"
 )

 DOCS=(
@ -63,23 +63,38 @@ src_prepare() {

 src_configure() {
 	local mycmakeargs=(
-		-DSIMDJSON_ENABLE_THREADS=ON
+		-DSIMDJSON_ENABLE_THREADS:BOOL=ON
 	)
 	use test && mycmakeargs+=(
-		-DSIMDJSON_TESTS=ON
+		-DSIMDJSON_TESTS:BOOL=ON
 	)

 	if use tools; then
 		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=ON
-			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
-			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-			-DSIMDJSON_COMPETITION=OFF
-			-DSIMDJSON_TOOLS=ON
+			-DSIMDJSON_DEVELOPER_MODE:BOOL=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS:BOOL=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS:BOOL=OFF
+			-DSIMDJSON_COMPETITION:BOOL=OFF
+			-DSIMDJSON_TOOLS:BOOL=ON
 		)
 	elif ! use test; then
 		mycmakeargs+=(
-			-DSIMDJSON_DEVELOPER_MODE=OFF
+			-DSIMDJSON_DEVELOPER_MODELBOOL=OFF
+		)
+	fi
+
+	if use all-impls; then
+		local -a impls=("fallback")
+		if use amd64 || use x86; then
+			impls+=("westmere" "haswell" "icelake")
+		elif use arm64; then
+			impls+=("arm64")
+		elif use ppc64; then
+			impls+=("ppc64")
+		fi
+
+		mycmakeargs+=(
+			-DSIMDJSON_IMPLEMENTATION:STRING=$(printf '%s;' "${impls[@]}")
 		)
 	fi

--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/alcotest/alcotest-1.7.0.ebuild
+++ b/dev-ml/alcotest/alcotest-1.7.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 RDEPEND="
--- a/dev-ml/async/async-0.15.0.ebuild
+++ b/dev-ml/async/async-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 # Need qtest_lib, netkit_sockets
--- a/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 RDEPEND="dev-ml/core_kernel:${SLOT}"
--- a/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
+++ b/dev-ml/async_rpc_kernel/async_rpc_kernel-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 RDEPEND="
--- a/dev-ml/async_unix/async_unix-0.15.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 RDEPEND="
--- a/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.15.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/core/core-0.15.1-r1.ebuild
+++ b/dev-ml/core/core-0.15.1-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 # TODO: Wants quickcheck_deprecated?
--- a/dev-ml/core_bench/core_bench-0.15.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 DEPEND="dev-ml/textutils:${SLOT}"
--- a/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 # Wants quickcheck_deprecated for now
--- a/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
+++ b/dev-ml/core_unix/core_unix-0.15.2-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
+++ b/dev-ml/expect_test_helpers_core/expect_test_helpers_core-0.15.0-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/int_repr/int_repr-0.15.0.ebuild
+++ b/dev-ml/int_repr/int_repr-0.15.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="dev-ml/ppx_jane:${SLOT}"
--- a/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
+++ b/dev-ml/ocaml_intrinsics/ocaml_intrinsics-0.15.2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"

--- a/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_disable_unused_warnings/ppx_disable_unused_warnings-0.15.0-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_ignore_instrumentation/ppx_ignore_instrumentation-0.15.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND=">=dev-ml/ppxlib-0.23.0:="
--- a/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild
+++ b/dev-ml/ppx_log/ppx_log-0.15.0-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
+++ b/dev-ml/protocol_version_header/protocol_version_header-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 RDEPEND="dev-ml/core:${SLOT}"
--- a/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild
+++ b/dev-ml/sexp_pretty/sexp_pretty-0.15.1-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/textutils/textutils-0.15.0.ebuild
+++ b/dev-ml/textutils/textutils-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+ocamlopt"

 RDEPEND="
--- a/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
+++ b/dev-ml/textutils_kernel/textutils_kernel-0.15.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/refs/tags/v${PV}.tar.gz

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 DEPEND="
--- a/dev-ml/timezone/timezone-0.15.0.ebuild
+++ b/dev-ml/timezone/timezone-0.15.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="+ocamlopt"

 RDEPEND="dev-ml/core:${SLOT}"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@ -1,3 +1,4 @@
 DIST serverless-application-model-1.66.0.gh.tar.gz 5779523 BLAKE2B 7ec6eb68a74686cc7f1acb160582065b7ca50d56f400c7111a2b47733e6e238e010ba912236c60207b7dba65005333507e2babd8022244cea1bea0691300b947 SHA512 fbcc799bc0935c17fa5f9ae655d8e722e659c78c0f4ea6325f2f0a89f6bbad3b8f43951a60e950de1effe699cc858b696a95fbfceb3d7b79eb35cd4d2c618846
 DIST serverless-application-model-1.67.0.gh.tar.gz 5786955 BLAKE2B d80e24e5e371daa0ad189ef01ca16a2a2be76902d38c2b77b7e1b7e832e1c776f58dc079b140a328a7f33f211cd9af1eab3d40490c74db342949321a1745fc81 SHA512 0828b9e5e3284dd1787bd168303f32118f8597dd2bf57361b05e86a1337ae2fcb5866a5cb59bb5afc830f44f101dd833e56198198693c154d307ecb841704182
 DIST serverless-application-model-1.68.0.gh.tar.gz 5807706 BLAKE2B 82d596bf9c93ca9f45cf7d9f6bbfbe46c0e845eb618f7619377f74a6e9e3971c60ba1ac6a73e5247f292553e1efaff723bbb66503bec74731eac97661a325950 SHA512 40a6961556e6e162d45d521f31fd086da77ce2e4e93d081d7be41f47779673513e09f8d48953b53410d59800942c9514eacb765d55534a3df4e2cddc09d658c7
+DIST serverless-application-model-1.69.0.gh.tar.gz 5925860 BLAKE2B 0182aad62920c911551dfcd5378f8d61a2c7f50eda6f222591128ebc513a7cb2f738875ceb24edf6136a964f56e5f39929f8734e5cf5e09d36331f0f988ac4f4 SHA512 4fa7941188af8ef0f0aef688617b8c5b02152fc565433af740bd7243b9b9d9b41035d4cf76c31ae5da764b4143d6ae5c1eda1345daf3b7265b48aaf2e1624284
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.69.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.69.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@ -1 +1,2 @@
 DIST backrefs-5.4.gh.tar.gz 4292341 BLAKE2B 9cbc443b82d2c7339dda30c6790f99d2da38a7e8db78df19e2dc2670c5cc12b1c303870fc63aad16f326b0dfd5d3d1e7c1a85bcde6cb698cd3602488b7e58ef3 SHA512 2949c40bfa60b37eccfd380eb05e5a7f425cad243d6bb332e6f329a1b9747760ca530d4af69daa25441bc9b0d2bd6291699aebf36bd52d055d4e84959ab45100
+DIST backrefs-5.5.gh.tar.gz 5401839 BLAKE2B e8674de4b1f9a068bf7439e56fd14de8afed0635b0f6fe3c99c64b678890939186c7aa2d660bee73d51e01cc982186bddeaf2e4bea5754c1a234992d518f8004 SHA512 00074d30a96da6bd0aedcd3cec02f533a264514832d91ff466a50937fae28566fe95db7fbedc7ffd185300b9529adf7f89bd4366e09f2bd864fa4f0f13963475
--- a/dev-python/backrefs/backrefs-5.5.ebuild
+++ b/dev-python/backrefs/backrefs-5.5.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs/
+	https://pypi.org/project/backrefs/
+"
+SRC_URI="
+	https://github.com/facelessuser/backrefs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -3,3 +3,4 @@ DIST boto3-1.26.146.gh.tar.gz 658035 BLAKE2B 29104a4ebd16ca8b2a0631bb747ed8b5af9
 DIST boto3-1.26.151.gh.tar.gz 661732 BLAKE2B 8adc42757d828414dd4bde9f460bc9fd6781131de5c8a5648fd1b6888ad4ff656db4075aeb2855493823290c5239ea6364aedd531197206c540b126bd466c379 SHA512 51359a351ed023de6b7c84e6d3e2bd5fc28f1ddc39e71af61bc6880002ed9478150e87e4237032d0ff9110792fcfbc09a62ee23f89d7d417730a88abccda0517
 DIST boto3-1.26.152.gh.tar.gz 662874 BLAKE2B 31866c0c3244cdb868fadaf985410e5577d8d75f37387ee44f6ce879ae06c282a4e85e262da4bab3e588918b126110c10b5a64bf7764f076baf495a4382cd225 SHA512 3d496da055172bbc840a3a6f8bd7df6f24bbb1f2f5dbacbbc0e337d4bd15d1355b9fd2e5dbb9e611aa1e415d11dc32bd0b61428a0d0ce7e2d55bb143a0cf1491
 DIST boto3-1.26.153.gh.tar.gz 663859 BLAKE2B 6c5a04fcaa6dde09a09552c2687a2ad1a780ce703cc60eda84c2fa6ad9061dd5f0a4aa0c8f7a7d15f73da2abd9f28d12f8f3d4f859a552cc355bde16f9b306aa SHA512 70117de2475d82f4bb94be2033b7ba18447290f767334d3ea11c60807619d76846003868439f1d025b396df12b91e126f4935f7438d649ca2ee7d629f0a499f4
+DIST boto3-1.26.154.gh.tar.gz 664248 BLAKE2B d36363c3a1561392fe9217c694f263ed34d10fee42141efffbe9d0899e5472d765af717a148deb9b3ef2abe654dcbb5840557d24644763a43ebda61fb39d7b5a SHA512 3aa8b243f9a39921c48d7d63ffb0be64f3bf8dbb824df03e7aafea072a218973660deb52b80ec23367f2a94f8bb9b2ee284a5b4d41d0edd81a1ea063cf94f453
--- a/dev-python/boto3/boto3-1.26.154.ebuild
+++ b/dev-python/boto3/boto3-1.26.154.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -3,3 +3,4 @@ DIST botocore-1.29.146.gh.tar.gz 11553866 BLAKE2B 7b5b060480de459af9045be8724272
 DIST botocore-1.29.151.gh.tar.gz 11618833 BLAKE2B cac8007e6177c029b97e288c244668657da6b20d3ea1b4e5b1b93e65bf7dec1206c5bccdc70094e14b02a3937a10f12868a3ea9b85cf6fbcb6e7a6c71155170a SHA512 960a5a62e467a3057e89f1f7d2700b67a1aff442b85a7b89b7da6a403deb2d706e9d6297392ef74a5569d90cd3123fa0474d40f378f0756012d88665c0214aa4
 DIST botocore-1.29.152.gh.tar.gz 11624895 BLAKE2B f6b8596548ab8ff5cbf401d98ebf90cd0425f0363f9be1b71f58649a98dd6c69a859deb80467621bcdc5c15ebe151df7960880ebc013d5834d5310e80a89e948 SHA512 f51f8e00e61ed51d39ec9e51a08cf0f57d29f5e1d4e77460cf28ed296f062cf9df2b5761a30d8a78b6bc4ca8a971032150929cb84147d099e45f8e0112a717e5
 DIST botocore-1.29.153.gh.tar.gz 11665559 BLAKE2B 82a51ba87753e4f241776652f846db39e5d3748997c635af960dfa389786f3abe3b622f2415abba1aaef81d12aee8b7197f1dea9e71a34e6fc18e1712a79eed5 SHA512 84f774eae433b8efecbc4ccf4990435cfa2f9a5fa1a6d29d94bbc57a75b6f3fd4c0b8392672a7d06a00ad7b5f0f4c3fcf66aa893ad655e3a1409083d8731df78
+DIST botocore-1.29.154.gh.tar.gz 11667747 BLAKE2B 0f5ad1bd37b977fcbf938bde18ddec0aab0ce71180e64b5f7318647843082cedead62215a99099a7b4f795228afa1093f22364fbe84b3ecd6c1d177a00f5ee8f SHA512 f66819a5b70ceb30b42bf448c9069d2ebfe68d25f33d4b489e1836b65a2233a3a62bd50d723c4b25531fa13fd49a4ba50cad9e67b6315954aa113428d8a87d4e
--- a/dev-python/botocore/botocore-1.29.154.ebuild
+++ b/dev-python/botocore/botocore-1.29.154.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@ -2,3 +2,4 @@ DIST cfn-lint-0.77.5.tar.gz 3513226 BLAKE2B edff62682027d87fc4f0934aba83ca1cbd83
 DIST cfn-lint-0.77.6.tar.gz 3554363 BLAKE2B abd496cdb72e1032c92a6489da12a4ffb4f83bba994067f9e2d333e55a13ea22d07db880dd3acca208f9b8328c17fe98540cec2847dac32ad87b2662aa0047e4 SHA512 b36c781dbd3294d6f2cfe43f617832170e47c9c9502845a551e6a9263e28dc6de99c77abd998699a2fcb6f08535daff615b17072c3ad1fe9c10853890a71989f
 DIST cfn-lint-0.77.7.tar.gz 3554332 BLAKE2B b669b9f97523933eb5549f7b2d67a132aef2236301b24094a0b74e9198d49121d4ec173c99d74b554b77eee2765b4ceb97126f2ccfab121393bc68e34cfb8147 SHA512 124ab4b96963f4971a25535852290ee71b5eed82e85a4101b3aa0469213b1006bfe8ae3d384f1acf236a0fa9915a24999b00f31f0d6ddbedbdaba123bfbb823b
 DIST cfn-lint-0.77.8.tar.gz 3578363 BLAKE2B 33fbc0dd76a025425453bf39da0cd1c9ffc15b057735e2add0a54fe387377824839ab34fb37216db4fe0cc05f60878b4ac828aceecd888d510612d9c44d8473f SHA512 7fc71965d33df29557de996e2ba0e911e681b5d220e69346a26448c1e04f3cd40f7e17b933cde695ad5aa6170d46981834efa19103e50d6690b4d476d13f82ba
+DIST cfn-lint-0.77.9.tar.gz 3477918 BLAKE2B dd575c9610289b5fd256b7ddd11985a6b5790706d2d8d79409bea4b3c6600d680931893ce8f9b38724c14348fbb6023bd43dbd932c822547d923f5eaa43552bc SHA512 f861fb4b6e8c95e6ac9cda564b9f65c639696a1df16408500fab9a07c317e4663a1bbde87e245536b555a664f325441bd802a703ede7cd51f16be473afe34966
--- a/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-0.77.9.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.68.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@ -1,2 +1,3 @@
 DIST croniter-1.3.14.tar.gz 40026 BLAKE2B 1b6cf2b0128a9d5f9ed0fe2ec64b114e3c903c0b18014793632dcf662c0277a909fc0b1cce74f7de35a2a585382237a4e687ca2bed6381e862e677170b70039d SHA512 f958ef0b05a99653343c7c0f2838602f5a21b8bc1c043519264513cc91ac04edb574fcf4de606d9eb1ccff2562f0b03d233b45db93ca0fd72f62f375519c0fb6
 DIST croniter-1.3.15.tar.gz 41391 BLAKE2B 285af568eba62efcd8cd95051806fa3433144b99c6ab63deef8e663266fe76eeb0e3e38eb42e35679a27f3fa41ed7bc59a4351b6aeeeca39fafcc7a0d88856ff SHA512 2b6f6a2cf6575a347249df6d3b00cc5b932604d55045c77e271b2981aa6804547c4e9a48114ed4607e41088abd33aef70b47d69ec915e303b9041e708e5ffe59
+DIST croniter-1.4.1.tar.gz 42301 BLAKE2B b650dab7074e45e6d53c37c177e0672cd165ada3c53d4f940c04c562d7279974d5f3bcca897b5b498335a54556efe11959b51dd8a30391bcb00a7df0df4e3559 SHA512 36d914d6a27ef6823d1eaeeb1b5f2ce8543caaa55d3e85457f042ef7b20aa8a68b46f61e23fb44d67ed7ba9a956c9082f19b83746fe543c221c8127e88dbdb82
--- a/dev-python/croniter/croniter-1.4.1.ebuild
+++ b/dev-python/croniter/croniter-1.4.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="
+	https://github.com/kiorky/croniter/
+	https://pypi.org/project/croniter/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/cython/cython-3.0.0_beta3-r2.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta3-r2.ebuild
@ -45,6 +45,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
 	# backport upstream fix e.g. for dev-python/pysimdjson on py3.12
 	"${FILESDIR}/${P}-py312-long.patch"
+	# should fix dev-python/symengine
+	# https://github.com/cython/cython/pull/5483
+	"${FILESDIR}/${P}-const-iter.patch"
 )

 distutils_enable_sphinx docs \
--- a/dev-python/cython/files/cython-3.0.0_beta3-const-iter.patch
+++ b/dev-python/cython/files/cython-3.0.0_beta3-const-iter.patch
@ -0,0 +1,207 @@
+From 913b8fadc5fc45306764c0ede472e1bc3b606d10 Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Mon, 12 Jun 2023 13:42:09 -0500
+Subject: [PATCH 1/4] Don't remove const for reverse iteration
+
+---
+ Cython/Compiler/ExprNodes.py   | 27 ---------------------------
+ Cython/Includes/libcpp/map.pxd |  8 ++++++--
+ 2 files changed, 6 insertions(+), 29 deletions(-)
+
+diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
+index ad4701b7bb6..275a6233da5 100644
+--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
+@@ -3268,32 +3268,6 @@ def free_temps(self, code):
+         ExprNode.free_temps(self, code)
+ 
+ 
+-def remove_const(item_type):
+-    """
+-    Removes the constness of a given type and its underlying templates
+-    if any.
+-
+-    This is to solve the compilation error when the temporary variable used to
+-    store the result of an iterator cannot be changed due to its constness.
+-    For example, the value_type of std::map, which will also be the type of
+-    the temporarry variable, is std::pair<const Key, T>. This means the first
+-    component of the variable cannot be reused to store the result of each
+-    iteration, which leads to a compilation error.
+-    """
+-    if item_type.is_const:
+-        item_type = item_type.cv_base_type
+-    if item_type.is_typedef:
+-        item_type = remove_const(item_type.typedef_base_type)
+-    if item_type.is_cpp_class and item_type.templates:
+-        templates = [remove_const(t) if t.is_const else t for t in item_type.templates]
+-        template_type = item_type.template_type
+-        item_type = PyrexTypes.CppClassType(
+-            template_type.name, template_type.scope,
+-            template_type.cname, template_type.base_classes,
+-            templates, template_type)
+-    return item_type
+-
+-
+ class NextNode(AtomicExprNode):
+     #  Used as part of for statement implementation.
+     #  Implements result = next(iterator)
+@@ -3336,7 +3310,6 @@ def infer_type(self, env, iterator_type=None):
+ 
+     def analyse_types(self, env):
+         self.type = self.infer_type(env, self.iterator.type)
+-        self.type = remove_const(self.type)
+         self.is_temp = 1
+         return self
+ 
+diff --git a/Cython/Includes/libcpp/map.pxd b/Cython/Includes/libcpp/map.pxd
+index d81af66e09a..2c2c5c82adf 100644
+--- a/Cython/Includes/libcpp/map.pxd
+++ b/Cython/Includes/libcpp/map.pxd
+@@ -50,7 +50,9 @@ cdef extern from "<map>" namespace "std" nogil:
+         cppclass reverse_iterator:
+             reverse_iterator() except +
+             reverse_iterator(reverse_iterator&) except +
+-            value_type& operator*()
+            # correct would be value_type& but this does not work
+            # well with cython's code gen
+            pair[T, U]& operator*()
+             reverse_iterator operator++()
+             reverse_iterator operator--()
+             reverse_iterator operator++(int)
+@@ -63,7 +65,9 @@ cdef extern from "<map>" namespace "std" nogil:
+             const_reverse_iterator() except +
+             const_reverse_iterator(reverse_iterator&) except +
+             operator=(reverse_iterator&) except +
+-            const value_type& operator*()
+            # correct would be const value_type& but this does not work
+            # well with cython's code gen
+            const pair[T, U]& operator*()
+             const_reverse_iterator operator++()
+             const_reverse_iterator operator--()
+             const_reverse_iterator operator++(int)
+
+From cb804f989eaa9938e72d0336d82bb7aa0003455f Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Mon, 12 Jun 2023 13:57:58 -0500
+Subject: [PATCH 2/4] Add test from gh5478
+
+---
+ tests/run/cpp_iterators.pyx | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/tests/run/cpp_iterators.pyx b/tests/run/cpp_iterators.pyx
+index 81048d0b36b..424168fa825 100644
+--- a/tests/run/cpp_iterators.pyx
+++ b/tests/run/cpp_iterators.pyx
+@@ -7,6 +7,7 @@ from libcpp.map cimport map as stdmap
+ from libcpp.set cimport set as stdset
+ from libcpp.string cimport string
+ from libcpp.vector cimport vector
+from libcpp.memory cimport shared_ptr, make_shared
+ from cython.operator cimport dereference as deref
+ 
+ cdef extern from "cpp_iterators_simple.h":
+@@ -272,6 +273,27 @@ def test_iteration_over_attribute_of_call():
+     for i in get_object_with_iterable_attribute().vec:
+         print(i)
+ 
+cdef extern from *:
+    # TODO: support make_shared[const int]
+    shared_ptr[const int] make_shared_const_int "std::make_shared<const int>"(int)
+
+def test_iteration_over_shared_const_ptr_set(py_v):
+    """
+    >>> test_iteration_over_shared_const_ptr_set[2, 4, 6])
+    6
+    4
+    2
+    """
+    cdef stdset[shared_ptr[const int]] s
+    cdef int i
+    for e in py_v:
+        i = e
+        s.insert(make_shared_const_int(i))
+
+    cdef shared_ptr[const int] a
+    for a in s:
+        print(deref(a))
+
+ def test_iteration_over_reversed_list(py_v):
+     """
+     >>> test_iteration_over_reversed_list([2, 4, 6])
+
+From a9bfacdcf5358e9d5a1d3c8ab0dd2eff6f18018a Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Mon, 12 Jun 2023 14:07:37 -0500
+Subject: [PATCH 3/4] Fix multimap too
+
+---
+ Cython/Includes/libcpp/map.pxd | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Cython/Includes/libcpp/map.pxd b/Cython/Includes/libcpp/map.pxd
+index 2c2c5c82adf..eb739509ac1 100644
+--- a/Cython/Includes/libcpp/map.pxd
+++ b/Cython/Includes/libcpp/map.pxd
+@@ -177,7 +177,9 @@ cdef extern from "<map>" namespace "std" nogil:
+         cppclass reverse_iterator:
+             reverse_iterator() except +
+             reverse_iterator(reverse_iterator&) except +
+-            value_type& operator*()
+            # correct would be value_type& but this does not work
+            # well with cython's code gen
+            pair[T, U]& operator*()
+             reverse_iterator operator++()
+             reverse_iterator operator--()
+             reverse_iterator operator++(int)
+@@ -190,7 +192,9 @@ cdef extern from "<map>" namespace "std" nogil:
+             const_reverse_iterator() except +
+             const_reverse_iterator(reverse_iterator&) except +
+             operator=(reverse_iterator&) except +
+-            const value_type& operator*()
+            # correct would be const value_type& but this does not work
+            # well with cython's code gen
+            const pair[T, U]& operator*()
+             const_reverse_iterator operator++()
+             const_reverse_iterator operator--()
+             const_reverse_iterator operator++(int)
+
+From 0528cd937e6d4606eb0902ee8d8db672ee7f88fe Mon Sep 17 00:00:00 2001
+From: Isuru Fernando <isuruf@gmail.com>
+Date: Mon, 12 Jun 2023 17:50:41 -0500
+Subject: [PATCH 4/4] Fix test
+
+---
+ tests/run/cpp_iterators.pyx | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/tests/run/cpp_iterators.pyx b/tests/run/cpp_iterators.pyx
+index 424168fa825..57d2716bea5 100644
+--- a/tests/run/cpp_iterators.pyx
+++ b/tests/run/cpp_iterators.pyx
+@@ -277,18 +277,17 @@ cdef extern from *:
+     # TODO: support make_shared[const int]
+     shared_ptr[const int] make_shared_const_int "std::make_shared<const int>"(int)
+ 
+-def test_iteration_over_shared_const_ptr_set(py_v):
+def test_iteration_over_shared_const_ptr_vector(py_v):
+     """
+-    >>> test_iteration_over_shared_const_ptr_set[2, 4, 6])
+-    6
+-    4
+    >>> test_iteration_over_shared_const_ptr_vector([2, 4, 6])
+     2
+    4
+    6
+     """
+-    cdef stdset[shared_ptr[const int]] s
+    cdef vector[shared_ptr[const int]] s
+     cdef int i
+-    for e in py_v:
+-        i = e
+-        s.insert(make_shared_const_int(i))
+    for i in py_v:
+        s.push_back(make_shared_const_int(i))
+ 
+     cdef shared_ptr[const int] a
+     for a in s:
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@ -1,3 +1,4 @@
 DIST emoji-2.2.0.gh.tar.gz 293134 BLAKE2B 4f6d8cf297c36a688b7f5e2f4afceb7e55102b23507fcac95799b6a6ab82521c55fcec884dcb2270e8290516942b7ef923de99b4e8da9241ce5828256b991653 SHA512 51150605c7b20fdb9a62746df098995814fb3b5b6c6b79dc65fb35dd8036c95b150b63c6af37f1baaf5dfab521c41ff7d0360864ffa77f696ba2465c50e1da79
 DIST emoji-2.4.0.gh.tar.gz 408557 BLAKE2B 9011ea74aad358a7e6b60771684538587ea34db601dac745663f1229db8b97b790092b2a3e6d83f274c7c3227504c8c3588701fe2c63d9c8147adc34979ee611 SHA512 5d52b4f70b4b10c2ac48e8170eff81e7e90ab8483bd76b38ba1a66f5ab33bbe8434ee30cace0e6251522a235384c9a5c4fdb9bc289c4a0a17d9a4f1331968e69
 DIST emoji-2.5.0.gh.tar.gz 416588 BLAKE2B 555d16433d658b508d82d8ba8b8df1ea78ffcb64c01624be9fa1f72530e694efe32d1aaaf4b15bd1e5bd7b14ab6234ecc7ed74b6b62f7badfa3d8fb2d37e4f03 SHA512 a557e3c9f6833c0dc83bccb113d5a7f5edc5215bd92408c535a5acbe5bb47edd3796ac2b3174be7d02254314f460ecf5c54201b5d61bb1405655157091170349
+DIST emoji-2.5.1.gh.tar.gz 417256 BLAKE2B 7964ad740de19654ed36fc1d6c333c7724883b17e8b28f0da9ff79d5d676202175071549a3d73cd2b807f8e0372a466af608f8e2d02ac58f815ccb4be56c99d0 SHA512 19310e49ea37ff396edd97008779cdf4456659265251d5ec6ce023c71e1fc3f8d1d5bab016c654454b4561841af69f370f38b4a009c71668d1e8518dbba42bbc
--- a/dev-python/emoji/emoji-2.5.1.ebuild
+++ b/dev-python/emoji/emoji-2.5.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="
+	https://github.com/carpedm20/emoji/
+	https://pypi.org/project/emoji/
+"
+SRC_URI="
+	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@ -1 +1,2 @@
 DIST python-api-core-2.11.0.gh.tar.gz 187535 BLAKE2B e8029b6344b572e1dcc8455b95f3ee63c8d3684f0c8807793e4e6ba2dd0179c939f183144085c2b94a29b8a1ae0e39aeffceb632988702806665ec39c51e3ce5 SHA512 798ff3970027d7ce60dcb62a88d395ebf00454f902fda4f272fc240b9ec104af112dd9de479fb6761990c48931c8ccd8c5223a1b2b5fa44823cabac862efdba8
+DIST python-api-core-2.11.1.gh.tar.gz 187982 BLAKE2B 095b96b50f0723543acf32e4db092a8b24eccf68088229668f7f36aa0d29f66905ea8c43d7ca4a4ee4179664b6bb63c45e4619d621a99f8c2a81a4b3dd61c25e SHA512 a2ca8a2a136fd29999662201af462b45da07c0e4d124649bba12d0564c595ebf02bd398354394d7eb4116c875b2c72b29280ee5a770a6773254accc979eacbbe
--- a/dev-python/google-api-core/google-api-core-2.11.1.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.11.1.ebuild
@ -0,0 +1,74 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio tests
+}
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@ -7,3 +7,4 @@ DIST hypothesis-6.76.0.gh.tar.gz 9373576 BLAKE2B ed580296f163f9808597aa3a7b2ceaf
 DIST hypothesis-6.77.0.gh.tar.gz 9376438 BLAKE2B 2c80427a43481fbc837042c8481e56f1186fa9026c15902f489b1d26cda216f33df6da2025e37d8b37676047d7a8be1f0aea686ec0d2d18178d14e5e8f08f24c SHA512 17c1a0d1b00c0bd9a4373c5cafa7f58f4f6c85a85a107f4afff7064b52280a21210502c555291a580c81c1085f7c5fdd9db91391b29b2af6e476c83f4838fe1a
 DIST hypothesis-6.78.1.gh.tar.gz 9376599 BLAKE2B c0998212067e947af71f17aa5f76609ed71cf57cf4d71418329ec92ca663b202bc3c8d09936e147304744d81d01f9ba0ae5f5cf369fe04cbcb95c351a3a6cd06 SHA512 5491dfce1a8a25288aca345a6a6f8b88557b3dc2a08773ee2aa10d133d9b44b9bddb4d7584ac99046a006f3d9fb85713b6b38f5cc635ddc437c8fb4bbe58a866
 DIST hypothesis-6.78.2.gh.tar.gz 9376858 BLAKE2B 8bbc6e373a9dd67b47922c4ba9f938f90d154a945f7142d07304db11b5b4e4d53b21605e4f7be24fb413153a2edf9c54bec01409a72abfb8fb31b43c87836ede SHA512 65ea4396365a3f4f1740d61cbcdf0eb380f99c133d582b56ee3e557bcc4da0d329ac832b38dad64c5e5fb7afcace55a17cc22fbb15ea1751508488983a1d7cef
+DIST hypothesis-6.78.3.gh.tar.gz 9377028 BLAKE2B 857d748262384fdf42f26e2656daa73e162c4058b136e2c0d1dff9e45fa42151512217653467cf81e514cb17cfc5aecfc6b1dbdbad7a62068489a79c13f3eb65 SHA512 1f15bd6ea2bb6822b3cf0cb1b679d976312a5c960e54741abab1e111ff0b9c6471c00752566bd937e86e7ef847b6bd80e53825964d6bc9fecf1b992499bf29f3
--- a/dev-python/hypothesis/hypothesis-6.78.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.78.3.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_IGNORE=()
+	local EPYTEST_DESELECT=(
+		# these tests can randomly fail with RecursionError when run
+		# in parallel
+		# https://github.com/HypothesisWorks/hypothesis/issues/3671
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types_with_defaults
+	)
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+		python3.12)
+			EPYTEST_DESELECT+=(
+				hypothesis-python/tests/cover/test_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup.py
+				hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@ -3,3 +3,4 @@ DIST jsonschema-spec-0.1.5.gh.tar.gz 36035 BLAKE2B 4e6019fb1c7f5e85a03488e00ef08
 DIST jsonschema-spec-0.1.6.gh.tar.gz 36043 BLAKE2B e85cad336d6b5ed11d6a51c8fab2c28826f6a9836ad50d2423b23bef047c338307d3e9430f1d151dbaf7a92574c9899dbfd016c570456996250e8d7634373313 SHA512 78ea06a78fd25006d270e2c5033645133ee79b0f45cbfc54e250d4225a36beac59cf9aa92f15fd51bd101fac20fee990d693ab91d8343cd6a298d71735c80884
 DIST jsonschema-spec-0.2.0.gh.tar.gz 37210 BLAKE2B 44892638371f8ed9074c997e0590594a55a4a00bb0f88bbe535021726f1de6b961825a710c7f1ed63081c5ee7d252bc4f5bcc2cb462ded71ecb492625876c811 SHA512 6bc9f50f9132a72243df1a20d16d049ca1413904fba5403fb780663c0819ae3be8dfd51efada84118e34e157e95475e375df9c6ce1e1930c72c6d45dc71d4d04
 DIST jsonschema-spec-0.2.1.gh.tar.gz 37242 BLAKE2B 8e1b2c4e44052fba0e78cefdf0a60a1e14adbe9f0027464d87e635bac7bb2ce1aefe65c92a1224877128ee23505402f199aca119cd48769d9149d57b5f9ec7ea SHA512 1d1769e301f60c2b2a1e7b413e5d1081f3e069bf29ad12d5e3c4b0c91094c8e78f44b01642a9a58f229e5efe69db14276cf067d9dad37d53c8a35368bd62d6d6
+DIST jsonschema-spec-0.2.2.gh.tar.gz 37188 BLAKE2B 05f740f36bf93da99e88167b054883c39cea05cc5271722cd25ab345da5c6a63aa3dcea0af370686e227af3eabe39e01ec196ae90452c4d2814828d7acb35400 SHA512 25bd6cd2a7ab8f40e05a78ec4b69601cee7cb9c22c43eaeb66777b991249f4314eb27038ee6ec1f8b7e15c782385ef604e4454179ef6a2307c1a73731f72a021
--- a/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.2.2.ebuild
@ -0,0 +1,44 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-spec/
+	https://github.com/p1c2u/jsonschema-spec/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	# remove random pins due to caret operator
+	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/jupyter-core/Manifest
+++ b/dev-python/jupyter-core/Manifest
@ -1 +1,2 @@
 DIST jupyter_core-5.3.0.tar.gz 83909 BLAKE2B c0e5418770a4d3527e825bcd63cb9371855f544f19493b82f49db892fc92e91fd257b07b45d7cf20760f9ac9205346b3ec533491baf45f225764e6d310524bb8 SHA512 2c63f59a9618ee01d200e233cf85d586d88976c8d545235be224f9c64a54eb3a70e8b47220cc29b8ad3c102cc6c8754c8ccff2a771899986f322def5f539e072
+DIST jupyter_core-5.3.1.tar.gz 84448 BLAKE2B 22adc8f7a0b39fa4ffd087a7c7305fa29d05d45200b69a3af6827083183292e58b3b5854b60545eb065808dffec2ae9252feb573b9450bd3014d493cb1784ed3 SHA512 752ce40c0aa71432177100f34596ad98d9907f8e2d26fcabc0bce7b4f5efb9207f1979d2db180f00d2160a84034656952640cde757186e538f7038bb0f626c7b
--- a/dev-python/jupyter-core/jupyter-core-5.3.1.ebuild
+++ b/dev-python/jupyter-core/jupyter-core-5.3.1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core common functionality of Jupyter projects"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_core/
+	https://pypi.org/project/jupyter-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/myst-parser \
+	dev-python/sphinx-autodoc-typehints \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-spelling \
+	dev-python/traitlets
+distutils_enable_tests pytest
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@ -1,2 +1,2 @@
 DIST kombu-5.3.0.tar.gz 434097 BLAKE2B ef378014e4e52d83dc917f9dc6245111e94eddb70d9852da1add1b532ee733578db83c9ca5b4aa82771c443ecbd00e87384b7a373102e78aebcc6724ab1bf6b2 SHA512 688782cab692f0e18444289654e43f53b9a54627d5495933e9717b9676d689ddeb6de368081ea796df26727d4dfd5239ed7554736c13bfce7236e8d73f62b4a9
-DIST kombu-5.3.0b3.tar.gz 436058 BLAKE2B d8470eea43a1d5f862d93e3b3608a3240b25cad6ccb342318a7bebda17e6ce818dce2889cb7af22fd77d2f6e69d1fdfa6926c77ba715c76dd40e973f3d9920dc SHA512 c330e1dd334810ed5fdeea234c49606aa8e43f84006703ff26d900f40ec7ce4920418bef3fd43abc8c792fb750499031191394475c45bfac50f7d29a6e30f5f8
+DIST kombu-5.3.1.tar.gz 434284 BLAKE2B 8df6d441d1229fe188584a34cab6d40250dc119a189215ab8ae8ec6660dc25e85166f48786b6b4c2abd56b4eb9e6fdc15a92372078d6f412b728ce45be0a81e5 SHA512 608e70cc66dc19915fd2b40c3b908f3147f60a7c971be1d8bf04f3a18f78999a7a140073ecc9f38ec9aec49c1ef0a6f01fb5f2d27d68fc68bd64aade1924edfa
--- a/dev-python/kombu/kombu-5.3.0_beta3.ebuild
+++ b/dev-python/kombu/kombu-5.3.0_beta3.ebuild
@ -45,17 +45,6 @@ distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx-celery

-EPYTEST_IGNORE=(
-	# Unpackaged azure-servicebus
-	t/unit/transport/test_azureservicebus.py
-	# Unpackaged librabbitmq
-	t/unit/transport/test_librabbitmq.py
-	# Unpackaged python-consul
-	t/unit/transport/test_consul.py
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	t/unit/transport/test_etcd.py
-)
-
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@ -1 +1,2 @@
 DIST mkdocs-material-9.1.15.gh.tar.gz 14217712 BLAKE2B 316d19f8e3c8f8edd57481c692b7b1cb136c3b914a5fd12fcbf68b9a11d268b0965874c3657b1f9bc766713426e2873597ca387942f610d98f2e8ce88b1bf52a SHA512 29ee4d859a54fcfa627eebc3e88f2269c2f1cb6dbea6180a02216bf9c64bccc628ca45f6136725d1af41a532cc5d209dca4f862f62f79a89f2026b24a1e55b7d
+DIST mkdocs-material-9.1.16.gh.tar.gz 14243340 BLAKE2B 73d89f310150a6f411b173497a33349e98e6cf0930781747a26321bec9834cbf1e3482e9a002d9db35ef69257ee2d125b43d776a6b05d91517ff22174ecfea86 SHA512 d4979ba567eadb26071e4a49bebaad196e80f292a870b3dc94484c9b59a7b061c9cf40a5c258725cb0a7cd7ca3f5d1a8de657518c4e806926fc059c40f37af9b
--- a/dev-python/mkdocs-material/mkdocs-material-9.1.16.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.1.16.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="social"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
+	social? (
+		>=dev-python/pillow-9.0[${PYTHON_USEDEP}]
+		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
+	)
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@ -1,2 +1,3 @@
 DIST openapi-core-0.16.6.gh.tar.gz 104008 BLAKE2B bb1bdac98dfc5aef0961624488074363568f53a6c44cb0730be0d103d891d24bed86659f640e0d07da4072edc233c904c0ddcfd9e8b3960ace1af078c0d745e5 SHA512 556636a4698dcd7db6c656333849077abacdac1a440fe58210ad8f02c1f0220e46dea29962346dfb3f89d164ebc986ec750c184840be9a34a5e1dd98fbf8ef98
 DIST openapi_core-0.17.1.tar.gz 85686 BLAKE2B f18b42fc496eaf4d6b82c15f66dd9c2eb9240402590b5a8e1f0e7b1e804c90aeef2db96d19683e9fea5846e776e95981ac52a38c47e2b56e6b5fd63d072b61f7 SHA512 0e2c673dbbfcce87ae7fbca6ec6c283d94c36376b1e17191d0bfa6c7001c62913381169b4614b5cd6131eaa67b729365036be3f1eb7641f634c0f3228de54897
+DIST openapi_core-0.17.2.tar.gz 88262 BLAKE2B 4d9a1be1eff4118bc1c687e57af0ff3738f984ceb6e564c643d26cb795bbcd3e703dd22c3b45d574f498d290f8da225819c9df618da5a1b8e40758304f2ebd07 SHA512 73cd2b62149549bd56781adb44922bca4a0519fbae8b6539d0225799ba1cfa1ab584428fd572ee42af4731b5437f08b8c4ad8f8895444aef315e4c6909fd4e5a
--- a/dev-python/openapi-core/openapi-core-0.17.2.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.17.2.ebuild
@ -0,0 +1,71 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/python-openapi/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-spec-0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-spec-0.1.6[${PYTHON_USEDEP}]
+	<dev-python/lazy-object-proxy-2[${PYTHON_USEDEP}]
+	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.4.2[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.6[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/pyproject-api/Manifest
+++ b/dev-python/pyproject-api/Manifest
@ -1 +1,2 @@
 DIST pyproject_api-1.5.1.tar.gz 22081 BLAKE2B 53ee778b4e04cac2f16ecd054adc7fd86373d6402f80d485fe22457252684f774b6a5df23d08cf6c6b1f96964d6dc1b1cc9014415f3d9105ffbb09421f69a11e SHA512 31936d242861027ea892e86219f430371aae18631c92893cefc8fb8fc02315906857ee57e5412eed62bf584e0bd24cca7ba82471c0ac6a72c71e8e93b8285a3e
+DIST pyproject_api-1.5.2.tar.gz 21926 BLAKE2B 337fa749273273e0d4c761876ac1b9ec25c02ad206dd222790717dde44ad82409d5200b94c2b5d35984116b1c88cfa10b93c699e684ff51b3235b936e35fe0ee SHA512 ee12ec0dccce0130bca703886c40ac21802f58fb7683370592f9dabbf83366939f5032d7f55c6b712cfa4fa0cf34d88fc37a05eae9d811b34fe9c7377886b8d7
--- a/Show More
+++ b/Show More