Sync with portage [Tue Nov 8 12:25:24 MSK 2022].

2 years ago · 23981f18b3
parent 7a71e8ea04
commit 23981f18b3
576 changed files with 4353 additions and 7409 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29601 BLAKE2B 02ed593e380ab05c1747792218fb6e829268827a86d9a0d26ef49c6f469d4f4df05887e9d42a68511fc7f762f045704324cefa4d6c814f58164ca1aa5dbe6134 SHA512 823cdf5af6642737efd01e826d13f5570b53c12f51048060027cae68f81bd04e22dd283ad58c4d4b9ed44d1961256c497bd3d064c467a7d1d2514cbb35a8e2b4
-TIMESTAMP 2022-11-07T17:40:03Z
+MANIFEST Manifest.files.gz 29575 BLAKE2B a62ab8ee17760bca98a7aa2050205764be6c908733b2e7f773844b1937668d5365af0ef6c7e58dbbaa3c823eda77f143bdeae4731f8f1793911a2313da9b2af8 SHA512 c2a01ca19c2409a3c3fc99fcee5f880df0f8c5fd0c09935d362ca7285facac6a3824bbd78325856500601d254f0f837a00ffcc3b0785c9418e9beac86598a7a9
+TIMESTAMP 2022-11-08T08:40:12Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNpQvNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNqFexfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDFQQ/9Guac8q75IgtzFPZEvdDN2OzoNmBBmbIRBb7u2jjVjpJxB6xWHsa1lRhc
-Pt61Tx6CmgBdQ1jrIizsuvQT8YT4JGEDv8rxmIqvo5DV3Ua/7hlhiRGfAApJfqOe
-uaI24sVQV2xYJ2SMwxLUtwJaPJCFDGwTCCTzAW/s9VUO/xBPdgeSEPKbulhc0kP0
-yK0/loWRIuc7dIZ0qy5ikLZm+gUHkzbERwK6qxzG32YfK/vwcDaJ1KpWV/MGxCVZ
-YESYMpCVlP3B3G+YCi0LKKe9azxDohMS9VBEjE479/qhGd8lqGClToHQnAsDr5XB
-uEMBFzUOLKMPnRxj/GD0WbqJ4FzmVmmu+xaesBcVVIedFKH+i8Ri8F5HmYf6ryko
-C1IwMpxC8BnSFLnXOmtQX3HgXehhxjIzOGRtm95QNNehBCZbcXxHL/YpwxALBlBF
-DULnSDBipBKrrxMRQmcTR87f88+I89t+2PgUyXGZNaLgqwSVjTeDUUjvAestK7D8
-hs7y8Bw2EYe8j8lvUnZqegXGDOfpaYHYR81ctoQAbk3xbqZ2j16U6dzfaXXDJSaz
-T1rMegJ9kvJSJn12qRNO6vcZI7LPjo42V6ZFpdDqiwQJho4ON7FK2doGbXLIxjpR
-w1fbTu9mtxvDX7rExmntO/jUHYLvheISy5hNCCPnsIS2zoqU8Pk=
-=Litl
+klBFmQ//dpVlZzy2Px1ig5vdNl+phvHz9U3Hypzh83QvtY7eu+K6fadld5Cj3FjF
+neod2g8goKVPKtgKakkIS2Gn5IXKCijVYplDRWSyjGi9jmCYGKfsbK/tYYgC9oTF
+7wc3hrjO/dMayX9YqJJl4GwwOQ6YsbUKYXBO1BHJ3v/y3OiijKzQ6YZiqG79tfGL
+TMwzEfEeXyFNVR1tjDrqbSB/cfT2edioVPKX3yGB02PJ0PGJfktsKQOUUjsWd1sN
+U2/ty9iMgmFeM6X31i9zVBVWuCDKObpnhhB816vo3ILctENfG/Jh90WM8zwWIbTS
+F/YVm8ya0vHmRB6l3+FNDvcDKAfriBGsVGxHy69vCLR3ztq6J/8Tpqu/NZ6UzCHw
+3+3k+6fr9g7cLvsBbg8ADMlJV0/svZAVzajaZrjSrytZsXM7GZBHUG+T8JEBBuBh
+K7LsCkfSpP5EVfgsVccZRqTnc9sa8cTgpklGOlkqqG/THE32Pn9hu4bYkbYy3EoJ
+ZSFQjXKq7QGryYGtvDysSszzzwH1/IdENIVtnKeFMTG+sP4TV67lTbNUyqj85zGS
+mxF77HSzzJArSlFU8eJfLKTGXrbDkB3Z2wp18L41q2dSuaCCklhW7Ya2Hl5SiqyN
+PFVNI1J1lm6E57kenpC3BG8AmrVjgTWjKHzakdluM0iLbjl+VBs=
+=8KIO
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -10,6 +10,7 @@ DIST aws-cli-1.27.0.gh.tar.gz 2294372 BLAKE2B 5cf6f745ae11155dffbdcd58f0850c2666
 DIST aws-cli-1.27.1.gh.tar.gz 2294930 BLAKE2B 720981aa974ee3999806fc480f9a20afef9a8c5c36a81d7beef8f692b5e6a3b0c567979c5cba6d243d695b310e63391d64138e8ed51ec3df8208c7d20a758ec1 SHA512 021c97ebd2f52d14a99d54143ef8a657e939caab32423b9747fa78f53430b914d4c93998cbe52e685550d3823a4d2f2049b3e3895c6c0ecec5e4535bd068008a
 DIST aws-cli-1.27.2.gh.tar.gz 2295292 BLAKE2B 6a2bf1e05b8e72880c8f2337da4fbe6dde6844371bbb441043fbb4fe319a68c7f97034eed7415098063a55da8c655332b757f9e18e2c4de8b63f580fe46da41c SHA512 19e0b420e3283c208b75fe0028d26296bf358d8a40e804b0c413bc1ead26d66f88c9dfbc609931d9f5a677d95d9b701089abf4f1df60f0d0ba3cba5e08ea51ac
 DIST aws-cli-1.27.3.gh.tar.gz 2295495 BLAKE2B cd396d324f2a7c81df2488e61cd021819d2498fbd1ff58f7e75d24f523df7d17f463eb4133339f429be4f8b1e3ae4eab20dc0bf45b140c2aaa7a91d576f9274e SHA512 6efeae8478486073aac0ebbf56ea10cf337b06be6b2306ebbbc489600e52fac28f4c95f8b8435f5e3a9a9342da59c9ca164a019d04ec17363ecbba533a53d7d5
+DIST aws-cli-1.27.4.gh.tar.gz 2296705 BLAKE2B 604306821f91decf0fb6f88d1115000164f393c8a878b5990ca25a2f8d36972a88832079844656e26f084c729aa0e05014e9ff9ca95d1e820346214f5d1bfde1 SHA512 0753e78e43e3d26fcb906c068e78e23ca3ecfbd4607d1f9d8487922d6a1e6b5598b80b9d2cae6236f6b4724e1667b51132c90b66eec7c427ca35aa6f7b3c5f24
 EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
@ -22,4 +23,5 @@ EBUILD awscli-1.27.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231b
 EBUILD awscli-1.27.1.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 EBUILD awscli-1.27.2.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 EBUILD awscli-1.27.3.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.27.4.ebuild 1844 BLAKE2B 7f8265feaccca47c18e706c8f216be88116d7bb0e406e5dbaf1a4d92826de02fb80b522daebbadca297d26fb5e84a9d2739c998ddf8ae736c304c4b046df7b87 SHA512 17fbf378dd5bf9afe1fdb2d6d7e22d610eaf863063d751a68c76bc1cf9e3c2896ba6b4c44a15e5d2aebb5e0881553d2031e378e9026bb517921cef677e917066
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- a/app-admin/awscli/awscli-1.27.4.ebuild
+++ b/app-admin/awscli/awscli-1.27.4.ebuild
@ -0,0 +1,72 @@
+# 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_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/ryzen_monitor/Manifest
+++ b/app-admin/ryzen_monitor/Manifest
@ -2,5 +2,5 @@ AUX fix-Makefile.patch 480 BLAKE2B c0228dc813a780c0a92ce3f931b90ce786debc5c6d6f5
 DIST ryzen_monitor-1.0.4.tar.gz 33716 BLAKE2B f755cc946b26ea5566c1bd304f84e3a3aee80383d151ec8e702919837d04287d4b3b4000b4f9587003cb20b2be45d4af727eb941c0080772b5f94104d68f8b78 SHA512 93cb55b64db75596da88d8f1f3c5eab38cce52d7ae9bb8b7895d62d39ec0b4c0157bad3ed688c32cc0aecf09eb211614b81159a31c704a0f028751ded46723c5
 DIST ryzen_monitor-1.0.5.tar.gz 37372 BLAKE2B 021b417a60a284020e7f9e96348f5e0745aede68e01c1b560e2205c4738fd504d4565bbc5b9c6824ea697a8c0a1d981722f9e6e178a8cfa9213b2e703c5f6b72 SHA512 8e1f02f59f40a3e4fe84c805a1053939a20d21e5c40223bb6b7c41716eff361b86e87fc67fd90078d3ffa9d78d2016284af5362aad2212b9cf35979427906ca8
 EBUILD ryzen_monitor-1.0.4-r1.ebuild 623 BLAKE2B 908b07b7b838ff46f57ecbd329a1c1b350d22a92427fb6110e35930a6a0cb142fb542d622a887aee44b9b57fabeaeece09a0185e667ff9501deaf43ca047cc35 SHA512 b32fd4ba7cb4897a501e78a34bf7c008f7d01387a955c9f0f22358c28797f4336c154ac515d3ddf80c4e00e8c3533f10a3b98460d8eb44a76857a3eb90b4d313
-EBUILD ryzen_monitor-1.0.5.ebuild 578 BLAKE2B 698db5eacc57f7e40980680c4e2cee2c350e34a1bd01a2ba98b6cc29353addf2f84aaccf2687a60a78f032f4904961c9739b4a576b24c661c99ffa2891c82d36 SHA512 a95755dce5b14da89b30865f45fff7d365b7949c8953ca1f77df4a5f8da59fd3f9d0275736e20dbb0e9aa1b2d50266302444f3452e6678bbe7784aa54e186bfe
+EBUILD ryzen_monitor-1.0.5.ebuild 576 BLAKE2B e2b86f0218cf46689c73fcaf594e72074d7b7e68e86a0d4d6cc58d401e456648faa99852b221f44682e55284574e5cbcb7228a6981845aaf76bdaf1be655b1d7 SHA512 152070bbe40f5afc16c8616aec6712b84d0f26500a4e1ee6d8b2c41f8cbd0cbf61c6da916ea69da45809effb345b4e04c78551f0677c4ed3e51e390215628c9e
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs

 SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
 HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -5,6 +5,6 @@ DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52a
 DIST sudo-1.9.12p1.tar.gz 4908060 BLAKE2B 976d00fb16b0d26b2714a188e379ccba102e0fa67b8ec6278e5435728af0cc9ba23d63db64a87d4e14d59cd52d3f62401943eb7c0f9c33317179ff764a9f950c SHA512 6f564112aa1e0e9cd223adb280bd430d513109c031e52deca308501234dedc0d7418f13cbb9b4249ac58d997cfdae1908c280c26733acbc55dbf9db45dff239a
 DIST sudo-1.9.12p1.tar.gz.sig 566 BLAKE2B 09f51a9f8eddaafc83bc5faac84ef0c0c37148beec025c777c1a19fd6ca88ecf354390f3557c31c74d13944093eb0ad921a2b7bdff04415f901fee549617e5f8 SHA512 6ec0596ad69fd6afc95d15a6e0ff871449e4534a651311371a4a604c258a34af6b41202cd2c636213d3128a811c5824338454cad764e1c05413ef02b551b7ae2
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
-EBUILD sudo-1.9.12_p1.ebuild 7417 BLAKE2B 8be07fd934d0a7ed8b60f714ed0059144c7461a074678763abaaa3776465e410bc0a6632b2e6b664ac5b3f9f551111b2a66f23f3f2dae91cbed71c04ac2551ab SHA512 c7c3d6b46657c45b3ee6f1161ebb655cfea193420ad814002715c980dd56871057622e541688e43bc5f801b1484259d55e2f5ebdcf3a5aab4c1e9731f1212a9c
+EBUILD sudo-1.9.12_p1.ebuild 7416 BLAKE2B 87c51a7ecd868f6650f1dc6a4e4f6753c5ebb8258867a621585c4fccdaa80a95463f70800c1e4ff4c5a4a17f7bb9f2f9435e475793fae171a92cb32d928b68ec SHA512 6aeb9b74de41ff05d65c18aab01d4ace55f4691181f2e5b3b7667c0395a6592841630778b1d6f7f727974e402d442762e9ea7b37f34d5bbea2e6da6f0f0f6f44
 EBUILD sudo-9999.ebuild 7421 BLAKE2B 9dfa40600141a49f26cfec28051914943fe0efbffd6e4b34d87c3f1e45dca65bca2f9a5d7584805b8411bb2ae4e70a2728525df893dce72af3484763bb9e92b0 SHA512 f392e4fe27f4df3ff162ea9c1d44ab91c03a63b5d65e6d60fceade321cb339395bd3c0cdfa9429e3c32ff90c992bdaa2118ca8b1ff485932dd85851f6d649efe
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
--- a/app-admin/sudo/sudo-1.9.12_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.12_p1.ebuild
@ -33,7 +33,7 @@ else
 	"

 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
 	fi

 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@ -1,3 +1,5 @@
+AUX bvi-1.4.1-prototypes.patch 1185 BLAKE2B 8000d4cadb056f1f568c61a3f6d674ae5e8303b5cb562ce02c0d2326169c31c49f2e6678bc10480be991081b9f910ee9221bc3384f475a91a045e6fc518f84c7 SHA512 7214f0ab69bd3be349e527b40deb65c1855ba3d468b4f799c5762e14c8a60e9d9d1137600982b5e21ab5bccae68d98ef55a70b1c3b0901f181ba25955410f1a8
 DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6
+EBUILD bvi-1.4.1-r1.ebuild 579 BLAKE2B abd5a53d851d896d0ec174dc5626f75774f9e55caaaa08d89788d7b5f71399e85043abef48f7459017569af9aa99aced06931c5391a76e60c38f34ebcddebfae SHA512 a8e4bc794bfbfc2eba700fd4320747f48ef8b9dd118832ed6fbc0e7effc6e57f6048df4f2c624c4111f38bb9d0253070cacafe1ed6bf26995e270e6d18267cfd
 EBUILD bvi-1.4.1.ebuild 485 BLAKE2B 81f7bee4e6ab083460f5fdfa4ae66443591bbbfb96877f3ef6901dd3a4f458bf872691f6e34bbda37705af59c354326cb82be70b6dec0b79752b403484b4ba15 SHA512 f8716421677b9a578f562be3e9cd50fe83a957a066803fe8d389c237ba5dbc88abaae3404e1ff62c3e0b73d0d7270b78dda22cc6bcaab62b6dd6437f9d9f7a23
 MISC metadata.xml 466 BLAKE2B 750a6358ba1ad7ca4922205cd97e1f71845969f49c85bc7ca5e8e6d695224fbd1ef31105a61f6bc8b74e9fdbd551ff32dca7d185947d055105820470f3c08051 SHA512 a36b0f9b68ab8041139c66ff95c742c596589ad5b491672b3f0f60e5a96f50561709d4ccb73336f8e767cd348d171611a6aa27f09f210eff09aca918f1ce7809
--- a/app-editors/bvi/bvi-1.4.1-r1.ebuild
+++ b/app-editors/bvi/bvi-1.4.1-r1.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-prototypes.patch" )
+
+src_configure() {
+	econf CFLAGS=-DANSI
+}
--- a/app-editors/bvi/files/bvi-1.4.1-prototypes.patch
+++ b/app-editors/bvi/files/bvi-1.4.1-prototypes.patch
@ -0,0 +1,34 @@
+https://sourceforge.net/p/bvi/bugs/14/
+
+diff --git a/bmore.h b/bmore.h
+index bb5174514a66..0c4811f743b2 100644
+--- a/bmore.h
+++ b/bmore.h
+@@ -135,12 +135,12 @@ extern	int		no_tty, no_intty;
+ #ifdef ANSI
+ 	void	initterm(void), set_tty(void), reset_tty(void);
+ 	void	cleartoeol(void), clearscreen(void), highlight(void);
+-	void	normal(void), bmbeep(void), home(void), sig(void);
+	void	normal(void), bmbeep(void), home(void), sig(int);
+ 	void	doshell(char *), emsg(char *);
+ 	void	do_next(int);
+ 	void	bmsearch(int);
+ 	void	pushback(int, char *);
+-	int		open_file(void);
+	int		open_file(char *);
+ 	int		printout(int), rdline(int, char *);
+ 	int		nextchar(void), vgetc(void);
+ 	int     sbracket(int, char *, int);
+diff --git a/bvi.h b/bvi.h
+index 0881ce79d6fd..90f68c9eeb92 100644
+--- a/bvi.h
+++ b/bvi.h
+@@ -215,7 +215,7 @@ extern  off_t   block_begin, block_end, block_size;
+ 	void	docmdline(char *), do_over(PTR, off_t, PTR), do_put(PTR, off_t, PTR);
+ 	void	jmpproc(int), printline(PTR, int);
+ 	int		addfile(char *);
+-	int		bregexec(PTR, char *);
+	PTR		bregexec(PTR, char *);
+ 	int		chk_comm(int);
+ 	int		doecmd(char *, int);
+ 	int		do_append(off_t, char *), do_logic(int, char *);
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,5 +1,5 @@
 AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fbefc70b4a5b1d08fd360bfc136b6e1cdc4ed480f4ffb6b37b81a019869aa7e322b3f96219241a2d1569 SHA512 bc8db27b8509059833ce1939a3c63d8389968366118596f2a832e188ea5f3e8eb2b66e781ceaabd58c941bbb8ca6818b363189ac267a96f0943bbd64983b5c65
 DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
-EBUILD nano-6.4.ebuild 2669 BLAKE2B 17f06b3f4370205742d036f7ca81964532bd22ba7274373429ad148a353335d3fce1eb9ce9a17c5782c3d9e292b274ee2c8a7ff934b04d7f526cf91e6ddc2d6e SHA512 e126669ae0ea24fd3f7d5d173832a6e252b92f5b5be2d8220a24d1b617b361ff6b3d16bc621a2f59497ad6950c0065419b7d9c91fd3b4502660d65d59673815e
-EBUILD nano-9999.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1
+EBUILD nano-6.4.ebuild 2703 BLAKE2B 77ce48f293a4c8200b3e8175bf07e8aa1158229887062324c8aafbdb96846c66bfe9ca5d8cf3889595c060dd13982cea0bfa42fc8b125075311e259f2d5a08be SHA512 786d9897c4ec70eac6d3107b9ce6fed248af4b76c450eab17df5ed37aa325faa73d7c764b5ac7aabb98b1d64c362aeb3624f7ff18468c322e584b33ad81c25e5
+EBUILD nano-9999.ebuild 2711 BLAKE2B 006aeed5a9c878a74019dc9e3f64616292893900e7d30d43178266bced135393de234044453c775210318ea1a1c5f1c7be9e6c9c1294ff610e289c4df1eb1768 SHA512 4cc302df2531125f62f1e3ab4a41dde065268b544652d6607aeb4f01d01168bccc5ece0257e07e0be4842b137021ae3336a0c802c7fd8fb01e99f69de5ebb2a6
 MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
--- a/app-editors/nano/nano-6.4.ebuild
+++ b/app-editors/nano/nano-6.4.ebuild
@ -17,7 +17,7 @@ fi
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
 HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"

-LICENSE="GPL-3"
+LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
 SLOT="0"
 IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"

--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@ -17,7 +17,7 @@ fi
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
 HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"

-LICENSE="GPL-3"
+LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )"
 SLOT="0"
 IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"

--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@ -11,6 +11,6 @@ DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26
 DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c25808901034f073945c3977dde4dda44b03869be1f530398d549f0b13dafae0eb82766464875ced2cd26621a0c5d88 SHA512 e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
 EBUILD neovim-0.7.2.ebuild 3139 BLAKE2B e7d19b040ba9d94abe6a1a89b0c59f25d1b9907782924e43f912dab8e9d7fc646ebd7b63c2474e1e33c9064f670b5366830b68f937b9bb7ebc9dfca418effeae SHA512 fe34e9673f54ede295abafc363eece3537fa5ce4e63a340565a871c8f0bbaf1d8bc3f19aadb5b3447ce87c1bd5db849e37e815c0911c56eb85ea9f3ca58b0c71
-EBUILD neovim-0.8.0-r1.ebuild 3462 BLAKE2B 84e154d73b28089dd5c711f9314ae1f121f5d2c40b48926e6cb2ea219f313ab2a20843d408ef223423f2c82a549f50c6fd00f7f6e2473f92902b3fc769658b2d SHA512 7e90850e64fe988d0fc8675cd33d9ba0856c3e9bee3a8417e7229346a25dd610f8624b076812477905ffafc8de5e9569940441e3123a733d966ea0a71a0a0b5f
+EBUILD neovim-0.8.0-r1.ebuild 3461 BLAKE2B a0c17ec43bd5be7e465f83e0b29450c036e33c2d527385afa6899fdfd5e0a1308880626f571cd85f58fdbb993c3c6343af303a079bc8e2a908cbd27acaae7fa6 SHA512 0fa5e8f34d649b2f120fb995374e6805885943ece30825907cbef8edfbb5e9637e78371b13032be577c2bffea71787f400797767fb1d6f2dc7f826cd9c9c6902
 EBUILD neovim-9999.ebuild 3410 BLAKE2B 5545f7480e3316aaef27277345f93f6bacab4cb6b3a61289f2e612f20e1dacfb29974f2b6445f4e7e7afac19be72a462f2245ee422c4c5c706d9b97b19f3cc8d SHA512 5a750bc0de072accda56ca64c98ac6b7b912f83bd682cf439f4fd1c691e20c2bfa6844846b4276949881d8cfd2f5235a50e994ae9283c12465f0c952ce1b4107
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
--- a/app-editors/neovim/neovim-0.8.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.8.0-r1.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
 fi

 LICENSE="Apache-2.0 vim"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@ -1,8 +1,8 @@
 AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
 DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.27.tar.gz 87761 BLAKE2B d372e3285bb80a0005e79142dc95d219a2219959974039083df502ceeec10281aaeaa57f97c8bf45ec1d31b530934faf03b24d2a40e94f09f1cce4a986ae602b SHA512 537c1cc1fc560000537f3894f0917738ab344a4b117eac927b290bc8b5d01b6ad1df1caad63e1f339edc8f4bcaa9cdf483995e2730661481b53dd5e693a33f34
-EBUILD buttercup-1.25.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
+DIST buttercup-1.28.tar.gz 87689 BLAKE2B 510741e02c5973c80f3b6d9374d179b132ead8aefddee530f9a5f2cd5e6603bcb925060e40d614ec6804bc6aa918e6dea568d47ad3295c427066ab4c4953b37e SHA512 b83f1a9e14bce6e6e63047788bfa4e34b8d958c6422a52829c8752e6af7622764021c1574f812160472de123f0cdc68edb6daa0703d3b2633e84fe7df6ddeacc
 EBUILD buttercup-1.26.ebuild 664 BLAKE2B 077b0052dc38e92fc20ae97d938cc8c4a4d60a258b02b97324d4d0c9667659fa6ce808aac28d3089c870de086e81c6998ad7917b2703408c2a077dda7f456d0e SHA512 14e30df54ed3ae39a27c793b5c8f02fdda1f2d3020d4bc2440b188fc060934d87364d5af0e35f0a9f372ad962452c603d079faf6037305b82b064a7a7a917f66
 EBUILD buttercup-1.27.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
+EBUILD buttercup-1.28.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
--- a/app-emacs/buttercup/buttercup-1.28.ebuild
+++ b/app-emacs/buttercup/buttercup-1.28.ebuild
--- a/app-emacs/geiser-guile/Manifest
+++ b/app-emacs/geiser-guile/Manifest
@ -2,6 +2,8 @@ AUX 50geiser-guile-gentoo.el 312 BLAKE2B d7fd0743d54c187697b0b09df60899a9919a494
 AUX geiser-guile-guile-scheme-src-dir.patch 434 BLAKE2B 4d7681379cefcc0b5297ad0d37e5b79a4d30494dae362d834b7d3e25d0b102bddfd34ef18599fd024e9dda57203e58d154dbebec4e32ffe4af60e4a2e7f22004 SHA512 5d7002b86cbb6e566079182bebbaf84a584eeab10edc63269bfa7a0484602bbc1492e5f9edfc3fd37dc8909f5ebb5922ab2b26e288762204b82247a474be8c18
 DIST geiser-guile-0.23.2.tar.gz 15615 BLAKE2B e30f5eef1496f8016be35fa3eda2bf02fc651e5bdb9ac8cf8c90a130bd72dd13b67140f172aab24ed38858294ff83c366eaa4b3e354b0a1107c28a0258b2f787 SHA512 c696bc0e406869d9c68f3cda9bbc2f5f0690148264e221c6fc3217f867a5cae3fd6df59851fdbec8a6c9eb6aab7f9482c3231fe75a509d58d2d9d16c008774b8
 DIST geiser-guile-0.26.1.tar.gz 15629 BLAKE2B b8daa40e2e713fcf43a02cc3797fa118c52b796921a0976bed8031b46c1c55da3c3d476cae24551f6a45f1f12f70c4fb99c59eb1ea900aa67ff6d557fd35c08b SHA512 2543773362872d82ca8c70ba278471be8e333e0919b42969b4634c1f14e1bb1b5416c530b1db346ac7897a4861624c4e69788c8d44beca39757c3bdf1d6d03b5
+DIST geiser-guile-0.28.0.tar.gz 16594 BLAKE2B 9a0bf91f1527dc77aeffd4fd829669f1a00cba217dad0e53a148679a7b9d6a4ecba84c7bde47d039be5a757911aec7e78a65e664ada03d9152ab5db30d6a7ab1 SHA512 b289586189e7ea461365b371cb4eefab7f2e62adb155429d9ac7c100a324badd66b08fa4200881924821d14bdb2cf66078ed3eeed8967fbed5ffa816874e3b7c
 EBUILD geiser-guile-0.23.2.ebuild 821 BLAKE2B 5850687cb12419dc41f22534a40cded96fc0fb749d02b2bc295836c370eb3f558e5487de206ed4482dce71ba18321ccf254543aea82e177b3f401b6e41ea6cea SHA512 3e07169f42f9a2bf3a5ecca1fcba3457d5f2ffd8d284d9c2768e4a935dbddca7a291f2de41460fcef3ed3157072f7edecca08932e476b452c6456fa9db846a7f
 EBUILD geiser-guile-0.26.1.ebuild 821 BLAKE2B 5850687cb12419dc41f22534a40cded96fc0fb749d02b2bc295836c370eb3f558e5487de206ed4482dce71ba18321ccf254543aea82e177b3f401b6e41ea6cea SHA512 3e07169f42f9a2bf3a5ecca1fcba3457d5f2ffd8d284d9c2768e4a935dbddca7a291f2de41460fcef3ed3157072f7edecca08932e476b452c6456fa9db846a7f
+EBUILD geiser-guile-0.28.0.ebuild 821 BLAKE2B 5850687cb12419dc41f22534a40cded96fc0fb749d02b2bc295836c370eb3f558e5487de206ed4482dce71ba18321ccf254543aea82e177b3f401b6e41ea6cea SHA512 3e07169f42f9a2bf3a5ecca1fcba3457d5f2ffd8d284d9c2768e4a935dbddca7a291f2de41460fcef3ed3157072f7edecca08932e476b452c6456fa9db846a7f
 MISC metadata.xml 549 BLAKE2B 24ae701ff497b7fc2d335b939d79697bd2a33c0a3e198156a745528eeac3635d036689f60c5fbc10c46dd9219c58ca6a4bcb484a104fbb82fce5d02480002157 SHA512 20c1411f9d96be4c8e4acc324e5cb74ebc90976c497c30136056cfb829db4fd974269af00da44a6bd8c77a24aec25f747449b45e0e0fb8f03d358880b0295f0b
--- a/app-emacs/geiser-guile/geiser-guile-0.28.0.ebuild
+++ b/app-emacs/geiser-guile/geiser-guile-0.28.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Guile's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/guile/"
+SRC_URI="https://gitlab.com/emacs-geiser/guile/-/archive/${PV}/guile-${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/guile-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	dev-scheme/guile
+"
+
+DOCS=( readme.org )
+PATCHES=( "${FILESDIR}"/${PN}-guile-scheme-src-dir.patch )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
--- a/app-emacs/geiser/Manifest
+++ b/app-emacs/geiser/Manifest
@ -1,10 +1,8 @@
 AUX 50geiser-gentoo.el 295 BLAKE2B 5dfbb043d11f242fae453719c85c7b5dd6abfa16e390de35c390d4dec9f80e512039e5d7dd6d79986df9e8d0822c12562d32001ad6bc6a33ab8c168299548044 SHA512 1a7ebc8f2b2e95ee5b1e7c81d498d6239fa88110165f54e6926bedcee4d1ba64c11e6946d8129d0a6958b0ecb280011af3c64c283279d183dc843b0328aa178c
-DIST geiser-0.25.1.tar.gz 652262 BLAKE2B 8c5a323bedd869c98bf500c861c7731a0b1dd9833f78bf348a2e29d26039c674a00b51529d77b56b213ccc1351b73388010847551b3cd829fb265cffb733864a SHA512 93a8d7e096a24759f5e8c9dbdd2d4ad31caf185c6a970ff1b4364c4492e5f2e0925cc59e97546f9c40dd5913fb2b38e7ade7599ef791c6e198ad0af966030f16
 DIST geiser-0.26.1.tar.gz 652903 BLAKE2B f2b0121b390b33ee8d93136af9addd92dff7f683820bb32f76f36090b5028e9693f629949dd239a27597fc4e290c21100e1cdc143f5db3fb275bb5bd826d5862 SHA512 dfec087e94e73c4b3a12db56ea3192614c536aaeb3acdb20e1afe0512e69f09388576e19acc6e55a39f8f5b6397bcef40ad7f1cce0504ffe742d1f9478eed44f
-DIST geiser-0.26.tar.gz 652756 BLAKE2B ac32db838473b8a07394146d5f7dc88ba2bfb36f4d169af14029e202a6d87950a69f0b920ed6a627bda90843cc77c1c7e57f49fee53af87ed9526642bdb65c27 SHA512 df6d7ec500e8e0546c56630f7f2f0901df8fa373924ac812b25ab0cfbeea2a5d0b9f1719850a7454eb7e7d0dda95209c201de85ff3937b717f2bec6ed2513e6b
 DIST geiser-0.27.tar.gz 653843 BLAKE2B 29f13b274bad54cfed2aaaebcbfbea266b6b1a2dba1d5daf27ee6344929ef449d733f4e5e6d66eb82c45187f79506aa68dfa2a4fc82102004941bad732ccbbf6 SHA512 be526047519aa007045370201965eae8ec1025b670e1e092f4653c64a9127fdf56059e46daa479132e5d6880b5d29845acd94002c48c0e0a151f2c2482a8e940
-EBUILD geiser-0.25.1.ebuild 804 BLAKE2B 4a20fad9c4b842d3e314738bd8a2e8ed83881f8ad9bc9a41f65392af7aeee25598634dec6e03ea948f36de139777df25e30281837b42be40288979ee92006b10 SHA512 6f8db059104559efcc4e82a2785ea2922da8bcb9ced667d7d1dd7477d11db9974c12e9d562899d49afa3a41c590751c981989b2bd272476016e4d78f469ef905
+DIST geiser-0.28.tar.bz2 655336 BLAKE2B 5fc0f7035abeb8dacac7f78654011eb85ccf83961808ba34159454320cb66c0152a576f5f1aa493b7ba7c6b6a1302d38ad5bbf5d253f3fdf39f3dcbaa76b1a93 SHA512 a9133b6d029b8f909e72b37b64ea555f23c8a778a27a2395f22a0291194632a7acc3d02772b75413fc258435df53132cce1b01b7a134d4ae5fa6e6152105228b
 EBUILD geiser-0.26.1.ebuild 804 BLAKE2B 4a20fad9c4b842d3e314738bd8a2e8ed83881f8ad9bc9a41f65392af7aeee25598634dec6e03ea948f36de139777df25e30281837b42be40288979ee92006b10 SHA512 6f8db059104559efcc4e82a2785ea2922da8bcb9ced667d7d1dd7477d11db9974c12e9d562899d49afa3a41c590751c981989b2bd272476016e4d78f469ef905
-EBUILD geiser-0.26.ebuild 804 BLAKE2B 4a20fad9c4b842d3e314738bd8a2e8ed83881f8ad9bc9a41f65392af7aeee25598634dec6e03ea948f36de139777df25e30281837b42be40288979ee92006b10 SHA512 6f8db059104559efcc4e82a2785ea2922da8bcb9ced667d7d1dd7477d11db9974c12e9d562899d49afa3a41c590751c981989b2bd272476016e4d78f469ef905
 EBUILD geiser-0.27.ebuild 804 BLAKE2B 4a20fad9c4b842d3e314738bd8a2e8ed83881f8ad9bc9a41f65392af7aeee25598634dec6e03ea948f36de139777df25e30281837b42be40288979ee92006b10 SHA512 6f8db059104559efcc4e82a2785ea2922da8bcb9ced667d7d1dd7477d11db9974c12e9d562899d49afa3a41c590751c981989b2bd272476016e4d78f469ef905
+EBUILD geiser-0.28.ebuild 805 BLAKE2B c48d33bccb7eb4efe3d7824a6f8833fa72c9a452c6b6f86a2cf475a7070862d8805dcfdb3a56c6c511c7fe09133e5e80d8623cc85773a5fc958858be0bc789c7 SHA512 b4c687c2a3c1b7a1e218f62a62a5e6d7f8cec424b5e63a79165133c28c091832a78cdbf1ec8847810557749964f7be6405ca3208e048e18755f480ec91756c7a
 MISC metadata.xml 551 BLAKE2B 2aedbc78837b20f258a94790c4a84f8bfab77f4d71e65354ea6439122c4d84378776c7f9c9a7649c0aadc68df9f33eeca482712961eb8b3af0dffde4d1769ded SHA512 aa663549e7f0710b8629889dd57bb99cc2ec2f2ea93c86d6b75dd85fe4a8467abb4688b38a38b8051655fc0705b8f1e0a7c71c6159abc7170e0bb1b9a0c7c112
--- a/app-emacs/geiser/geiser-0.26.ebuild
+++ b/app-emacs/geiser/geiser-0.26.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=25.1
-
-inherit elisp
-
-DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations"
-HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
-SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-emacs/transient"
-BDEPEND="
-	${RDEPEND}
-	app-text/texi2html
-	sys-apps/texinfo
-"
-
-DOCS=( readme.org news.org doc/html )
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	BYTECOMPFLAGS="-L elisp" elisp-compile elisp/*.el
-
-	emake -C doc info web
-}
-
-src_install() {
-	elisp-install ${PN} elisp/*.el{,c}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	doinfo doc/*.info
-	einstalldocs
-}
--- a/app-emacs/geiser/geiser-0.25.1.ebuild
+++ b/app-emacs/geiser/geiser-0.25.1.ebuild
@ -9,7 +9,7 @@ inherit elisp

 DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations"
 HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
-SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/hello/Manifest
+++ b/app-misc/hello/Manifest
@ -1,5 +1,5 @@
 DIST hello-2.10.tar.gz 725946 BLAKE2B 0af5a3890191dff6e570e2297c20f72c8d0598cadfc2b291e2fe3612e73f7eca48b3b63032c883f11a8a5764c757625c4a736904d756d451ad0516578040290f SHA512 e301d785135c52575a8b4c35994c0316f8d366451f604eb5e74c1f907077502aebd5a1a32cd1e26cd7ca32c22f4de5623a335f8ae7e735ac977420df664f01de
 DIST hello-2.11.tar.gz 1018256 BLAKE2B 6e06e4a3a113fc24bca056197ba004fd97b2076bb2f5d660f337782c9a982a0d80e265e7e1dc22f3467257eab071fe5e252a020234839f30ce767ae5d5ee7a3b SHA512 9b1defc1dd7b6a989d3f64a1cb1c6f47276192d7bacf11282ae8683606eb613473c882c1a5e74c18d641f46584f0735981597a45ae4eb37830a5b4d955e3aec7
-EBUILD hello-2.10-r1.ebuild 470 BLAKE2B 4da043cb8d6542105fb3b7bda841d0b0c4246bba7124017ba153f95ee36da735d28b124ed4f1d979469aab64e9edc00ddb07dbe2e6e15c4cd45db07a0509f594 SHA512 f3d4bfed8c5729a4ae8fe089af1c33575f1f77127f45fd779e1a2d9962080e8d83e9e47405951485053dddca13110a55d2ad7f241c528a5b1f733af1029364a4
-EBUILD hello-2.11.ebuild 470 BLAKE2B 8957cfef26db716479f023ea1cfbb6e60d70ac2562f6f5d2c16930fef3cb6a8c3ca5fb21d2b68d3eca7655fa9843619344c0cc654c66816bc0443c1d46861547 SHA512 558e63e1f425927e0cc62694d81c75c9a48b879c259e9e0c29fca73cd434ce1f77da104ae5deee2124e87fbfe171c98f0f301b07a6f310ab10005969cecbae53
+EBUILD hello-2.10-r1.ebuild 472 BLAKE2B db54830b83f402cd9d379b232787c2abac4db4abcfdf80d285861ced96c79b58617d556cde9a0ef7e77ed709994f2a2c713126002f3baab868dec9d77759d863 SHA512 56d29245067cf394a6fbdac6b6eec10d5e4248407ef7650f36b939f946eb17638d87c45e05185654a4379dd305254d8fb6228ea024f9bd6bd7f4f18df5b454fe
+EBUILD hello-2.11.ebuild 472 BLAKE2B 9a8f5ca0fbb6eab9df429fb427c66c529d8cc933115a0d5fd823fd7fdc1f53d49baddb6ad4250e3395458107592b7b037abdbd44c3cbca96a8c8d28c9fb2207c SHA512 60ba38f778a6e506ef037711775a4829579e8392f1aa946e2a5ad9c9b8eeeb373cf99ed74ebccbbcac338e2c2e4e30c8ad9a4fe0d172b7a339d3ca825ea87bd9
 MISC metadata.xml 330 BLAKE2B 785b422a1f5c408719355b1f8f4857ab8431575a77d16ef6aae25e4a0eb9f57b44422aafca865e92112ea1b2e95c404b8b2359eca200e2d7b4e839ae927ebb83 SHA512 e4cec8adba388c44b6efc988dba444a32e51838f08b9f2be0f7b118aa19b1873bc965c25d4f3d2df29a52615c10b8b3d9c5950608e54800059dd7e8f77d00eca
--- a/app-misc/hello/hello-2.10-r1.ebuild
+++ b/app-misc/hello/hello-2.10-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
@ -7,7 +7,7 @@ DESCRIPTION="GNU \"Hello, world\" application"
 HOMEPAGE="https://www.gnu.org/software/hello/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

-LICENSE="FDL-1.3 GPL-3"
+LICENSE="FDL-1.3+ GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
--- a/app-misc/hello/hello-2.11.ebuild
+++ b/app-misc/hello/hello-2.11.ebuild
@ -7,7 +7,7 @@ DESCRIPTION="GNU \"Hello, world\" application"
 HOMEPAGE="https://www.gnu.org/software/hello/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

-LICENSE="FDL-1.3 GPL-3"
+LICENSE="FDL-1.3+ GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@ -2,6 +2,6 @@ AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f
 AUX mc-4.8.28-tests.patch 1308 BLAKE2B 37f2d2a3264386d558212741d95c68c9362676d727d4d2b47a690dd6ad97c15ff943b3950cc28456ffceda78e88645bd6f73958a592f425594e727cc383721cf SHA512 41499d5ee4a7d0bf3e08c6fad56c2d46e3761f4f7359db1351c4ca1358a9ba33be7979df55d19263214acb3ea01271278efccff72d32ea3cf8a3cfb84a964f47
 DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd
 EBUILD mc-4.8.28-r1.ebuild 3278 BLAKE2B 789023ffda0093dcbce773103624981efc10e537014bea0f055145c68c85c02287b27f14f9795292f295cfecc6458373ebf8cd43dff88759491b235a0d17afb4 SHA512 1d9c1166c77e2a8a08d7eb712ea271bed8b91e1e9c36973ccdeca9bfaed137c428ccbe2d46c427a2abca2d8e4de9f76573b579bd41a3d114c76228d985814fca
-EBUILD mc-4.8.28-r2.ebuild 3311 BLAKE2B ebe58fe905eb8f9ff7734f4800853df05232c6d07b0460af3455d8bfbd097fdca659b41420be803722876befced7c34370afc824d3dd635c0da7f4223dce5bf1 SHA512 fcee6f6bff039a58f9f6a52359c6d8a499a19d8ed13dba0007e8e1151c8d682aeb071b7139c0b7d514919a6ae645d568ce6fa013bdb7f92a392b51d6914e3ca6
+EBUILD mc-4.8.28-r2.ebuild 3310 BLAKE2B d4661ccf757c9acff5fff0fb7008b17132441e336d85339336bf387029540c6352c99fe82418dbe725bc88179fc0bdae84678f0fcfc600dc1d23746f85198438 SHA512 473930ee23ad745032e1ad56544f8ce65bb7f64f1f75036b4aa9763bf14754a408437b3f6a302ccf1dcb6066dba4db1b904f2c5e3a583a0d4f8c1aff05dac56a
 EBUILD mc-9999.ebuild 3573 BLAKE2B bfc47edaf0d2d929fba3abd75c739bcbc213c18344be024f0ea773dfdd3ae52e27177c6c8028a939550b384d6a7b9e4c594b9da2bf79a76e7003a098e75f3e7e SHA512 a577f23011c6382b671d46724e57effeff59c4c3e608fa8f05622d8c240c142cc776504c21f21cc779530a982f76f44875bfe2542e5bb716ff3a97951e3b2c83
 MISC metadata.xml 742 BLAKE2B 159a395bd2c0c56d8997bc198c55491d5ae0fe881eb8124345fd66a82f2ebad6c169f2c83c8f16e344bd4ac2355bf608868a5a775adc117a72d5547b42766567 SHA512 38b1fbe9480b4f23d3f00c234a2f8315e7c81080d8fe4da39701999bd46bf4aca4b45de34ceb11891d07a1fe92ec1bf7b86044d906467710c0bff0fdd7677a08
--- a/app-misc/mc/mc-4.8.28-r2.ebuild
+++ b/app-misc/mc/mc-4.8.28-r2.ebuild
@ -7,7 +7,7 @@ inherit autotools flag-o-matic

 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"

 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@ -6,8 +6,8 @@ AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
-EBUILD screen-4.8.0-r3.ebuild 3848 BLAKE2B e861b10538b50fa4d53a9b42fc3e69409c2a9d6e24d4f757b9905fc2f48b2ebcc94066f7c7b25f5dfc0c6661b696ca878b9a4a8fce694ed847e6e0eab2095112 SHA512 5c51dde15eeab2e1f0dbf3120ee20cdc1ec22666ad62bf4b86a9db85793d1293673071d2a5cb620726abbba6b2318f172248d381383338b23ba89f1e03cbef3b
-EBUILD screen-4.9.0-r1.ebuild 3851 BLAKE2B 5a85d371d6fb07207d883fa1324094f605114af99c017fb95cd3ff1bfe5d37ba3f0a659e7b98129bf680546514fe6891362369a8ba8e93e1794e0524b2c6bbd0 SHA512 a258bc64578d2189003c1f6d9cd24e5025983cb70c6da9332c654d0a7a5331a434f56c14e336480d9f5f03d040094d7e0f01a4c00498403718ea8a45c3e71111
-EBUILD screen-4.9.0.ebuild 3776 BLAKE2B 3a633a10f4ce16e6a98ce539679e6466f41e2edab285caea9bb8d51706d657df7e31d03639bdd9d87a77af7cfc2d308a64a72800371076ba66b981bf942547b6 SHA512 9b8d81c3652eac5342823c27e3199a873031bb8c54182ff3432d631e6f363322a71973b9d58610e93aeca9f040f30f06a3e4592d573146ea826c3f05d13db9e2
-EBUILD screen-9999.ebuild 3781 BLAKE2B c70c76d9f0d0f1ea8f7af9d182e22dcb381d9e0ef0f134b27e72e07a3be90e387efe0856dff3459ce04e125dd0e555e83df1e5e32c93bce84ccb7a6b1ee7f6cd SHA512 b503a8ebfdef364fed0acbac79f0960969c668b68243c337ed12a814e7b796cec4235a4faa2c6bae84cb20d6d866547aa3e2b1d4dd242be328cbda43a9c7f188
+EBUILD screen-4.8.0-r3.ebuild 3849 BLAKE2B 0f76a8163c66406bfbfbc677b8b5028a45b10379ae4f8f25ca73de35355feb1110c1d3cee74048781c1fdcf324c5e5ee2c490930c74a907e3185160af16eb1aa SHA512 693e79718dcbc75f7c0d390847a5cfa2d818ce79ca22b1c0cc15fe3c8b8c61855f09efa5662cf3f07da4da6a646b272352010580bc98e7e31da4a4925045598c
+EBUILD screen-4.9.0-r1.ebuild 3852 BLAKE2B 8952b380f2b3e63e0f55753bb3bd1c5bd365d277c68f056d6cdb687e666a511baf4acacc1499fcbe6837fa0579cb7b8b1cf38a864b34bb28a91fb858db27d039 SHA512 a7ce8dc0f1ebda38c042cd36cd15b5f8cd099a3b7d58faf25b91cf6700576d0761e1dec1409942ceee6f5d114c638c7dce09109c8699bd7714f01adcb9821017
+EBUILD screen-4.9.0.ebuild 3777 BLAKE2B 0121296dec6aee6e152eaa7ea8b3ec87e1900930ced1564dcfb002797b081e4049c5a472d350975aa9d9c52fa9ba5353341e0c21d3fb914d9dcb044e7758c2b7 SHA512 ba2a51b3b00c6cd85e4a20b489d94ccb48b5f55cc14d8769c2ffe5d771258456fd398dce04d4f64ba191bab1c47dbe8ba1a23ac978abbb24af1e05866c4d51d7
+EBUILD screen-9999.ebuild 3782 BLAKE2B 2606ed8495e3531a41bf65489b2dc5af681ff9c5893b12c1de22da9bc246f1d4cb5b1213ce05d8d0fc29878b7bba67e57cf6f9013afc8e9c19141e11755ac01f SHA512 f1d7fb1eca56373b91da540f8097be1b499a8be13315ad980c05c87dbd026bf19865eccf1fb9aa5ebd60c0362db8dc033cebede55c9067b6b63b02cc8936421e
 MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca
--- a/app-misc/screen/screen-4.8.0-r3.ebuild
+++ b/app-misc/screen/screen-4.8.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -18,7 +18,7 @@ else
 	S="${WORKDIR}"/${P}/src
 fi

-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"

--- a/app-misc/screen/screen-4.9.0-r1.ebuild
+++ b/app-misc/screen/screen-4.9.0-r1.ebuild
@ -18,7 +18,7 @@ else
 	S="${WORKDIR}"/${P}/src
 fi

-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"

--- a/app-misc/screen/screen-4.9.0.ebuild
+++ b/app-misc/screen/screen-4.9.0.ebuild
@ -18,7 +18,7 @@ else
 	S="${WORKDIR}"/${P}/src
 fi

-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"

--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@ -18,7 +18,7 @@ else
 	S="${WORKDIR}"/${P}/src
 fi

-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="debug nethack pam selinux multiuser"

--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@ -2,8 +2,8 @@ AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac
 AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
 DIST tmuxp-1.13.0.tar.gz 833657 BLAKE2B 5938121b2951b735e52eb7361a83dace4327b120ea7bb8217a5e4c32488e8cd93074b8993068b1d5d87d79df16c2f1e3d254d010b5c2836f435ed887349a010f SHA512 21a5a9fb21e30d5022d6aa6257dd9eb2977574e16e9b8ea0a3af8af4d55f69d4f6a3730ca9fc5e9a4e0b6194922d73717154cc55b808e71714570326cc7f27a9
 DIST tmuxp-1.15.0.tar.gz 842727 BLAKE2B 7e0e68ae848fdefab46a936511f57a9927b28a220e1dadb8b2531cd26a2cb6cbb7f1fd3a3a279f624a3ac8cebfeb434582cf48803d3c8bbf14b1c6960b5f2ef7 SHA512 4c9c72ddeea283ee4d0595d099dfdc178b3fdd96691ae1b02e9867096f770b4339e1f60abea985a05b974d3d620addd8b571c05db7d2914e8736322e5cf19fb6
-DIST tmuxp-1.18.1.tar.gz 852674 BLAKE2B 07dc3ff9d71bcef76944e77ca38be44e48a0d9f9224be985c8de17fc3bf68269db2bcca0ed9383c488cc597d12523c5b54c7dadd43fbf639f1d3ac3d2661e4a1 SHA512 865d40fa5954a66d36cbb329aa8290bde66e6e93260e0449aa12d7570a6b5154af0ea55ffe964e92297c240e1eb862e6389066127b407e98302f37609fa139ca
+DIST tmuxp-1.18.2.tar.gz 853145 BLAKE2B 4fc3e825474bccce9f78072e1c3545b7c8eeb40e0d23265901062a00f7434506a84db0414637d18c57e84f4e3b37978c890e01a786d6f1edda87af806c2b298d SHA512 c599dac5b54627342424b2ef7721f47c57c2d271698b007ffb7de972a3a7683c0bd7ea76d2a7e4c168e8a412a03171dd5f53422a3e2d858f7dfc746fa7946be8
 EBUILD tmuxp-1.13.0.ebuild 1004 BLAKE2B 117193b813735527156d70a0047b08fc5e41bfc8acc8782fbd7bc0932a2194c084e8b00cff233c8cdf0df7755aa3ee5451c236d04c0e357fb1b741580bd5f793 SHA512 058dce47281254ecbd769e2ff18587622c47286d81e75ad299e12c62f301d6c4cf94d2952dda0640be17c3ac9989eb7800af8d225073de792b7778da95d26783
 EBUILD tmuxp-1.15.0.ebuild 920 BLAKE2B fe1a327e618e2298f9d4b84a6480143161adfc5063883c79cd98f49ce14982e802701859c48bef0eb37a20d6e6b3a4605d8d379da9a230bf4845f0215e51e82a SHA512 99f396fb98ca803bb51da39dbb844f492b30d76e690ad689688888cb31d444183f1bba53d0c1ee70b13aec925b12949edf811e4a213154711c3b6190a3f34ff3
-EBUILD tmuxp-1.18.1.ebuild 928 BLAKE2B 4988926342091828cd81ea9a9a4f2b09a12362ec3edf2a83038e6f7fbbec9f7c9da9a759d03377a524613e350f5c5e6d452cb15ada2c7c41e91509115f1b49fc SHA512 6ea3027ed76d8a6c38922aeb5233bbad573614753fbb2a8728f66eb08d8f0c2665ac5b1922b0c96d05f53c836de35daf9485036d63f9835b9cc36bf24aab2055
+EBUILD tmuxp-1.18.2.ebuild 928 BLAKE2B 4988926342091828cd81ea9a9a4f2b09a12362ec3edf2a83038e6f7fbbec9f7c9da9a759d03377a524613e350f5c5e6d452cb15ada2c7c41e91509115f1b49fc SHA512 6ea3027ed76d8a6c38922aeb5233bbad573614753fbb2a8728f66eb08d8f0c2665ac5b1922b0c96d05f53c836de35daf9485036d63f9835b9cc36bf24aab2055
 MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
--- a/app-misc/tmuxp/tmuxp-1.18.2.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.18.2.ebuild
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/pgo/Manifest
+++ b/app-portage/pgo/Manifest
@ -3,4 +3,4 @@ DIST pgo-0.0.3.tar.gz 1759259 BLAKE2B 9a6be02078d9ff44311fef72e01316a6f5ff896b84
 EBUILD pgo-0.0.2.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
 EBUILD pgo-0.0.3.ebuild 584 BLAKE2B 13e957fc2fbcfbf6b0355dcdc32911c1ffb069d66f7ad8da96cfd142702f0a3ee3d02091a6a1301536780fb09ee4111317d6ea99e7368a91671bed4062173066 SHA512 9a0ebb9477fe3b7fb33e20e84552cb1404a18c8813c3521e715159bc24a6247146fc77c09a80bb139d70e321891241d0a12c4e515cd2ae27c7d79c4e2f2530df
 EBUILD pgo-9999.ebuild 577 BLAKE2B 4a92a4c1251bb0e867647a83769bc4ee0ff106945758da9f512e86bea773ee179693f354a91ad53b67c90514f970f4b627c62cc090848e22c047c7426d11d816 SHA512 b38fbfccabcb745e8af56b4808ef7af7da179b765456e22d508a46851f25428db418f3f5bc2d33584620fbb83578815908efa5e93c3c314b311e2abccefadb8b
-MISC metadata.xml 862 BLAKE2B d0e3b34d847666f52050e30e7d21fd0d649c93b2c09feaa95bee25d3d539081b0a6cd0280276d614cf2617cab3ef82c22186b851ee69a85e5d745c72412be8a3 SHA512 669e71e922d57c661f7a7d263b8a10a59a83f9c62b3a89ee6264dc9854dc30d7c90f25b689cc0ba7ce2f4dad14061f838e016db04a59c454691f3e323381206f
+MISC metadata.xml 726 BLAKE2B 28c4bd22e9636aacd9c970afa6f26b69cc75047ca07fa5761f96ab123b2fbc8227c40fd66fb32e97f821a8fe5445c91d474c9ba5fa2c8a2716843846b46583ce SHA512 125addc44a7f9764b2bc2138c81c62d8524a7d71f9440ffbee6d854cacd668d6aa0c7e6441cd85a3b6d287fdc9e8261f6a755647a5435a98ce1830c9f65a3f89
--- a/app-portage/pgo/metadata.xml
+++ b/app-portage/pgo/metadata.xml
@ -1,11 +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">
-		<email>arzano@gentoo.org</email>
-		<name>Max Magorsch</name>
-	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -385,6 +385,20 @@ DIST bash52-001 1381 BLAKE2B d00a8b4fb3babf52c67a3e345158c1f70b5b45e5a54100a6671
 DIST bash52-001.sig 95 BLAKE2B 003557022d011c084d542256de0bb8f7430a66adb0aef997599802cae3a0de1aa8015d45b1d6cb83611557e95cb8d359ec9ba70eb6351468639d10c5a65a59d1 SHA512 95b70255674df4f39be8c976702f851a245bd234b330bfb21e3f91120d4ebd6a4dfe448f7d35497d51787350d172cebd33a99c528d938e749161bf52cdc71370
 DIST bash52-002 1328 BLAKE2B b3b7e2511823a0527aeed5af2c8d9f44e5ab079fa8b3f48fe84b35a14327d0143e14e04316c16bfbe2a1cac0c7fcf7ab5058a2b00be38ed3243b53b786e969f1 SHA512 2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1
 DIST bash52-002.sig 95 BLAKE2B 7ba48e58c973630e845dfe887f6bae35bb67ff6c099fd3f820b89f98d89ed5cfe38bec1aacdd3f2612a862057cf7b0da42848f926dd8f1ed7d1c4889cde0e84b SHA512 201631d4ec2a238a58d09ced4c497e83ccadc005e3c64a2fa8cbd11734d552272e525198b682f5380acb4294b89d7bfd80392c9fb9d96b4f965bde812596e33d
+DIST bash52-003 2157 BLAKE2B d9f358c240d998a331d6aa4513b02191b1fbe7e875f8e96e531fca8968f84d0f4672d3644bbd6258f2aca0cabd2deb6159bbf98ba201e667d61353113a3e8240 SHA512 c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb
+DIST bash52-003.sig 95 BLAKE2B fa7176e2d80ef549c9f62875779e72050c6f5180034c29d98159e0835ed0ee332367404b533b2938ba7e41b1404d096398127c2fb0d60631d515d5433b0e1633 SHA512 1f261af58ac459be50ba3267c73275597407b0b5fa0b953940d217b49a9c5a9c991b7a3f5b8b3189d4f5ada81096bbdc8095a13200d517db5ee5b63c68ce219c
+DIST bash52-004 2016 BLAKE2B 159fbb7a6dddece1d4db2b38d6de591366ae07eb237ffa8ad61c933560160561736a4e70b8bd5441cd75ae88e8d4a29869367838b169a4533d06d9d3c345d554 SHA512 64bab53225ab2f0b974988c9b1ad5d2d2bb256ce384bb9d4646d1e75411a8eefc7ce2a7ee470345bff276e71147e9b5149a5d9b25bd5308f7bad77b8f68b5c84
+DIST bash52-004.sig 95 BLAKE2B 01c145e4e24293cf65c79052836cb7f7588592fe08f5a9e533613ee52e06c89814eaa150a2e8ab78168832fe18c0e84878d50ff5a8cae903ae2a6def000a39d5 SHA512 01c41e33fdb91850b6e1673567216570ee35d92ff9f857a33393f6fc249064215cdabe30065ef2d837d526e8b194584a9474954898dd10694c2b2ae576c1cc97
+DIST bash52-005 1515 BLAKE2B 5afdbe8fa644e1b7108600a7ecc0a8e5774a837f3acff45bfe5eff9ffca1b9e5ab09f19083464a9cfaee4bd6c9b351275c5baef5331c43dbfbc642e226ca8af3 SHA512 9971ebef50d2a776226d68dbb11feaac85522f66824a0e54faa97b0a14cc242eb8daae2c4364ec59cea5413824be7cbc149c02d1452f211588c505f030b13ee0
+DIST bash52-005.sig 95 BLAKE2B abbf6b5633af059ce24863102774583339d340a911d4a9c0c7404f7b99f05f5faa5b94f8cfeccde8505808fb25b2d57870ab0a5ec90d58c846fe74c9a60e272a SHA512 3c761c0bd44301a755ec6c8d5d04430e89fdfa8500388f8a792ba511e9061ae908d39b3a1432c441559af966a8cee5667d7e2f76cfaf45557434925f1432d9fe
+DIST bash52-006 8790 BLAKE2B 68c37f5f5164685d0d1f25a05d5584128b6d8d83efa271aaaf80c82e2ec71bc78a3961ebd5d5d6620ef6a3dcca7e6494f0e666b651056faef9c0ea0866b3b94e SHA512 aa46d8a5523374a269ea3d1b4b75ae4e3d918ef4f6d89331bed5da24505bcfac321864071f29161e56487c611d35fe1351c2a2ea226ccaeecef55d01a5a5f2c7
+DIST bash52-006.sig 95 BLAKE2B 9343c367d8e162ce481a1d38e96c0df2113935d54fd200952cc45fb80b513d53db8a1a21942332426a10af9adadb84e0268dd7a2418e2e6940a5893c29e6fa14 SHA512 49f78ba88cda3dcdc60f6c9e4dc02f6bd4c35ec271ecf5ca766037f34d2835b144573dcd80b7f64acf3810a446d61f5a260e4fea6328084c2c5a98c173369199
+DIST bash52-007 9072 BLAKE2B 028808fa9eac85e66ad942fff07ca6595b578911b3f3f99ae7d67289bd6c27936bbce66fea160e8c3e2fcc6bb18f6429121685c550a815ed992f9d0c757391ae SHA512 a2f5ce78c651ec220852989a8b2325d0f1a3739f6494796124324e5883290f74b7e360f91d540c339e1ca3030e54b91301241bb481e965f9fdf915d5fd5accd1
+DIST bash52-007.sig 95 BLAKE2B 511bfeb735d4f5fdaa5a2bdd3659421c1087a7cd6ce1bcbf5cc7169a3c9d3535f113c63b81165be18552c17e8c9f228f1416d025ab89064cf4293d067d28d06e SHA512 38f02577c6feb687bca5ceb86b04457c29e4aff9612ea1ec690f8f733dd885433dc5b8913cc0aa78fda235afd8e7697884e3585242b12b409228d4ab3f519a42
+DIST bash52-008 1771 BLAKE2B b46dde58525b727565efeca99cf4279fd2510382430b227ed233e7fc78c433b8d7eb2f1f7e4d31174118e9cc5bb8c43656e78583dc7fde15381aa63001b78277 SHA512 1f317f3c2313ede7b67c4e396dfad453787f4a30ff77fc53aae482c7dbb752f60c1f33cb414dcc3055a55b77c8c80aeda9626e5b066a79af8a082c6e056340e2
+DIST bash52-008.sig 95 BLAKE2B bf702abda6415ac31627c84095d211807cfaed74d53cdd712e1524ec5926f334852bf88b316aade5a87c5c2be2e2268d6867813e0d5205e4c3adc332259d54cf SHA512 84fde6817c0d63525d79355452eb31242b69d39dcc6d9e9453e5691e7ceb79af48a1be854a002d57aa120c7decbcae61af047a48ab1de54eef35b3877856c73b
+DIST bash52-009 1316 BLAKE2B 36a1a5be9166f436077aff8c8dc8e6b8745b6b07408e5abc3756846d199799cee22e825ae992f3db5f3885157fb37b64f1159b3bc8d0bd1d16c5980c9f74e092 SHA512 71fffb71e5876e7abea7e769f4438f2f8d3843d7dfec13f1ba7e79ead5b001d7543c92eb3a628b393f8652bf136e4768c1d1c7b55c155cafe83886b900396e68
+DIST bash52-009.sig 95 BLAKE2B 5527f79b8477b48077002e0fa8277ea6851c02895e0e2cc3bb164f09032be093c2db9afeaea10410451cc4d6d0c189ef153d25f015e64d98495afb28b9d73769 SHA512 ca4b88c3f056d5ab25aaef0f4f9071fd29efc1ac1034a18f0c82187789618203db7eeb4693f82a302a553a0c779b5f186083d4d3f77d03fe34b8398dc44fcbec
 EBUILD bash-2.05b_p13.ebuild 5246 BLAKE2B a428bfdebf5a98f8a45f2fb6127a132708ec0efc5bbd9cf6fa5c7bb70e565ae12e6b61248c80fda686da3706f957216aff2b5870ca13e1a0a86edfcf50648049 SHA512 72002267b10db0258c1912d5b665d4ca41054210197b4617822a4888ac7a2ff66a0a0354456a947333df5000272a54f70f75ccbcd24e137efe0a0058a4055f25
 EBUILD bash-3.0_p22.ebuild 5384 BLAKE2B a011f5d6d7c8428ffaabfff4f4ced9908876fb3cd198c4f72c2be7fb6b9c8cae37c333c6ad31e8506694c2945e83d0fe8fd6b8bd172f4c6092f74354b9e5fb65 SHA512 e56eedddbbe76d0c96fbbc8b6b1f95c183b1b3fe45fb32ea5ded646cfaff7ab14af4813cfb7ad20a6ce81b75118055aa606bba665e88d4dab55cec7ec6e5acdd
 EBUILD bash-3.1_p23.ebuild 5061 BLAKE2B 30640571e07e149a1a087c139c9f891922e9660a23033fdec6be3258a47812ef3280d72f68ec4521b2b6cb0c136cfce515f40c6ca1f2fafdac1205c7b8ac4067 SHA512 1137f8f69407ce2829681e932a534daff6a2f64c9b79c39e49766223719dae21503467e726dcaab729c10be9b887a947dda2d78d9f958b170168e2bcc2bfef5d
@ -398,5 +412,6 @@ EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f
 EBUILD bash-5.1_p16-r1.ebuild 8047 BLAKE2B 920477ad40a57b693a034c2a526b9769e90d6a8c71a7e956551f198e4cb84605abe32e580df99f78340c183e85590640f213b76a437b825d7710b5c5d755a493 SHA512 d3dba26ef514f9dd93c9743d73dd5ea6041e006bc3f4e5d330898f4579267d08d87cdd0634de57e7f740d065e6f4e518119c141447f691679a0b4a3df7a0a147
 EBUILD bash-5.1_p16-r2.ebuild 8226 BLAKE2B f14fc9e50ffa1e89643c2702a52bc89dc0255c5bde3dfca94d7de28baf8a54f121efe1096b673554e324ccd831147f318962c3bca5e7679979a5f58952a66e72 SHA512 aadde860015cf550415fce75a0d8ea0b207f590b597ee8b0ed10ad2d8802ce72389b3f0f6b19d2bac52edccbf26650296820a64fa14b9cc66bb9a09abebc9928
 EBUILD bash-5.2_p2-r2.ebuild 9477 BLAKE2B c16b5f06f20e14a0401f3acde5bab9e5e260117f75b12a8db2d2557f9d98d60231931f141a93a340895896bfade9a8e3de41928e5a26ddcad6ef7068c1562afa SHA512 4377489d3ad2f3d2e50715e10c364fa5e73e0aff7d36399e0176add2f573db9a0b9816c62055d4bf34818fd11e80e7323a9cb8e6bd02d4daaf47e45c10742dbb
+EBUILD bash-5.2_p9.ebuild 9344 BLAKE2B 6149478fedce8c8fc0c23feb47878dadca0e2a82bb25c00caf34bc7d50e8bf2a8ca45303771b12c2d621a543e094c0f9d55ce07f3befb547a3c54bd75c4aeb41 SHA512 214bb91ad2f2ff7d3fa1faa832749cbbc5abfa1be6d079b513aaa1ee74a8708092abfa32c7cd8736ebbf4097a692ce91122f8380466c8d1831160c2ee7f956b8
 EBUILD bash-9999.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
--- a/app-shells/bash/bash-5.2_p9.ebuild
+++ b/app-shells/bash/bash-5.2_p9.ebuild
@ -0,0 +1,344 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
+inherit flag-o-matic toolchain-funcs prefix verify-sig
+
+# Uncomment if we have a patchset
+#GENTOO_PATCH_DEV="sam"
+#GENTOO_PATCH_VER="${PV}"
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+MY_PATCHES=()
+
+is_release() {
+	case ${PV} in
+		9999|*_alpha*|*_beta*|*_rc*)
+			return 1
+			;;
+		*)
+			return 0
+			;;
+	esac
+}
+
+[[ ${PV} != *_p* ]] && PLEVEL=0
+
+# The version of readline this bash normally ships with.
+# Note: right now, we don't use the system copy of readline for bash for non-releases.
+READLINE_VER="8.2_p1"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
+	EGIT_BRANCH=devel
+	inherit git-r3
+elif is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
+
+	if [[ ${PLEVEL} -gt 0 ]] ; then
+		# bash-5.1 -> bash51
+		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
+
+		patch_url=
+		my_patch_index=
+
+		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
+			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
+				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
+				SRC_URI+=" ${patch_url}"
+				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
+			done
+
+			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
+		done
+
+		unset my_pn patch_url my_patch_index
+	fi
+else
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
+fi
+
+if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+if is_release ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:=
+	nls? ( virtual/libintl )
+"
+if is_release ; then
+	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
+RDEPEND="
+	${DEPEND}
+"
+# We only need yacc when the .y files get patched (bash42-005, bash51-011)
+BDEPEND="
+	virtual/yacc
+	pgo? ( dev-util/gperf )
+	verify-sig? ( sec-keys/openpgp-keys-chetramey )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+PATCHES=(
+	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
+
+	# Patches from Chet sent to bash-bug ml
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	# bug #7332
+	if is-flag -malign-double ; then
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig ; then
+			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
+		fi
+
+		unpack ${MY_P}.tar.gz
+
+		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
+			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
+		fi
+	fi
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/* || die
+		touch lib/{readline,termcap}/Makefile.in || die # for config.status
+		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches, bug #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/* || die
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+
+		# Force linking with system curses ... the bundled termcap lib
+		# sucks bad compared to ncurses.  For the most part, ncurses
+		# is here because readline needs it.  But bash itself calls
+		# ncurses in one or two small places :(.
+		--with-curses
+
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading bug #7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	if is_release ; then
+		# Historically, we always used the builtin readline, but since
+		# our handling of SONAME upgrades has gotten much more stable
+		# in the PM (and the readline ebuild itself preserves the old
+		# libs during upgrades), linking against the system copy should
+		# be safe.
+		# Exact cached version here doesn't really matter as long as it
+		# is at least what's in the DEPEND up above.
+		export ac_cv_rl_version=${READLINE_VER%%_*}
+
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins ; then
+		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+
+	# bug #444070
+	tc-export AR
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if use pgo ; then
+		# Build Bash and run its tests to generate profiles.
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		# Used in test suite.
+		unset A
+
+		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
+
+		# Rebuild Bash using the profiling data we just generated.
+		emake clean
+		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
+
+		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
+	else
+		emake
+
+		use plugins && emake -C examples/loadables all others
+	fi
+}
+
+src_test() {
+	# Used in test suite.
+	unset A
+
+	default
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+
+	keepdir /etc/bash/bashrc.d
+
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+
+	if ! use readline ; then
+		# bug #432338
+		sed_args+=(
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			docinto ${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					dodoc ${f}
+				fi
+			done
+		done
+	fi
+
+	# Install bash_builtins.1 and rbash.1
+	emake -C doc DESTDIR="${D}" install_builtins
+	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
+	doman "${T}"/rbash.1
+
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@ -4,6 +4,6 @@ DIST sqlmap-1.6.8.gh.tar.gz 7205751 BLAKE2B 49fddc4b7c62c9baa5d6732bb9150bd2b3e4
 DIST sqlmap-1.6.9.gh.tar.gz 7205911 BLAKE2B 7da1ae0201d0194c67bfc02b5f2e4e0319eb5820129da7c2708ec8012a7e9474a798767331c541ecea4e078a21d7117a2416ce7e2d135151512019e0ddc543d2 SHA512 ae1b78a75b591162898aaf273d476bd0d4a414820169c463e0694105e774c487bc546c6eb134d8200a51ddb152f5204134032e60f51484ba1a15af7040211d4d
 EBUILD sqlmap-1.6.10.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 EBUILD sqlmap-1.6.8.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
-EBUILD sqlmap-1.6.9.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
+EBUILD sqlmap-1.6.9.ebuild 1332 BLAKE2B de701fae22dc510d882186d9ccb2b38ffd9159e1ad52408b6bf08994f9a26a83fa335d0a24ca884c3e4f85f54a46f600c7dd39163d63fdba52b14e3a49422431 SHA512 1b6efa626e7c37cfedec7c33bdb48f6c66825c6bf4e41bb61053959753654c6811f424dae6d9750c951bfdbab0f83ae2d798bca731cc771334c781089360184d
 EBUILD sqlmap-9999.ebuild 1334 BLAKE2B 7aaeb296a821b93b5359dcce7639463f636dc6e23e5abfa50f34bb713a10c5975d52f22f92a5f401a8ab31721c52e5df913108d2f514b25d4392d76c6622ba25 SHA512 7cf620ece1b65143b68687f5b73d22cfbf3bae319f52e006501d5158a3b155b8496c361fd79a800ffa66008041991b1e5a10ac7b17d9b3565fe4bc64047f743e
 MISC metadata.xml 847 BLAKE2B 31fdd4fd94a4b6ad8c775bbbc9cb48b5627f2f5944a7bdaf6c30f3559044dda6cd92be3b50c8baf462b1e2e4ea4aa905bbac88c616cbfbc833a4895a1944b0d6 SHA512 bddfbc5ce988bc1770a2ad1d6952d8ef44010c9e4ef789500f0408c7c5754960804f270bb6e24e4739852cdef07b3f22111ad9da453648730f045d0b2c3deea9
--- a/dev-db/sqlmap/sqlmap-1.6.9.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.6.9.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi

 # sqlmap (GPL-2+)
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/felix-main/Manifest
+++ b/dev-java/felix-main/Manifest
@ -1,3 +1,3 @@
 DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
-EBUILD felix-main-7.0.5.ebuild 2245 BLAKE2B e8276bb5bdffc4bffc71d41b91d43235d21358a3b2779cc150bcae9f0b5544021be30cfd5688a0335150e031c4dacd124d6042b855b39aee4268e785e43fe9c5 SHA512 a1c30e25e3b6c253e75f9b177354e2954bd6356dbb6fd9c73060ae6bd09d1e6df39a4d85332fef8817dc07c4c832ecf55729d7972958c2a4c2d0ab8539a96400
+EBUILD felix-main-7.0.5-r1.ebuild 2244 BLAKE2B 5b056e7910703a6dc2b6571d98b0c4f8d0762626605435c0c96063d1fb4de9f6dd39d79e0da87ecd720aa31d30086b7c2129974c3d9aa02f83f5d82871ee4b85 SHA512 ddd6c49dc16ae2c39a8b6d7fe3c2fb917a627ee2445421c039aad22d014541cc2fe6936e5670ef9ab66ebd4a673f94a5d3100830955a70ffb91bfbc7fb175af0
 MISC metadata.xml 594 BLAKE2B 9ec3f78cd94f82740e506f44a6494d8e60894f09cd655b022886978c41bcf73a01628c9f1850a39a78bb96ed9dc57c04e7e1f6f5193b91bd8f23f1706899ef84 SHA512 1d8fab624036e9eda29d385fd042a0ca6b130dfa943c63c09e2a161ee039c695f215da1fe6135b59ece4a0fec06399dff2f80d0a12ab690805fd718d90cc05f2
--- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~arm ~arm64"
 CP_DEPEND="~dev-java/felix-framework-${PV}:0"

 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	${CP_DEPEND}
 "

--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@ -13,7 +13,7 @@ DIST gnat-2020-20200429-19B04-src.tar.gz 8485156 BLAKE2B 79683138873b236d8329396
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
-EBUILD gnat-gpl-2020.ebuild 3840 BLAKE2B 82c2560e8b058805ce38780067334a8930bd5601f242d58ebca6b2e661796dccf5de0c306e66da1561ba9e0f38b3184da7e95399e40622ddd36985eed4569412 SHA512 971629f9003934c9bf018dd7d41293d395c86f3cd3dfe54bc007392a66e3ee3b1a50c57bf850f5e667509f99a9e5c063cf77ed5b74dca47787ba8fd2ecd73c28
+EBUILD gnat-gpl-2020.ebuild 3856 BLAKE2B 44ecd30945e6d6d43ac52627c555813385e45833df4f8a5707a739255eb29c875c74ed5dee1ce8b777e952356f9ef0291b8b69ee2daf4d36949cd41daee8d6ed SHA512 981067880ec785f28816cefdc607a6b7a45ecdc027567dcc51cf0072e813fe12fa7bf6c6bb63ef664c13d0a2cd4f29585211ae235479d0de0771877c2721b4cd
 EBUILD gnat-gpl-2021-r1.ebuild 3963 BLAKE2B 13efe1a5e0196fe4af7b1a313bc2240be092c5bd772a99f8900473dc90a78e5c88b55a82a2fe86b138e5d1261ff0ed27b42fef4adc539ad7b3d5706a5d31a17f SHA512 b5b29e236535c4e5f53cd585ad13542e06875cc50eeb184fcc1997e055567efecefd1712c9037d50bafc0d0568ef727b5750aed93961b61e9b2efbdfa2806316
-EBUILD gnat-gpl-2021-r4.ebuild 3972 BLAKE2B 6191724794bc5a9a2189450432f553352cd00e5e1da4978a8f890db7edf5fe36fcc411c4c0679b525473fd0df6b2384e17fc1cd42fce4c9704697f8b714f3df1 SHA512 ad78b00fd56d1e9c0d40bfef0af070dff5734d5fc7c9a3c6919961549d91d7e1a35285993e515472bf5671b4f1ea5ae7d8e76b9ca14404ba0552dadc45eb8550
+EBUILD gnat-gpl-2021-r4.ebuild 4027 BLAKE2B 26dbc22175e9d7a963fd16caa6a32c505d1218e8451f883944996c19eff9752ccd2697abbbe21da837de0a32a6af60b0bed88b7ca661b38e29a54e9a1c8cdd08 SHA512 a681164a575c1ac8d04fcb2b09714889aea4cedfdf68e62a7fb0961400163c0ec6dbbe6d8297e2744091c029804ef9d45574a1c773c70813d353518fa81d2698
 MISC metadata.xml 1960 BLAKE2B e06642a8ae69d163bd2450a4dbf2350399becc0fa933780cbf1378721ec127b033cb547c7aff22d4b89724aefe933c7c0eaac55eab4a223f45d138006dd3492e SHA512 81c3ceafdc0a4d73427d6b12c1bfa41d647e8c788e71e1de09e79de4795573e35e403fd03b981beb350a6e9b55b44fd0d8a2f7279e83c23273fc150a126f2b07
--- a/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2020.ebuild
@ -52,17 +52,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"

-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	toolchain_src_unpack
-}
-
 src_prepare() {
 	if use amd64; then
 		BTSTRP=${BTSTRP_AMD64}
@ -83,6 +72,15 @@ src_prepare() {
 	if [[ ${gnatpath} != "." ]] ; then
 		GNATMAKE="${gnatpath}/${GNATMAKE}"
 	fi
+
+	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
+		eerror "You need a gcc compiler that provides the Ada Compiler:"
+		eerror "1) use gcc-config to select the right compiler or"
+		eerror "2) set the bootstrap use flag or"
+		eerror "3) set ADA to a working gcc ada compiler"
+		die "ada compiler not available"
+	fi
+
 	if use bootstrap; then
 		rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \
 			|| die
--- a/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r4.ebuild
@ -74,7 +74,8 @@ src_prepare() {
 	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
 		eerror "You need a gcc compiler that provides the Ada Compiler:"
 		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
+		eerror "2) set the bootstrap use flag or"
+		eerror "3) set ADA to a working gcc ada compiler"
 		die "ada compiler not available"
 	fi

--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -12,10 +12,10 @@ DIST php-8.1.11.tar.xz 11797016 BLAKE2B d9e3839931370cb833692b7829d98d29a3e94236
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a SHA512 7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94bcccc5e3c068877644e58fc
 EBUILD php-7.4.32.ebuild 21336 BLAKE2B d47b39aba8e40665101d8f1cbff76c2dcf46cf7a3049e1cb2619b7fa927ac59a010c16f5ebf49c8880d78ab24476bc950289bea9d6bd1e5072af41dca5e5d02e SHA512 ca94a122871dd267e899b3a4f2fccc0b7e18c4b9043ba9d7b5eb1a275cbca454b2458a2c4b1b7906ed84739efff1e6d432ede0597ef7254396fb3b83f270487e
-EBUILD php-7.4.33.ebuild 21351 BLAKE2B 0f4c6886c2d1a604c651a95ef0102396a059a15ed1e4c213c2393cd4c37d377a3114c66fc25e1ac180598b266cc73827acc08bf1a65f84048764f41421cb4b66 SHA512 e2c807ed6880ad4c7babec21e9766297de845d2465f0f51ce22f5f48c14dc71e2b5a22629627eacf51ec206a48fa4ae475d27c7dac16f43fff622dbe4700d57f
+EBUILD php-7.4.33.ebuild 21350 BLAKE2B 6a2c5dbff4e050c45b65e61d486aa059a09481ef4bc183e4dfc5403c5fe1cf924958a58b739e3e3f56ce1ea71ef07b4ba9286f28c4ffc182fb93cf04205a0eb9 SHA512 b4c0c2622f42299f17dd8c4ab810821f1d3fcd56a5c94367a8b4a6edf9a2309177f4f584b2b70c13b0dbf6127e500c13254e94f3841cf5560aac478990632f56
 EBUILD php-8.0.24.ebuild 21845 BLAKE2B 9bbc8fcd79a39502a50257ba00eb68abaa8313306d2554e3ade270203bd872fa66083a57fc10f6d4e7e46c8930efbfcf6de7c6562d2499dc262fb690db1aeb7d SHA512 af251c56145df7af13bbbcb73dce4f311af742245e5558cf062a6505526c77e45637adc99454471f5d30791ced2a9fd96438191bce71a1275df2137b85043c5c
-EBUILD php-8.0.25.ebuild 21860 BLAKE2B 64abe0437cd042d1b91d30fcabb541b9d8b63d2fc4865ee15bfcd0bb3af90911e53f8d990c6e20ea7435097c5ce999fd5c5be453e8a9767d7cbcecba8d33a3a5 SHA512 a235c4b1c2a3f9d092e790f41f69ec34af3cd427d095db19bd3e5b6f95b865336ddd41fe0d8be173f98111795caec1b23218be1f25c992ab1ad81eb7fbe96bad
+EBUILD php-8.0.25.ebuild 21859 BLAKE2B 9f7127308e10a8ec8a1a25fc34445b1c360cc9f7a1013a59994add6958cb2330e435516331c5da838f0ed68894a45016fc7d9bd41ef7b68f720b321c7574c380 SHA512 469593d4e3b8fd6ccb02e09cb9b68e63279dc2ade6b8222f629a4dbd784ebd3bf825ebae35e279f389456a18dd38b3b1bee55227be80b55237ba0a3ff665ff29
 EBUILD php-8.1.11.ebuild 21802 BLAKE2B 3c440783310cc43ecea65725d6df5877ba9e66d295faaba0fb4d22bb5f2c538e0ec7fbc4a88e760f8c613de3c0cc7cb4e8c469a2ccb4eee0daf5a53c069ce3ae SHA512 c91499df986e64060dbbf0eeaf68fcf94d7838cbca67904abc7f83b4accdb8c25d6d6391406d57de19bc586424a11be19f202afb658cb1790ee36c4205b2a8f9
-EBUILD php-8.1.12.ebuild 21817 BLAKE2B 09211fb00d6a006c36fc0732a2a7238296c272085ce01c2da0ab11444a85bca4f66136a3151b3d97e43e74a7d50675e947c9df7323837851f8646a644c8755c1 SHA512 ef8cc24cb08cb93f4675ccec1741809852d0a5863ed27a3a746a8487ec4eda96e6ca409d569a31cef098888dbb46a52b73e217fd5a492a046c344a1992164884
+EBUILD php-8.1.12.ebuild 21816 BLAKE2B fcde8b20d5629e905fccdd561c804d44de0d953b73776d7b4fa351b872f5546273ffd01ce0c28ec01968102a81e7aed519f9f145da68eb1f66fdea953a834970 SHA512 6a7103b3bd00ac76355ba8177684c0ddbb9b6326fc203cef65c9113f6fd6931da97e84bbc3b02e0e940b785b09c13e930b3cb69db05870f086db027580de1484
 EBUILD php-8.2.0_rc5.ebuild 21929 BLAKE2B 4179ca69a70e7d04e313e3c9f33bf9b12798b1a831ab95729fce97cd792f3af95fa67ba5ec9085b2470dd14da6884fab4d6131d25293b07895909a2b9105b76a SHA512 13a68d3eb5ce5a27cb794fc893d40b0e6a4aead00ab633ed3cb09fec3cb0489bd370d0c8eaa1472c71ea5009a456c18b1861479ff1e8a7c58fcec2c693096f87
 MISC metadata.xml 3230 BLAKE2B 215062835c9f7ae9d570a40b3a6e59c7a2b7fb51e0fb9b89cd51888f54e2cbee1cbcf571b8ccfef3ed1970949dcac81bb411ca6536e972875b184caee688cb12 SHA512 03d948a300d3a29a113248b371be92fa9c1c4feb371886a9cab335e956a2ff9958cb9b5449aab88a5306bcafed42161ac88655115a1e286fa9e876920ad1d59a
--- a/dev-lang/php/php-7.4.33.ebuild
+++ b/dev-lang/php/php-7.4.33.ebuild
@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 S="${WORKDIR}/${PN}-${MY_PV}"

--- a/dev-lang/php/php-8.0.25.ebuild
+++ b/dev-lang/php/php-8.0.25.ebuild
@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 S="${WORKDIR}/${PN}-${MY_PV}"

--- a/dev-lang/php/php-8.1.12.ebuild
+++ b/dev-lang/php/php-8.1.12.ebuild
@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

 S="${WORKDIR}/${PN}-${MY_PV}"

--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@ -20,7 +20,7 @@ DIST python-gentoo-patches-3.8.15_p2.tar.xz 27472 BLAKE2B eef7e3f944b59573078580
 DIST python-gentoo-patches-3.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c019961c81f795678da55979934e4d3d8b85ff53bd44f98bc1564ab47efaf11f581271b49f15a41538452d49dbe8ea6bfd0a9d6e3e9 SHA512 c4635fe88cb59f3d16a2a3c1d1519c9566b069995151d6caabc661af3d980522dd00b4a7c9de9969c0d10dafe27b6e0524af4469148fad6841e5f3329a5dad3d
 EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-3.10.8_p2.ebuild 12901 BLAKE2B b406040e5412b528ae58e26fbc8226707f22137cc372eb386267b45d3ba047c8cd03d94027e60ef337be05ff8b1f5d89a258d1f4568925a4495f6e577f829249 SHA512 5bfd248c730be86592a747b47e23f87dc7eb1a249e3eb61cea87c4add7738755a9d4badc12f59e0fe0cba5190d94dd4a29bb6707f255f16ca748e2acfcc2a042
-EBUILD python-3.11.0_p1.ebuild 13804 BLAKE2B 5fd8784121aeb46d5bdee415e28ee2d2f6189ba71f542e048fa53391fe1a93144ae7bd018b6b3cdd733db42d83298e08a825bb9e078dd8faff2f386f7c82fd80 SHA512 78d54b34be2b650bff930089dddea5959350831a4d5b71a98a56c92709adcbcdd01f63fb803f06a911afdb8d84f07fd64b5a5262eaa198cbc0ed1b1514074659
+EBUILD python-3.11.0_p1.ebuild 13802 BLAKE2B b3158f83b9bac65b7eb6be26e479965bdf554413d3fcb18db346a3331d9f0054575eb882f5e0dda87e51d262896db0de7a842774ce98de3f6984643f394cce20 SHA512 5b1930a47532616f493d1f63461cfca7da48e7643117e96fab1b8e1e95ed4bde0c38a3ebbe2eff58a79a8f08a68866bf884f9bdbabdcf3c152381e73d8c93db8
 EBUILD python-3.12.0_alpha1_p1.ebuild 13694 BLAKE2B 77802b95f3b9bf8c5a88d4a50e7529cc094c332f408be39a1cbdf243ceba3a084765247f5acc9094f939fede82b24ff7967e6544cf73b755fb3b502be4979e96 SHA512 8b2665b81a0ffa78529e66db5559d23ef682244de9849aff3985ee013d3e6fbfbb359542744ef1f90e2ba85c7b22be2f5c6e2c3751a2d9fce449564f9abc99ae
 EBUILD python-3.8.15_p2.ebuild 11439 BLAKE2B d6daa1f6acb91842a3eed6d47291ec664ce9e7fdb10644aaee576aa25ba50af80d613f47a97a0714d5ff981332efc3efca4b247bc852c08a5542ed4224fe499a SHA512 10fdfa955eed007c37640959b19ac01689cb38b9e1e2181439473ad1ca06e014393d8c7aec79835a00351d1e5b46b6b6ddba9037169920c4fbd2c637b9be0025
 EBUILD python-3.9.15_p2.ebuild 12699 BLAKE2B 0c79c486faf93fbf44143cdac9a4cae7d7f5296294209be9c0e6bbab524e80aa41a88f7be3f449a92e3ccb5e1edab0b412f4aa375f615825a77fe162edbc4ac4 SHA512 bd797e9555e3b67486a33431baf5e34a55756ce6afb849d36550ff12e7aa5fb80cf6e9148e6292ffe222318368f12b2e2ab65657444e35f44aa81aa8eef6c9bd
--- a/dev-lang/python/python-3.11.0_p1.ebuild
+++ b/dev-lang/python/python-3.11.0_p1.ebuild
@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
 	+ncurses pgo +readline +sqlite +ssl test tk
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@ -7,5 +7,5 @@ DIST zig-0.9.1-fix-detecting-abi.patch 22233 BLAKE2B fa523c4c4c23a74c0b4f85c6d2d
 DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
 EBUILD zig-0.10.0.ebuild 2540 BLAKE2B 79d46569b4707027657c25c7dcba54dfdd48fefd2d3ea4b92843888f4a1d7268fde05b55662888fad0deb7ce2ac407fdcf598c1046eb9d841737c65d58fb2f5c SHA512 e89bb8ca55df6bfc1d3d937157fa69422a53038ebdd605bac4dc4d4b927ef79c1e524fa6d298d35e38ce7405be8578441dafcedb6f82bf2f6ee04212053d8c55
 EBUILD zig-0.9.1-r3.ebuild 1611 BLAKE2B 1fb2ad3330aa85dfb54c4a41897fa000bf07712dd6db257598a182d814e996cb74b22b8fa615f2f97a600fb820b16f9158743c974670628f1f4e1091ab02620b SHA512 8469f133c8e32b9796e6076314ffbfb73fc19fd10c23139cc6aa228b08293976321588d96ba698eb8530dce36ce77549c22ffc1fd43256e2cae53b86823c58ac
-EBUILD zig-9999.ebuild 1947 BLAKE2B 0abb82be2332f7609c1a58d0089850fba2f8a4bf7126b4ba8540eb322c4395e7a74876357387a4e02fe0f055dd32d24757c8a275241a05723e50cfa71ae8c2b2 SHA512 ee5a640b8045dee4d80f13f238defcb41163db46dcb750d4d26b1d833f1de8da5d025feac7053833c5a89be031197eacbad80becb3e4c51a2c2dbdf7105dfe60
+EBUILD zig-9999.ebuild 1856 BLAKE2B 383772a93b4d7c5bf7d84f0627fc05fd9494de1c9bcd54fa0c1fefa409bf177d4d45c2cc1066ef1a08afa069d4fbcd07baa02f28186577f9744da95dfa97fc63 SHA512 4fc3f4a558d9fce7ff16aea5d25bb8757a8781f82270a850ddc7dd5ba4ca04537a6370e25ecabba4e482edc05f162e3a8c43ba715224f2c80032d82fc088699a
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
--- a/dev-lang/zig/zig-9999.ebuild
+++ b/dev-lang/zig/zig-9999.ebuild
@ -18,8 +18,6 @@ fi

 LICENSE="MIT"
 SLOT="0"
-IUSE="test +threads"
-RESTRICT="!test? ( test )"

 BUILD_DIR="${S}/build"

@ -60,7 +58,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DZIG_USE_CCACHE=OFF
 		-DZIG_SHARED_LLVM=ON
-		-DZIG_SINGLE_THREADED="$(usex !threads)"
 		-DCMAKE_PREFIX_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})
 	)

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libtompoly/Manifest
+++ b/dev-libs/libtompoly/Manifest
@ -1,4 +1,4 @@
-AUX libtompoly-0.04-Fix-Wimplicit-function-declaration.patch 3113 BLAKE2B 77f58e605cb897f2ec6ada6edbdbaf582f62c0d54cdcf2456f89cfd6ab8e0dd47e6a622511973b2b926b1a611478d7e8a09c0e337afc1e2f70a3f14764f0fe36 SHA512 599f1bd7c434abf5c68195b54ab569311ebbcc39dbb63ecec7c966d55c3a6ba76b78559be6e667ee15dfa085f83c5860002bfc26f37eb391abb636609c64e460
+AUX libtompoly-0.04-Fix-Wimplicit-function-declaration.patch 3693 BLAKE2B f549593e1540cc34aa65785be8a26caf91b752bbe8d1b77bcd45b3720904cddd1357025cf1aa22035df5ce8644ec609c5ffdb9707c2c61e9ac953fe9ba21144b SHA512 9a46f2bf2b7c065cf8b8a463d7977a0ce45a93ecd9d83c9a0699ffd1df8b136693ea2e859e0711aa70e3069fe5005bb29de29129688c9645fe43f3d87575e5c6
 DIST ltp-0.04.tar.bz2 171966 BLAKE2B 748fd04d55bd3dcdcd9510de1e34e2b9d96c38fc4f48c14137676f60c6d89751e8a095e07687d368d9a46e49ed056484cf8971e96fc400cde15b254a7374c38c SHA512 64a0b25eb058fc2475e6c645138729796099081ad7e926b58d2e83468d988048607e26716b4b669f0e923ea74d4d9705ff5a0466eb41cbe160488d0173447234
-EBUILD libtompoly-0.04-r1.ebuild 787 BLAKE2B 50bd5523b80be11db62f4928a6c8af5098d130c51bc9bc163eafd166e45093887ed484db7f94d6c6fc84fd942c8c8310c1dcc2ef37cc1a3d990bdf00722742b3 SHA512 86ffacdf939609bac18fa29c277244a09502920d142af78f51820d6fd50c9ed0105dfc54ee63a3823b013b67dc45d29d1fbe05d36e1919d08c62baeee865b17f
+EBUILD libtompoly-0.04-r2.ebuild 787 BLAKE2B 7ba4ae35883e39d44d771408d3aca0c3747f76e603bff8323e45950eafef5b01e25667459efc53c93c5b85f2b70ce34fd01a12e3bf737a42c6e992a2ccf80b72 SHA512 7f6bd724c0180787d6fa9db3804c937b3d0c2c9c857c7146b0d35deaae174d903818fef2440b4e74fe2ab4caad145a6acaf86581f3cb6347f6ae7dd115279c92
 MISC metadata.xml 910 BLAKE2B cd74dfeebe4cf884027b6ec410f5e01e79ef59fadac951939a14e6a2483a785ac90e164e14558a8042eb711defe309fd15fcecd7dd97b5f059d11bff477dc883 SHA512 9dfc6fc5a3deb7c91c7cab20915a52003531ba43aa49bad37da9c52a378c94b301b0b3a93bd02542a9a4bb78c83837649ce4347ecdc897eacfdbe52f65eaaa1d
--- a/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch
+++ b/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch
@ -1,38 +1,39 @@
-https://github.com/libtom/libtompoly/pull/4
+https://github.com/libtom/libtompoly/commit/2803e69dcc7cac9b470360c984b62198a3774882

-From 62f0b57e577cb3ec371042e60eb82ffcd0ae6bd0 Mon Sep 17 00:00:00 2001
+From 2803e69dcc7cac9b470360c984b62198a3774882 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 19 Oct 2022 02:21:00 +0100
 Subject: [PATCH] Fix -Wimplicit-function-declaration

-Causes build failures with Clang 16.
+Clang 16 will make -Wimplicit-function-declaration error by default.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+[3] hosted at lists.linux.dev.

 Bug: https://bugs.gentoo.org/875527
+Signed-off-by: Sam James <sam@gentoo.org>
 --- a/pb_add.c
 +++ b/pb_add.c
-@@ -10,6 +10,7 @@
-  * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
-  */
- #include <tompoly.h>
-+#include <math.h>
- 
- int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
- {
-@@ -17,7 +18,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -17,7 +17,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
    pb_poly *tmp;
 
    /* grow c to be the max size */
 -   y = MAX(a->used, b->used);
-+   y = fmax(a->used, b->used);
+   y = PB_MAX(a->used, b->used);
    if (c->alloc < y) {
       if ((err = pb_grow(c, y)) != MP_OKAY) {
          return err;
-@@ -28,7 +29,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -28,7 +28,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
    characteristic = mp_iszero(&(c->characteristic));
 
    /* add the terms */
 -   z = MIN(a->used, b->used);
-+   z = fmin(a->used, b->used);
+   z = PB_MIN(a->used, b->used);
    for (x = 0; x < z; x++) {
        if ((err = mp_add(&(a->terms[x]), &(b->terms[x]), &(c->terms[x]))) != MP_OKAY) {
           return err;
@ -89,29 +90,38 @@ Bug: https://bugs.gentoo.org/875527
 {
 --- a/pb_sub.c
 +++ b/pb_sub.c
-@@ -10,6 +10,7 @@
-  * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
-  */
- #include <tompoly.h>
-+#include <math.h>
- 
- int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
- {
-@@ -17,7 +18,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -17,7 +17,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
    pb_poly *tmp;
 
    /* grow c to be the max size */
 -   y = MAX(a->used, b->used);
-+   y = fmax(a->used, b->used);
+   y = PB_MAX(a->used, b->used);
    if (c->alloc < y) {
       if ((err = pb_grow(c, y)) != MP_OKAY) {
          return err;
-@@ -28,7 +29,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -28,7 +28,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
    characteristic = mp_iszero(&(c->characteristic));
 
    /* sub the terms */
 -   z = MIN(a->used, b->used);
-+   z = fmin(a->used, b->used);
+   z = PB_MIN(a->used, b->used);
    for (x = 0; x < z; x++) {
        if ((err = mp_sub(&(a->terms[x]), &(b->terms[x]), &(c->terms[x]))) != MP_OKAY) {
           return err;
+--- a/tompoly.h
+++ b/tompoly.h
+@@ -112,4 +112,13 @@ int pb_rawsize(pb_poly *a);
+ int pb_toraw(pb_poly *a, unsigned char *dst);
+ int pb_readraw(pb_poly *a, unsigned char *buf, int len);
+ 
+/* What follows should be in a private header, but it's fine for now like that. */
+
+#ifndef PB_MIN
+#define PB_MIN(x, y) (((x) < (y)) ? (x) : (y))
+#endif
+#ifndef PB_MAX
+#define PB_MAX(x, y) (((x) > (y)) ? (x) : (y))
+#endif
+
+ #endif
+
--- a/dev-libs/libtompoly/libtompoly-0.04-r2.ebuild
+++ b/dev-libs/libtompoly/libtompoly-0.04-r2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 inherit toolchain-funcs

-DESCRIPTION="portable ISO C library for polynomial basis arithmetic"
+DESCRIPTION="Portable ISO C library for polynomial basis arithmetic"
 HOMEPAGE="https://www.libtom.net/"
 SRC_URI="https://github.com/libtom/libtompoly/releases/download/${PV}/ltp-${PV}.tar.bz2"

--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@ -3,5 +3,5 @@ DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b
 DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
 EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05
 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
-EBUILD libvterm-0.3.ebuild 776 BLAKE2B b52bd59e074f728c6bed5f7b6ec9e3283fff3731cb757a45d99ccf279fb562bf252997b015e93e2600dd1ba0c8ef683271b2d1b4c5a1616ed02f789e8445d422 SHA512 6ddad5ce34fa5a790ce434a92532e2394ba742743f2d98ddf136ac235611c6e5d5c85c0a6b142a546ea37a3e5686da89ea46882ad6b77d130e2f00b979eb5c45
+EBUILD libvterm-0.3.ebuild 775 BLAKE2B 2f026db9aff7ae25b51c6ce0a83e4ee5764d4c9b8137649e9bd1695af7d5ec13949813e910dea9053b7ac0e82e409195285becab00a386b9ca0059b43e8a8afe SHA512 2e244a5687c53d0f02aebfcbe2ebc3c8616db8a4888efce3b7850ac192ef39afe3a8f33bc28d30ef920a2f7aa4ac483c57c0f07a445d271bfa1623fe0c82a29e
 MISC metadata.xml 326 BLAKE2B 1ede96c6ed5288e9f8603f2c1fd2daad8bf48384c09b01de355628fd970e3f252b6d064cff58d70fb5838cdf0edaa71c6d83e65f240e0ce48559ef74cbff43b3 SHA512 951e8795d8482cd230a256c4084f5d0e28d9cfb7fdae75f239f72b7d67d900c9545b47bdafc8260eec393c302eed4fdd70912e965521312705fcb4ddb281d814
--- a/dev-libs/libvterm/libvterm-0.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.3.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"

 BDEPEND="
 	dev-lang/perl
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@ -6,5 +6,5 @@ DIST luv-1.44.2.0.tar.gz 124180 BLAKE2B 0a46ffccd67bf04fb60c7aa3685fef328da13234
 DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 EBUILD luv-1.36.0.0.ebuild 2303 BLAKE2B 516f7e876698b6b15639e648778d59f044d89ec216e2152fa607e24eaebeb0f3c6f5150de367aee211ac3c08b00407b325ab4c3289f873de3abe72f139ea9458 SHA512 732a3d8900cf3695a7ea65ab75c2f05c6cef120d43295a12413ea76c0a838dab4f18e64c815c38a634651af000b9219ee164d52814cf06c0ca5076945a45adeb
 EBUILD luv-1.43.0.0.ebuild 2302 BLAKE2B ff752f24faf4d0939cd4954ba6e52beaa09bcd78da6d960ee01995554b6a1ea7019a9b991255fe7f1abc98c86d30055b7d2c6de25ace37155aca7a1243d8b107 SHA512 1b23f6a3c63e42895f9457c8676510a74130c3baf51dbc1b0c9294f510db3cc848c2b6addda3bd6fc9650efa2130873ec4b8956e7362ecc2e88e09fba783fcb6
-EBUILD luv-1.44.2.0.ebuild 2312 BLAKE2B d540ea5129ea524d394f3dd3bd06621b02cff1008de1104264e36f4b73ec0373f6795aeba36afdd9d9cf485a611d69a5a283d5f2de3e0f892e9b15a52a63b995 SHA512 76a1c2c49e8a777acb8cf6320da854703daa88cc86a461f52639313d84f6b2ef2bf954f8f8d5b0f71a3d31b2fdb10be3e7764282fc5e1c1eff7482e1886f510b
+EBUILD luv-1.44.2.0.ebuild 2311 BLAKE2B b5753a3c1ec20db6420ddba7c37483ab537ecaf981af4b0f39fef4788183dbfc444e2cb0fd627b85ea44aecef203b677529e64f696cca23b1b6f95c79dd77d2b SHA512 f013f7ee9fa7dc0956172133a05a23e1f059122a6c4fd5fef29c115ffafe575f988365fa11f7ac3b516900aa378785558bb8b594ad25e70534f1b82202585e06
 MISC metadata.xml 484 BLAKE2B eb035fd19fe978128b6742025f44fc233348a496de2628c80f67db2ae64717e4a3685eec1456f920052e406d15855e225987389a4e33d7caaa5b938418849ecf SHA512 4bf472b91b176e1af730ffb84fade9ab49590726107c73f6c37dac491df394b6779a50e658d062b1cedc0a05f1fb89463817945bc075df572e3e9d6adab04a2f
--- a/dev-lua/luv/luv-1.44.2.0.ebuild
+++ b/dev-lua/luv/luv-1.44.2.0.ebuild
@ -22,7 +22,7 @@ SRC_URI="

 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@ -1,6 +1,4 @@
 AUX abydos-0.5.0-fix-py3.10.patch 719 BLAKE2B e0607ecb3633642be5b2b034088b7dd097d9dab3acf44619a3fb9493b8cc91dee4b7fdfc2564d88d60ffb83991a95d1f71838e2b48968a1983cf491a59d15c91 SHA512 12730eb82a3186f62da662456fd6648437ac631a3f0278d5840919b13d2798c154115c60f2301560b64234c28b30c68bf761989c682e57cd34c6279e92dcb531
 DIST abydos-0.5.0.gh.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
-DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
-EBUILD abydos-0.5.0-r1.ebuild 981 BLAKE2B b7fed06f873295a9b8e9e63fbb74e9c1f22554680d278afaf7ef8ace71e5e7ca3f4dc736eb07f3125a01e67d1a224e5ab5378716954c230bb9cc48102efecc9b SHA512 5804aa55c3672d492e12299a7d7612eb3736429779bce20d7084e88d1b0ef5c9aef9f3397a92b0c02f00774e4754d2ab3e7afbb3507a92ad2e4cf66fd78db477
-EBUILD abydos-0.5.0-r2.ebuild 1017 BLAKE2B ec16a44c4b7533ab84d941a24e193f42555b78d2888bd923ada5d36aade9b5c5ab6004dc32cddd89f5a37943d4ba735cb90be49dd609002937b9c21562871fad SHA512 df39b0a9651d1ab7ff2ec54886a6ac6e089b0dac8e156c7d28bb0383823bbd48e00088f758d7cacb711875aa77350a7f5a0063f127a1da7e1488c2e8730dc5b2
+EBUILD abydos-0.5.0-r2.ebuild 1015 BLAKE2B 2889b268ac176647be3334bc3e59aa741cec7a024295415a192dba083637d4c0307dfaa04ed807fd8608d457bae69b81917129e0fd116d177383c8954d0c69af SHA512 148ebf90b3c3114010e8101fd4db7548e062ea1a45d89f1e7e332a7f70c64ce7d228771a2cf97d23b8f39fa592b9efbb0c9f09c5ac56d84f5a66dfb20d3fb566
 MISC metadata.xml 407 BLAKE2B f28b4d12169f91e75d4bdb117fef6bc8e3a1a1a9bce3498aa11a26d1ad71c486d4ee8a76084551d3563530a2d492c2f47b4d8f830e00d7379fe079ba1e3df8a8 SHA512 1738b7309d3a9f0e90c5716ac0376274d1f34bb3264d8a3bf69dfe020724417f1b89b1883eae34bba9cd0147b5f2e8962114a216a5e684fd10365505f684fac4
--- a/dev-python/abydos/abydos-0.5.0-r1.ebuild
+++ b/dev-python/abydos/abydos-0.5.0-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abydos NLP/IR library"
-HOMEPAGE="https://github.com/chrislit/abydos"
-SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-# Requires access to the internet
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/nltk[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
-# Extension error: You must configure the bibtex_bibfiles setting
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
--- a/dev-python/abydos/abydos-0.5.0-r2.ebuild
+++ b/dev-python/abydos/abydos-0.5.0-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.

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

 # Requires access to the internet
 RESTRICT="test"
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@ -1,3 +1,5 @@
 DIST asteval-0.9.27.tar.gz 41789 BLAKE2B 6db628dfc90479b605370e6cd4c3eb27a6fdabd2422016aab200ddb217fc5459df77ae99397145511600ae4a79e259c9e7c75c3be50bf5201e08915a76ca5571 SHA512 b56fb81f1055ab66868084edb89775ec87f40ee45563531bf4661ee65656e777b388856e691740af60b4a3891e872683768ac590a78fda2fed9173e613aa7263
+DIST asteval-0.9.28.gh.tar.gz 39784 BLAKE2B 99c74b7d9f01de07dc568a5276852e66dd6c520c45af91b9471bc6f9485ac50bc20bc96df804188a610bac01e8e34534e8bb157784afd6b1799ca97280e4c5ed SHA512 108652594a0eaaf009b8652ced9000ef7454d8f33fe844e74fb1dd78a2ead42a60d5ba68845c8d9c9d8570a70b5958519a6350d77c66257a7fa18de23802c3b0
 EBUILD asteval-0.9.27.ebuild 610 BLAKE2B cb14facf2eb312582fd5395da3514d891d1c45f3dc94db15918e746f5c4f56110fa47287353a1f95f68b48f783cec3434c75196964c174e0c3e9eb36ded0cbbd SHA512 4f10dbb6ed34ffc47f169e1bafe31508a95ff9425d6b7f35c37da19d2e19bfd979cd39c0e5a31a3ed8e85fde63d044da9527f5760232fe3b39ca3b93fe932112
+EBUILD asteval-0.9.28.ebuild 693 BLAKE2B 4632ac0d69b576cbacc9e1a143576a4498efe7526ad89b73e8c3d7258f4fa2e543035edb1402837c7cada3e059625e17fa3071e8417ae72dd101e9216c09de05 SHA512 3681b15c185bf4b082c32c8b4525e7a893f1d05c81165ceeba8b006f8e551bbf99a94b28da1ed09477cab107432764796a1b2c4e164e7b40fef0dffe527dd82c
 MISC metadata.xml 388 BLAKE2B 8167e3615c8fbf4fdbee5ac6aa354ed365c255ece5a3793a5a9b9db68206781230437f824360c5ff7223ee70c33da9f2c2be1d9b7c9d7f4413b9da82b1a96c2f SHA512 a4185b786faa55a63dedb33b0a2ec1900f2e9fca3887d1531963047be795271c4300c51238afeaab98f39778b1cdace3193b1fa4b3e400d83f7201392b09f221
--- a/dev-python/asteval/asteval-0.9.28.ebuild
+++ b/dev-python/asteval/asteval-0.9.28.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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="
+	https://newville.github.io/asteval/
+	https://github.com/newville/asteval/
+	https://pypi.org/project/asteval/
+"
+SRC_URI="
+	https://github.com/newville/asteval/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	epytest -o addopts=
+}
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@ -1,5 +1,3 @@
-DIST astroid-2.12.11.gh.tar.gz 436132 BLAKE2B ba3aa5766e669d1b509856cd8eb8cb90f6483b8459e6a2511945c4c54f28d86179b3420d6bfa26f54cf459926114d34dd2fe7d775f356eda17f995be860672a3 SHA512 1e8e364bcebce90d06f90494e2a029bfeae89a0dd3120400fa6ff5098ca05ec7c7f520336cc3b174ac007c81e272d774385c35f94762789b767d38e603c7d41d
 DIST astroid-2.12.12.gh.tar.gz 437277 BLAKE2B a1f549db526b1012e76e1da480e779a35971e8985f452eaf5ce1bc6735c5210db5c2282685dbaa2f1720a1e1fa6cf6f2152fbb8c782243cd11e09acc427774da SHA512 61047c1aa31b5b0a80c604194a91341c474062e2f1094316ff9b03641ecfe3ddf25b4a3b26356561f9c16d8b5599694ecef275ce5846792a18bcc0a7ad3e720f
-EBUILD astroid-2.12.11.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
-EBUILD astroid-2.12.12.ebuild 1817 BLAKE2B 8e495b2ba1a5ba50cd82944562d02f279cb9915cff1487ae13e3d752f0341213cb2be6b7a0ad3c88c9a0e09258c8b007ee557fdccfe821fb38d818015a141030 SHA512 18156ef33b1c5bde959cad1afc1309435eec1049e631edece13070713988d76b9ebe5574a15d64fd3098e62a7d74c3c3d6c1ebf500f6811aa7f76d35389d2617
+EBUILD astroid-2.12.12.ebuild 1809 BLAKE2B 989055cbea9fa3c74f80b54efe69005c1d9f802aa9c0b6c91105ed77dbafd3406e955e98c4acd8b51a5dfc5126bcef001fa00a8d6dce186cb8011ffcb1cd7a07 SHA512 46c0adf7b503d3716baadad6fc9fb1fe61dff5ca4e11c5225354cdd57b0afb1a05e66a8650dff8e76fdd45062e16ba89c639e24405238c175e6e715b4a3a313f
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
--- a/dev-python/astroid/astroid-2.12.11.ebuild
+++ b/dev-python/astroid/astroid-2.12.11.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
--- a/dev-python/astroid/astroid-2.12.12.ebuild
+++ b/dev-python/astroid/astroid-2.12.12.ebuild
@ -20,7 +20,7 @@ SRC_URI="

 LICENSE="LGPL-2.1+"
 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"

 # Version specified in pyproject.toml
 RDEPEND="
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@ -1,5 +1,3 @@
 DIST black-22.10.0.gh.tar.gz 1177403 BLAKE2B c8185f1cd16bf890ad0c75a50ccf211eb8e0d50a62654abc30ff6404818c323a08551d9a79194d05df6f4f92c4c7bca43b1d317243d84542f8eda3dcc0b2895c SHA512 ec03dd7b29becaabac1393d636ba394182c4fdacc57112980c76485f05e8fdf41e23cf8dc72dfdf530a5f060e709a0bc9d60d797e897020ae036e0a5410fc4b2
-DIST black-22.8.0.gh.tar.gz 1173503 BLAKE2B 851e2dedf35871dc07caaafbffa15aa91e18640a352df717e19dc98b48134af21343e36faf90899fedd700149f988f5385c18c2d01ca330ef6e7a721cbe41a38 SHA512 f9db2079aedb14a8d9388a2c0997ffd55c74636d487ef7a3ad86fcd038a3e5d3f63168a1bca266b3e3128cd8590a641bd4259be9c238a8df968c3c085682d3b6
-EBUILD black-22.10.0.ebuild 1466 BLAKE2B 072a2582f272391ea621754053f24db0a5fd7a7c2d2dfd5500f392111987987f29933da5cca4be26a7c33039698363f2a7328e93eb6a2c3b675167746fa373bd SHA512 fd34188e6961a7e31705995d12005fdc09765003d87910de17782d7a689556ab3a33586927f30c2595c2e3df14c4f20e9f5173183ac4bd3699ca04fdb1d39fd5
-EBUILD black-22.8.0.ebuild 1454 BLAKE2B 30813b617fd5de90fbea17ba485785b4ef5997a112c4d3c17310c368b32e06fae0622ebcb72d02a7ce0446871e9ddf3e3dd57b64b1c766da24376a935d154133 SHA512 05ead152cca0fd418d7e18bcc5d66a129e11825dcf2820f2f8d34b35e928742a117cc46e21db4acbfcf6ae628c1e6b99fd32c4d3bff20e31dce78b156ae3853e
+EBUILD black-22.10.0.ebuild 1458 BLAKE2B 732e396bcd769aaabe77a98e379bed54cb1a3f8546ae59df723e673d69e5ce48f8587433451ded9cd21d735c2fbe2164cc27a055e3a4e49e05b820de8932c5e2 SHA512 65fb488109e2e9418b8eda50d6301f54245ef725f17482b41eb5a5ff342a4618af5246f89ef1599b492ffd91ef8712c9509f374110f0b88dfbcbecf42508478f
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
--- a/dev-python/black/black-22.10.0.ebuild
+++ b/dev-python/black/black-22.10.0.ebuild
@ -20,7 +20,7 @@ SRC_URI="

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

 RDEPEND="
 	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
--- a/dev-python/black/black-22.8.0.ebuild
+++ b/dev-python/black/black-22.8.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# py3.11 blocked by mypy_extensions
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="The uncompromising Python code formatter"
-HOMEPAGE="
-	https://black.readthedocs.io/en/stable/
-	https://github.com/psf/black/
-	https://pypi.org/project/black/
-"
-SRC_URI="
-	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
-	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
-		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-pkg_postinst() {
-	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
-}
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -1,26 +1,8 @@
-DIST boto3-1.24.88.gh.tar.gz 543896 BLAKE2B 9dd2a18e3fb8d0a9f3a3a1fd7d0cceb491765690f99c7bd4200f37c66cbdb1e86dcdcdd09669d3175b97e762e6faabac3a2e5cba49136f42cba459e45f3ab67f SHA512 676528ca180c23834d1666b69292754e551a339914362da2708ff3f937c2eb04fe3b3dd1d4c6960eb8f5f7f58b1e0bcf13b1f52cc16a7c8d3bd025e9ea4ee109
 DIST boto3-1.24.96.gh.tar.gz 547933 BLAKE2B 63c347b3abb383f36e4109b2695014dda6b4dd159b8f0e878ea17bcd24c9605dcf403a120b15f63e9a335065a1e3254813998a435d5eb1663f0066f2e7797be6 SHA512 9c3ac6dba99904a54e4b06b02531c2388d235b1926cb5bd7b767c679632b613db4a0d453030295e5f4101efdb7a3df8aca08e3c2e92a6725dc3df733cef37d72
-DIST boto3-1.25.0.gh.tar.gz 548321 BLAKE2B 46371869420a12b067594efbaa0d0f6b8003e813c5c85511fdead9841489bd333fe1207cc5310fd663628560a3c570ce495f0234ecc72eb93dfa20b79532390f SHA512 7cd6443fdb67a7e2df440c9b1ec84f7d37040549ddcdfaf5ca41fbee3d47e99d995f0be8690f22c25422391734d664746d00c88bd59aa269285f8c0e038836f9
-DIST boto3-1.25.1.gh.tar.gz 548647 BLAKE2B 84a6560e39ea526d1a4fa744bb4cb8fc2f934254c5949a08e0f40f34c363b6cf077dec4f6325da61fd06f5e2d2e021494bc29bf5993213fedc43f5914e18f062 SHA512 dbd0606e2aa4bd4eb3a836fe8e6da20eec97f5c62b5b43009f7296d1a51eaf7eaec7ca8246be8e3db2181e574d5672d72ea18deb4fc73a7cf3f0fca64ab1dacc
-DIST boto3-1.25.2.gh.tar.gz 548880 BLAKE2B 765b16f0192cf6243a34428090234943553384d5422dcdc728b0da9ca303ca5eb860cb49d177191aa53c8818795bb620910c6f3e5a6f2bb9072fd96d1bcf0fa1 SHA512 8e702758923b384ed97803a35daf211e9754ea6967819e301034efb2c1394f05f4f899dac03b96e65480b55101a96d106fe08faa6f28fccd6d37a5e9d7d6cd2c
-DIST boto3-1.25.3.gh.tar.gz 549487 BLAKE2B f0c4f2dee25dff926ce5d0699bc6ff9a876ddd12b469759dd24deb22f037fbf37e013b234605ade2ab1712127f1362d0c5fcfdf8302df2c5b983b2bafa68f1a6 SHA512 3a6227dd10cba78b2f67802da953ca8ddfd0dfe3f7dd2e9a360b8e1a45488d12bece3f8a60729eb185e74c3c2dd95403a610f26ae281acdc6a820238660f86b4
-DIST boto3-1.25.4.gh.tar.gz 549950 BLAKE2B f9dfb94d2bfc3f11ac0e98b4ca1755157cf5d71b5b756a4b228bedf48b0d116de80ad1638789dcc1e44ec2d5ab2bf85923a566caf50a15141b3e04baa195b416 SHA512 77ddbd3ec3815d7fad99e918d2474ffedf2f0f5b35cd9f8fa68eaff0c1f4f7e6495c280e7fb6ef1b6f368103b2ecf11565b99636b34ca5a95038ff44a87088fa
 DIST boto3-1.25.5.gh.tar.gz 550814 BLAKE2B 85f345b635fe16a978853d21192f49804837b050539aba650195bf788c7912f8713aa3a826de6f5ae4c28c4c3795e7053a2105622757f3087579e827eda3487f SHA512 6f4cd909b7a6670f74df6c7cac4a140114a0e05f736ed23c5a53351c5c6505f02d40e81ad1314db86db67d16429b38f78708e9cc8ce2cb08f28742ec209c2755
-DIST boto3-1.26.0.gh.tar.gz 551306 BLAKE2B fb72315724321f1f41b7ff8f90eb5386b5361f049913ed87ac884140c405587ee0dc7acfc13300851566e96d12de16d3c6f1db52af44b27ea320c4e6deaaf2c9 SHA512 eafff7ba7792fb62d2ba93213588e1a034b6d51fcc7e8167dcf15e0276c3b499440d3ff340cb2145aedf2f432c0de563cbc69111543530c5b4a4705cd08871bf
-DIST boto3-1.26.1.gh.tar.gz 551830 BLAKE2B 85dff3350796fcb06ea927d469d5afdbe43c448cc5c267364edc2641d25aac8d33a76a3cae06cf414a52874bce626d88f15252f3273530c1a2a791791134fafa SHA512 d1ccea2a2155d22c765504597dfb185190c52f99e7b1c9210eedf9832d9a191d7bbb1205930682f906a7bf6316226836b61dbece5b54ca24dbc91073b0a41591
-DIST boto3-1.26.2.gh.tar.gz 552193 BLAKE2B 07b12ab669bc0eae08d4f74b8b8f0b979b90b75b24c87172bb2bda7d9a7051e41a6971d758c48b764da35b4e38ff02c0ba2a57971f70aed6e79517225e4f2461 SHA512 ce5362af3109d412de633f74ebb08d60c229ff7644c02c86e2692c2d85611269254be05041e0eedf88dda7e76e7f5d81a20abad6a3367c87585b7b52f7968a08
-DIST boto3-1.26.3.gh.tar.gz 552510 BLAKE2B 58c9040c1273cad53719f17a82c909fdd05a7f56b91e39b61dabfa75871a2d8b011acd8136c11101ee8e87c9e22c82075358c53b4e3fc6210e3b02438d747a2b SHA512 ba63aa8f6c5cf08031fd74661c52527153b02af5a08d4a8e9bfdcf11706e8573b56319195d7d74850a8d5e48174a8076ad8200877494ce3297f3d9a435b8765f
-EBUILD boto3-1.24.88.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
-EBUILD boto3-1.24.96.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.25.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+DIST boto3-1.26.4.gh.tar.gz 553689 BLAKE2B 0da69cfa0b05ab789fc59938562efb49c3c0a46ae0dd5ca84d5e5782f7ed78f4fae45fa38cfea27c2dbb59bff2604b7f09064d2f4f35578500d379ff9f34513e SHA512 2f7058c405145d66b92412f0941ec705c111132e87121cae3f4be9fd6db4cfee3c1bedc3d952badd5ead13e2e1a4e10d4a1a7bf73b7869225a7615d5038a9086
+EBUILD boto3-1.24.96.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-1.25.5.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.0.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.1.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.2.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
-EBUILD boto3-1.26.3.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.4.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
--- a/dev-python/boto3/boto3-1.24.88.ebuild
+++ b/dev-python/boto3/boto3-1.24.88.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.24.96.ebuild
+++ b/dev-python/boto3/boto3-1.24.96.ebuild
@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"

 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
--- a/dev-python/boto3/boto3-1.25.1.ebuild
+++ b/dev-python/boto3/boto3-1.25.1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.25.2.ebuild
+++ b/dev-python/boto3/boto3-1.25.2.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.25.3.ebuild
+++ b/dev-python/boto3/boto3-1.25.3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.25.4.ebuild
+++ b/dev-python/boto3/boto3-1.25.4.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.26.0.ebuild
+++ b/dev-python/boto3/boto3-1.26.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.26.1.ebuild
+++ b/dev-python/boto3/boto3-1.26.1.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.26.2.ebuild
+++ b/dev-python/boto3/boto3-1.26.2.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.26.3.ebuild
+++ b/dev-python/boto3/boto3-1.26.3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.26.4.ebuild
+++ b/dev-python/boto3/boto3-1.26.4.ebuild
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -1,26 +1,8 @@
-DIST botocore-1.27.88.gh.tar.gz 9703393 BLAKE2B b7152546ffd44fccc3607ce4fb0df586e192a68431d68f40063d6397d6005507118c49197e3bb0215ccc4ce6b075a2e95919dc0b2352da3562ba8b5675274ca4 SHA512 0cca62a8e357c8c345afa2ebfa8fa931aa75e323b93ecd63857db05fac7fcd83118012ee7f93921a31895721189995af3179f6ae62ee61cef68eda84edc88132
 DIST botocore-1.27.96.gh.tar.gz 9792299 BLAKE2B 7d4b388e0dd45a41c794ad8527287fb326c5e828c15998393936b817333055dfbc59f85365f074f6b3017715341d30fed4ea0de8e1ee24ee08d13eff36b369bf SHA512 1050c23a207d089af16e86404db0367936d186c23b8e1fcfa8ebb07737ad411c2771344d535edd5dde43f8473e45ad85c8e5c39f2ddb03449ead3c9daa746a22
-DIST botocore-1.28.0.gh.tar.gz 9815905 BLAKE2B 40c7a5eb9aaa851b682c85d4045f4e3fbdbf34f2933e5a97cd84109e71d6b442c1075122b83870da20cba79a84dfeb213e1df62bf761efbc60d729d672e9224f SHA512 a9700867564d07024527a27c13a9a1fc5a014865afe9fa2f39401abbefeb16fae753fbaf97e81536de946fbb515724d6bdde864868077fd40b4fdfa2b7a35b9c
-DIST botocore-1.28.1.gh.tar.gz 9820975 BLAKE2B 76e578cb3b41e923ced56b12b79b36c589ad64324b6057168c4e0d92c7165f7df3709a2ba968e593d004b43320ca94c3a4a118f91ae1ce8420703c5c6bcd1100 SHA512 8a7ef4a209f145f39f6305fb5ed118849d46dc1bd10be2d0ef9dcd066f4b3dd78e2b3d391903b3d1db3f8ef3c8bc880c40dc3f7a02b4555845fb20f2ceb75ef4
-DIST botocore-1.28.2.gh.tar.gz 9822124 BLAKE2B ff56b485cdc58811e809f39ddf250ff9f04a4da9b7bcfce7f26a8fae92f58828033434b02b7b25ccbff7815e37fb2980d7dc10523d6d4f7543dc811ad50d8d10 SHA512 df3531914c6af955069e3710fb8710a7a5080d783f5a51966df72b0c07e1c319b779770d2a1d0d64d107c1a01bc9f69a92d0cc6cbdae594a376908b67052fd18
-DIST botocore-1.28.3.gh.tar.gz 9829079 BLAKE2B 77010a262689d99530f6cfa89d3389828f0250f83819979cbffebbd47458ab01f45c5a2e10418e11b982fa9c7680334831b5bb2472cf25af97a8283036420ab8 SHA512 99273da875b0b8321182a1135a09d51c98e242f291ed7ec5a62ae0f9708f55dbd69def3d4bfbac590fab9fef41c7c79f7c87f71b6022f17bb232c3b5dfd9b9e7
-DIST botocore-1.28.4.gh.tar.gz 9830940 BLAKE2B a4f7148ff4ef77dab59b088e241f19cf072dbf0231aac36fdf2220660e3460b08d4f50bc8be6e9eacf169997124b58b27a0f8ab52c042741dc5c1cb43837b00e SHA512 7ce121333cd25f1eb2a99dca0edae21988ab6cd9a1e073e453c633dfacb88b45f40f07fe922bf8a52356ec41d819243785091e8c002c192c17bf89a4e626a380
 DIST botocore-1.28.5.gh.tar.gz 9842427 BLAKE2B ed185346c21eeb0d05b39b55e99e065d9a5448fbe8206de49b3c128d12f4aabe1f6258153710350783846d10e5e10a22ccf77f6d27345297ec64e7ce74e51b87 SHA512 8b41b79826a71ed31c27534129e959e0896d9f4cb1769b4f14f1760d173500563a579aa0e00aaff5058275d5b5e8b921fed34b12825cf16ba4e216b174e4bba5
-DIST botocore-1.29.0.gh.tar.gz 10570614 BLAKE2B 08c48caba9516cb7345204d426942779dc8e2060cd3b95f634fe6293f6314c6a825c3c75371a446c22365f855f888c86ce303f50b53ecb6348f3453c5c9b9cab SHA512 b35322e8636fbf9d1743e234889dd370f8cc4853eb0318ad55e563de7a3f3be47fe0842be1ead8fa7c4eaf455264aa7bc15c0a8313fc2343f82d419b7cad781b
-DIST botocore-1.29.1.gh.tar.gz 10572059 BLAKE2B d0adb21a47ae4e4b092a7965630b599e8ad7322e11f808bc18632e7bc79afacf743e5149aecad788fe8d6479a68e99b125fd07bd48e3b3bc5901784b3ca12423 SHA512 ce9b7d2b8a2a590993a3fad259ec3a7b038cad8234cad3e8fdbb5523db278e682a391f40e59811dfda3f312f8e5a158246f8654b7e08bfafe817a7e62ee5ef04
-DIST botocore-1.29.2.gh.tar.gz 10572801 BLAKE2B 3a2512deabf0780fa8ca112753a161c066de19757999c3b948f2e25c4954600ef7477e645b92b706493c0b973478e6f246eb18bb83256946e538fd720c9f5c3b SHA512 efc6229adc9f48ce23432609832de0d20d385217087a23006ede4cc0e415c52a7c80774c57b7a86b804ecd3b1fecd437c7d15d05582c3f585afb670969dbca9d
-DIST botocore-1.29.3.gh.tar.gz 10578018 BLAKE2B 26ef86833ad6cbc3786f7a5e40a6847d40c48571b3f5028e9d40570bf693bc68e2dd1f9536566a038e05854bc629664731d46fcc858e9d05d78f08a3fdfa8e17 SHA512 4000887b78882534e4d1e062186fee49e3fc66521d359fb3c22db009a23901cbbc35194b4eafdd1e4d6aaa398749588bc4f6c444692e5380a10856dc1c2e00d0
-EBUILD botocore-1.27.88.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
-EBUILD botocore-1.27.96.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.2.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.3.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.28.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+DIST botocore-1.29.4.gh.tar.gz 10587870 BLAKE2B e8007cc2e6aa82bd3223f13c5df0e94dcd6f90cfd86d6137723209191d95b7f1be8df3755eae9190aee44312b9980eb81a5a4ede4d326f4cdf3d4b43febb4486 SHA512 f164b1ab95ea34127d2cdaa6e0ec626e7f8849ac1d112e28384e5e1b105b7e482f386999da52d968023d0f35bff5c6b433b4117f98b85eb060887205fc2f55a4
+EBUILD botocore-1.27.96.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-1.28.5.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.0.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.1.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.2.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
-EBUILD botocore-1.29.3.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
+EBUILD botocore-1.29.4.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
--- a/dev-python/botocore/botocore-1.27.88.ebuild
+++ b/dev-python/botocore/botocore-1.27.88.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/botocore/botocore-1.27.96.ebuild
+++ b/dev-python/botocore/botocore-1.27.96.ebuild
@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi

 RDEPEND="
--- a/dev-python/botocore/botocore-1.28.1.ebuild
+++ b/dev-python/botocore/botocore-1.28.1.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/Show More
+++ b/Show More