Sync with portage [Thu Feb 24 22:02:41 MSK 2022].

2 years ago · 30255ec986
parent 0cad2b0a85
commit 30255ec986
325 changed files with 3197 additions and 1493 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/logrotate/logrotate-3.19.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.19.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl +cron selinux"

 DEPEND=">=dev-libs/popt-1.5
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/zstd/zstd-1.5.2.ebuild
+++ b/app-arch/zstd/zstd-1.5.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"

 RDEPEND="app-arch/xz-utils
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@ -1,3 +1,2 @@
 DIST borgmatic-1.5.21.tar.gz 278933 BLAKE2B b098334fa476304a8e63ceed37b3c2b9c67d0549bea6d06d8f0fd0f41f9812e79cea52f88fc15d2be29e491355f9544b6ccbe7c31936dfbd78eefd42e9ff2832 SHA512 e183269a0ac3ae049031832414d597ced8f75dd1f82d16379faec6d53566a1c19f51d613745e61077621381ee819d2f5dfc5cabaf9928a629f5cf3e13398503c
-DIST borgmatic-1.5.22.tar.gz 286392 BLAKE2B 99105661935b58a6e772d694214590ad13c3ff284eeccdb075b36f6a4c55abeaf02c46a49d01ab3ca165b47320280ef0bb2b2c978f039e7a695b50a6cafb8d1d SHA512 a9006685ca707ceca199cfae9d52414b0edd295afcff7478bfac16fc05c12d31ee6578b58970ead8f702a7b9928d33db8a32617bfb8f6e9e8d5fa06bddd6a02c
 DIST borgmatic-1.5.23.tar.gz 290506 BLAKE2B 9924d9df1cae7e4f97ff70eb16f84a2ee8a0fe0cd3a08add7a7ec59d269fb693f74350cdb45633fc4d76816614216a69a205504cac9c7608a635fc364253add6 SHA512 1b811fec2e814854459d10e4c90e552d90e0450d908931dbca5a838dc091c40dc6075c6fa09653a5aac69073e5b7600aed4beda4bc765daf0c6d8d2a00983ad7
--- a/app-backup/borgmatic/borgmatic-1.5.22.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.22.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Automatically create, prune and verify backups with borgbackup"
-HOMEPAGE="https://torsion.org/borgmatic/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
-
-# borg is called as an external tool, hence no pythonic stuff
-RDEPEND="app-backup/borgbackup
-	$(python_gen_cond_dep '
-		<dev-python/colorama-0.5[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		<dev-python/ruamel-yaml-0.18.0[${PYTHON_USEDEP}]
-	')"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/flexmock-0.10.10[${PYTHON_USEDEP}]
-		')
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.1-no_test_coverage.patch
-	"${FILESDIR}"/${PN}-1.5.16-systemd_service_bin_path.patch
-)
-
-# test_borgmatic_version_matches_news_version tries to run the 'borgmatic'
-# executable so making it work would require passing --install
-# to distutils_enable_tests. Given that this is the only test requiring
-# this and that all it does is make sure the NEWS file has been updated
-# for the current version, just skip it.
-EPYTEST_DESELECT=(
-	tests/integration/commands/test_borgmatic.py::test_borgmatic_version_matches_news_version
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit sample/systemd/borgmatic.{service,timer}
-	keepdir /etc/borgmatic
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "To generate a sample configuration file, run:"
-		elog "    generate-borgmatic-config"
-	fi
-	elog
-	elog "Systemd users wishing to periodically run borgmatic can use the provided timer and service units."
-}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@ -1 +1,2 @@
 DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a
+DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25
--- a/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
+++ b/app-editors/okteta/files/okteta-0.26.6-crashfix.patch
@ -1,34 +0,0 @@
-From 607390315750815b0009b95ecd65699e2a1d110a Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Thu, 11 Nov 2021 15:57:54 +0100
-Subject: [PATCH] String extraction tool: fix crash with marked strings in
- closed view
-
-BUG: 444405
-
-FIXED-IN: 0.26.7
---
- .../controllers/view/stringsextract/stringsextracttool.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kasten/controllers/view/stringsextract/stringsextracttool.cpp b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-index 0d629999a..bcb6b6734 100644
--- a/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-+++ b/kasten/controllers/view/stringsextract/stringsextracttool.cpp
-@@ -58,7 +58,12 @@ QString StringsExtractTool::title() const { return i18nc("@title:window of the t
- void StringsExtractTool::setTargetModel(AbstractModel* model)
- {
-     if (mByteArrayView) {
-        mByteArrayView->disconnect(this);
-+        // disconnect explicitly from all connects but QObject::detroyed,
-+        // for the case mSourceByteArrayView is mByteArrayView
-+        disconnect(mByteArrayView,  &ByteArrayView::selectedDataChanged,
-+                   this, &StringsExtractTool::onSelectionChanged);
-+        disconnect(mByteArrayView, &ByteArrayView::offsetCodingChanged,
-+                   this, &StringsExtractTool::offsetCodingChanged);
-     }
- 
-     mByteArrayView = model ? model->findBaseModel<ByteArrayView*>() : nullptr;
-- 
-GitLab
-
--- a/app-editors/okteta/okteta-0.26.6-r1.ebuild
+++ b/app-editors/okteta/okteta-0.26.6-r1.ebuild
@ -53,8 +53,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

-PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DOMIT_EXAMPLES=ON
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="HPND MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"

 SITEFILE="60${PN}-gentoo.el"

--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@ -1,2 +1 @@
-DIST protontricks-1.6.0.tar.gz 61220 BLAKE2B 8a9af6f8cc134ad0e74b4c5e6c35bc8344687e65cc9811ca54402b16f723264cef8def6e733a532fd412db51d0ec63533baec52699ae994a97ecad0a25ebe847 SHA512 7276d7de1f0c18afc5c67552290888e3851bd5f073bbbf684000be66c2e65abac84b079373b120ff0ab6e4f4919caf8ee1288a2320de6c37629cb1185dfbea29
 DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff
--- a/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch
+++ b/app-emulation/protontricks/files/protontricks-1.5.0_no-setuptools-scm.patch
@ -1,36 +0,0 @@
-Since version 1.4.1 upstream has used setuptools-scm to determine the
-current version number. Unfortunately the package in question does not
-support GitHub release archives, using GitHub VCS snapshots would require
-retrieving and updating commit hashes corresponding to release tags, and
-PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
-help because it requires extra files to be included in the repository,
-which upstream has not done.
-
-Seeing as we already know the version number, bypass setuptools_scm
-altogether and create the version file ourselves. For obvious reasons the
-latter has to be done in ebuilds themselves.
-
--- a/setup.py
-+++ b/setup.py
-@@ -16,9 +16,6 @@
- 
- setup(
-     name="protontricks",
-    use_scm_version={
-        "write_to": "src/protontricks/_version.py"
-    },
-     description=DESCRIPTION,
-     long_description=LONG_DESCRIPTION,
-     author=AUTHOR,
-@@ -28,11 +25,6 @@
-     packages=["protontricks"],
-     package_data={"": ["LICENSE"]},
-     package_dir={"protontricks": "src/protontricks"},
-    setup_requires=[
-        # setuptools-scm v6 requires Python 3.6+
-        "setuptools_scm<6 ; python_version <= '3.5'",
-        "setuptools_scm ; python_version > '3.5'"
-    ],
-     install_requires=["vdf>=3.2"],
-     entry_points={
-         "console_scripts": [
--- a/app-emulation/protontricks/protontricks-1.6.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.6.0.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0_no-setuptools-scm.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
-}
-
-pkg_postinst() {
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
--- a/app-emulation/protontricks/protontricks-1.7.0.ebuild
+++ b/app-emulation/protontricks/protontricks-1.7.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"

 RDEPEND="app-emulation/winetricks
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@ -1,2 +1 @@
-DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
 DIST xchm-1.33.tar.gz 886169 BLAKE2B 26b6c664307de3ef1bef21d3fd240b5636f5abc8196c5aa1b7cd6b91f12addbbd5a8c54d133de2fd8ce9132ea2677f79f0ef722b1da6c87429cd3df54d208585 SHA512 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989
--- a/app-text/xchm/xchm-1.32.ebuild
+++ b/app-text/xchm/xchm-1.32.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
--- a/app-text/xchm/xchm-1.33.ebuild
+++ b/app-text/xchm/xchm-1.33.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="nls"

 RDEPEND=">=dev-libs/chmlib-0.36
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-9999.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
-else
-	SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-1.ebuild
@ -5,11 +5,9 @@ EAPI=7

 inherit vim-plugin

-MY_P=${P/0.}
 DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
 HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
+SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"

 LICENSE="vim"
 SLOT="0"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@ -1 +1 @@
-DIST sqlcl-21.4.0.348.1716.zip 40013712 BLAKE2B 32a1f450d32d46dd10ea2b7ca9b466944f69564ab5064af4d8b7c7b6e2489a2a544240e899ed5bdddb50303c9037d404de3ccca49dd6c8f7bab34a751a78a3fb SHA512 abedea9c57d318ed7611fdf77968fd0dcade93f19d908f2d9da39db10a8814dbbfe561b812bbb08eac279cbbd816cea9149b58e3d9ea71060c4b9bffc5ef53a0
+DIST sqlcl-21.4.1.17.1458.zip 39959489 BLAKE2B 95b80c22cf9cc1da018819c14ae61a3829f051d8d4dd832add69bdd3a706090528cbb209508ddbd7c42bfe29c8f38165e03e39674255ef51c38b072cae74ef56 SHA512 a4565dd220e718729d695f7227fee3ee4ed72d0da478bfb7fe8c126b48e4426d5e5dbebf159338042bb572cf7263af81d6013dde6c2dcd576e9bdce67cb9c9c2
--- a/dev-db/sqlcl-bin/sqlcl-bin-21.4.0.348.1716.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-21.4.0.348.1716.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
--- a/dev-db/sqldeveloper/Manifest
+++ b/dev-db/sqldeveloper/Manifest
@ -1,2 +1,2 @@
-DIST sqldeveloper-21.4.1.349.1822-no-jre.zip 469968216 BLAKE2B 4f740829ba2836255ab3e131947dbbe8beeb38f2ee20b8a5489b044707fe992f28a12aa85c4a553b94994a94ce63bac76fed8b5fca91e5d0f996c1d570fab1c3 SHA512 6072bd07d2315c30c800965477b317281144471ae0d699af5112ff04a3918ce015ef4cfeb0a63aa89bf4619c74c0e1d8d1ea70739ac13e6bb76a7adaa826b45f
+DIST sqldeveloper-21.4.2.018.1706-no-jre.zip 469919665 BLAKE2B 01aedcdf670e079b74166428b2f794a0fba1ea27df148ae7b26ba77a6abfde1eb6a7e922685d409c67be226c1ac8967c7b1c120aced812f2fcfa0fbb6837f648 SHA512 d876a253666ac54b317388b8777f41f9de9e1c1abd088498886397fc93a1a936e3b47e650078c70ebd81de0b74c954ecede830b0d9da952ac81cf389c62c85ac
 DIST sqldeveloper-4.2.0.17.089.1709-no-jre.zip 348604841 BLAKE2B 0c3adff04f148102e6460c7550f787329c7e5a69aca0b81c2de4725b9c9ea27c03bb2f588671a95371aa3612839805f2042855b443bb5635c70d0e0b2140295b SHA512 4d1e270376ae125a60146228e35fcb2cb615d593c0e9f2ca98e4deef4d8fd1ddff59cf15064d63e33e77125f49e8da9fe317ed1fd96a9b00a699bf6c5e739874
--- a/dev-db/sqldeveloper/sqldeveloper-21.4.2.018.1706.ebuild
+++ b/dev-db/sqldeveloper/sqldeveloper-21.4.2.018.1706.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit desktop java-pkg-2

--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9-r1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="log4j-12-api-2"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/log4j-12-api:2"
+RDEPEND="${DEPEND}"
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.4
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.4
@ -1,7 +0,0 @@
-JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.4"
-PACKAGE="=dev-java/ant-eclipse-ecj-4.4*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7"
-ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
-ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.4,ant-eclipse-ecj-4.4"
-GENERATION="2"
--- a/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
+++ b/dev-java/antlr-runtime/antlr-runtime-3.5.2.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://repo1.maven.org/maven2/org/antlr/${PN}/${PV}/${P}-sources.jar"

 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"

 # Common dependencies
 # POM: ${P}.pom
--- a/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
+++ b/dev-java/antlr-tool/antlr-tool-3.5.2.ebuild
@ -27,7 +27,7 @@ SRC_URI="

 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
--- a/dev-java/antlr/antlr-3.5.2-r2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2-r2.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 CP_DEPEND="
 	~dev-java/antlr-runtime-${PV}:${SLOT}
--- a/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r4.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-logging:commons-logging:1.2"
+
+inherit java-pkg-2 java-ant-2 java-osgi
+
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
+HOMEPAGE="https://commons.apache.org/logging/"
+SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="avalon-framework avalon-logkit log4j servletapi test"
+REQUIRED_USE="doc? ( avalon-framework avalon-logkit log4j servletapi )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
+
+CDEPEND="
+	avalon-logkit? ( dev-java/avalon-logkit:2.0 )
+	avalon-framework? ( dev-java/avalon-framework:4.2 )
+	log4j? ( dev-java/log4j-12-api:2 )
+	servletapi? ( dev-java/tomcat-servlet-api:4.0 )"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+EANT_BUILD_TARGET="compile"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes"
+
+DOCS=( RELEASE-NOTES.txt PROPOSAL.html )
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}/${P}-gentoo.patch"
+	# patch to make the build.xml respect no servletapi
+	eapply "${FILESDIR}/${P}-servletapi.patch"
+
+	# bug #208098
+	echo "jdk.1.4.present=true" > build.properties || die
+
+	if use avalon-framework; then
+		echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" avalon-framework-4.2"
+	fi
+	if use avalon-logkit; then
+		echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" avalon-logkit-2.0"
+	fi
+	if use log4j; then
+		echo "log4j12.jar=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" log4j-12-api-2 log4j-core-2"
+	fi
+
+	if use servletapi; then
+		echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die
+		EANT_GENTOO_CLASSPATH+=" tomcat-servlet-api-4.0"
+	fi
+}
+
+src_install() {
+	local pkg=org.apache.commons.logging
+	java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\""
+	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
+	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
+
+	einstalldocs
+	use doc && java-pkg_dojavadoc target/docs/
+	use source && java-pkg_dosrc src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
--- a/dev-java/fec/fec-1.0.4-r4.ebuild
+++ b/dev-java/fec/fec-1.0.4-r4.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/log4j-12-api:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+EANT_GENTOO_CLASSPATH="log4j-12-api-2"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+src_prepare() {
+	# Apply patches.
+	default
+
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so
+}
--- a/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r2.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for high performance network applications"
+HOMEPAGE="https://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+# Same test failures as before the revbumps still occur. See https://bugs.gentoo.org/827221
+RESTRICT="test"
+
+CP_DEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j-12-api:2
+	dev-java/log4j-core:2
+	dev-java/slf4j-api:0"
+
+RDEPEND="${CP_DEPEND}
+	virtual/jre:1.8"
+
+# It does not build with java 11, https://bugs.gentoo.org/788364
+# src/main/java/io/netty/util/internal/Cleaner0.java:44: error: cannot find symbol
+#                Cleaner cleaner = (Cleaner) cleanerField.get(direct);
+#                ^
+#  symbol:   class Cleaner
+#  location: class Cleaner0
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/asm:4
+		dev-java/cglib:3
+		dev-java/easymock:3.2
+		dev-java/hamcrest-core:1.3
+		dev-java/hamcrest-library:1.3
+		dev-java/junit:4
+		dev-java/mockito:0
+		dev-java/objenesis:0
+		dev-java/slf4j-simple:0
+	)"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+JAVA_SRC_DIR="src/main/java"
+
+src_prepare() {
+	default
+	# Needs Mockito 1.10.
+	rm -v src/test/java/io/netty/util/concurrent/PromiseCombinerTest.java || die
+}
+
+src_test() {
+	cd src/test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH},asm-4,cglib-3,easymock-3.2,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,mockito,objenesis,slf4j-simple)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.1.ebuild
@ -21,7 +21,7 @@ SRC_URI="

 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 CP_DEPEND="
 	dev-java/antlr-runtime:3.5
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.7.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"

 # Tests don't even compile with that old mockito version.
 RESTRICT="test"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@ -1 +1,2 @@
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
+DIST newt-0.52.21_p20210816.tar.gz 128555 BLAKE2B 97c791d7301b657bec68045f2cd9bbe16eef0b099a6304e2336414837b36492bd794be04d0bbcd9eadc6fcd000ba2563a5ab90be5d61249390a6ea5435091f97 SHA512 06c1d5634d88a6126de5eddd1c4d436639a4d739b100f391638b0429a3941eabcaa0ff7398f498d735ec0af5e88deb14178110ab11bf5301ef661f7953692bc4
--- a/dev-libs/newt/files/newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch
+++ b/dev-libs/newt/files/newt-0.52.21_p20210816-makefile-LDFLAGS-ordering.patch
@ -0,0 +1,30 @@
+From 22d44d2cbfcbec216d0028ebdf274247139a8045 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 14 Jul 2021 05:12:32 +0100
+Subject: [PATCH] Swap order of LDFLAGS and P*FLAGS
+
+Needed to respect as-needed.
+
+Bug: https://bugs.gentoo.org/798945
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 1047efc..f0bc417 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -97,8 +97,8 @@ _snack.$(SOEXT):   snack.c $(LIBNEWTSH)
+ 		PLFLAGS=`$$pyconfig --libs`; \
+ 		echo $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+ 		$(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snack.o snack.c; \
+-		echo $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+-		$(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+		echo $(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+		$(CC) --shared $(LDFLAGS) $$PLDFLAGS $$PLFLAGS -o $$ver/_snack.$(SOEXT) $$ver/snack.o -L.  -lnewt $(LIBS); \
+ 	done || :
+ 	touch $@
+ 
+-- 
+2.32.0
+
--- a/dev-libs/newt/newt-0.52.21_p20210816.ebuild
+++ b/dev-libs/newt/newt-0.52.21_p20210816.ebuild
@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-r1 toolchain-funcs
+
+COMMIT=a7533580cd092e6a71c4ed722e830da4eb884d06
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://github.com/mlichvar/newt/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gpm nls tcl"
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/popt-1.6
+	=sys-libs/slang-2*
+	gpm? ( sys-libs/gpm )
+	tcl? ( >=dev-lang/tcl-8.5:0 )
+	"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.52.13-gold.patch
+	"${FILESDIR}"/${PN}-0.52.14-tcl.patch
+	"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	"${FILESDIR}"/${P}-makefile-LDFLAGS-ordering.patch
+	"${FILESDIR}"/${PN}-0.52.21-fix-non-POSIX-backticks.patch
+)
+
+S=${WORKDIR}/${PN}-${COMMIT}
+
+src_prepare() {
+	sed -i Makefile.in \
+		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+		-e 's|instroot|DESTDIR|g' \
+		-e 's|	make |	$(MAKE) |g' \
+		-e "s|	ar |	$(tc-getAR) |g" \
+		|| die "sed Makefile.in"
+
+	if [[ -n ${LINGUAS} ]]; then
+		local lang langs
+		for lang in ${LINGUAS}; do
+			test -r po/${lang}.po && langs="${langs} ${lang}.po"
+		done
+		sed -i po/Makefile \
+			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
+			|| die "sed po/Makefile"
+	fi
+
+	default
+	eautoreconf
+
+	# can't build out-of-source
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	building() {
+		emake PYTHONVERS="${EPYTHON}"
+	}
+	python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+	installit() {
+		emake \
+			DESTDIR="${D}" \
+			PYTHON_SITEDIR="$(python_get_sitedir)" \
+			PYTHONVERS="${EPYTHON}" \
+			install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installit
+	dodoc peanuts.py popcorn.py tutorial.sgml
+	doman whiptail.1
+	einstalldocs
+
+	# don't want static archives
+	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
+}
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@ -1,3 +1,4 @@
 DIST autobahn-21.11.1.tar.gz 365165 BLAKE2B 91a12bf1fa9acd056246d86675c76fbcdb4de8914f4ab5e2c8ec06cf8e822cc1a72f8a7b39b520405cce32e2f32024ebbaa48ba024e1dc71b50da4e6f8913e19 SHA512 5a23272046ef67821e86c6bfe766273b3ba73a75fbc51c7864c2ab83ffb8d4e119022980f8b71c453118bf15b26ede8042aa0114e54caebbfb33555208093ac2
 DIST autobahn-22.1.1.tar.gz 365843 BLAKE2B 835861db493be3f70fbff1971f3ab09346f689b5e100ea29115635b6d283c14f944a6c6fcc234d549cfa895496125ce7d03576ea6536c0536f6e79277a1e5592 SHA512 9198fc71ef0d967e9d0d577684c9c5f6ef36d12392a043f581a0be920fc0bf842369f50406a3a5a33d1c6063d21a57136735d8dc123230b18b6da8c4e80f8eed
 DIST autobahn-22.2.1.tar.gz 375438 BLAKE2B dffc92c0bfb1b34f4929aea72bb60b55ab7ec73a1cdd2148f7b9498bb4a75f6c0d0ff3b653aa5b31b08cbd707121d56f721540d97acc88ea8776836978ecc184 SHA512 dd1543ddf918bd54f3436cdea2be28b1402e651ec8867303a4d9140d395e37bb3e9867c0360f20611acc61c3431533d6b47eba9fac1d8b3363b588a3aa626188
+DIST autobahn-22.2.2.tar.gz 375443 BLAKE2B a321cfeaa35e7da5aa58ade0da3bc5891baab1d4a915782e9d25038679261c19744d65baa4a981cb01025902dc8f4ffb93d8c0ad59b8db32119c0fb0eeb49d53 SHA512 95b0ee867a866b1cf67a55ffa9386addd3640b12a3e5a2673b4d496aa6d41ec49408e1f528bc21d1e390d5e3343dda0b1625d4ac0d9e9101db151c7c79623263
--- a/dev-python/autobahn/autobahn-22.2.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.2.2.ebuild
@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="https://pypi.org/project/autobahn/
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@ -1,3 +1,4 @@
 DIST github3-3.0.0.gh.tar.gz 35410027 BLAKE2B d5da6c7a4612879646af7bfe82ac899c3894c0ecba9d6bf2d467ff497431ddabbbb342a5895d55bee56a03a6ea4b12bb989a903bdef31998da4382619810a9bd SHA512 67b8d30ec44a38344117a2d28f4eed1d86ddc4ffda68e36da9d6540ef4fe57a544e9d793d278a289f61e8874271b3ee21da0d742d9a7463cceccd4f1384669d5
 DIST github3-3.1.0.gh.tar.gz 35518951 BLAKE2B f5e804f2e475cda88423a5ffaa36c1a1d92501dae9a7746f7cb1ef252b3a035db36f84929bfb9ea368a008aad8f5c08e70df9a63bc5e6b543d31ddd0e8549632 SHA512 6410f7e38c23ae654e5e8af3b3f2e4511960d19ce37f170283878e1f71349d0affb094b18b869cba79868666dc10e18a00d9182e2990f943c64814fbd3eea82c
 DIST github3-3.1.1.gh.tar.gz 35520342 BLAKE2B d06a5121bb034c9ac18c88e3affb9414d6802aba8dd69339c7c17ffb0897e18beac7a004dd3f328c7b4f4bfc91b9bf4e23c8cb33d145a2adbc961896659c8e27 SHA512 45c775c6070088a0e73ba353d6fc4d8c7f5e709884caf9116a10faa3de21d1e4e184d5563a741b2f8f60d16ac72304441d7004a5c81680b7ea2660d26fc3758d
+DIST github3-3.1.2.gh.tar.gz 35519407 BLAKE2B 392f34a6f74c6536113a8eb9511d38e40ce9c45ba078322d61fe8bdf9555ab5c440bccd6776c695d68034743d02eb0b80f3d84347c50b4753c7e50f982d08666 SHA512 ebb65229e82b3f3874fc556b2e323add81def711810725fd7e0ad991578de1ce1a0e38fee2bab54073079abae3ed666bbed5408ae26e9ca788a99704df4ab0af
--- a/dev-python/github3/github3-3.1.2.ebuild
+++ b/dev-python/github3/github3-3.1.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper for the GitHub API written in python"
+HOMEPAGE="https://github3py.readthedocs.io/en/master/"
+SRC_URI="
+	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.3.0[${PYTHON_USEDEP}]
+"
+# via PyJWT[crypto]
+RDEPEND+="
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
--- a/dev-python/google-api-core/google-api-core-2.5.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.5.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

@ -59,3 +59,7 @@ python_compile() {
 	distutils-r1_python_compile
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
 }
+
+python_test() {
+	epytest -p no:aiohttp -p no:trio
+}
--- a/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.38.0-r1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
--- a/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
+++ b/dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="google-auth-library-python-httplib2-${PV}"
+DESCRIPTION="httplib2 Transport for Google Auth"
+HOMEPAGE="https://pypi.org/project/google-auth-httplib2/
+	https://github.com/googleapis/google-auth-library-python-httplib2"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-httplib2/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@ -1 +1,2 @@
 DIST google-auth-library-python-oauthlib-0.4.6.gh.tar.gz 50982 BLAKE2B 93980a69777089125bca9f583cae0b64f9facf699da3ac135561a9cf135122d9e22a6c0be3325d366dd77a2240fb16d5c63633a216cfee07b9fceb2239227c86 SHA512 a20a85c073a6208d72c8f6ceb34544241f599e716b1191bfc52bcc367797efc18d0e2b94d4e433cec692282b00428bcb4d7e73ed48a26e66d6005189d5dddb77
+DIST google-auth-library-python-oauthlib-0.5.0.gh.tar.gz 52118 BLAKE2B 596f9af156030b0dbc0a35c3946ab865370fa326176fc33b04d55aa5d99950718d275f69b399d9afe303ee84f9c5823571eb4c144353f17fe6a64bbca7a35e18 SHA512 7da0d1c5e8c20aee843798c317a2c1edd29caf98abaf8895e354e20279c45395de4a522e21f11dbbe9e67c3bd984ded101b0cde04519b9256d80bdc42501a71a
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.0.ebuild
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
--- a/dev-python/google-auth/google-auth-2.6.0.ebuild
+++ b/dev-python/google-auth/google-auth-2.6.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.4.0-r1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	# remove the test that requires hacking
+	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@ -1 +1,2 @@
 DIST mando-0.6.4.tar.gz 36560 BLAKE2B 9878746485d4b896c3e32512b77ac02739940a1398eee12056fd6719cc3c99f8c526c8e573d2556b6a9d0d8d26e20fb45c97119e626b1d44f0a5b5f4655adba1 SHA512 457fa0db4e8e5dbfac6146d254181213814ef1975c919b4573007face27749ec3a50eda850558ebdc0fdff94a5e9819fd825b10cb3023078b2b426c2825fdbf0
+DIST mando-0.7.1.gh.tar.gz 37802 BLAKE2B 1caf437248f1b1397888674fff0171680fd1d2cffd1d3394869edce4fef0d214fb52fc0eb7435ef162722f128f129f8d19385e65661914c51f78108b64f8db38 SHA512 a25dfd57e833416cbd64933ca3970712d28c2e2ed172091a0d0c082f486c707d0061afb071e3973e7e42b654d1a6e70f4909b1254fdef493471dc0ae9d3eb62b
--- a/dev-python/mando/mando-0.7.1.ebuild
+++ b/dev-python/mando/mando-0.7.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Create Python CLI apps with little to no effort at all!"
+HOMEPAGE="https://mando.readthedocs.io/ https://github.com/rubik/mando/"
+SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
+++ b/dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/googleapis/oauth2client"
+SRC_URI="https://github.com/googleapis/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_p/-post}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+PATCHES=(
+	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
+)
+
+python_test() {
+	nosetests -v \
+		-e appengine \
+		-e django_util \
+		-e test_multiprocess_file_storage \
+		-e test_bad_positional || die "tests fail with ${EPYTHON}"
+	# appengine - requires appengine
+	# django_util - requires django
+	# test_multiprocess_file_storage - requires fasteners
+	# test_bad_positional - expects TypeError, gets ValueError
+}
--- a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="https://github.com/openstack/openstacksdk/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+CDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to handle official service types for OpenStack and it's aliases"
+HOMEPAGE="https://github.com/openstack/os-service-types"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
--- a/dev-python/osc-lib/osc-lib-2.5.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.5.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
@ -0,0 +1,50 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo Concurrency library"
+HOMEPAGE="https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency"
+SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
+S="${WORKDIR}/${PN/-/.}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventlet*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
--- a/dev-python/oslo-config/oslo-config-8.8.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/oslo-log/oslo-log-4.6.1-r1.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.6.1-r1.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
+
+python_test() {
+	eunittest -b
+}
--- a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

@ -30,8 +30,10 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
@ -47,3 +49,15 @@ src_prepare() {
 	sed -i -e '/pbr/d' requirements.txt || die
 	distutils-r1_src_prepare
 }
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
--- a/dev-python/proto-plus/proto-plus-1.20.3.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/pytest-codeblocks/Manifest
+++ b/dev-python/pytest-codeblocks/Manifest
@ -1,4 +1,2 @@
-DIST pytest-codeblocks-0.12.2.tar.gz 8547 BLAKE2B d5bfea250aa2fc955eab5b8e96bb942c119b44367fa2f9e8cab8350409a7dbf697c16e3193ad18e629d7f4ccbb2ddc1f4fbce4cead96167cf16d1b6a922fdd91 SHA512 d69819106b389ce3cd2d04a1385e49f2bdf4eb70ea334175e6ba5e2921d77266ac2e69b22ce5a42880846555dd271e5b7dc25bda838b9238ad5d14add9389681
 DIST pytest-codeblocks-0.13.0.tar.gz 8407 BLAKE2B 5ba3c41f7b4af908172799036331c6605fcd7d9c0fb0bdfc5cf3697e97181ec099b580a30d9dcd83ed568a5ee8fe736843d26b7d39163581adeb5d75a9a321f6 SHA512 092035e5cf3d1d35fedbc6f867ff77a40751df5b4a3b922d5f960fdaa5d1ca9e599c7b813ae60a4da3cd43e3e7884f38260f77bc466e234422480b5edebee24a
 DIST pytest-codeblocks-0.14.0.tar.gz 8432 BLAKE2B cb63d68e61a909bd199240470be6f09a0e48a6ef7ab4f2360940030a384919939e2274a604499bbeaf533cbf5e15b7402fd2294841ca21bc9d65c54977353549 SHA512 740b6a74a3451cee25e37969706d7b603f258c76bb8b1cd608eaf63021aaaed99136a41885b453a2708302f53e8d9516a3487dc3f5cc8ad39ca6c3ab9721ae86
-DIST pytest-codeblocks-0.9.0.tar.gz 6590 BLAKE2B 34d1c72a891d2f2f1d98c4238322d888a48b286d628e3738043d16a59a75b3bd15b29e31c554a83508d9af31caf1b526e3c535a243bcf77c8d77f9bf5be69f5b SHA512 834002c4e9c8ad36baa9a4ed494fe28cf09460e0ee5a0a3d8d111cb0bd8ca4ed3c784a047901bc67984e7892f931b5644c1ea68112e4d9dda514a20e048b3d11
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.12.2.ebuild
+++ b/dev-python/pytest-codeblocks/pytest-codeblocks-0.12.2.ebuild
@ -1,28 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/pytest-codeblocks/"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/pytest-6[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	distutils_install_for_testing
-	epytest -p pytester
-}
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.9.0.ebuild
+++ b/dev-python/pytest-codeblocks/pytest-codeblocks-0.9.0.ebuild
@ -1,21 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/pytest-codeblocks/"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@ -1,2 +1,3 @@
 DIST pytest-console-scripts-1.2.0.tar.gz 13976 BLAKE2B 1452ecfdc47d3341d8f3f30d49f371ae89d6138d56e4dc3a230f6a3803c6c36f542df40e2785c99c3cfd5080fa03b5b3d4926bb742dc99bd2127d47305fbf788 SHA512 07c9baab85035265ab6a21cc0c754b076dba87f08e1ab51319ef47a0a8af0b44f7d42422014c68cf93ed28b508138a70e14b968707cc831682885b3ca8106aa7
 DIST pytest-console-scripts-1.2.2.tar.gz 14314 BLAKE2B 1e4c210fe9fa6a4e9dbe308cf3d6c1a1829f2155185fe3911ee0a299c0292db6bceeeeb7efd5ace9a166c90ae8376d3cdfec8b0c0b585467f157e175709afe6d SHA512 c749b76c8370734f9ab7fe93284f9ac25a38e4bef61181a3b61b3b0d229532f1876e668e5a6e1449dcb939d9cb53527e021f79fd9132f3a28bdf45d95bdcb40e
+DIST pytest-console-scripts-1.3.tar.gz 14365 BLAKE2B 7a9b83f53ef9911e5f336375389e6c6311e64e7b4880ea2cb1f996221d4dbf119bf6fc487f7bb7bfda4355df8f797981e99ac9db2fff3e4871173a878a4fbd64 SHA512 8b66df3a8ff700817f8ec34aa95385ff82c4df47fd67974e91cf4d2fdae578d4683032b0a8162723adfcd461e5da7f1c5bb99339d62ed9cbdca4fd1be001b0f6
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin for testing console scripts"
+HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
+	cat > "${script}" <<-EOF
+		#!/usr/bin/env python
+		import pytest
+		import sys
+		sys.exit(pytest.console_main())
+	EOF
+	chmod +x "${script}" || die
+	epytest -x
+	rm "${script}" || die
+}
--- a/dev-python/python-cinderclient/python-cinderclient-8.2.0-r1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.2.0-r1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Cinder API"
+HOMEPAGE="https://launchpad.net/python-cinderclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pbr-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/oslo-serialization[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b cinderclient/tests/unit
+}
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@ -1 +1,2 @@
 DIST python-glanceclient-3.5.0.tar.gz 198273 BLAKE2B 7861a2124a9474c4f6267f5b82e6d7fa9825d3cdc8411fbb05afabf69928dd230a881452de57cf54f9cd1a52157f806826036d85f6a93651980ce65e86afd520 SHA512 e5db1afeea7e3f653d7afac7961aeb3ec28df5dc40bba6b8b70795efcfc66928c2af45ecc0e4bbcc0d59a0157599e4ef3af090a8b0ccd0d727e8a94d4f8c866e
+DIST python-glanceclient-3.6.0.tar.gz 202581 BLAKE2B 20bf5ee863cc3d319cc7b670f4a218c9b84b49c392f7a7756636a93643ddf81781f808d6d966ca1982246b66b7963354c433239f554eb2aa0291bd1d57da2e79 SHA512 7bcf08386cfe6d4787dd8e6616907814a53fcc35bdac1818aef7ba094dcd37dfddddda43a1451d55f22d175f400f8680801d1a43508c5d85ce39f15164b71a5d
--- a/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b glanceclient/tests/unit
+}
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest keystoneclient/tests/unit
+}
--- a/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1

--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@ -1 +1,2 @@
 DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
+DIST restructuredtext_lint-1.4.0.tar.gz 16723 BLAKE2B 2beaa565391fd1a130f8ef998b140e0ebb4695759a61c0526f066e71c3bd42e981115f267c48d30e19eb45c240907ea71d9f49a03d74e9ce1d4b80a2c0b511c9 SHA512 8e16e2a43cb1e52bb3b4ac60da53130bd4a8d0b823fc95b32e62068bed95728084de3b55820cfcaba70eecaaa93bdf3f956b8bb6c55155115b40c7151ef58a2c
--- a/dev-python/restructuredtext-lint/metadata.xml
+++ b/dev-python/restructuredtext-lint/metadata.xml
@ -5,8 +5,12 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">restructuredtext_lint</remote-id>
+		<remote-id type="pypi">restructuredtext-lint</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P="${P/-/_}"
+DESCRIPTION="Checks PyPI validity of reStructuredText"
+HOMEPAGE="https://pypi.org/project/restructuredtext-lint/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
--- a/dev-python/stestr/stestr-3.2.1.ebuild
+++ b/dev-python/stestr/stestr-3.2.1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1

 DESCRIPTION="A parallel Python test runner built around subunit"
--- a/dev-python/tempest/tempest-29.2.0-r1.ebuild
+++ b/dev-python/tempest/tempest-29.2.0-r1.ebuild
@ -0,0 +1,69 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Small subset of tests, which fail as result of not using specific
+	# testing environment. Others expect to run suite using stestr.
+	rm -r tempest/tests/lib/services/volume/v3/ || die
+	rm tempest/tests/test_list_tests.py || die
+	rm tempest/tests/lib/cmd/test_check_uuid.py || die
+
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
+	eunittest -b -s tempest/tests -t .
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
--- a/dev-python/test_server/Manifest
+++ b/dev-python/test_server/Manifest
@ -1,4 +1,2 @@
-DIST test_server-0.0.31.tar.gz 18578 BLAKE2B a08c23a7db43f1c99a0cd270852d9ea841e0c0e9888d1d4a95b8879b436f8c016d1d10222127fc8024fe3560340fd65dc629677106a18c7bc01a565c85a6702e SHA512 f245165f6326e63fae6e51ae247cedade41a391c505d9899c00b886df192326aac32f2a479d322de079f77b252cf199746a7ea3e06089cab105646d194d4d775
-DIST test_server-0.0.32.tar.gz 17548 BLAKE2B a24397fb73243e6f8dc1ec1fc84cb4e411ae5ac4217b3b3b47e6f819fc6315e3515ffb81a31d941e0ba1dc289adc37c8da3df35016067a94e026484f20d14e88 SHA512 4cc70fff2f1d932f6daba9cf610fb9dc9aca9554f19d494a34300d9b3f31a038cc9843f5e07ec9f884402f6b505e99773e66f8d7da1200cde221af5b83fc2f1c
-DIST test_server-0.0.33.tar.gz 16491 BLAKE2B 8c4f9ae1264b72e940b2e9d8db580ad077e37db2759af6992ee76b3146bfc6260b52dfa649423e74288d01b5090171a99ae66a2b96f986c0a998bbaef048fb53 SHA512 bf7b954a80954e0acfe9eb88dc506e141c9421ef38dcd94a95d0c054b38f088c5c855e1466b7d36d72c1737f34d8639dc456123ca848d567b2d087ff6f9bda00
-DIST test_server-0.0.35.gh.tar.gz 16503 BLAKE2B 01c3ec16c6b6d926ce9220f5878edc385ce087641e2419a613388dde1a5b5018c71991b146fa95b1e5e46a39cc4ca657f68cf06af23f1385ed05835dcea9d609 SHA512 bbea0e9965d3c839fb953f60480c271a8f6a8c808d922a9af68c576fb13d3a5d5b1055767f47874e897a5ee2e87f2749a93dab6e1d69acc143ff886158f95cf6
+DIST test_server-0.0.36.gh.tar.gz 16663 BLAKE2B fa3e6a00aef11727271dee9c3e06ac878da4aac6098df6d9de56049f175af143bb858e2bd8d91cd1acfffcdf59e8d3dd1bc0fa840c1431ab162a599d103e37f7 SHA512 699abef74e5589396e45309b140da15be82de49383d5c683b729343f83a2e369a6e2bd4383ae442369dffe777100099abaf4f917cd700ec9926f2bcdfe0b84ce
+DIST test_server-0.0.37.gh.tar.gz 16873 BLAKE2B ee2a086e9199e1b5d42b1487d3dd2ecfa5ec0e4ab081369c9e7b626a4cdcdcee4ab15a664e3eaf958bd1285c9a3908c366d5b74958d575016a9040d463b71339 SHA512 5c77b6d2b9bcb971af2a563e5a1c840abe429394d2a870f7caa5bd8a5edfb9488a30faf6485bb5a7105a83c36b6547abb1c06f98f44d66af8ff86469bf4125e3
--- a/dev-python/test_server/test_server-0.0.31.ebuild
+++ b/dev-python/test_server/test_server-0.0.31.ebuild
@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="https://github.com/lorien/test_server https://pypi.org/project/test-server/"
-SRC_URI="https://github.com/lorien/test_server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/bottle-0.12.13[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/webtest[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
--- a/dev-python/test_server/test_server-0.0.33.ebuild
+++ b/dev-python/test_server/test_server-0.0.33.ebuild
@ -1,17 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="https://github.com/lorien/test_server https://pypi.org/project/test-server/"
-SRC_URI="https://github.com/lorien/test_server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
--- a/dev-python/test_server/test_server-0.0.36.ebuild
+++ b/dev-python/test_server/test_server-0.0.36.ebuild
--- a/dev-python/test_server/test_server-0.0.37.ebuild
+++ b/dev-python/test_server/test_server-0.0.37.ebuild
@ -3,12 +3,20 @@

 EAPI=8

+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
 inherit distutils-r1

 DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="https://github.com/lorien/test_server https://pypi.org/project/test-server/"
-SRC_URI="https://github.com/lorien/test_server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/lorien/test_server/
+	https://pypi.org/project/test-server/
+"
+SRC_URI="
+	https://github.com/lorien/test_server/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@ -1 +1,2 @@
 DIST transitions-0.8.10.tar.gz 1103547 BLAKE2B caeeb97406d1d2ba926f5ff14c4961acb7c2b9b979a1a20614e1017e4b20a664b069f384cfe878df95dffe832f00cfeb4c0ce96efe2156cc858e14eba5746137 SHA512 a598d65431a2d0241b5ea4c806631edf2e1f06537224e8716d531e86bcb10817d1cf32a62672147d1c1b398fd755a9ef046d884dcd0b4de6a9f8c1bfd04af62a
+DIST transitions-0.8.11.tar.gz 1103585 BLAKE2B e91800baa5101e2654b4e88fecec8bc795329a0e43890e32f42f7777136379d9852702f7cef14da3f3c26b50ce7bf9dcf2f6d2980d4af82149d2d16ea343d826 SHA512 96c91c988db990326f50b06c7538fb806c2a5d19f950f23cd0304b40517657c888df6c09445917d5e7224c1aa1b1d8d719bd10b0e210001f15eec947681c3847
--- a/dev-python/transitions/transitions-0.8.11.ebuild
+++ b/dev-python/transitions/transitions-0.8.11.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	|| (
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+	use examples && dodoc examples/*.ipynb
+}
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@ -2,3 +2,4 @@ DIST virtualenv-20.11.2.tar.gz 9953645 BLAKE2B 8bd0e5bee4fad2cdb13b1ce3e018191ef
 DIST virtualenv-20.12.1.tar.gz 9956052 BLAKE2B 1507e45de7d1383062b18a2796baf91befec576200560e3a07a5b78e563d6c93cd8f1b3aea327d2edf4d9e582a9a4a9c62f03e9f8cf023318ea4a6cd1fdc6c79 SHA512 1f1a721f1b03cab72330827bca68741cc7f3d4c713a44eb50028ce7b72101cf7530f12cb1fbbff1c94ce9ce621601484845069f34d0c36250f80d8186b2501f9
 DIST virtualenv-20.13.0.tar.gz 9957090 BLAKE2B 7ff73c458b319c2a4545e6ad468cfdf3b4d48eec02f2d82843fd5276a0f97b72a953079849295ab2467fc78d6fb304774cac800b8744cbf7a295cc3fc4dbb433 SHA512 72aa8cffe92551479ad4ec93395597cd9f77ddaf2063e36d5836277199a96ab2d57236d94b99b7038a60ada103a2d8a37ae4b13ffaaa6ed8e786245d9fbbf6d6
 DIST virtualenv-20.13.1.tar.gz 11990886 BLAKE2B 9db9504576406f7992f5ad132241e91042e57fc9b37b0a539c11a79499e1b6da9eea997fa9bbba85ba1e3e388b3dc9245bf02f4ee87408547590b9a34ff6f389 SHA512 97204361a308cced55b07b868b2039662b7c9d82cf4ecf64df18ff9723312e73bc9eb2a88937fb6b5f19c2bae3289784cf28bca46f138603fd55d8a76c6e2897
+DIST virtualenv-20.13.2.tar.gz 12111439 BLAKE2B 956c5c7f1215bfb46279b29634ab0cab523bb44578077837bab47634495462ccc0f8010a438d3eeebfe6afec0900cfa14dd015dabbc31a8e56c9f34312f2f260 SHA512 7e5ef7927637ab1d029c8831889846acb13948c8cfafc17d56ca815f23f682207da0f3b3291936585a9b059c10ec35813fb53511f19462f867edaf5f197c0135
--- a/dev-python/virtualenv/virtualenv-20.13.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.13.2.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@ -1 +1,2 @@
 DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
+DIST xxhash-3.0.0.tar.gz 74279 BLAKE2B 4c3d68103a7145aa1fd99da955b206c734c7882f1f6f3020d8bce9e5f2eb9714b9168b28918595bbb60445a024ec50d606e387358e6db8f4e575014763dece65 SHA512 170bfbacf0c4f8136550a257328d71dca096d996a52993a54442a7c5a54d48c51bb7997b3a718d73ae6c8e25a672ed4de664e7a651e02c43eb5f3fd135a59a80
--- a/dev-python/xxhash/xxhash-3.0.0.ebuild
+++ b/dev-python/xxhash/xxhash-3.0.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python binding for the xxHash library"
+HOMEPAGE="https://github.com/ifduyue/python-xxhash
+	https://pypi.org/project/xxhash/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/xxhash-0.8.0"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+python_configure_all() {
+	export XXHASH_LINK_SO=1
+}
+
+python_test() {
+	cd tests || die
+	eunittest
+}
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@ -1,5 +1,5 @@
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72 SHA512 ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
+DIST patch-5.16.10.xz 501568 BLAKE2B 9b3b86590d3b86b398c7ee2118df6944fe94dc872141706aca2e886ed7edf33d3e339847985208836f99c40858d1fe1efc6b6ef853854c9edfdb69b49d868798 SHA512 2e9917689f036b5b28ef9bb8d372148ed9dc0dd4460749d0e27aaa871adeb8e67aaeb557f0d891837be2ccb7f64c346e4f52fc23421917409f46d250fc793f53
 DIST patch-5.16.2.xz 20432 BLAKE2B 9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425 SHA512 50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f5302222
-DIST patch-5.16.5.xz 401000 BLAKE2B e58ef6f70b283a9d357472e4e9b148ba1038edb2473d299d367f1293c66051ae2b5aad2131df3f5b99052edc6ca885cc0f2140b727cb5277c776a6a0e01012a4 SHA512 8944096f994207522640b4fc7c0be97677ea44924875870f2dc3734e2e9fa3df871821780e7d459348fbe25db1b22cdfca8e852aed11c823ee489a174fb7d9c3
--- a/dev-util/bpftool/bpftool-5.16.10.ebuild
+++ b/dev-util/bpftool/bpftool-5.16.10.ebuild
--- a/Show More
+++ b/Show More