Merge updates from master

2026-07-18 19:43:24 -04:00 · 2022-06-06 16:32:55 +00:00
parent 91e60ac4f8 a6079679cc
commit 553cb28c01
107 changed files with 1419 additions and 419 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,7 @@

 If you find an interesting piece of software here, consider to package it, also you are free to add any package you want to see in GURU

-Name | Buildsystem | Category | User | RFH | Dependency
+Name | Buildsystem | Category | User | Need help | Dependency
 ------------ | ------------- | ------------- | ------------- | ------------- | -------------
 [odilia](https://odilia.app) | cargo | accessibility | - | ? | ✖
 [spacelib](https://github.com/Alessandro-Barbieri/SpaceLib) | none | science | Alessandro-Barbieri | ✖ | ✖
@@ -23,7 +23,7 @@ Name | Buildsystem | Category | User | RFH | Dependency
 [Intel-sgx](https://01.org/intel-softwareguard-extensions) | make | devel | Alessandro-Barbieri | ✔ | ✖
 [compcert](https://compcert.org) | make | compiler | Alessandro-Barbieri | ✔ | ✖
 [predictive](https://www.dr-qubit.org/predictive.html) | make | emacs | Alessandro-Barbieri | ✔ | ✖
-[tau](http://www.cs.uoregon.edu/research/tau/home.php) | make | tools | Alessandro-Barbieri | ✖
+[tau](http://www.cs.uoregon.edu/research/tau/home.php) | make | tools | Alessandro-Barbieri | ✔ | ✔
 [gnat-llvm](https://github.com/AdaCore/gnat-llvm) | make | compiler | Alessandro-Barbieri | ✔ | ✖
 [csparse](https://people.sc.fsu.edu/~jburkardt/c_src/csparse/csparse.html) | make | science | Alessandro-Barbieri | ✖ | ✔
 [gslib](https://github.com/Nek5000/gslib) | make | cluster | Alessandro-Barbieri | ✖ | ✔
@@ -110,4 +110,5 @@ Name | Buildsystem | Category | User | RFH | Dependency
 [kaitai](https://github.com/kaitai-io/kaitai_struct) | sbt | util | Alessandro-Barbieri | ✔ | ✖
 [casadi](https://web.casadi.org/) | cmake swig | science | Alessandro-Barbieri | ✖ | ✔
 [ipyleaflet](https://github.com/jupyter-widgets/ipyleaflet) | setuptools yarn | jupyter | Alessandro-Barbieri | ✔ | ✖
+[gitlab](https://gitlab.com/gitlab-org/gitlab-foss) | yarn gem | vcs | Alessandro-Barbieri | ✔ | ✖
 [HOL4](http://hol-theorem-prover.org/) | ? | math | Alessandro-Barbieri | ✔ | ✖
--- a/app-admin/ananicy-cpp/metadata.xml
+++ b/app-admin/ananicy-cpp/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>salah.coronya@gmail.com</email>
 		<name>Christopher Byrne</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
--- a/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
+++ b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

-inherit vcs-snapshot cmake-utils
+inherit cmake

 DESCRIPTION="Neovim client library and GUI, in Qt5"
 HOMEPAGE="https://github.com/equalsraf/neovim-qt"
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gcov +msgpack"
+IUSE="gcov"

 DEPEND="
-	msgpack? ( dev-libs/msgpack )
+	dev-libs/msgpack
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -27,8 +27,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_GCOV=$(usex gcov ON OFF)
-		-DUSE_SYSTEM_MSGPACK=$(usex msgpack ON OFF)
+		-DUSE_SYSTEM_MSGPACK=ON
 	)

-	cmake-utils_src_configure
+	cmake_src_configure
 }
--- a/app-misc/vocabsieve/vocabsieve-0.7.3.ebuild
+++ b/app-misc/vocabsieve/vocabsieve-0.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 RDEPEND="
 	dev-python/PyQt5[${PYTHON_USEDEP}]
--- a/app-office/beancount/Manifest
+++ b/app-office/beancount/Manifest
@@ -1 +1 @@
-DIST beancount-2.3.3.tar.gz 1784037 BLAKE2B ff62ef30d3bcadd3f1dc195adf71cb58703e50c93e12cf71ef699c651ce67daf89ea8285b53b43811687fb132c02d8d6364651d87bc3e092f9485e6934883110 SHA512 420369105939bcdcf2b7caaba27ab1d486b3dfc18e0a3286d917a6380345eaf5fa64ff5e0779fd2275129b7088de24f4a2dbd0232a482aceb124064e5c56ccc4
+DIST beancount-2.3.5.gh.tar.gz 1718715 BLAKE2B 2bcbf250e6947c6ea93f7c4308fac2ea03c0b5b722dc4a6eb396133880ca201235ceb8cbb2e3a6e63afe573e1b3ab8bb945444a1edc73791b73200fb4d45bd18 SHA512 a3f1343ddf54cf13ef60802de210dc89e9ae202bca802b1b4eb532588f71d51fa4b71672b4e6a1e9676135d406fd55c421b80c439fa2f5f4279e61211f558a2a
--- a/app-office/beancount/beancount-2.3.3.ebuild
+++ b/app-office/beancount/beancount-2.3.3.ebuild
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A double-entry accounting system that uses text files as input"
-HOMEPAGE="https://github.com/beancount/beancount"
-SRC_URI="https://github.com/beancount/beancount/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.3-disable-network-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-disable-tmp-access-tests.patch"
-	"${FILESDIR}/${PN}-2.3.3-disable-install-test.patch"
-)
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
-		>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
-		>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
-		>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
-		>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-		>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.0[${PYTHON_USEDEP}]
-	')
-"
-
-BDEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-5.4.2[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-python_test(){
-	esetup.py build_ext -i
-	make ctest
-	make test
-}
--- a/app-office/beancount/beancount-2.3.5.ebuild
+++ b/app-office/beancount/beancount-2.3.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DITUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="A double-entry accounting system that uses text files as input"
+HOMEPAGE="https://beancount.github.io https://github.com/beancount/beancount"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.3-disable-network-tests.patch"
+	"${FILESDIR}/${PN}-2.3.3-disable-tmp-access-tests.patch"
+	"${FILESDIR}/${PN}-2.3.3-disable-install-test.patch"
+)
+
+RDEPEND="$(python_gen_cond_dep '
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	>=dev-python/bottle-0.12[${PYTHON_USEDEP}]
+	dev-python/google-auth-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.10[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-4.0[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magic-0.4.12[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+')"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed "/def find_repository_root/a\    return '${S}'" \
+		-i ${PN}/utils/test_utils.py || die
+	sed "s/\[PROGRAM\]/['${EPYTHON}', PROGRAM]/" \
+		-i ${PN}/tools/treeify_test.py || die
+	sed "/DATA_DIR =/c\    DATA_DIR = '${S}/${PN}/utils/file_type_testdata'" \
+		-i ${PN}/utils/file_type_test.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# keep in sync with hashsrc.py, otherwise expect test failures
+	cp beancount/parser/{lexer.l,grammar.y,decimal.h,decimal.c,macros.h,parser.h,parser.c,tokens.h} "${BUILD_DIR}"/lib/${PN}/parser || die
+}
+
+python_test(){
+	emake ctest
+
+	cd "${T}" || die
+	epytest --pyargs ${PN}
+}
--- a/dev-cpp/libcutl/Manifest
+++ b/dev-cpp/libcutl/Manifest
@@ -0,0 +1 @@
+DIST libcutl-1.11.0-b.9.tar.gz 35388 BLAKE2B 241db59fce05d8b9d425342f04727d016893f8253914f55d68730409dc3208c6f94bf261fd1a610ad06d0c75381864b7ec3424a40c2b4d0466d58aa7bd180dad SHA512 2949518a8f0d71cef5325957df96eb36193f11f1fc0da070a93c6159966efcc79183b96a57a1b25e98296a967883c3012ac3a659046d41abe43e654c64339d84
--- a/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
+++ b/dev-cpp/libcutl/libcutl-1.11.0_beta9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-$(ver_cut 1-3)-b.$(ver_cut 5)"
+
+inherit edo multiprocessing
+
+SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
+KEYWORDS='~amd64 ~x86'
+DESCRIPTION='C++ utility library'
+HOMEPAGE='https://www.codesynthesis.com/projects/libcutl/'
+LICENSE='MIT'
+
+SLOT='0'
+IUSE='test'
+RESTRICT='!test? ( test )'
+
+BDEPEND='dev-util/build2'
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	edo b configure \
+		config.cc.coptions="${CFLAGS}" \
+		config.cc.loptions="${LDFLAGS}" \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS}" \
+		--jobs $(makeopts_jobs)	\
+		--no-progress \
+		--verbose 2
+}
+
+src_compile() {
+	edo b update-for-install \
+		config.install.root="${EPREFIX}"/usr \
+		--jobs $(makeopts_jobs) \
+		--no-progress \
+		--verbose 2
+	use test && edo b update-for-test \
+		--jobs $(makeopts_jobs) \
+		--no-progress \
+		--verbose 2
+}
+
+src_test() {
+	edo b test \
+		--jobs $(makeopts_jobs) \
+		--no-progress \
+		--verbose 2
+}
+
+src_install() {
+	edo b install \
+		config.install.chroot="${D}" \
+		config.install.root="${EPREFIX}"/usr \
+		config.install.lib="${EPREFIX}"/usr/$(get_libdir) \
+		config.install.doc="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-progress
+}
--- a/dev-cpp/libcutl/metadata.xml
+++ b/dev-cpp/libcutl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		libcutl is a C++ utility library. It contains a collection of
+		generic and independent components such as meta-programming
+		tests, smart pointers, containers, compiler building blocks,
+		etc.
+	</longdescription>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>pravorskyi@meta.ua</email>
+		<name>Andrii Pravorskyi</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-cpp/std-format/metadata.xml
+++ b/dev-cpp/std-format/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
--- a/dev-embedded/rauc/Manifest
+++ b/dev-embedded/rauc/Manifest
@@ -1 +1 @@
-DIST rauc-1.6.tar.xz 878684 BLAKE2B 0fa4686db47793fefb675d3f3b873741a46a7f7ae4bdf931d66dfcba480963504b9d140edf65c4f88aff9753e61658f56e39189603a51d52583a90b50b1b810c SHA512 265646e3abb97c47344a8c9a62c022824b5cae12264915a06987ba4f9d63f25ee56b7e7df5aa59489bdb3f34cad72b6ec1c4b58d041e6203dab529b517ec0388
+DIST rauc-1.7.tar.xz 1049072 BLAKE2B 51e29e66cbb649b2fb7b1b0b93725f69bb1079e879a74e5431cf562b050ea43911dd52c1e2853e8223174710a8d040bd0349583ad104bba65dc7e191fbb24287 SHA512 16bcba35806a746b118546aa64bea65bda7f91e9295c3599959ea77ab48daade87d866a68c5cb438cb0c666e535d71fbf4854fa956785002e912ca02c4ed15e6
--- a/dev-embedded/rauc/files/rauc-1.7-tests.patch
+++ b/dev-embedded/rauc/files/rauc-1.7-tests.patch
@@ -13,7 +13,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>

 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -155,10 +155,6 @@ check_PROGRAMS = \
+@@ -162,10 +162,6 @@ check_PROGRAMS = \
 	test/progress.test \
 	test/slot.test
 
@@ -21,10 +21,10 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 -check_PROGRAMS += test/network.test
 -endif
 -
- if WANT_JSON
- check_PROGRAMS += test/boot_switch.test
+ if ENABLE_STREAMING
+ check_PROGRAMS += test/nbd.test
 endif
-@@ -242,9 +238,6 @@ test_utils_test_LDADD = librauctest.la
+@@ -260,9 +256,6 @@ test_utils_test_LDADD = librauctest.la
 test_install_test_SOURCES = test/install.c
 test_install_test_LDADD = librauctest.la
 
@@ -36,7 +36,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 
 --- a/test/rauc.t
 +++ b/test/rauc.t
-@@ -283,16 +283,16 @@ test_expect_success "rauc bundle" "
+@@ -325,16 +325,16 @@ test_expect_success "rauc bundle" "
   test -f ${TEST_TMPDIR}/out.raucb
 "
 
--- a/dev-embedded/rauc/rauc-1.7.ebuild
+++ b/dev-embedded/rauc/rauc-1.7.ebuild
--- a/dev-hare/hare-xml/hare-xml-9999.ebuild
+++ b/dev-hare/hare-xml/hare-xml-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3
+
+DESCRIPTION="XML support for Hare"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/hare-xml"
+EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare-xml"
+LICENSE="MPL-2.0"
+SLOT="0"
+
+DEPEND="dev-lang/hare"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i 's;^PREFIX=.*;PREFIX=/usr;' Makefile || die
+}
--- a/dev-hare/hare-xml/metadata.xml
+++ b/dev-hare/hare-xml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-libs/atl/Manifest
+++ b/dev-libs/atl/Manifest
@@ -0,0 +1 @@
+DIST atl-2.2.1.gh.tar.gz 36765 BLAKE2B 6bba939452f86e1021555e860704a76a28f99dee575d8d3ea8bd431ff2b37ac27bf60745af625fd69980d8bfea46d620f5de7a2d68371a4bbaba06bab8a3f331 SHA512 c0372fa1e16e674a6d079dfd783a383bea4283c6b25e379d94e09100ae3c9195112fdade2551e16e435475e04af9086f51a370181d93c6c927677c7f14de5a61
--- a/dev-libs/atl/atl-2.2.1.ebuild
+++ b/dev-libs/atl/atl-2.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for the creation and manipulation of lists"
+HOMEPAGE="https://github.com/GTkorvo/atl"
+SRC_URI="https://github.com/GTKorvo/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +utilities"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DATL_INSTALL_HEADERS=ON
+		-DATL_INSTALL_PKGCONFIG=ON
+		-DATL_QUIET=OFF
+		-DBUILD_SHARED_LIBS=ON
+
+		-DATL_LIBRARIES_ONLY=$(usex utilities 'OFF' 'ON')
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
--- a/dev-libs/atl/metadata.xml
+++ b/dev-libs/atl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/GTKorvo/atl/issues</bugs-to>
+    <remote-id type="github">GTKorvo/atl</remote-id>
+  </upstream>
+  <use>
+    <flag name="utilities">Build utilities</flag>
+  </use>
+</pkgmetadata>
--- a/dev-libs/boinc-zip/metadata.xml
+++ b/dev-libs/boinc-zip/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>cyber+gentoo@sysrq.in</email>
 		<name>Anna</name>
 	</maintainer>
--- a/dev-libs/dill/Manifest
+++ b/dev-libs/dill/Manifest
@@ -0,0 +1 @@
+DIST dill-2.4.1.gh.tar.gz 209181 BLAKE2B 508dc8c59744f41acca24817f63bdb6efa15cf4674cd0cb36a2b09a80ae6ecb603ee45a54e0ede23558e982b25ddc06c0a7f2e1463e63b9decc4aa1b9dbd7c42 SHA512 8acdf80a59696ef45453dd677f13dce7aada9ac81bddab7a36f70b23644b8d507dba64576410fe87a5359d7a73df416302522823898e7b807ffb277d3363b54e
--- a/dev-libs/dill/dill-2.4.1.ebuild
+++ b/dev-libs/dill/dill-2.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Provides instruction-level code generation directly into memory regions"
+HOMEPAGE="https://github.com/GTkorvo/dill"
+SRC_URI="https://github.com/GTKorvo/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="disassembly ignore-native multitarget test"
+
+RDEPEND="
+	dev-libs/libffi
+	disassembly? ( sys-libs/binutils-libs )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/binutils
+	dev-lang/perl
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DDILL_INSTALL_PKGCONFIG=ON
+		-DDILL_INSTALL_HEADERS=ON
+		-DDILL_QUIET=OFF
+		-DLIBFFI_INTERNAL=OFF
+
+		-DBUILD_TESTING=$(usex test)
+		-DDILL_ENABLE_DISASSEMBLY=$(usex disassembly)
+		-DDILL_IGNORE_NATIVE=$(usex ignore-native)
+		-DDILL_MULTI_TARGET=$(usex multitarget)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
--- a/dev-libs/dill/metadata.xml
+++ b/dev-libs/dill/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/GTKorvo/atl/issues</bugs-to>
+    <remote-id type="github">GTKorvo/atl</remote-id>
+  </upstream>
+  <use>
+    <flag name="disassembly">Enable binutils-based disassembly</flag>
+    <flag name="ignore-native">Build to do emulation, regardless of architecture</flag>
+    <flag name="multitarget">Build all available target architectures</flag>
+  </use>
+</pkgmetadata>
--- a/dev-libs/ffs/Manifest
+++ b/dev-libs/ffs/Manifest
@@ -0,0 +1 @@
+DIST ffs-1.6.0.gh.tar.gz 1127791 BLAKE2B 65f97569ee924d8e6b44f16127c8d0f1e0d7fcc6a5304f48486a006a07ee0cbc161073d559f8b60567d04c83a4aca9128586300b6ad7571913524d24a01c3395 SHA512 2c50be7b1cc8a024d4e0120791fa0838a287cd1bdeb3055d5698f7c6c130a80434821bc922a2597ec02ecb2cd7921e07d16118b1c48ba86be3bd7fd63787f6f2
--- a/dev-libs/ffs/ffs-1.6.0.ebuild
+++ b/dev-libs/ffs/ffs-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="FFS is a middleware library for data communication"
+HOMEPAGE="https://github.com/GTkorvo/ffs"
+SRC_URI="https://github.com/GTKorvo/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+atl test"
+
+RDEPEND="
+	atl? ( dev-libs/atl )
+	dev-libs/dill
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DFFS_INSTALL_PKGCONFIG=ON
+		-DFFS_INSTALL_HEADERS=ON
+		-DFFS_QUIET=OFF
+
+		-DFFS_USE_ATL=$(usex atl)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
--- a/dev-libs/ffs/metadata.xml
+++ b/dev-libs/ffs/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/GTKorvo/ffs/issues</bugs-to>
+    <remote-id type="github">GTKorvo/ffs</remote-id>
+  </upstream>
+  <use>
+    <flag name="atl">Enable the use of ATL</flag>
+  </use>
+</pkgmetadata>
--- a/dev-libs/kwsys/Manifest
+++ b/dev-libs/kwsys/Manifest
@@ -0,0 +1 @@
+DIST kwsys-c28e27bc4ad8e12d88b05f30eec19b2987c60721.tar.bz2 184328 BLAKE2B 3d0c4286207cbd4d04d2c7850294dfa46ca1cb1474fa71353e05d3c5be982ed0103b9e27f790d8e4d7a001d0e375cf203aad6a8a659175529a45d0cf09edc36e SHA512 c1c162b6de0fd28dcc99804de6c1835e31fe8cd2e5f2ec5b56fd71ed3425e075d4fe7eaef3faa14501a6bed3f584c1076e69b25ec3b648fd3b8a54d4a3262971
--- a/dev-libs/kwsys/kwsys-0_pre20220603.ebuild
+++ b/dev-libs/kwsys/kwsys-0_pre20220603.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+COMMIT="c28e27bc4ad8e12d88b05f30eec19b2987c60721"
+
+DESCRIPTION="Kitware System Library"
+HOMEPAGE="https://gitlab.kitware.com/utils/kwsys"
+SRC_URI="https://gitlab.kitware.com/utils/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.bz2"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DKWSYS_INSTALL_BIN_DIR=bin
+		-DKWSYS_INSTALL_INCLUDE_DIR=include
+		-DKWSYS_INSTALL_LIB_DIR=$(get_libdir)
+		-DKWSYS_STANDALONE=ON
+
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
--- a/dev-libs/kwsys/metadata.xml
+++ b/dev-libs/kwsys/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,3 +1,2 @@
 DIST olm-3.2.11.tar.bz2 2735303 BLAKE2B 577465d5a5246cda85848e0caa2912bd225af520c23a247cacec06669bae2ab0b7c3bf209a203e8bf2f7e0e573f7f30f8699704a2b6cf2e7996209eade69bb8c SHA512 4ab2263395efd33ecb336577d72845c8eaf6f6478448d78f104424ea7f48f6273e13df4038f96a05e946dbe5f6beb952bbbc86b81eaca035195dbdaaf9a2dd26
-DIST olm-3.2.8.tar.bz2 489350 BLAKE2B bf8b31262c15da2cffd5eeb1f426fe60e83dc60b3377191d65b4b4992133f92adfb7d18deb69b075207550b1b32220a1d807f331e58b41839d8aa5330a80bf3d SHA512 2a249b6880ff0c368458c14d6bae3103890f23dceaaf5753d140884185590fd54f1d7bcb8959f43b3b0f5c9302f76e380e6cdfe3340feab7f9fff60362a39303
-DIST olm-3.2.9.tar.bz2 2734794 BLAKE2B 6c5cc89804071f961ebd571dd5d3fac43aa9517fda4e029a0855fc89f4ec46e49b784aa2cfbf8cec8e34b8ef06c5e61f2111ec30fc872f44c90795359892f205 SHA512 c196430054920d78587fc79eed25312d11498594257b9a12057bfb2feaf2abfb7df35854952b4a36bc22a8c62b99b58e55f9434001a00791ca62ca47556957a5
+DIST olm-3.2.12.tar.bz2 2742680 BLAKE2B 47c3bacaf05cc0bb6088da34e6a031f9c770893771ddcf9f13bc0e10a050139f14969dfc91f38684336872089b4cbf9d66e4bd85692989eba5fc3df966da3cd2 SHA512 a25db4c72910512beca9120db59ebeeefc5fff6a381e88ae7cf261bc5ab896edc2cfe25ece57b7b28b2e3d8bc66367c457133c147e1a3514f926714159b5cf6f
--- a/dev-libs/olm/olm-3.2.12.ebuild
+++ b/dev-libs/olm/olm-3.2.12.ebuild
--- a/dev-libs/olm/olm-3.2.8.ebuild
+++ b/dev-libs/olm/olm-3.2.8.ebuild
@@ -1,35 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets"
-HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
-SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DOLM_TESTS="$(usex test)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
-}
-
-src_install() {
-	use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md )
-
-	cmake_src_install
-}
--- a/dev-libs/perfstubs/Manifest
+++ b/dev-libs/perfstubs/Manifest
@@ -0,0 +1 @@
+DIST perfstubs-0_pre20210915.gh.tar.gz 27236 BLAKE2B 79eb382f9562581ba98f641e3f70cce16370b293129e2cf3264ccaea16ae108e2f63c8bd0b82399c6925112a121d05b5e9b442f21dcd1a247bb843c7839fb370 SHA512 5830c7a81200627951c7870065e44a166c560c19154d7a8d9ec015caa6a99501fbfe0a25c88e1200304da125956958a41da90362e14b06f9f2808a35756936c3
--- a/dev-libs/perfstubs/metadata.xml
+++ b/dev-libs/perfstubs/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">
+Profiling API for adding external tool instrumentation support to any project.
+This was motivated by the need to quickly add instrumentation to the ADIOS2 library without adding a build dependency, or tying to a specific measurement tool.
+The initial prototype implementation was tied to TAU, but evolved to this more generic version, which was extracted as a separate repository for testing and demonstration purposes.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/khuck/perfstubs/issues</bugs-to>
+		<remote-id type="github">khuck/perfstubs</remote-id>
+	</upstream>
+	<use>
+		<flag name="default">Use provided perfstubs tool_example</flag>
+		<flag name="timers">Use our own tool_example of timers</flag>
+		<flag name="tools">Build libperfstsubs_n</flag>
+	</use>
+</pkgmetadata>
--- a/dev-libs/perfstubs/perfstubs-0_pre20210915.ebuild
+++ b/dev-libs/perfstubs/perfstubs-0_pre20210915.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake fortran-2
+
+COMMIT="bdd9118a6e4af9245640ccb58b4f49cbf5aaa899"
+
+DESCRIPTION="Profiling API for adding external tool instrumentation support to any project"
+HOMEPAGE="https://github.com/khuck/perfstubs"
+SRC_URI="https://github.com/khuck/${PN}/archive/${COMMIT}.tar.gz -> ${PF}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+default examples +timers tools"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	sed \
+		-e "s|/lib|/$(get_libdir)|g" \
+		-e "s|DESTINATION lib|DESTINATION $(get_libdir)|g" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DPERFSTUBS_USE_STATIC=OFF
+
+		-DPERFSTUBS_BUILD_EXAMPLES=$(usex examples)
+		-DPERFSTUBS_BUILD_MULTI_TOOL=$(usex tools)
+		-DPERFSTUBS_USE_DEFAULT_IMPLEMENTATION=$(usex default)
+		-DPERFSTUBS_USE_TIMERS=$(usex timers)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md
+}
--- a/dev-python/base58/base58-2.1.1.ebuild
+++ b/dev-python/base58/base58-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 BDEPEND="
 	test? (
--- a/dev-python/bidict/bidict-0.22.0.ebuild
+++ b/dev-python/bidict/bidict-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 BDEPEND="test? (
 	dev-python/hypothesis[${PYTHON_USEDEP}]
--- a/dev-python/bitbox02/bitbox02-5.3.0.ebuild
+++ b/dev-python/bitbox02/bitbox02-5.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

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

 RDEPEND="
--- a/dev-python/compreffor/compreffor-0.5.1_p1.ebuild
+++ b/dev-python/compreffor/compreffor-0.5.1_p1.ebuild
@@ -4,29 +4,26 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-MYPV="${PV/_p/.post}"
-MYP="${PN}-${MYPV}"
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1

+MY_P="${PN}-${PV/_p/.post}"
 DESCRIPTION="A CFF table subroutinizer for FontTools"
 HOMEPAGE="
 	https://github.com/googlefonts/compreffor
 	https://pypi.org/project/compreffor/
 "
-SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.tar.gz"
-S="${WORKDIR}/${MYP}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"

-RDEPEND="
-	>=dev-python/fonttools-4[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/fonttools-4[${PYTHON_USEDEP}]"
+DEPEND=">=dev-python/cython-0.29.24[${PYTHON_USEDEP}]"
 BDEPEND="
 	app-arch/unzip
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "

@@ -34,12 +31,7 @@ PATCHES=( "${FILESDIR}/${P}-remove-unwanted-dependencies.patch" )

 distutils_enable_tests pytest

-python_compile() {
-	distutils-r1_python_compile
-	esetup.py build_ext --inplace
-}
-
 python_test() {
-	cd "${S}/src/python" || die
-	PYTHONPATH=".:${PYTHONPATH}" epytest compreffor/test
+	cd "${T}" || die
+	epytest --pyargs compreffor
 }
--- a/dev-python/cymem/Manifest
+++ b/dev-python/cymem/Manifest
@@ -0,0 +1 @@
+DIST cymem-2.0.6.tar.gz 8241 BLAKE2B 359c1cee8b3d01a2e659898992c22da7f7e3fab0ae5481d328f660c314a0dde85ca868e63e2c1b55b3624e568f369b8e993da04fa30c2ea79d21472cc6c1f7b0 SHA512 058fef116e02a38960017bfb4347f625fd5bda39cc239c8b434c7c928a9303678e1689ae5860181750fa23d8ee7a0bce1836c33420b6b4799d297df85f2b64e7
--- a/dev-python/cymem/cymem-2.0.6.ebuild
+++ b/dev-python/cymem/cymem-2.0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Manage calls to calloc/free through Cython"
+HOMEPAGE="
+	https://pypi.org/project/cymem/
+	https://github.com/explosion/cymem
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs ${PN}
+}
--- a/dev-python/cymem/metadata.xml
+++ b/dev-python/cymem/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cymem</remote-id>
+		<remote-id type="github">explosion/cymem</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -0,0 +1,2 @@
+DIST gnuplot-py-1.8.tar.gz 118828 BLAKE2B 880062169b2fa047d60318cc7dc556c60794bfd81317681395329a56712506f7e406efecb79f37cd98103e76a6feb8b635e55fe056c3ce5bee0c670c8bcaf7a8 SHA512 748dc95ea53acd362f67c821a3cc7cf23b6329c2dd13c130c91e1c9f89afe1ffd84619ed321923c65455adf86ee58976dd6dd187881ee3ede5e0f5f551fb027d
+DIST python-gnuplot_1.8-8.debian.tar.xz 13304 BLAKE2B 2bebf1bc648f90b9679a7499f46f208baaee026aef81ac345f7dbdf7769caedc07668c62a809950d454cad560473438aa2e82a29d21f71e8c87201bf7978a3be SHA512 d2d9466d6d738b8244522572d9e45ae3ea1c0e68c3edb18e13bdca8f630b45466219fe68f874155901020540d801ab5aa025164d28958c440dc37ea4dda098cb
--- a/dev-python/gnuplot-py/gnuplot-py-1.8_p8.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8_p8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYPN="python-gnuplot"
+MYPV="$(ver_cut 1-2)"
+MYP="${PN}-${MYPV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python wrapper for Gnuplot"
+HOMEPAGE="http://gnuplot-py.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MYP}.tar.gz
+	mirror://debian/pool/main/p/${MYPN}/${MYPN}_${PV//_p/-}.debian.tar.xz
+"
+S="${WORKDIR}/${MYP}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	sci-visualization/gnuplot
+"
+
+DOCS="ANNOUNCE.txt CREDITS.txt FAQ.txt NEWS.txt TODO.txt"
+PATCHES=(
+	"${WORKDIR}/debian/patches/00-python3-port.patch"
+	"${WORKDIR}/debian/patches/fix-privacy-breach.patch"
+	"${WORKDIR}/debian/patches/00-remove-version-import.patch"
+	"${WORKDIR}/debian/patches/fix-python-name.patch"
+	"${WORKDIR}/debian/patches/fix-malfuction-mouse-keys.patch"
+	"${WORKDIR}/debian/patches/fix-string-exceptions.patch"
+)
+
+python_install_all() {
+	HTML_DOCS=( doc/Gnuplot/*.html )
+	einstalldocs
+}
--- a/dev-python/gnuplot-py/metadata.xml
+++ b/dev-python/gnuplot-py/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnuplot-py</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/graphene/graphene-3.0.0.ebuild
+++ b/dev-python/graphene/graphene-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MY_PV}.tar.gz -> ${P

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	dev-python/aniso8601[${PYTHON_USEDEP}]
--- a/dev-python/graphql-core/graphql-core-3.1.6.ebuild
+++ b/dev-python/graphql-core/graphql-core-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 BDEPEND="
 	test? (
--- a/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild
+++ b/dev-python/graphql-relay/graphql-relay-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="dev-python/graphql-core[${PYTHON_USEDEP}]"
 BDEPEND="
--- a/dev-python/hunter/Manifest
+++ b/dev-python/hunter/Manifest
@@ -1,2 +1 @@
-DIST hunter-3.3.8.tar.gz 536260 BLAKE2B cdb048798dd831229f3c3ff784b16f94ee45c54bc35eb29e9b228f2736c103dbc39357df82476a2b25310501d33be67474f85c2f5a97a61baca20c8dfc5a725f SHA512 4d715893c805afb5ca709f8c8ce20fbf5ec8540a06c7536862d941a5a4f45b0721f8cd3aa2eeb79c072152d243f4d0ce949431defbdc8c17831f744c3f7ff58a
-DIST hunter-3.4.3.tar.gz 538017 BLAKE2B 92ad2b653d0285059ea2f005c6ba9564f357e1ea438a0fe30087f88efa202aaa504bad65985a88484cf7178c24432ac44705098dabc2667328c71e0ee38f718c SHA512 921bb48ac5d384977908dda060e178e623eb7c1e4298cbf3c0a273cab23695f2a2a60221afb257e54cd144399d2b3b55b80ae9a2c7f71ba452894cc86112d5f7
+DIST hunter-3.4.3.gh.tar.gz 538017 BLAKE2B 92ad2b653d0285059ea2f005c6ba9564f357e1ea438a0fe30087f88efa202aaa504bad65985a88484cf7178c24432ac44705098dabc2667328c71e0ee38f718c SHA512 921bb48ac5d384977908dda060e178e623eb7c1e4298cbf3c0a273cab23695f2a2a60221afb257e54cd144399d2b3b55b80ae9a2c7f71ba452894cc86112d5f7
--- a/dev-python/hunter/files/hunter-remove-vendored-colorama.patch
+++ b/dev-python/hunter/files/hunter-remove-vendored-colorama.patch
@@ -1,34 +0,0 @@
--- a/src/hunter/actions.py
-+++ b/src/hunter/actions.py
-@@ -8,6 +8,8 @@
- from itertools import islice
- from os import getpid
- 
-+from colorama import AnsiToWin32
-+
- from . import config
- from .util import BUILTIN_SYMBOLS
- from .util import CALL_COLORS
-@@ -22,7 +20,6 @@
- from .util import frame_iterator
- from .util import iter_symbols
- from .util import safe_repr
-from .vendor.colorama import AnsiToWin32
- 
- try:
-     from threading import get_ident
--- a/src/hunter/util.py
-+++ b/src/hunter/util.py
-@@ -8,9 +8,9 @@
- from collections import defaultdict
- from collections import deque
- 
-+from colorama import Back
-+from colorama import Fore
-+from colorama import Style
-from .vendor.colorama import Back
-from .vendor.colorama import Fore
-from .vendor.colorama import Style
- 
- try:
-     import __builtin__ as builtins
--- a/dev-python/hunter/files/remove-setuptools_scm-upper-constraint.patch
+++ b/dev-python/hunter/files/remove-setuptools_scm-upper-constraint.patch
@@ -1,15 +0,0 @@
--- a/setup.py
-+++ b/setup.py
-@@ -163,10 +163,10 @@
-         ':platform_system != "Windows"': ['manhole >= 1.5'],
-     },
-     setup_requires=[
-        'setuptools_scm>=3.3.1,!=4.0.0,<6.0',
-+        'setuptools_scm>=3.3.1',
-         'cython',
-     ] if Cython else [
-        'setuptools_scm>=3.3.1,!=4.0.0,<6.0',
-+        'setuptools_scm>=3.3.1',
-     ],
-     entry_points={
-         'console_scripts': [
--- a/dev-python/hunter/hunter-3.3.8.ebuild
+++ b/dev-python/hunter/hunter-3.3.8.ebuild
@@ -1,76 +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} )
-inherit distutils-r1
-
-DESCRIPTION="Hunter is a flexible code tracing toolkit"
-HOMEPAGE="
-	https://github.com/ionelmc/python-hunter
-	https://pypi.org/project/hunter/
-"
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/colorama[${PYTHON_USEDEP}]"
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aspectlib[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/manhole[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-PATCHES=( "${FILESDIR}/remove-setuptools_scm-upper-constraint.patch" )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
-
-python_compile() {
-	# native extension build fails with python3.10
-	# https://github.com/ionelmc/python-hunter/issues/104
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		SETUPPY_NOEXT="yes" distutils-r1_python_compile
-		return
-	fi
-
-	distutils-r1_python_compile
-	if use test; then
-		"${EPYTHON}" tests/setup.py build_ext --force --inplace || die
-	fi
-}
-
-python_test() {
-	local PUREPYTHONHUNTER
-	local -x PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}"
-	local epytest_args=(
-		--deselect tests/test_remote.py::test_gdb
-		--deselect tests/test_remote.py::test_gdb_clean_exit
-		--deselect tests/test_remote.py::test_manhole
-		--deselect tests/test_remote.py::test_manhole_clean_exit
-	)
-
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		epytest_args+=(
-			--deselect tests/test_cookbook.py::test_probe
-			--deselect tests/test_tracer.py::test_perf_filter[pure]
-			--deselect tests/test_tracer.py::test_perf_stdlib[pure]
-			--deselect tests/test_tracer.py::test_perf_actions[pure]
-			--deselect tests/test_tracer.py::test_proper_backend
-		)
-		PUREPYTHONHUNTER="yes"
-	fi
-
-	epytest "${epytest_args[@]}"
-}
--- a/dev-python/hunter/hunter-3.4.3-r1.ebuild
+++ b/dev-python/hunter/hunter-3.4.3-r1.ebuild
@@ -0,0 +1,69 @@
+# 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
+
+DESCRIPTION="Hunter is a flexible code tracing toolkit"
+HOMEPAGE="
+	https://github.com/ionelmc/python-hunter
+	https://pypi.org/project/hunter/
+"
+SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/python-${P}"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# python-hunter only works if deps are vendored (some .pth stuff)
+#RDEPEND="
+	#>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	#dev-python/cymem[${PYTHON_USEDEP}]
+#"
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aspectlib[${PYTHON_USEDEP}]
+		dev-python/ipdb[${PYTHON_USEDEP}]
+		dev-python/manhole[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+" # toml is an indirect dependency (needed by ipdb)
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+
+EPYTEST_IGNORE=( test_remote.py )
+EPYTEST_DESELECT=(
+	tests/test_tracer.py::test_source_cython
+	tests/test_tracer.py::test_fullsource_cython
+)
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
+
+src_unpack() {
+	default
+	cp -a ${S} tests_package || die
+	mv -f tests_package/tests/setup.py tests_package || die
+}
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	cd "${WORKDIR}"/tests_package >/dev/null || die
+	distutils_pep517_install "${BUILD_DIR}"/test
+
+	cd ./tests || die
+	epytest
+}
--- a/dev-python/hunter/hunter-3.4.3.ebuild
+++ b/dev-python/hunter/hunter-3.4.3.ebuild
@@ -1,82 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Hunter is a flexible code tracing toolkit"
-HOMEPAGE="
-	https://github.com/ionelmc/python-hunter
-	https://pypi.org/project/hunter/
-"
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-# toml is an indirect dependency (needed by ipdb)
-BDEPEND="
-	>=dev-python/setuptools_scm-3.3.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aspectlib[${PYTHON_USEDEP}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-		dev-python/manhole[${PYTHON_USEDEP}]
-		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
-PATCHES=( "${FILESDIR}/${PN}-remove-vendored-colorama.patch" )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs ">=dev-python/sphinx-py3doc-enhanced-theme-2.3.2"
-
-src_prepare() {
-	# remove vendored colorama
-	rm -r src/hunter/vendor || die
-	default
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	if use test; then
-		"${EPYTHON}" tests/setup.py build_ext --force --inplace || die
-	fi
-}
-
-python_test() {
-	local PUREPYTHONHUNTER
-	local -x PYTHONPATH="${S}/tests:${BUILD_DIR}/lib:${PYTHONPATH}"
-	local epytest_args=(
-		--deselect tests/test_remote.py::test_gdb
-		--deselect tests/test_remote.py::test_gdb_clean_exit
-		--deselect tests/test_remote.py::test_manhole
-		--deselect tests/test_remote.py::test_manhole_clean_exit
-	)
-
-	if [[ ${EPYTHON} == python3.10 ]]; then
-		epytest_args+=(
-			--deselect tests/test_cookbook.py::test_probe
-			--deselect tests/test_tracer.py::test_perf_filter[pure]
-			--deselect tests/test_tracer.py::test_perf_stdlib[pure]
-			--deselect tests/test_tracer.py::test_perf_actions[pure]
-			--deselect tests/test_tracer.py::test_proper_backend
-		)
-		PUREPYTHONHUNTER="yes"
-	fi
-
-	epytest "${epytest_args[@]}"
-}
--- a/dev-python/hwi/hwi-1.2.1.ebuild
+++ b/dev-python/hwi/hwi-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/bitcoin-core/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="udev doc"

 BDEPEND=""
--- a/dev-python/hwi/hwi-2.0.2.ebuild
+++ b/dev-python/hwi/hwi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="udev"

 RDEPEND="
--- a/dev-python/manhole/Manifest
+++ b/dev-python/manhole/Manifest
@@ -1 +1 @@
-DIST manhole-1.8.0.tar.gz 30823 BLAKE2B 7de4966faaa5a386097d9e3015318f3df5422f9f4525347ea93bc1b3cc988236e2db9dcdf7c5e4f058ad816c74beebab210af65fd331e2347da9c05035a22128 SHA512 041452d602895f7ceaafc74ac50713acd470120b022a942946de83f90d2d839ee15b333dfc329f88597b13e0b3fee436af526beae95a3ff94e51376fd2cc27e6
+DIST manhole-1.8.0.gh.tar.gz 30823 BLAKE2B 7de4966faaa5a386097d9e3015318f3df5422f9f4525347ea93bc1b3cc988236e2db9dcdf7c5e4f058ad816c74beebab210af65fd331e2347da9c05035a22128 SHA512 041452d602895f7ceaafc74ac50713acd470120b022a942946de83f90d2d839ee15b333dfc329f88597b13e0b3fee436af526beae95a3ff94e51376fd2cc27e6
--- a/dev-python/manhole/manhole-1.8.0-r1.ebuild
+++ b/dev-python/manhole/manhole-1.8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

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

 DESCRIPTION="Debugging manhole for python application"
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/ionelmc/python-manhole
 	https://pypi.org/project/manhole/
 "
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 S="${WORKDIR}/python-${P}"

 LICENSE="BSD-2"
@@ -35,8 +35,6 @@ distutils_enable_sphinx docs dev-python/sphinx-py3doc-enhanced-theme
 distutils_enable_tests pytest

 python_test() {
-	distutils_install_for_testing
-
 	local -x PYTHONPATH="${S}/src:${PYTHONPATH}"
 	local EPYTEST_DESELECT=(
 		tests/test_manhole.py::test_connection_handler_exec
@@ -51,11 +49,7 @@ python_test() {
 		tests/test_manhole.py::test_stderr_doesnt_deadlock
 	)

-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			tests/test_manhole.py::test_log_fh
-		)
-	fi
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=( tests/test_manhole.py::test_log_fh )

-	epytest
+	distutils-r1_python_test
 }
--- a/dev-python/pip-api/pip-api-0.0.29.ebuild
+++ b/dev-python/pip-api/pip-api-0.0.29.ebuild
@@ -3,16 +3,11 @@

 EAPI=8

-COMMIT="1af2c0f4cc2aa3c50d906adc8da7a6ceb2ba5df7"
-EPYTEST_DESELECT=(
-	tests/test_installed_distributions.py::test_installed_distributions_legacy_version
-	tests/test_installed_distributions.py::test_installed_distributions_multiple_paths
-)
-DISTUTILS_SETUPTOOLS="pyproject.toml"
 PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

+COMMIT="1af2c0f4cc2aa3c50d906adc8da7a6ceb2ba5df7"
 DESCRIPTION="An unofficial, importable pip API"
 HOMEPAGE="https://github.com/di/pip-api"
 SRC_URI="https://github.com/di/pip-api/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz" # only for 0.0.29
@@ -31,4 +26,20 @@ BDEPEND="
 	)
 "

+EPYTEST_DESELECT=(
+	tests/test_installed_distributions.py::test_installed_distributions_legacy_version
+	tests/test_installed_distributions.py::test_installed_distributions_multiple_paths
+
+	# disable tests that check for pinned version
+	tests/test_tests.py::test_all_the_right_pips
+	tests/test_version.py::test_version
+)
+
 distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# class constructor wants to download pinned pip version
+	sed "/class PipTestEnvironment/{n;s/__init__/init/}" -i tests/conftest.py || die
+}
--- a/dev-python/promise/promise-2.3.0.ebuild
+++ b/dev-python/promise/promise-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/syrusakbary/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="test? (
--- a/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
+++ b/dev-python/pytest-benchmark/pytest-benchmark-3.4.1.ebuild
@@ -4,18 +4,19 @@
 EAPI=8

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

 DESCRIPTION="py.test fixture for benchmarking code"
 HOMEPAGE="
-	https://pypi.python.org/pypi/pytest-benchmark
+	https://pypi.python.org/pypi/pytest-benchmark/
 	https://github.com/ionelmc/pytest-benchmark
 "
 SRC_URI="https://github.com/ionelmc/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 DOCS=( {AUTHORS,CHANGELOG,README}.rst )

@@ -30,11 +31,34 @@ BDEPEND="test? (
 	dev-python/hunter[${PYTHON_USEDEP}]
 	dev-python/pygal[${PYTHON_USEDEP}]
 	dev-python/pygaljs[${PYTHON_USEDEP}]
-)"
+	dev-python/pytest-xdist[${PYTHON_USEDEP}]
+)" # tests include pytest-xdist integration

 EPYTEST_DESELECT=(
 	tests/test_cli.py::test_help
 	tests/test_cli.py::test_help_compare
+
+	# test failures with pytest7, see:
+	# https://github.com/ionelmc/pytest-benchmark/issues/214
+	tests/test_benchmark.py::test_groups
+	tests/test_benchmark.py::test_group_by_func
+	tests/test_benchmark.py::test_group_by_fullfunc
+	tests/test_benchmark.py::test_group_by_param_all
+	tests/test_benchmark.py::test_group_by_param_select
+	tests/test_benchmark.py::test_group_by_param_select_multiple
+	tests/test_benchmark.py::test_group_by_fullname
+	tests/test_benchmark.py::test_only_override_skip
+	tests/test_benchmark.py::test_fixtures_also_skipped
+	tests/test_benchmark.py::test_max_time_min_rounds
+	tests/test_benchmark.py::test_max_time
+	tests/test_benchmark.py::test_disable_gc
+	tests/test_benchmark.py::test_custom_timer
+	tests/test_benchmark.py::test_sort_by_mean
+	tests/test_benchmark.py::test_basic
+	tests/test_benchmark.py::test_skip
+	tests/test_benchmark.py::test_disable
+	tests/test_benchmark.py::test_mark_selection
+	tests/test_benchmark.py::test_only_benchmarks
 )

 distutils_enable_tests pytest
--- a/dev-python/python-socketio/python-socketio-5.1.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-5.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 #wait for dev-python/python-engineio
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="client asyncio-client"

 RDEPEND="dev-python/bidict[${PYTHON_USEDEP}]
--- a/games-fps/quakespasm/metadata.xml
+++ b/games-fps/quakespasm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="no">
+	<maintainer type="person">
 		<email>contact@hacktivis.me</email>
 		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
--- a/games-util/legendary/Manifest
+++ b/games-util/legendary/Manifest
@@ -1,2 +1,2 @@
-DIST legendary-0.20.24.tar.gz 126626 BLAKE2B 4b98f3fd271c252ae9e0bae1b1eba4149f83eb4b4e614fb27f87ac99224bd56534d68927e0dde013917425749c8803ca02ca4ed96d49b844280fe27c93b785a8 SHA512 65727c7917b3675ebd6d2fc91c8f01cd7d32fff21d1bb9b0280c18a4e78e548b92796785647f4576bf44b33af2c8adab0e9b9f631c5e20b7346721c92dab885f
 DIST legendary-0.20.25.tar.gz 127548 BLAKE2B 7c2b10e04bfe30be01733184b07b470c8f77d5c911deee8109ce18b87b9f7d611aae5a677212c4e8c5487b2b3685a2c22c0685f481f24daabd3d1cd10ef5746c SHA512 2ba8d3ebcd751201e23dccb3666e849366529c0edcc926fe6fd3216f23683aff9a396eb6e7f2d9e26961bd02cf07578e1ded95a6065460e6977e8d10f0242962
+DIST legendary-0.20.26.tar.gz 128509 BLAKE2B b563b607dd76e93c591868a67ed3c0299291b1387aeed59bab447db75e6ff653e2bfaf8ad976f2915f7e1fa5bc6a36183d30ea3a0e2c481987e79dc322bd2b83 SHA512 d1b3244437bf2f2c7efb3fd181cc6a83d197c32256bb31d9f9b0c1b8a4712814a8ad5e6f227d953cd0bc5e31dffb816f456f33d14ebbd68355f5b4d78f4e5ea0
--- a/games-util/legendary/legendary-0.20.26.ebuild
+++ b/games-util/legendary/legendary-0.20.26.ebuild
@@ -1,11 +1,10 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 PYTHON_COMPAT=( python3_{9,10} )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS="bdepend"

 inherit distutils-r1

--- a/gnome-extra/extension-manager/Manifest
+++ b/gnome-extra/extension-manager/Manifest
@@ -1,2 +1,3 @@
 DIST extension-manager-0.2.3.tar.gz 1384925 BLAKE2B 3bd98f67f419c646a4a7b9d1dee656de305eff5e35124f3765d5d9c82aff7d9e7bbeea912f24c0766c95e0c497b070831ee9922747f200bbcd57470a6adcec7e SHA512 9bb078f3d00cdfe1e84a757f7cce32f5a33333fdf4f60f3952523ac48779becab9c00da78974551f224c194806217eddf3116a29eb33f1e9982ff8caa5e06218
 DIST extension-manager-0.3.0.tar.gz 1431028 BLAKE2B 059d46118b57f204b1258a5d9c55587407130db3048b87be13294e6f426b5d8515475e6b7622cca3ed5951c3f2ed238d22a09ab4f4d1bf78196618b8fe580f29 SHA512 34642d81be67978ac039a17e0762fa1f44ea41720d066a5aeb7fa1e35f2f6ac25a7924b5daf3073ddf4caa3013e1e70b24c5df4c998920ebe1c8e0a875dbec0c
+DIST extension-manager-0.3.1.tar.gz 1441120 BLAKE2B bd1f6ac1a30521d7ff209c556bcc4ce0103666b9740aa982f0e1a7727b40106df482b693ece920a7449a634955984fa363e217a6b7d14fa0861effe27490824c SHA512 fd434baf0889fcf20a41be71d8bbe6d82aed0baff989747d4da3e8c0ae04a90b6b0b8ad54eede28f266250ca94db8711f35f6a6aa90ceb23195d3460bbd8f1ca
--- a/gnome-extra/extension-manager/extension-manager-0.3.1.ebuild
+++ b/gnome-extra/extension-manager/extension-manager-0.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mjakeman/extension-manager.git"
+else
+	SRC_URI="https://github.com/mjakeman/extension-manager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A native tool for browsing and installing GNOME Shell Extensions"
+HOMEPAGE="https://github.com/mjakeman/extension-manager"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	dev-libs/glib:2
+	dev-util/blueprint-compiler
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	gui-libs/gtk:4[introspection]
+	gui-libs/libadwaita:1[introspection]
+	gui-libs/text-engine
+	net-libs/libsoup:3.0
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	local emesonargs=()
+	if has live ${PROPERTIES}; then
+		# Produce a development build for live ebuild
+		emesonargs+=( -Ddevelopment=true )
+	fi
+	meson_src_configure
+}
+
+# Tests are skipped because as of version 0.3.0, the tests only validate
+# resource files and do not verify any functionality of the program.  Those
+# validations are either already handled by QA checks or not relevant on
+# Gentoo.  For more information about the rationale, please refer to:
+# https://github.com/gentoo/guru/commit/f896bee213fbb62c70e818c1bf503fee2a41919a#comments
+#
+# If tests are to be executed in the future because the upstream adds
+# functionality tests or for other reasons, and should there be no convenient
+# way to skip the validations, the following variable values need to be set:
+#
+# IUSE="test"
+# RESTRICT="!test? ( test )"
+# BDEPEND="test? ( dev-libs/appstream-glib dev-util/desktop-file-utils )"
+src_test() {
+	:
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/net-dialup/tio/Manifest
+++ b/net-dialup/tio/Manifest
@@ -1 +1 @@
-DIST tio-1.37.tar.xz 1804236 BLAKE2B 320ab5955c80551198b24ae9f166a0d41790557755d4cc44149d0aeaabb5a75dfc3e5d29c009b5b985a6788226b63756e4e7588dbb7f658f4b8a8ce99b270bf6 SHA512 207184d297809c7f88185353b55519cf119eed26b5710b644418ef0603d003618c69e593a0f531822c0455a512397cea1b4747a453af5bbb369dad14025b0847
+DIST tio-1.38.tar.xz 1806556 BLAKE2B e8a02e4349b4b4ea27887031fdcce79bd99914b85710a005b1dc5328aea98ec175e6991920d85df7c9acf9c0557dfc3c31005c19c62ca7d28ac7bba08896753f SHA512 d702c907460abd3c15d051f185592d5ec9245734016e299960a4a102724e28208bb21b71cb3cba7919cd2197f338470297034401c7978bcd207195b548e8a2b9
--- a/net-dialup/tio/tio-1.38.ebuild
+++ b/net-dialup/tio/tio-1.38.ebuild
--- a/net-im/go-sendxmpp/Manifest
+++ b/net-im/go-sendxmpp/Manifest
@@ -1,4 +1,4 @@
-DIST go-sendxmpp-0.3.0-vendor.tar.xz 694672 BLAKE2B eb84432a5f809d60e28a11b834afbcd1067d3e89c10ed5ba2c4a5087f04485b5316be313b383a0d22602b97b783ad3585060b8d0fa0e0d1e993f023a8e744824 SHA512 d05d9f720b4c1044b11532d18b80b4a013d0d88171e29187b631009889a9c5be6a65c56b463a96015c1016abe3c43399f931fcf2ac058a333b940fee1b44eb6a
-DIST go-sendxmpp-0.3.0.tar.bz2 17809 BLAKE2B 8c1a0fcf44ed4986fd17806cac169653f05901338169ab8d552f59474ff5eb01dc5ceace1e399edf79c9e967fcaf15216c78f44803f3cb9a6995095e519bdf94 SHA512 9ceefd156d558c8c396956b190504c24fd2824a1ee0308606945d046d378a1d745789a86578e5f6af7b6c0ce0a92c6f7069e1007e96c075df26e92c7f3917501
 DIST go-sendxmpp-0.5.0-vendor.tar.xz 1237388 BLAKE2B 5708f68dee789353df9b9c0aabfc5182239831f74fd4a8e5572137a67c217580e515e3d32c776f1a85edd5259ac7e17482ca68ef9d33c278b08cc6cf0796c9f9 SHA512 38b390ca8806f52a963a14886d7a7a854ab43763b67715dae0f41e832d822a7191fa4a5a344e664ee060d86de3f192ef7822712b3d412aca837da3ddbdc264d0
 DIST go-sendxmpp-0.5.0.tar.bz2 26529 BLAKE2B 7240ead295ea694f3ff7ccbfff978b808ebfcbdcde9f81f98cac4cec548cbc4ad537e56eb7eaa937822397d9933b6b57a12269ff8a344ed327d6ab8545f3fa00 SHA512 45230b5b742e5476ac067d5671fd6c18bfdb2435c65b34b6ef180f74e6123f61fa8097957c05eadf4311a38a96e78446a653d26e1d534bdec4cedff8fd7df329
+DIST go-sendxmpp-0.5.1-vendor.tar.xz 1237104 BLAKE2B 76896da8365f3213518fc6fee4000216ceebbd56690ccb0234c274df2bba9387d8e4bb7c28213edb71df24efeaf94508a6c965b6891de643bc5207315dad61ac SHA512 91e97e060fc4f139e5c95281e0c32325bea4e52509de26b6cec2b43001143167af67c8661fca43cb81a527f5e6d51ea0474375fd5865518f144d3a19d4cbd0a9
+DIST go-sendxmpp-0.5.1.tar.bz2 26585 BLAKE2B 7a016b867cb5ece929fcab9aa2d828c53e1d113082ca3626637f7d8fedf14df456b01910c815dddaee66f13f3a36fa2c828873d1745af204c08e894754315c0e SHA512 470f54ef32946f22914af23b96327e30cb6f6bb4b7d76a955b8512ac818973d77babba6421b1e55a3fa80c9094734dc7ab612ff36e8bad97afc8c45814b97fa9
--- a/net-im/go-sendxmpp/go-sendxmpp-0.5.1.ebuild
+++ b/net-im/go-sendxmpp/go-sendxmpp-0.5.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A little tool to send messages to an XMPP contact or MUC"
 HOMEPAGE="https://salsa.debian.org/mdosch/go-sendxmpp"
 SRC_URI="
 	https://salsa.debian.org/mdosch/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2
-	https://tastytea.de/files/${P}-vendor.tar.xz
+	https://tastytea.de/files/gentoo/${P}-vendor.tar.xz
 "
 S="${WORKDIR}/${PN}-v${PV}"

--- a/net-libs/udt/Manifest
+++ b/net-libs/udt/Manifest
@@ -0,0 +1 @@
+DIST udt.sdk.4.11.tar.gz 147707 BLAKE2B 2be5c280d73138e7d508199aaaecc52ff5824266a92ab8718606c8c2688231ea609ff77d22dc85d2ee99c14edc170559cf9a544fd16bdc98953e1a871d257632 SHA512 fc555ce1ddde2a8bd92c8adf470fd69a9a35d0a679def32b6ddbb18d67dc8b7d9dd928d772dc8598f08b350130f1e90bb4be58c46252a0a79ecc99f61eca8a92
--- a/net-libs/udt/files/udt-4.11-makefiles.patch
+++ b/net-libs/udt/files/udt-4.11-makefiles.patch
@@ -0,0 +1,93 @@
+--- a/app/Makefile
+++ b/app/Makefile
+@@ -1,4 +1,4 @@
+-C++ = g++
+C++ = $(CXX)
+ 
+ ifndef os
+    os = LINUX
+@@ -8,7 +8,7 @@
+    arch = IA32
+ endif
+ 
+-CCFLAGS = -Wall -D$(os) -I../src -finline-functions -O3
+CCFLAGS = -Wall -D$(os) -I../src $(CXXFLAGS)
+ 
+ ifeq ($(arch), IA32)
+    CCFLAGS += -DIA32 #-mcpu=pentiumpro -march=pentiumpro -mmmx -msse
+@@ -26,7 +26,7 @@
+    CCFLAGS += -DSPARC
+ endif
+ 
+-LDFLAGS = -L../src -ludt -lstdc++ -lpthread -lm
+LDFLAGS += -L../src -ludt -lstdc++ -lpthread -lm
+ 
+ ifeq ($(os), UNIX)
+    LDFLAGS += -lsocket
+@@ -43,18 +43,18 @@
+ all: $(APP)
+ 
+ %.o: %.cpp
+-	$(C++) $(CCFLAGS) $< -c
+	$(C++) $(CCFLAGS) -fPIC $< -c
+ 
+ appserver: appserver.o
+-	$(C++) $^ -o $@ $(LDFLAGS)
+	$(C++) $^ -o $@ $(CCFLAGS) -fPIE $(LDFLAGS)
+ appclient: appclient.o
+-	$(C++) $^ -o $@ $(LDFLAGS)
+	$(C++) $^ -o $@ $(CCFLAGS) -fPIE $(LDFLAGS)
+ sendfile: sendfile.o
+-	$(C++) $^ -o $@ $(LDFLAGS)
+	$(C++) $^ -o $@ $(CCFLAGS) -fPIE $(LDFLAGS)
+ recvfile: recvfile.o
+-	$(C++) $^ -o $@ $(LDFLAGS)
+	$(C++) $^ -o $@ $(CCFLAGS) -fPIE $(LDFLAGS)
+ test: test.o
+-	$(C++) $^ -o $@ $(LDFLAGS)
+	$(C++) $^ -o $@ $(CCFLAGS) -fPIE $(LDFLAGS)
+ 
+ clean:
+ 	rm -f *.o $(APP)
+--- a/src/Makefile
+++ b/src/Makefile
+@@ -1,4 +1,4 @@
+-C++ = g++
+C++ = $(CXX)
+ 
+ ifndef os
+    os = LINUX
+@@ -8,7 +8,7 @@
+    arch = IA32
+ endif
+ 
+-CCFLAGS = -fPIC -Wall -Wextra -D$(os) -finline-functions -O3 -fno-strict-aliasing -fvisibility=hidden
+CCFLAGS = -fPIC -Wall -Wextra -D$(os) -fno-strict-aliasing -fvisibility=hidden $(CXXFLAGS)
+ 
+ ifeq ($(arch), IA32)
+    CCFLAGS += -DIA32
+@@ -33,21 +33,18 @@
+ OBJS = api.o buffer.o cache.o ccc.o channel.o common.o core.o epoll.o list.o md5.o packet.o queue.o window.o
+ DIR = $(shell pwd)
+ 
+-all: libudt.so libudt.a udt
+all: libudt.so udt
+ 
+ %.o: %.cpp %.h udt.h
+-	$(C++) $(CCFLAGS) $< -c
+	$(C++) $(CCFLAGS) -fPIC $< -c
+ 
+ libudt.so: $(OBJS)
+ ifneq ($(os), OSX)
+-	$(C++) -shared -o $@ $^
+	$(C++) $(CCFLAGS) $(LDFLAGS) -shared -fPIC -lpthread -Wl,-soname,libudt.so.0 -o $@ $^
+ else
+ 	$(C++) -dynamiclib -o libudt.dylib -lstdc++ -lpthread -lm $^
+ endif
+ 
+-libudt.a: $(OBJS)
+-	ar -rcs $@ $^
+-
+ udt:
+ 	cp udt.h udt
+ 
--- a/net-libs/udt/metadata.xml
+++ b/net-libs/udt/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/udt/bugs/</bugs-to>
+		<remote-id type="sourceforge">udt</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-libs/udt/udt-4.11.ebuild
+++ b/net-libs/udt/udt-4.11.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="UDT is a UDP based data transport protocol"
+HOMEPAGE="http://udt.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}.sdk.${PV}.tar.gz"
+S="${WORKDIR}/${PN}4"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64"
+
+DOCS=( README.txt RELEASE_NOTES.txt draft-gg-udt-xx.txt )
+PATCHES=( "${FILESDIR}/${P}-makefiles.patch" )
+
+src_compile(){
+	tc-export CXX
+
+	# IA32 isn't a typo
+	case ${ARCH} in
+		x86)        PLATFORM="IA32";;
+		ppc|ppc64)  PLATFORM="POWERPC";;
+		amd64)      PLATFORM="AMD64";;
+		ia64)       PLATFORM="IA64";;
+	esac
+
+	case ${CHOST} in
+		*-freebsd*|*-netbsd*|*-openbsd*|*-dragonfly*)  OSNAME="BSD" ;;
+		*-darwin*)                                     OSNAME="OSX" ;;
+		*)                                             OSNAME="LINUX" ;;
+	esac
+
+	MAKEOPTS="-j1" emake os="${OSNAME}" arch="${PLATFORM}"
+}
+
+src_install(){
+	dolib.so src/libudt.so
+	dosym ./libudt.so /usr/$(get_libdir)/libudt.so.0
+	exeinto "/usr/libexec/udt"
+	doexe app/{appserver,appclient,sendfile,recvfile}
+
+	insinto /usr/include/udt
+	doins src/udt.h
+
+	local HTML_DOCS=( doc/* )
+	einstalldocs
+
+	cat  <<EOF > udt.pc
+prefix=/usr
+libdir=\${prefix}/$(get_libdir)
+includedir=\${prefix}/include
+
+Name: ${PN}
+Description: ${DESCRIPTION}
+Version: ${PV}
+URL: ${HOMEPAGE}
+Libs: -L\${libdir} -ludt
+Cflags: -I\${includedir}/udt
+EOF
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins udt.pc
+}
--- a/net-mail/remail/remail-0.13.ebuild
+++ b/net-mail/remail/remail-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/tglx/remail.git/snapsho

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="examples systemd"

 RDEPEND="${PYTHON_DEPS}
--- a/net-misc/maestral-qt/maestral-qt-1.5.2.ebuild
+++ b/net-misc/maestral-qt/maestral-qt-1.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> $

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
--- a/net-misc/maestral-qt/maestral-qt-1.5.3.ebuild
+++ b/net-misc/maestral-qt/maestral-qt-1.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> $

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
--- a/net-misc/maestral/maestral-1.5.2.ebuild
+++ b/net-misc/maestral/maestral-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${PV}.tar.gz -

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
--- a/net-misc/maestral/maestral-1.5.3.ebuild
+++ b/net-misc/maestral/maestral-1.5.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${PV}.tar.gz -

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
--- a/net-misc/maestral/maestral-1.6.2.ebuild
+++ b/net-misc/maestral/maestral-1.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/samschott/maestral/archive/refs/tags/v${PV}.tar.gz -

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"

 RDEPEND="
 	>=dev-python/click-8.0.2[${PYTHON_USEDEP}]
--- a/net-misc/xmrig-mo/metadata.xml
+++ b/net-misc/xmrig-mo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
+  <maintainer type="person">
    <email>me@kevinthomas.dev</email>
    <name>Kevin Thomas</name>
  </maintainer>
--- a/net-p2p/ipfs-cluster/metadata.xml
+++ b/net-p2p/ipfs-cluster/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -39,3 +39,11 @@ dev-python/aionotify
 # Doesn't support Python 3.10.
 dev-python/kitchen
 net-misc/tuir
+
+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-06-04)
+# Pytest hangs. No revdeps. Removal on 2022-07-04.
+dev-python/threadloop
+
+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2022-06-04)
+# Incompatible with recent pytest. No revdeps. Removal on 2022-07-05.
+dev-python/thriftrw
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -65,3 +65,8 @@ media-libs/skia ffmpeg
 # cmake failure
 # https://github.com/mfem/mfem/issues/2243
 sci-libs/mfem netcdf
+
+# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2022-06-05)
+# build failure
+# https://github.com/GTkorvo/evpath/issues/62
+sys-cluster/evpath udt4
--- a/sci-libs/dart/dart-6.12.1-r2.ebuild
+++ b/sci-libs/dart/dart-6.12.1-r2.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
 	app-arch/lz4
 	>=dev-cpp/eigen-3.0.5
 	dev-games/ode
-	dev-libs/boost
+	dev-libs/boost:=
 	dev-libs/tinyxml2
 	dev-libs/urdfdom
-	>=media-libs/assimp-3.0.0
+	>=media-libs/assimp-3.0.0:=
 	media-libs/freeglut
 	media-libs/imgui:=[glut(-),opengl(-)]
 	media-libs/lodepng:=
@@ -47,7 +47,7 @@ RDEPEND="
 	sci-physics/bullet
 	virtual/opengl

-	examples? ( dev-cpp/tiny-dnn )
+	examples? ( dev-cpp/tiny-dnn:= )
 	osg? ( dev-games/openscenegraph )
 	python? (
 		${PYTHON_DEPS}
--- a/sci-mathematics/minisat+/Manifest
+++ b/sci-mathematics/minisat+/Manifest
@@ -1 +1,2 @@
+DIST MiniSat+.pdf 320302 BLAKE2B d4cfec2ccdd8ae8381ab848427efe3a05157cb0ddd0d47e32b627d276fd2fcdb03e1de7d1741036437a2ccd0af143be1d3cc028ac07844ed14360d8e86b15bb9 SHA512 9d011fab434de2b121c03b88f068d374135e1fd248030a89b0a383b292801734bf7bd8c095d0c70377b7ee4a9c59dbab532eb9c41dc0092606d204b3f39237ed
 DIST minisat+_2007-Jan-05.zip 920081 BLAKE2B 4b133a3c06ffe8539a26c7f39f4734d8115053df299bfcd002e97ea00a104abf326633120371560d71cf2700ed02be8891ef78c185f16b516da818269b1101c9 SHA512 deee0cce2882fad8c175c7ca061d7952a243d00119e8d7fcf9ed0260db874a2e5bb846cb9513aa43163735406aebf5cd8ac01000621e2db37da0dc5d5de3854d
--- a/sci-mathematics/minisat+/minisat+-2007.01.05-r1.ebuild
+++ b/sci-mathematics/minisat+/minisat+-2007.01.05-r1.ebuild
@@ -3,24 +3,26 @@

 EAPI=8

-MYPV="${PV/.01./-Jan-}"
-MYP="${PN}_${MYPV}"
-
 inherit toolchain-funcs

+COMMIT="e9dcbabbf5399d16ed4b09250307d1165a341160"
 DESCRIPTION="solver for pseudo-Boolean constraints"
-HOMEPAGE="https://minisat.se/MiniSat+.html"
-SRC_URI="https://minisat.se/downloads/${MYP}.zip"
+HOMEPAGE="http://minisat.se/MiniSat+.html"
+DOWNLOADS_URI="https://github.com/niklasso/minisat-webpage/raw/${COMMIT}/downloads"
+SRC_URI="
+	${DOWNLOADS_URI}/${PN}_${PV/.01./-Jan-}.zip
+	doc? ( ${DOWNLOADS_URI}/MiniSat+.pdf )
+"
 S="${WORKDIR}/${PN}"

 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bignum"
+IUSE="bignum doc"

 RDEPEND="
-	bignum? ( dev-libs/gmp )
-	sys-libs/zlib
+	bignum? ( dev-libs/gmp:= )
+	sys-libs/zlib:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"
@@ -39,12 +41,14 @@ src_compile() {
 }

 src_install() {
+	use doc && dodoc "${DISTDIR}"/MiniSat+.pdf
 	dodoc -r Examples
+
 	dobin minisat+_64-bit
 	use bignum && dobin minisat+_bignum
 	if use bignum; then
-		dosym ./minisat+_bignum "${EPREFIX}/usr/bin/minisat+"
+		dosym ./minisat+_bignum usr/bin/minisat+
 	else
-		dosym ./minisat+_64-bit "${EPREFIX}/usr/bin/minisat+"
+		dosym ./minisat+_64-bit /usr/bin/minisat+
 	fi
 }
--- a/sys-apps/ov/ov-0.11.1.ebuild
+++ b/sys-apps/ov/ov-0.11.1.ebuild
@@ -904,9 +904,9 @@ RESTRICT="!test? ( test )"

 src_compile() {
 	ego build -v -x -o ${PN} -ldflags="-X main.Version=${PV}" || die
-	edo ./ov --completion fish > ov.fish
-	edo ./ov --completion bash > ov.bash
-	edo ./ov --completion zsh > ov.zsh
+	edo ./ov --config ov.yaml --completion fish > ov.fish
+	edo ./ov --config ov.yaml --completion bash > ov.bash
+	edo ./ov --config ov.yaml --completion zsh > ov.zsh
 }

 src_install() {
--- a/sys-apps/watchdogd/Manifest
+++ b/sys-apps/watchdogd/Manifest
@@ -0,0 +1 @@
+DIST watchdogd-3.5.gh.tar.gz 113820 BLAKE2B 8ff0a3c36806663fcbc4d003d93e7d76fa00e8414612832cacebc4bfbb254c8312673f31667dabb395884d0a81611718143a95eb40ff9a5ccde85d1b7769ef24 SHA512 7bbedae36c7a88924a03d478eef3c00100664a046f90dca9e56835c847fb338830cca29db582288f4ff997c841092078f07fa735b69cea19453cac1664b56909
--- a/sys-apps/watchdogd/metadata.xml
+++ b/sys-apps/watchdogd/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/troglobit/watchdogd/issues</bugs-to>
+		<remote-id type="github">troglobit/watchdogd</remote-id>
+	</upstream>
+	<use>
+		<flag name="compat">Enable compat supervisor.status and signals</flag>
+		<flag name="generic">Enable generic script monitor</flag>
+		<flag name="loadavg">Enable CPU load average monitor</flag>
+		<flag name="filenr">Enable file descriptor leak monitor</flag>
+		<flag name="meminfo">Enable memory leak monitor</flag>
+	</use>
+</pkgmetadata>
--- a/sys-apps/watchdogd/watchdogd-3.5.ebuild
+++ b/sys-apps/watchdogd/watchdogd-3.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo toolchain-funcs
+
+DESCRIPTION="Advanced system & process supervisor for Linux"
+HOMEPAGE="
+	https://troglobit.com/watchdogd.html
+	https://github.com/troglobit/watchdogd
+"
+SRC_URI="https://github.com/troglobit/watchdogd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="compat examples filenr generic loadavg meminfo systemd"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/libite
+	dev-libs/libuev
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	local myconf=(
+		$(use_enable compat)
+		$(use_enable examples)
+		$(use_with filenr)
+		$(use_with generic)
+		$(use_with loadavg)
+		$(use_with meminfo)
+		$(use_with systemd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dodoc README.md ChangeLog.md doc/*
+	if use examples; then
+		dodir "/usr/libexec/${PN}"
+		edo mv "${ED}"/usr/bin/ex* "${ED}/usr/libexec/${PN}/"
+	fi
+	edo find "${ED}" -name '*.la' -delete
+}
--- a/sys-cluster/evpath/Manifest
+++ b/sys-cluster/evpath/Manifest
@@ -0,0 +1 @@
+DIST evpath-4.5.0.gh.tar.gz 806308 BLAKE2B b69683c165aba2f15c6839adb6357a93e3588cf7ebe48f60062bab43b7f614102af72803ea650b1f7b979a3fa11734f98621e5e11e4f968c2dc3a2bd1511f14e SHA512 e5c7d2a7beda731db39f99fe0e0f3b6d96b0c9442edf523de51a0369f3aa6fb01cb97c52c6f8752a7a18b855793b7138d9aea7d12120a60a7dc6f9f65eb70190
--- a/sys-cluster/evpath/evpath-4.5.0.ebuild
+++ b/sys-cluster/evpath/evpath-4.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="EVpath is an event transport middleware layer"
+HOMEPAGE="https://github.com/GTkorvo/evpath"
+SRC_URI="https://github.com/GTKorvo/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="enet infiniband libfabric test udt4" # nvml nnti
+
+RDEPEND="
+	dev-libs/atl
+	dev-libs/dill
+	dev-libs/ffs
+
+	enet? ( net-libs/enet )
+	infiniband? ( sys-block/libfabric )
+	libfabric? ( sys-block/libfabric )
+	udt4? ( net-libs/udt:4 )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-find-udt.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DEVPATH_INSTALL_HEADERS=ON
+		-DEVPATH_INSTALL_PKGCONFIG=ON
+		-DEVPATH_QUIET=OFF
+		-DEVPATH_USE_NNTI=OFF
+		-DEVPATH_USE_NVML=OFF
+
+		-DBUILD_TESTING=$(usex test)
+		-DEVPATH_USE_ENET=$(usex enet)
+		-DEVPATH_USE_IBVERBS=$(usex infiniband)
+		-DEVPATH_USE_LIBFABRIC=$(usex libfabric)
+		-DEVPATH_USE_UDT4=$(usex udt4)
+	)
+#		-DEVPATH_USE_ZPL_ENET=$(usex enet)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+}
--- a/sys-cluster/evpath/files/evpath-4.5.0-find-udt.patch
+++ b/sys-cluster/evpath/files/evpath-4.5.0-find-udt.patch
@@ -0,0 +1,36 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -296,7 +296,8 @@
+ if(DEFINED EVPATH_USE_UDT4)
+   option(EVPATH_USE_UDT4 "Build the udt4 transport" "${EVPATH_USE_UDT4}")
+   if(EVPATH_USE_UDT4)
+-    find_package(udt4 4.11 REQUIRED)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(UDT4 REQUIRED udt)
+   endif()
+ else()
+   find_package(udt4 4.11)
+@@ -309,17 +310,18 @@
+   set(RUN_UDT4_TESTS FALSE)   # DON'T TEST.  UDT4 NOT USEFUL
+   if(EVPATH_TRANSPORT_MODULES)
+     add_library(cmudt4 MODULE cmudt4.cpp ip_config.c)
+    target_include_directories(cmudt4 PRIVATE ${UDT4_INCLUDE_DIRS})
+     set_target_properties(cmudt4 PROPERTIES
+       OUTPUT_NAME ${EVPATH_LIBRARY_PREFIX}cmudt4)
+ 
+-    target_link_libraries(cmudt4 evpath udt4::udt4)
+    target_link_libraries(cmudt4 evpath ${UDT4_LIBRARIES})
+     list(APPEND EVPATH_TRANSPORT_TARGETS cmudt4)
+   else()
+     target_sources(EVPath PRIVATE cmudt4.cpp)
+-    target_link_libraries(EVPath PRIVATE udt4::udt4)
+-    _pkg_get_target_prefix(udt4::udt4 udt4_PREFIX)
+-    list(APPEND _pkg_config_pfxs "${udt4_PREFIX}")
+-    list(APPEND _pkg_config_private_reqs "udt4 >= ${udt4_VERSION}")
+    target_link_libraries(EVPath PRIVATE ${UDT4_LIBRARIES})
+    target_include_directories(EVPath PRIVATE ${UDT4_INCLUDE_DIRS})
+    list(APPEND _pkg_config_pfxs "${UDT4_PREFIX}")
+    list(APPEND _pkg_config_private_reqs "udt >= ${UDT4_VERSION}")
+   endif()
+ endif()
+ 
--- a/sys-cluster/evpath/metadata.xml
+++ b/sys-cluster/evpath/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/GTKorvo/evpath/issues</bugs-to>
+    <remote-id type="github">GTKorvo/evpath</remote-id>
+  </upstream>
+  <use>
+    <flag name="enet">Build the enet transport</flag>
+    <flag name="infiniband">Build the ibverbs transport</flag>
+    <flag name="libfabric">Build the libfabric transport</flag>
+    <flag name="udt4">Build the udt4 transport</flag>
+  </use>
+</pkgmetadata>
--- a/sys-cluster/extrae/extrae-4.0.1.ebuild
+++ b/sys-cluster/extrae/extrae-4.0.1.ebuild
@@ -31,11 +31,12 @@ peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml
 #	aspectj? ( >=dev-java/aspectj-1.9.6 )
 CDEPEND="
 	${PYTHON_DEPS}
+	dev-libs/libpfm:=
 	dev-libs/libxml2
 	dev-libs/papi
 	!sys-cluster/openmpi[libompitrace(+)]
-	sys-libs/binutils-libs
-	sys-libs/libunwind
+	sys-libs/binutils-libs:=
+	sys-libs/libunwind:=
 	sys-libs/zlib
 	virtual/mpi

@@ -80,6 +81,7 @@ BDEPEND="

 PATCHES=(
 	"${FILESDIR}/${PN}-3.8.3-link-sionlib.patch"
+	"${FILESDIR}/${P}-fix-pfm-linking.patch"
 )
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
--- a/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch
+++ b/sys-cluster/extrae/files/extrae-4.0.1-fix-pfm-linking.patch
@@ -0,0 +1,12 @@
+diff -ru /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am extrae-4.0.1/src/cmd-line/Makefile.am
+--- /var/tmp/portage/sys-cluster/extrae-4.0.1/work/extrae-4.0.1/src/cmd-line/Makefile.am	2022-05-13 17:41:45.000000000 +0200
+++ extrae-4.0.1/src/cmd-line/Makefile.am	2022-06-05 08:45:43.807262310 +0200
+@@ -11,7 +11,7 @@
+ extrae_cmd_CFLAGS = -I$(INCLUDE_DIR) -I$(COMMON_INC) -I$(TRACER_INC) \
+  -I$(TRACER_INC)/wrappers/API -I$(TRACER_INC)/clocks -I$(TRACER_INC)/hwc -O -g
+ 
+-extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm
+extrae_cmd_LDADD = $(TRACER_LIB)/libseqtrace.la $(MERGER_LIB)/libmpi2prv.la -lm @PAPI_LIBS@
+ if HAVE_BINUTILS
+ extrae_cmd_LDADD += $(BFD_LDFLAGS) $(BFD_RPATH) $(BFD_LIBS) $(LIBERTY_LDFLAGS) $(LIBERTY_RPATH) $(LIBERTY_LIBS)
+ endif
--- a/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild
+++ b/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild
@@ -17,7 +17,7 @@ LICENSE="BSD CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64"

-RDEPEND="virtual/mpi"
+RDEPEND="virtual/mpi[cxx]"
 DEPEND="${RDEPEND}"

 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`DIST libcutl-1.11.0-b.9.tar.gz 35388 BLAKE2B 241db59fce05d8b9d425342f04727d016893f8253914f55d68730409dc3208c6f94bf261fd1a610ad06d0c75381864b7ec3424a40c2b4d0466d58aa7bd180dad SHA512 2949518a8f0d71cef5325957df96eb36193f11f1fc0da070a93c6159966efcc79183b96a57a1b25e98296a967883c3012ac3a659046d41abe43e654c64339d84`
				`@@ -0,0 +1 @@`
				`DIST atl-2.2.1.gh.tar.gz 36765 BLAKE2B 6bba939452f86e1021555e860704a76a28f99dee575d8d3ea8bd431ff2b37ac27bf60745af625fd69980d8bfea46d620f5de7a2d68371a4bbaba06bab8a3f331 SHA512 c0372fa1e16e674a6d079dfd783a383bea4283c6b25e379d94e09100ae3c9195112fdade2551e16e435475e04af9086f51a370181d93c6c927677c7f14de5a61`
				`@@ -0,0 +1 @@`
				`DIST dill-2.4.1.gh.tar.gz 209181 BLAKE2B 508dc8c59744f41acca24817f63bdb6efa15cf4674cd0cb36a2b09a80ae6ecb603ee45a54e0ede23558e982b25ddc06c0a7f2e1463e63b9decc4aa1b9dbd7c42 SHA512 8acdf80a59696ef45453dd677f13dce7aada9ac81bddab7a36f70b23644b8d507dba64576410fe87a5359d7a73df416302522823898e7b807ffb277d3363b54e`
				`@@ -0,0 +1 @@`
				`DIST ffs-1.6.0.gh.tar.gz 1127791 BLAKE2B 65f97569ee924d8e6b44f16127c8d0f1e0d7fcc6a5304f48486a006a07ee0cbc161073d559f8b60567d04c83a4aca9128586300b6ad7571913524d24a01c3395 SHA512 2c50be7b1cc8a024d4e0120791fa0838a287cd1bdeb3055d5698f7c6c130a80434821bc922a2597ec02ecb2cd7921e07d16118b1c48ba86be3bd7fd63787f6f2`
				`@@ -0,0 +1 @@`
				`DIST kwsys-c28e27bc4ad8e12d88b05f30eec19b2987c60721.tar.bz2 184328 BLAKE2B 3d0c4286207cbd4d04d2c7850294dfa46ca1cb1474fa71353e05d3c5be982ed0103b9e27f790d8e4d7a001d0e375cf203aad6a8a659175529a45d0cf09edc36e SHA512 c1c162b6de0fd28dcc99804de6c1835e31fe8cd2e5f2ec5b56fd71ed3425e075d4fe7eaef3faa14501a6bed3f584c1076e69b25ec3b648fd3b8a54d4a3262971`
				`@@ -0,0 +1 @@`
				`DIST perfstubs-0_pre20210915.gh.tar.gz 27236 BLAKE2B 79eb382f9562581ba98f641e3f70cce16370b293129e2cf3264ccaea16ae108e2f63c8bd0b82399c6925112a121d05b5e9b442f21dcd1a247bb843c7839fb370 SHA512 5830c7a81200627951c7870065e44a166c560c19154d7a8d9ec015caa6a99501fbfe0a25c88e1200304da125956958a41da90362e14b06f9f2808a35756936c3`
				`@@ -0,0 +1 @@`
				`DIST cymem-2.0.6.tar.gz 8241 BLAKE2B 359c1cee8b3d01a2e659898992c22da7f7e3fab0ae5481d328f660c314a0dde85ca868e63e2c1b55b3624e568f369b8e993da04fa30c2ea79d21472cc6c1f7b0 SHA512 058fef116e02a38960017bfb4347f625fd5bda39cc239c8b434c7c928a9303678e1689ae5860181750fa23d8ee7a0bce1836c33420b6b4799d297df85f2b64e7`
				`@@ -0,0 +1 @@`
				`DIST udt.sdk.4.11.tar.gz 147707 BLAKE2B 2be5c280d73138e7d508199aaaecc52ff5824266a92ab8718606c8c2688231ea609ff77d22dc85d2ee99c14edc170559cf9a544fd16bdc98953e1a871d257632 SHA512 fc555ce1ddde2a8bd92c8adf470fd69a9a35d0a679def32b6ddbb18d67dc8b7d9dd928d772dc8598f08b350130f1e90bb4be58c46252a0a79ecc99f61eca8a92`
				`@@ -0,0 +1 @@`
				`DIST watchdogd-3.5.gh.tar.gz 113820 BLAKE2B 8ff0a3c36806663fcbc4d003d93e7d76fa00e8414612832cacebc4bfbb254c8312673f31667dabb395884d0a81611718143a95eb40ff9a5ccde85d1b7769ef24 SHA512 7bbedae36c7a88924a03d478eef3c00100664a046f90dca9e56835c847fb338830cca29db582288f4ff997c841092078f07fa735b69cea19453cac1664b56909`
				`@@ -0,0 +1 @@`
				`DIST evpath-4.5.0.gh.tar.gz 806308 BLAKE2B b69683c165aba2f15c6839adb6357a93e3588cf7ebe48f60062bab43b7f614102af72803ea650b1f7b979a3fa11734f98621e5e11e4f968c2dc3a2bd1511f14e SHA512 e5c7d2a7beda731db39f99fe0e0f3b6d96b0c9442edf523de51a0369f3aa6fb01cb97c52c6f8752a7a18b855793b7138d9aea7d12120a60a7dc6f9f65eb70190`