diff --git a/app-admin/chezmoi/chezmoi-2.11.2.ebuild b/app-admin/chezmoi/chezmoi-2.11.2.ebuild
index d5b2619055..6a572929e2 100644
--- a/app-admin/chezmoi/chezmoi-2.11.2.ebuild
+++ b/app-admin/chezmoi/chezmoi-2.11.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit go-module bash-completion-r1
 
 DESCRIPTION="Manage your dotfiles across multiple machines, securely"
-HOMEPAGE="https://chezmoi.io"
+HOMEPAGE="https://chezmoi.io/"
 
 # Building this list can be done by:
 # cd $(mktemp -d)
diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
index e4e9913adc..f10c459a01 100644
--- a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
+++ b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P="CUSTOMRESCUECD-x86"
 DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
+HOMEPAGE="https://sourceforge.net/projects/customrescuecd/"
 SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
 
 LICENSE="GPL-3"
diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.6.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.6.ebuild
index d57a8059dc..97ae9bab28 100644
--- a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.6.ebuild
+++ b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.12.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P="CUSTOMRESCUECD-x86_64"
 DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
-HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
+HOMEPAGE="https://sourceforge.net/projects/customrescuecd/"
 SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
 
 LICENSE="GPL-3"
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 53b5101108..c368789b8f 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1 +1 @@
-DIST glance-23.0.0.tar.gz 2095878 BLAKE2B 9c47dc3005828d1d6e8e194d641abea67d1fc05cb4fd76a4f70c8906a036df2c5501984e1f81050e0c8719410b6226a699ead8b91a9ae14a9a5cd491743d3adf SHA512 97c11c95c8957fece373f009644e192468b0e2f74bd8ed78e5a99c549890a432c96e4a8a85c66bbcdac1278b3a2db1c3b7a01f779cfcf939a830557414f8cc14
+DIST glance-24.0.0.tar.gz 2100290 BLAKE2B 3f9774a1ff30974bf5986b9c64bd3b7aef63427ef75449daf29bd217b8a87d6edc9696e338d5f30abcc289e6d2f7fde25893c619ddd49acf483ebdf765663324 SHA512 a5a9a9d91f14f485cdebe6b2b96a0712b09cfbf2f03b13c3919d597dbef1bd58b0ab2b4aac386c52a25e6059c03d2e1a821b28827b7689c3272cde51d80f3809
diff --git a/app-admin/glance/files/glance.logrotate b/app-admin/glance/files/glance.logrotate
new file mode 100644
index 0000000000..b91cfd32ce
--- /dev/null
+++ b/app-admin/glance/files/glance.logrotate
@@ -0,0 +1,8 @@
+/var/log/glance/*.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+    copytruncate
+}
diff --git a/app-admin/glance/files/glance.sudoers b/app-admin/glance/files/glance.sudoers
new file mode 100644
index 0000000000..ebb61440de
--- /dev/null
+++ b/app-admin/glance/files/glance.sudoers
@@ -0,0 +1,3 @@
+Defaults:glance !requiretty
+
+glance ALL = (root) NOPASSWD: /usr/bin/glance-rootwrap /etc/glance/rootwrap.conf *
diff --git a/app-admin/glance/files/glance.tmpfiles b/app-admin/glance/files/glance.tmpfiles
new file mode 100644
index 0000000000..33619e3052
--- /dev/null
+++ b/app-admin/glance/files/glance.tmpfiles
@@ -0,0 +1,2 @@
+d /var/lib/glance 0750 glance glance -
+d /var/log/glance 0750 glance glance -
diff --git a/app-admin/glance/files/openstack-glance-api.service b/app-admin/glance/files/openstack-glance-api.service
new file mode 100644
index 0000000000..841d4e3156
--- /dev/null
+++ b/app-admin/glance/files/openstack-glance-api.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=OpenStack Image Service API server
+After=network.target httpd.service memcached.service etcd.service mysqld.service redis.service rabbitmq.service
+
+[Service]
+LimitNOFILE=131072
+LimitNPROC=131072
+Type=simple
+User=glance
+ExecStart=/usr/bin/glance-api --log-file=/var/log/glance/api.log
+PrivateTmp=true
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/app-admin/glance/glance-23.0.0.ebuild b/app-admin/glance/glance-24.0.0.ebuild
similarity index 80%
rename from app-admin/glance/glance-23.0.0.ebuild
rename to app-admin/glance/glance-24.0.0.ebuild
index 26203fab46..331a5d544c 100644
--- a/app-admin/glance/glance-23.0.0.ebuild
+++ b/app-admin/glance/glance-24.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
-inherit distutils-r1
+inherit distutils-r1 systemd tmpfiles
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="
@@ -23,17 +23,6 @@ IUSE="mysql postgres +sqlite +swift"
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	)
 	>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
@@ -50,16 +39,16 @@ RDEPEND="
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-5.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-limit-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-4.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
@@ -74,6 +63,19 @@ RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/os-win-4.0.1[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+
 	acct-user/glance
 	acct-group/glance
 "
@@ -108,6 +110,15 @@ REQUIRED_USE="
 
 distutils_enable_tests pytest
 
+python_compile_all() {
+	oslo-config-generator --config-file etc/oslo-config-generator/glance-api.conf  || die
+	oslo-config-generator --config-file etc/oslo-config-generator/glance-scrubber.conf || die
+	oslo-config-generator --config-file etc/oslo-config-generator/glance-cache.conf || die
+	oslo-config-generator --config-file etc/oslo-config-generator/glance-manage.conf || die
+	oslo-config-generator --config-file etc/oslo-config-generator/glance-image-import.conf || die
+	oslopolicy-sample-generator --config-file=etc/glance-policy-generator.conf || die
+}
+
 python_prepare_all() {
 	sed -i '/pysendfile/d' test-requirements.txt || die
 	sed -i '/^hacking/d' test-requirements.txt || die
@@ -126,6 +137,16 @@ python_install_all() {
 	keepdir /var/lib/glance/images
 	keepdir /var/lib/glance/scrubber
 
+	systemd_dounit "${FILESDIR}/openstack-glance-api.service"
+	newtmpfiles "${FILESDIR}/glance.tmpfiles" glance.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/glance.logrotate" glance
+
+	insinto /etc/sudoers.d
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/glance.sudoers" glance
+
 	insinto /etc/glance
 	insopts -m 0640 -o glance -g glance
 	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
diff --git a/app-admin/krapplet/krapplet-0.3.1.ebuild b/app-admin/krapplet/krapplet-0.3.1.ebuild
index 84a037e56c..3d63246e7f 100644
--- a/app-admin/krapplet/krapplet-0.3.1.ebuild
+++ b/app-admin/krapplet/krapplet-0.3.1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1 xdg
 
 DESCRIPTION="Krapplet (keyring applet): a Linux graphical password manager"
-HOMEPAGE="https://gitlab.com/hfernh/krapplet https://pypi.org/project/krapplet"
+HOMEPAGE="https://gitlab.com/hfernh/krapplet https://pypi.org/project/krapplet/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/app-crypt/certbot-dns-desec/certbot-dns-desec-1.2.0.ebuild b/app-crypt/certbot-dns-desec/certbot-dns-desec-1.2.0.ebuild
index 793e950780..fca623fc6d 100644
--- a/app-crypt/certbot-dns-desec/certbot-dns-desec-1.2.0.ebuild
+++ b/app-crypt/certbot-dns-desec/certbot-dns-desec-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="deSEC DNS Authenticator plugin for Certbot"
 HOMEPAGE="
-	https://pypi.org/project/certbot-dns-desec
+	https://pypi.org/project/certbot-dns-desec/
 	https://github.com/desec-io/certbot-dns-desec
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/app-dicts/dictd-gazetteer/dictd-gazetteer-1.3.ebuild b/app-dicts/dictd-gazetteer/dictd-gazetteer-1.3.ebuild
index 20fef7e22f..69b409b0d1 100644
--- a/app-dicts/dictd-gazetteer/dictd-gazetteer-1.3.ebuild
+++ b/app-dicts/dictd-gazetteer/dictd-gazetteer-1.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="The original U.S. Gazetteer Place and Zipcode Files for dict"
-HOMEPAGE="https://sourceforge.net/projects/dict-gazetteer"
+HOMEPAGE="https://sourceforge.net/projects/dict-gazetteer/"
 SRC_URI="mirror://sourceforge/project/dict-gazetteer/dict-gazetteer_${PV}.orig.tar.gz"
 S="${WORKDIR}/dict-gazetteer-${PV}"
 LICENSE="GPL-2 public-domain"
diff --git a/app-misc/hollywood/hollywood-1.22.ebuild b/app-misc/hollywood/hollywood-1.22.ebuild
index ca4167ff6d..8ee0f1237d 100644
--- a/app-misc/hollywood/hollywood-1.22.ebuild
+++ b/app-misc/hollywood/hollywood-1.22.ebuild
@@ -9,7 +9,7 @@ COMMIT="35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"
 
 DESCRIPTION="Fill your console with Hollywood melodrama technobabble"
 HOMEPAGE="
-	https://hollywood.computer
+	https://hollywood.computer/
 	https://github.com/dustinkirkland/hollywood
 "
 SRC_URI="https://github.com/dustinkirkland/hollywood/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
diff --git a/app-portage/gentoo-sweep/gentoo-sweep-0.1.2a.ebuild b/app-portage/gentoo-sweep/gentoo-sweep-0.1.2a.ebuild
index 9c526d9296..f71b81cc67 100644
--- a/app-portage/gentoo-sweep/gentoo-sweep-0.1.2a.ebuild
+++ b/app-portage/gentoo-sweep/gentoo-sweep-0.1.2a.ebuild
@@ -8,7 +8,7 @@ CMAKE_IN_SOURCE_BUILD=1
 inherit cmake
 
 DESCRIPTION="Check your gentoo installation for unwanted cruft, forgotten files"
-HOMEPAGE="https://sourceforge.net/projects/gentoo-sweep"
+HOMEPAGE="https://sourceforge.net/projects/gentoo-sweep/"
 SRC_URI="mirror://sourceforge/gentoo-sweep/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 LICENSE="GPL-2"
diff --git a/app-shells/zsh-history-to-fish/zsh-history-to-fish-0.3.0.ebuild b/app-shells/zsh-history-to-fish/zsh-history-to-fish-0.3.0.ebuild
index 5480e2359c..8326317f18 100644
--- a/app-shells/zsh-history-to-fish/zsh-history-to-fish-0.3.0.ebuild
+++ b/app-shells/zsh-history-to-fish/zsh-history-to-fish-0.3.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Bring your ZSH history to Fish shell"
 HOMEPAGE="
 	https://github.com/rsalmei/zsh-history-to-fish
-	https://pypi.org/project/portio
+	https://pypi.org/project/portio/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-R/RColorBrewer/Manifest b/dev-R/RColorBrewer/Manifest
index 1cc2fabf37..44985492bf 100644
--- a/dev-R/RColorBrewer/Manifest
+++ b/dev-R/RColorBrewer/Manifest
@@ -1 +1 @@
-DIST RColorBrewer_1.1-2.tar.gz 11532 BLAKE2B b1f52ee7732b6a94056a547148fb4d3125ea7c34b845474ffc4d2abcebc7bbf32557022454ced9b0c8cd2307e62c56cedceb5386adfd962b95e1748384e1f5fd SHA512 29eeecae274c57f2af3366d072fb6a61a1e0be64aae9393e10c7e92c3b98473b60b7042b532c49e0ce2f53e6dce1a728ddd6937bbc64cedcb3664a429c3e54da
+DIST RColorBrewer_1.1-3.tar.gz 11638 BLAKE2B f5d3c2ae82be0e46c1c7ca2d39ecbc63559a607d062e7ec2ad62c1cebe8327f81193edf8d7de88c1948a5e5507a290c4f1519fe9bed33792980d1526d9687c54 SHA512 1a5941906959f4f76570cad8a1b9b672e975195268ea30dc739d8381edc09299098df9d9612174bcef91d1190797cdb43ed0a5f7e7f2cb37625b2462c5f936d5
diff --git a/dev-R/RColorBrewer/RColorBrewer-1.1.2.ebuild b/dev-R/RColorBrewer/RColorBrewer-1.1.3.ebuild
similarity index 59%
rename from dev-R/RColorBrewer/RColorBrewer-1.1.2.ebuild
rename to dev-R/RColorBrewer/RColorBrewer-1.1.3.ebuild
index 04bcd99eed..59dc55ac35 100644
--- a/dev-R/RColorBrewer/RColorBrewer-1.1.2.ebuild
+++ b/dev-R/RColorBrewer/RColorBrewer-1.1.3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit R-packages
 
+MYPV=$(ver_rs 2 -)
+
 DESCRIPTION='ColorBrewer Palettes'
-SRC_URI="mirror://cran/src/contrib/RColorBrewer_1.1-2.tar.gz"
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
 KEYWORDS="~amd64"
 LICENSE='Apache-2.0'
diff --git a/dev-R/RInside/Manifest b/dev-R/RInside/Manifest
index 8fbb0a3208..e845194aea 100644
--- a/dev-R/RInside/Manifest
+++ b/dev-R/RInside/Manifest
@@ -1 +1 @@
-DIST RInside_0.2.16.tar.gz 80576 BLAKE2B ac61f01e0de6c4099db97753a4af93aa84a4ea84728e6e029bb31bb1fe76be1afc12aa0aa781a4049b512e85c7188bfa9d8a6172d869336fbe30a3d75e5d2c0b SHA512 367430d2243864532688aea17cabca45e9dfcaa357b5a19dfd8fa3c8878d0c38e55815feba00c27541e1a908507766bbe5a4b87274734fa1b66581da254fc215
+DIST RInside_0.2.17.tar.gz 81202 BLAKE2B 604b21535b6cc9be4dbe8e3822f76658adaf2f612ea4dd1db5baa2654e3c1cb447a9ff58d3b715ece27bae2922e720b09b09ac20121ba8e73fbd491e7f3cf231 SHA512 c055306162db6f725e890afc2cc6b6d1921f57249cd1b4c2188e7c5314436ae53861f36698e463b44e0dc7b94dd36bc90e8846b37af261571caadd2d792a631d
diff --git a/dev-R/RInside/RInside-0.2.16.ebuild b/dev-R/RInside/RInside-0.2.17.ebuild
similarity index 92%
rename from dev-R/RInside/RInside-0.2.16.ebuild
rename to dev-R/RInside/RInside-0.2.17.ebuild
index 9c4f456bea..6255b43ccf 100644
--- a/dev-R/RInside/RInside-0.2.16.ebuild
+++ b/dev-R/RInside/RInside-0.2.17.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
diff --git a/dev-R/rprojroot/Manifest b/dev-R/rprojroot/Manifest
index 2f30e7036a..682dd7d8b1 100644
--- a/dev-R/rprojroot/Manifest
+++ b/dev-R/rprojroot/Manifest
@@ -1 +1 @@
-DIST rprojroot_2.0.2.tar.gz 59967 BLAKE2B d07ca0631aca99c5ee167cb2410c97c2980be4e15a12e4d5e2123993572e5fdc7d1aff2be7afc9e806af19b719ea7f8c670b2e0785388dd4b06864fc67a75867 SHA512 36f9bcf1435709eea2325e2a0f681782083ae158eaca485af5fb9871c9a3429e8a3a94c4dae1741905d37d8e9538d35d6588fa3e901ef60601de344282497629
+DIST rprojroot_2.0.3.tar.gz 59939 BLAKE2B ccb1d8f06ada72aa666e7f81cfdf5ce77596fce543c525c80f6eb91a5239c78d42aa16f192d900f9a90fc98d8c283af1ec2eada755a2dff9147bcd03002ceca3 SHA512 ffe7e82e3647760f29a57ffa341026df76888ad4ff4cc29443c878b1f5b268f60b68d374f3579e4101601cdf84fbbbd8a9c996d3d84b23aa98ffe3710b82b73d
diff --git a/dev-R/rprojroot/rprojroot-2.0.2.ebuild b/dev-R/rprojroot/rprojroot-2.0.3.ebuild
similarity index 57%
rename from dev-R/rprojroot/rprojroot-2.0.2.ebuild
rename to dev-R/rprojroot/rprojroot-2.0.3.ebuild
index 85579b3468..00dc0f0053 100644
--- a/dev-R/rprojroot/rprojroot-2.0.2.ebuild
+++ b/dev-R/rprojroot/rprojroot-2.0.3.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
@@ -11,3 +11,13 @@ LICENSE='MIT'
 
 DEPEND=">=dev-lang/R-3.0.0"
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/covr
+	dev-R/knitr
+	dev-R/lifecycle
+	dev-R/mockr
+	dev-R/rmarkdown
+	>=dev-R/testthat-3.0.0
+	dev-R/withr
+"
diff --git a/dev-cpp/cli11/cli11-2.1.2.ebuild b/dev-cpp/cli11/cli11-2.1.2.ebuild
index a758cbac26..e83d6f9161 100644
--- a/dev-cpp/cli11/cli11-2.1.2.ebuild
+++ b/dev-cpp/cli11/cli11-2.1.2.ebuild
@@ -9,7 +9,7 @@ inherit cmake docs
 
 CATCH_PV=2.13.6
 DESCRIPTION="Command line parser for C++11"
-HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book"
+HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book/"
 SRC_URI="https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/CLI11-${PV}"
 
diff --git a/dev-cpp/cli11/cli11-2.2.0.ebuild b/dev-cpp/cli11/cli11-2.2.0.ebuild
index a758cbac26..e83d6f9161 100644
--- a/dev-cpp/cli11/cli11-2.2.0.ebuild
+++ b/dev-cpp/cli11/cli11-2.2.0.ebuild
@@ -9,7 +9,7 @@ inherit cmake docs
 
 CATCH_PV=2.13.6
 DESCRIPTION="Command line parser for C++11"
-HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book"
+HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book/"
 SRC_URI="https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/CLI11-${PV}"
 
diff --git a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
index 7c8af865dc..8311e6323b 100644
--- a/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
+++ b/dev-cpp/libstudxml/libstudxml-1.1.0_beta10.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing
 SRC_URI="https://pkg.cppget.org/1/beta/${PN}/${MY_P}.tar.gz"
 KEYWORDS='~amd64 ~x86'
 DESCRIPTION='Streaming XML pull parser/serializer for modern C++'
-HOMEPAGE='https://www.codesynthesis.com/projects/libstudxml'
+HOMEPAGE='https://www.codesynthesis.com/projects/libstudxml/'
 LICENSE='MIT'
 
 SLOT='0'
diff --git a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild b/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
index 45399ce123..2a94506495 100644
--- a/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
+++ b/dev-cpp/xdgpp/xdgpp-0_pre20201007.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DESCRIPTION="C++17 header-only implementation of the XDG Base Directory Specification"
-HOMEPAGE="https://sr.ht/~danyspin97/xdgpp"
+HOMEPAGE="https://sr.ht/~danyspin97/xdgpp/"
 SRC_URI="
 	https://git.sr.ht/~danyspin97/xdgpp/commit/d41f2b8189619f27aca1b6f1bf7b1ef4af8bb482.patch -> ${PN}-01.patch
 	https://git.sr.ht/~danyspin97/xdgpp/commit/3ca427d179412892a111b879a4253b146ba94b0c.patch -> ${PN}-02.patch
diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
index 526a2f7b52..e3e1edfbb7 100644
--- a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
+++ b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
@@ -8,7 +8,7 @@ COMMIT="13e5b90eecc79ec6704efb333c4c100187520e80"
 inherit autotools elisp-common java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="The Aldor Programming Language"
-HOMEPAGE="http://pippijn.github.io/aldor"
+HOMEPAGE="http://pippijn.github.io/aldor/"
 SRC_URI="
 	https://github.com/pippijn/aldor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 	doc? (
diff --git a/dev-libs/libnodave/libnodave-0.8.5.1-r2.ebuild b/dev-libs/libnodave/libnodave-0.8.5.1-r2.ebuild
index 3f50a47467..f303b1caa4 100644
--- a/dev-libs/libnodave/libnodave-0.8.5.1-r2.ebuild
+++ b/dev-libs/libnodave/libnodave-0.8.5.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic perl-module toolchain-funcs
 
 DESCRIPTION="Connect to and exchange data with Siemens PLCs"
-HOMEPAGE="https://sourceforge.net/projects/libnodave"
+HOMEPAGE="https://sourceforge.net/projects/libnodave/"
 SRC_URI="mirror://sourceforge/libnodave/libnodave-${PV}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-libs/memkind/memkind-1.11.0-r2.ebuild b/dev-libs/memkind/memkind-1.11.0-r2.ebuild
index 45310e91a7..f6d2be77a2 100644
--- a/dev-libs/memkind/memkind-1.11.0-r2.ebuild
+++ b/dev-libs/memkind/memkind-1.11.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit autotools linux-info python-any-r1 toolchain-funcs
 
 DESCRIPTION="user extensible heap manager built on top of jemalloc"
-HOMEPAGE="https://memkind.github.io/memkind"
+HOMEPAGE="https://memkind.github.io/memkind/"
 SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/dev-libs/memkind/memkind-1.13.0.ebuild b/dev-libs/memkind/memkind-1.13.0.ebuild
index 3736c38134..a7059c9f00 100644
--- a/dev-libs/memkind/memkind-1.13.0.ebuild
+++ b/dev-libs/memkind/memkind-1.13.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit autotools linux-info python-any-r1 toolchain-funcs
 
 DESCRIPTION="user extensible heap manager built on top of jemalloc"
-HOMEPAGE="https://memkind.github.io/memkind"
+HOMEPAGE="https://memkind.github.io/memkind/"
 SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/dev-ml/cstruct/Manifest b/dev-ml/cstruct/Manifest
index 4c0dd85090..2ad60d23e5 100644
--- a/dev-ml/cstruct/Manifest
+++ b/dev-ml/cstruct/Manifest
@@ -1 +1 @@
-DIST ocaml-ctruct-6.0.0.tar.gz 242357 BLAKE2B e3f86f134cbae8724c392ba4e4a2c178cc49150758e995c24069a061e420ea2d53b26242d62397efb6e4cd5ba114f197fcab573bd831627bda833be16eaac668 SHA512 5dae3fe9f35d02ca0dedef1a01ad1ed2f7d52b167248b3badbcf3cf88d94104d4b6974b225d199a36a96c2282b5fbcc92baa00f98d3895d98472300ad0f50b1e
+DIST ocaml-ctruct-6.0.1.tar.gz 243082 BLAKE2B 874ba34583bbc8b53c5b50ba038e2aa423fd704711194dcf99899239015d5fb383242b1d4654c1be2705fd80465e6da7e8eaa5265eceebca7b09dc036d4ebf40 SHA512 2f696b9dca1426d57f60fd4e997ee0c89b1af1a49e186e08c16911ceb03e9f89518a63faf4407b4a7e3c5f391d51979019e47a77f33961624d767a9e36146ca4
diff --git a/dev-ml/cstruct/cstruct-6.0.0-r2.ebuild b/dev-ml/cstruct/cstruct-6.0.1.ebuild
similarity index 100%
rename from dev-ml/cstruct/cstruct-6.0.0-r2.ebuild
rename to dev-ml/cstruct/cstruct-6.0.1.ebuild
diff --git a/dev-ml/ipaddr/Manifest b/dev-ml/ipaddr/Manifest
index ef471692e5..3bcc37e9df 100644
--- a/dev-ml/ipaddr/Manifest
+++ b/dev-ml/ipaddr/Manifest
@@ -1 +1 @@
-DIST ocaml-ipaddr-5.0.1.tar.gz 32964 BLAKE2B cd4f2ba145973c258b564752b3ea5bcd555aae466548d8745bd7a6219dc6d16350698eebcd7994a167e4166cffd822ac7bdc3316e2969a4185cc77d90d7aa267 SHA512 0e7984e2911d2a8aaba8ee28661288e7a1ce87bdb993bd910206e513a40c4fcf7272c73be72295a739f1254ccf9622e8b4aa448db0f599508c1e814020410ec8
+DIST ocaml-ipaddr-5.3.0.tar.gz 34247 BLAKE2B de7c059649ed1dfd32e02e7ec27d2c86cb470e7a3cdd3dd79ef4a5d935962970d5384e871c788f114309b3133e09b46cb7e647ace92a2e700edad9d863e016bc SHA512 ef7d720d4625fc0e147ac517efbfc8e4269b1ad2b864099e6552303784591c9fec5662177db31c64bf9e740bb834196a603bd97437499acd6d6c9b80f51818d5
diff --git a/dev-ml/ipaddr/ipaddr-5.0.1-r2.ebuild b/dev-ml/ipaddr/ipaddr-5.3.0.ebuild
similarity index 100%
rename from dev-ml/ipaddr/ipaddr-5.0.1-r2.ebuild
rename to dev-ml/ipaddr/ipaddr-5.3.0.ebuild
diff --git a/dev-ml/mirage-profile/Manifest b/dev-ml/mirage-profile/Manifest
index 0add7acf48..fd038d6503 100644
--- a/dev-ml/mirage-profile/Manifest
+++ b/dev-ml/mirage-profile/Manifest
@@ -1 +1 @@
-DIST mirage-profile-0.9.0.tar.gz 11633 BLAKE2B d55b73be2df42230666577be11e1c9138cadc8e1d895a1b58cec342adfac165c76a405298cd24d2d21e6caad12b9593599ba4c62c459e51cf9be58409edfb425 SHA512 9a1ba91cfe1454aa85a6f1f72c934d413a8bc4f4793689f309abeca9be22c66c3c3213e8d360ea62813c019e064573cb250d835656c6302429b8e7cbdb39fa2c
+DIST mirage-profile-0.9.1.tar.gz 11717 BLAKE2B decec88c0fd0eacbfe6a81c0d56c1d27c87a169ca6e4dec65cc7a15bfab600ad8ed11f46b428c4f3bdb2a915dc97d7a3cf40192b540a7246ff34ee3d77bc5330 SHA512 df13d3467309b62e05d34ac2161e6f575ec71c3eed647fc563e52419a9520e19584fa3647403ae0a94c185456a9558a4cafd11da5babfa5e41c7e85978fcd0fd
diff --git a/dev-ml/mirage-profile/mirage-profile-0.9.0-r2.ebuild b/dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild
similarity index 100%
rename from dev-ml/mirage-profile/mirage-profile-0.9.0-r2.ebuild
rename to dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild
diff --git a/dev-ml/xmlm/Manifest b/dev-ml/xmlm/Manifest
index e96019c4d8..fa2717989f 100644
--- a/dev-ml/xmlm/Manifest
+++ b/dev-ml/xmlm/Manifest
@@ -1 +1 @@
-DIST xmlm-1.3.0.tbz 25176 BLAKE2B 546f433386101c2460b0a8cadf94e383269e81792d068fa4c85d78117a5e65a64bd5e2fac0a5857d6bdefc7c511ae98cc77410b276ecb0300baf73d70ccb2251 SHA512 fd3b9ba8cd12321fd8d56e9ce829a7c8b121bff11cbf7ede58fa0280302fe0ba64f510360ff5b5182591faef660792db66db36e45f6355e3d22bb521f8e308fe
+DIST xmlm-1.4.0.tbz 26122 BLAKE2B dcc75836199eeca49967c4245b793b612c3ac83677dc4185d956437af63802759cc99190ad3ad036227706b4ecd4af938ed76d2f049b1273e81bf13b79e6316b SHA512 69f6112e6466952256d670fe1751fe4ae79e20d50f018ece1709eb2240cb1b00968ac7cee110771e0617a38ebc1cdb43e9d146471ce66ac1b176e4a1660531eb
diff --git a/dev-ml/xmlm/xmlm-1.3.0-r3.ebuild b/dev-ml/xmlm/xmlm-1.4.0.ebuild
similarity index 84%
rename from dev-ml/xmlm/xmlm-1.3.0-r3.ebuild
rename to dev-ml/xmlm/xmlm-1.4.0.ebuild
index bb7de9ee70..e470e5e5e6 100644
--- a/dev-ml/xmlm/xmlm-1.3.0-r3.ebuild
+++ b/dev-ml/xmlm/xmlm-1.4.0.ebuild
@@ -7,10 +7,10 @@ inherit findlib opam
 
 DESCRIPTION="Ocaml XML manipulation module"
 HOMEPAGE="
-	http://erratique.ch/software/xmlm
+	https://erratique.ch/software/xmlm
 	https://github.com/dbuenzli/xmlm
 "
-SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+SRC_URI="https://erratique.ch/software/${PN}/releases/${P}.tbz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
diff --git a/dev-python/Pyro5/Pyro5-5.13.1.ebuild b/dev-python/Pyro5/Pyro5-5.13.1.ebuild
index f194c261a1..bcce9edf85 100644
--- a/dev-python/Pyro5/Pyro5-5.13.1.ebuild
+++ b/dev-python/Pyro5/Pyro5-5.13.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Distributed object middleware for Python (RPC)"
 HOMEPAGE="
 	https://pyro5.readthedocs.io
-	https://pypi.org/project/Pyro5
+	https://pypi.org/project/Pyro5/
 	https://github.com/irmen/Pyro5
 "
 SRC_URI="https://github.com/irmen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.37.9.ebuild b/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.37.9.ebuild
index 6b1db65441..ca89b0b6be 100644
--- a/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.37.9.ebuild
+++ b/dev-python/SQLAlchemy-Utils/SQLAlchemy-Utils-0.37.9.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Various utility functions and datatypes for SQLAlchemy"
 HOMEPAGE="
 	https://github.com/kvesteri/sqlalchemy-utils
-	https://pypi.org/project/SQLAlchemy-Utils
+	https://pypi.org/project/SQLAlchemy-Utils/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/WSME/WSME-0.11.0.ebuild b/dev-python/WSME/WSME-0.11.0.ebuild
index ffb466fa5c..5ac6ded6dd 100644
--- a/dev-python/WSME/WSME-0.11.0.ebuild
+++ b/dev-python/WSME/WSME-0.11.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Simplify the writing of REST APIs, and extend them with additional protocols"
 HOMEPAGE="
 	https://opendev.org/x/wsme
-	https://pypi.org/project/WSME
+	https://pypi.org/project/WSME/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/XenAPI/XenAPI-2.14-r1.ebuild b/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
index 217c6982dd..261a2434d7 100644
--- a/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
+++ b/dev-python/XenAPI/XenAPI-2.14-r1.ebuild
@@ -9,9 +9,9 @@ inherit distutils-r1
 
 DESCRIPTION="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
 HOMEPAGE="
-	https://xenproject.org/developers/teams/xen-api
+	https://xenproject.org/developers/teams/xen-api/
 	https://github.com/xapi-project/xen-api
-	https://pypi.org/project/XenAPI
+	https://pypi.org/project/XenAPI/
 "
 SRC_URI="mirror://pypi/X/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/XenAPI/XenAPI-22.14.0.ebuild b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
index ff82bbb1d3..0ecf932e72 100644
--- a/dev-python/XenAPI/XenAPI-22.14.0.ebuild
+++ b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
@@ -10,9 +10,9 @@ inherit bash-completion-r1 distutils-r1 dune pam systemd
 
 DESCRIPTION="Xen API SDK, for communication with Citrix XenServer and Xen Cloud Platform"
 HOMEPAGE="
-	https://xenproject.org/developers/teams/xen-api
+	https://xenproject.org/developers/teams/xen-api/
 	https://github.com/xapi-project/xen-api
-	https://pypi.org/project/XenAPI
+	https://pypi.org/project/XenAPI/
 "
 SRC_URI="https://github.com/xapi-project/xen-api/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xen-api-${PV}"
diff --git a/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
index ac181b0197..7b98e3024c 100644
--- a/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
+++ b/dev-python/aiosqlite/aiosqlite-0.17.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="asyncio bridge to the standard sqlite3 module"
 HOMEPAGE="
 	https://aiosqlite.omnilib.dev
-	https://pypi.org/project/aiosqlite
+	https://pypi.org/project/aiosqlite/
 	https://github.com/jreese/aiosqlite
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/almost/almost-0.1.5.ebuild b/dev-python/almost/almost-0.1.5.ebuild
index 09e1e2cc70..82df851dfd 100644
--- a/dev-python/almost/almost-0.1.5.ebuild
+++ b/dev-python/almost/almost-0.1.5.ebuild
@@ -12,7 +12,7 @@ inherit distutils-r1
 DESCRIPTION="A helper for approximate comparison"
 HOMEPAGE="
 	https://github.com/sublee/almost
-	https://pypi.org/project/almost
+	https://pypi.org/project/almost/
 "
 SRC_URI="https://github.com/sublee/almost/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/aspectlib/aspectlib-1.5.2.ebuild b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
index 30b270f7cc..dbb4b0e0b5 100644
--- a/dev-python/aspectlib/aspectlib-1.5.2.ebuild
+++ b/dev-python/aspectlib/aspectlib-1.5.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="An aspect-oriented programming, monkey-patch and decorators library"
 HOMEPAGE="
 	https://github.com/ionelmc/python-aspectlib
-	https://pypi.org/project/python-aspectlib
+	https://pypi.org/project/python-aspectlib/
 "
 SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/autoflake/autoflake-1.4-r1.ebuild b/dev-python/autoflake/autoflake-1.4-r1.ebuild
index 370d5864ad..c4e72bbf28 100644
--- a/dev-python/autoflake/autoflake-1.4-r1.ebuild
+++ b/dev-python/autoflake/autoflake-1.4-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Removes unused imports and unused variables as reported by pyflakes"
 HOMEPAGE="
 	https://github.com/myint/autoflake
-	https://pypi.org/project/autoflake
+	https://pypi.org/project/autoflake/
 "
 SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/automaton/automaton-2.4.0.ebuild b/dev-python/automaton/automaton-2.4.0.ebuild
index dc7a22d3e8..434bed5ada 100644
--- a/dev-python/automaton/automaton-2.4.0.ebuild
+++ b/dev-python/automaton/automaton-2.4.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Friendly state machines for python."
 HOMEPAGE="
-	https://pypi.org/project/automaton
+	https://pypi.org/project/automaton/
 	https://opendev.org/openstack/automaton
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/avro/avro-1.11.0.ebuild b/dev-python/avro/avro-1.11.0.ebuild
index 0ef1b000d3..337ae10f59 100644
--- a/dev-python/avro/avro-1.11.0.ebuild
+++ b/dev-python/avro/avro-1.11.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Apache Avro is a data serialization system"
 HOMEPAGE="
-	https://pypi.org/project/avro
+	https://pypi.org/project/avro/
 	https://avro.apache.org
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
index d341f1f4e7..8ef2982d5f 100644
--- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
+++ b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="A set of third-party serializers for Betamax"
-HOMEPAGE="https://pypi.org/project/betamax-serializers https://gitlab.com/betamax/serializers"
+HOMEPAGE="https://pypi.org/project/betamax-serializers/ https://gitlab.com/betamax/serializers"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/billiard/billiard-3.6.4.0.ebuild b/dev-python/billiard/billiard-3.6.4.0.ebuild
index 7dc902fafa..e11b1aac4c 100644
--- a/dev-python/billiard/billiard-3.6.4.0.ebuild
+++ b/dev-python/billiard/billiard-3.6.4.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python multiprocessing fork"
 HOMEPAGE="
-	https://pypi.org/project/billiard
+	https://pypi.org/project/billiard/
 	https://github.com/celery/billiard
 "
 SRC_URI="https://github.com/celery/billiard/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/check-manifest/check-manifest-0.46.ebuild b/dev-python/check-manifest/check-manifest-0.46.ebuild
index 6e61178eff..b201cf09c4 100644
--- a/dev-python/check-manifest/check-manifest-0.46.ebuild
+++ b/dev-python/check-manifest/check-manifest-0.46.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Tool to check the completeness of MANIFEST.in for Python packages"
 HOMEPAGE="
 	https://github.com/mgedmin/check-manifest
-	https://pypi.org/project/check-manifest
+	https://pypi.org/project/check-manifest/
 "
 SRC_URI="https://github.com/mgedmin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild b/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild
index 3e61cb2dfa..4bf40e61f9 100644
--- a/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild
+++ b/dev-python/click-didyoumean/click-didyoumean-0.0.3.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Enable git-like did-you-mean feature in click"
 HOMEPAGE="
 	https://github.com/click-contrib/click-didyoumean
-	https://pypi.org/project/click-didyoumean
+	https://pypi.org/project/click-didyoumean/
 "
 SRC_URI="https://github.com/click-contrib/click-didyoumean/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/click-repl/click-repl-0.2.0.ebuild b/dev-python/click-repl/click-repl-0.2.0.ebuild
index a47cafaec9..a2cad4ed6b 100644
--- a/dev-python/click-repl/click-repl-0.2.0.ebuild
+++ b/dev-python/click-repl/click-repl-0.2.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Subcommand REPL for click apps"
 HOMEPAGE="
 	https://github.com/click-contrib/click-repl
-	https://pypi.org/project/click-repl
+	https://pypi.org/project/click-repl/
 "
 SRC_URI="https://github.com/click-contrib/click-repl/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/clickgen/clickgen-1.1.9.ebuild b/dev-python/clickgen/clickgen-1.1.9.ebuild
index f43097573a..29dc4b6a58 100644
--- a/dev-python/clickgen/clickgen-1.1.9.ebuild
+++ b/dev-python/clickgen/clickgen-1.1.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="X11 & Windows cursor building API"
-HOMEPAGE="https://github.com/ful1e5/clickgen https://pypi.org/project/clickgen"
+HOMEPAGE="https://github.com/ful1e5/clickgen https://pypi.org/project/clickgen/"
 SRC_URI="https://github.com/ful1e5/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/cotyledon/cotyledon-1.7.3.ebuild b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
index 12d80c5d40..b79d7bba78 100644
--- a/dev-python/cotyledon/cotyledon-1.7.3.ebuild
+++ b/dev-python/cotyledon/cotyledon-1.7.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Cotyledon provides a framework for defining long-running services"
 HOMEPAGE="
 	https://github.com/sileht/cotyledon
-	https://pypi.org/project/cotyledon
+	https://pypi.org/project/cotyledon/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/curio/curio-0.9.ebuild b/dev-python/curio/curio-0.9.ebuild
index 7267ef5ab8..14c93fc51e 100644
--- a/dev-python/curio/curio-0.9.ebuild
+++ b/dev-python/curio/curio-0.9.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Curio is a coroutine-based library for concurrent systems programming"
 HOMEPAGE="
 	https://github.com/dabeaz/curio
-	https://pypi.org/project/curio
+	https://pypi.org/project/curio/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/curio/curio-1.4-r1.ebuild b/dev-python/curio/curio-1.4-r1.ebuild
index 9749c58068..b1cf005346 100644
--- a/dev-python/curio/curio-1.4-r1.ebuild
+++ b/dev-python/curio/curio-1.4-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Curio is a coroutine-based library for concurrent systems programming"
 HOMEPAGE="
 	https://github.com/dabeaz/curio
-	https://pypi.org/project/curio
+	https://pypi.org/project/curio/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/curio/curio-1.5.ebuild b/dev-python/curio/curio-1.5.ebuild
index f5ab539db0..f68f7b80d7 100644
--- a/dev-python/curio/curio-1.5.ebuild
+++ b/dev-python/curio/curio-1.5.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Curio is a coroutine-based library for concurrent systems programming"
 HOMEPAGE="
 	https://github.com/dabeaz/curio
-	https://pypi.org/project/curio
+	https://pypi.org/project/curio/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/daiquiri/daiquiri-3.0.1.ebuild b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
index 9300fd7d0d..ebc7d00c44 100644
--- a/dev-python/daiquiri/daiquiri-3.0.1.ebuild
+++ b/dev-python/daiquiri/daiquiri-3.0.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python library to easily setup basic logging functionality"
 HOMEPAGE="
-	https://pypi.org/project/daiquiri
+	https://pypi.org/project/daiquiri/
 	https://github.com/jd/daiquiri
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/desktop-notifier/desktop-notifier-3.3.2.ebuild b/dev-python/desktop-notifier/desktop-notifier-3.3.2.ebuild
index 78ee1aafce..61f082bef1 100644
--- a/dev-python/desktop-notifier/desktop-notifier-3.3.2.ebuild
+++ b/dev-python/desktop-notifier/desktop-notifier-3.3.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="desktop-notifier is a Python library for cross-platform desktop notifications"
 HOMEPAGE="
 	https://desktop-notifier.readthedocs.io
-	https://pypi.org/project/desktop-notifier
+	https://pypi.org/project/desktop-notifier/
 	https://github.com/samschott/desktop-notifier
 "
 SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild b/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
index 82d2e329f2..830de8f38e 100644
--- a/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
+++ b/dev-python/desktop-notifier/desktop-notifier-3.4.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="desktop-notifier is a Python library for cross-platform desktop notifications"
 HOMEPAGE="
 	https://desktop-notifier.readthedocs.io
-	https://pypi.org/project/desktop-notifier
+	https://pypi.org/project/desktop-notifier/
 	https://github.com/samschott/desktop-notifier
 "
 SRC_URI="https://github.com/samschott/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/dotmap/Manifest b/dev-python/dotmap/Manifest
index d6b0b6516a..e144385b38 100644
--- a/dev-python/dotmap/Manifest
+++ b/dev-python/dotmap/Manifest
@@ -1,2 +1,2 @@
-DIST dotmap-1.3.25.tar.gz 12043 BLAKE2B e534f321786a14abb6cd1775b33cb51b332340febdbd44c13d6ccf4b4b679e5b52348e1e21e9e6458b5dc45299a2335bf05551794e3ddd668748c1b28543f393 SHA512 8270b9b042847565e21ede4ec29c00a51a84f9c819f6f0d80b24cc6e8d3524c3c09ca6bf7beeaf05a03b8a51e5d239d52996a55593a19326d8ebbbba349e2853
 DIST dotmap-1.3.26.tar.gz 12070 BLAKE2B 28023eebf6437530f3f1ee541f138eaffbc632f441bc9698e2329ab8d9894510e04122f797a77416cbe498fde5092f5c0a821615c4e9fbd1959c75cce94f7cfc SHA512 5083fec8f9e909f68f0fa12db8709ca064d0fd134230f6d0fe315c66613983290bf7de35db29d805013b13024babf250e9110308817265d4e70b9dea5b9a132f
+DIST dotmap-1.3.28.tar.gz 12097 BLAKE2B c172a3c4b8f4b10e2351d342cf38eed1ea8cac510eb4a66fa7df5660628fcf57056083af519f8360e78dce1d494185d2b09edfc7a4e7e604af658af15335fcc3 SHA512 9d16b1886884464cbe9df5d0af6426c869969767b9fee527cf108551d8f0d5d81f479d429350e31c89b9db2d3cc6d395945321f56688850dca7bfa2bbf273451
diff --git a/dev-python/dotmap/dotmap-1.3.25.ebuild b/dev-python/dotmap/dotmap-1.3.28.ebuild
similarity index 87%
rename from dev-python/dotmap/dotmap-1.3.25.ebuild
rename to dev-python/dotmap/dotmap-1.3.28.ebuild
index e934702e42..fb4d14f7a2 100644
--- a/dev-python/dotmap/dotmap-1.3.25.ebuild
+++ b/dev-python/dotmap/dotmap-1.3.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Dot access dictionary with dynamic hierarchy creation and ordered iteration"
 HOMEPAGE="
 	https://github.com/drgrib/dotmap
-	https://pypi.org/project/dotmap
+	https://pypi.org/project/dotmap/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild b/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild
index d2326342a0..74219f0622 100644
--- a/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild
+++ b/dev-python/etcd3gw/etcd3gw-1.0.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="A python client for etcd3 grpc-gateway v3 API"
-HOMEPAGE="https://pypi.org/project/etcd3gw"
+HOMEPAGE="https://pypi.org/project/etcd3gw/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/exifread/exifread-2.3.2.ebuild b/dev-python/exifread/exifread-2.3.2.ebuild
index 963e97a380..b152583dc5 100644
--- a/dev-python/exifread/exifread-2.3.2.ebuild
+++ b/dev-python/exifread/exifread-2.3.2.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 
 DESCRIPTION="Easy to use Python module to extract Exif metadata from tiff and jpeg files"
 HOMEPAGE="
-	https://pypi.org/project/ExifRead
+	https://pypi.org/project/ExifRead/
 	https://github.com/ianare/exif-py
 "
 SRC_URI="https://github.com/ianare/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild b/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
index b8190cfd87..8939603524 100644
--- a/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
+++ b/dev-python/fake-useragent/fake-useragent-0.1.11-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Up to date simple useragent faker with real world database"
 HOMEPAGE="
 		https://github.com/hellysmile/fake-useragent
-		https://pypi.org/project/fake-useragent
+		https://pypi.org/project/fake-useragent/
 "
 SRC_URI="https://github.com/hellysmile/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/fastavro/fastavro-1.4.7.ebuild b/dev-python/fastavro/fastavro-1.4.7.ebuild
index 45d430816b..eb3dabce31 100644
--- a/dev-python/fastavro/fastavro-1.4.7.ebuild
+++ b/dev-python/fastavro/fastavro-1.4.7.ebuild
@@ -18,7 +18,7 @@ inherit distutils-r1
 DESCRIPTION="Fast Avro for Python"
 HOMEPAGE="
 	https://github.com/fastavro/fastavro
-	https://pypi.org/project/fastavro
+	https://pypi.org/project/fastavro/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/filecheck/filecheck-0.0.22.ebuild b/dev-python/filecheck/filecheck-0.0.22.ebuild
index 02dd5d00d8..692b3b0d7b 100644
--- a/dev-python/filecheck/filecheck-0.0.22.ebuild
+++ b/dev-python/filecheck/filecheck-0.0.22.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python port of LLVM's FileCheck, flexible pattern matching file verifier"
-HOMEPAGE="https://pypi.org/project/filecheck"
+HOMEPAGE="https://pypi.org/project/filecheck/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild b/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild
index 50b5076061..895afb0ae7 100644
--- a/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild
+++ b/dev-python/googletrans/googletrans-4.0.0_rc1.ebuild
@@ -7,7 +7,7 @@ inherit distutils-r1
 
 MY_PV=${PV/_/}
 DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
-HOMEPAGE="https://pypi.org/project/googletrans https://github.com/ssut/py-googletrans"
+HOMEPAGE="https://pypi.org/project/googletrans/ https://github.com/ssut/py-googletrans"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-python/googletransx/googletransx-2.4.2-r1.ebuild b/dev-python/googletransx/googletransx-2.4.2-r1.ebuild
index a90aaafb3d..e26fbc72dd 100644
--- a/dev-python/googletransx/googletransx-2.4.2-r1.ebuild
+++ b/dev-python/googletransx/googletransx-2.4.2-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Free Google Translate API for Python. Translates totally free of charge."
-HOMEPAGE="https://pypi.org/project/googletransx"
+HOMEPAGE="https://pypi.org/project/googletransx/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gpxpy/gpxpy-1.4.2.ebuild b/dev-python/gpxpy/gpxpy-1.4.2.ebuild
index 70f5d93ce7..ddf9a2af4d 100644
--- a/dev-python/gpxpy/gpxpy-1.4.2.ebuild
+++ b/dev-python/gpxpy/gpxpy-1.4.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="GPX file parser and GPS track manipulation library"
 HOMEPAGE="
 	https://github.com/tkrajina/gpxpy
-	https://pypi.org/project/gpxpy
+	https://pypi.org/project/gpxpy/
 "
 SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
diff --git a/dev-python/graphene/graphene-3.0.0.ebuild b/dev-python/graphene/graphene-3.0.0.ebuild
index 341bfadd04..37939dd173 100644
--- a/dev-python/graphene/graphene-3.0.0.ebuild
+++ b/dev-python/graphene/graphene-3.0.0.ebuild
@@ -12,7 +12,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GraphQL Framework for Python"
 HOMEPAGE="https://graphene-python.org
-	https://pypi.org/project/graphene
+	https://pypi.org/project/graphene/
 	https://github.com/graphql-python/graphene
 "
 SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-python/graphene/graphene-3.0.0_beta7.ebuild b/dev-python/graphene/graphene-3.0.0_beta7.ebuild
index 132ac37152..02ef9589a4 100644
--- a/dev-python/graphene/graphene-3.0.0_beta7.ebuild
+++ b/dev-python/graphene/graphene-3.0.0_beta7.ebuild
@@ -12,7 +12,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GraphQL Framework for Python"
 HOMEPAGE="https://graphene-python.org
-	https://pypi.org/project/graphene
+	https://pypi.org/project/graphene/
 	https://github.com/graphql-python/graphene
 "
 SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-python/hstspreload/hstspreload-2021.10.1.ebuild b/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
index 99c1b0a235..7707b176aa 100644
--- a/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
+++ b/dev-python/hstspreload/hstspreload-2021.10.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Chromium HSTS Preload list as a Python package"
 HOMEPAGE="
 	https://hstspreload.org
 	https://github.com/sethmlarson/hstspreload
-	https://pypi.org/project/hstspreload
+	https://pypi.org/project/hstspreload/
 "
 SRC_URI="https://github.com/sethmlarson/hstspreload/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/httptools/httptools-0.1.1.ebuild b/dev-python/httptools/httptools-0.1.1.ebuild
index 1355cde239..40b4f0da7b 100644
--- a/dev-python/httptools/httptools-0.1.1.ebuild
+++ b/dev-python/httptools/httptools-0.1.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="httptools is a Python binding for the nodejs HTTP parser"
 HOMEPAGE="
 	https://github.com/MagicStack/httptools
-	https://pypi.org/project/httptools
+	https://pypi.org/project/httptools/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/hunter/hunter-3.3.8.ebuild b/dev-python/hunter/hunter-3.3.8.ebuild
index c2252fc8c0..c232f819e7 100644
--- a/dev-python/hunter/hunter-3.3.8.ebuild
+++ b/dev-python/hunter/hunter-3.3.8.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Hunter is a flexible code tracing toolkit"
 HOMEPAGE="
 	https://github.com/ionelmc/python-hunter
-	https://pypi.org/project/hunter
+	https://pypi.org/project/hunter/
 "
 SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/python-${P}"
diff --git a/dev-python/injector/injector-0.18.4.ebuild b/dev-python/injector/injector-0.18.4.ebuild
index 8ce21cf342..d010e7931d 100644
--- a/dev-python/injector/injector-0.18.4.ebuild
+++ b/dev-python/injector/injector-0.18.4.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python dependency injection framework"
 HOMEPAGE="
-		https://pypi.org/project/injector
+		https://pypi.org/project/injector/
 		https://github.com/alecthomas/injector
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/iuliia/iuliia-0.11.4.ebuild b/dev-python/iuliia/iuliia-0.11.4.ebuild
index 09e4665e27..0105638213 100644
--- a/dev-python/iuliia/iuliia-0.11.4.ebuild
+++ b/dev-python/iuliia/iuliia-0.11.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Transliterate Cyrillic to Latin in every possible way"
 HOMEPAGE="
 	https://dangry.ru/iuliia/
-	https://pypi.org/project/iuliia
+	https://pypi.org/project/iuliia/
 	https://github.com/nalgeon/iuliia-py
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/iuliia/iuliia-0.11.5.ebuild b/dev-python/iuliia/iuliia-0.11.5.ebuild
index 2c0ca18759..aacf5740fc 100644
--- a/dev-python/iuliia/iuliia-0.11.5.ebuild
+++ b/dev-python/iuliia/iuliia-0.11.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Transliterate Cyrillic to Latin in every possible way"
 HOMEPAGE="
 	https://dangry.ru/iuliia/
-	https://pypi.org/project/iuliia
+	https://pypi.org/project/iuliia/
 	https://github.com/nalgeon/iuliia-py
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/libusb1/libusb1-2.0.1.ebuild b/dev-python/libusb1/libusb1-2.0.1.ebuild
index 5aa2809704..1c7c295570 100644
--- a/dev-python/libusb1/libusb1-2.0.1.ebuild
+++ b/dev-python/libusb1/libusb1-2.0.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Pure-python wrapper for libusb-1.0"
-HOMEPAGE="https://github.com/vpelletier/python-libusb1 https://pypi.org/project/libusb1"
+HOMEPAGE="https://github.com/vpelletier/python-libusb1 https://pypi.org/project/libusb1/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
diff --git a/dev-python/manhole/manhole-1.8.0-r1.ebuild b/dev-python/manhole/manhole-1.8.0-r1.ebuild
index dfdfad7dbf..94e34d898c 100644
--- a/dev-python/manhole/manhole-1.8.0-r1.ebuild
+++ b/dev-python/manhole/manhole-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Debugging manhole for python application"
 HOMEPAGE="
 	https://github.com/ionelmc/python-manhole
-	https://pypi.org/project/manhole
+	https://pypi.org/project/manhole/
 "
 SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/python-${P}"
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index b8d05ba2e6..c26f095070 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1 +1,2 @@
 DIST os-testr-2.0.1.tar.gz 50884 BLAKE2B f709b33b168fade7faf8e13d0dbf3309cb9aa8e543133138cf7a3ac1d642670cbf803ea5e3b19a4cb2db9b5237837ea89835133e30fa09565af11b52385366cd SHA512 d4c5b84a18d05c0da8a017c045e7304b8fe6a3afc3295a76fa3ba192873f0e507e2fa6c3da423f7d77a82eb3e141225b1abd6875acd56c5a2a9d77a32476deff
+DIST os-testr-3.0.0.tar.gz 38684 BLAKE2B 4089416f1abb78a90848a5bfbcf38f8f6ac404e1776d3eae2d178aa6afc60f5408bce8787d6540eb987d9922706e0e2ec84b1879265b9ab8f62cc36ffa5ef9c0 SHA512 707515153f73cb02df138bfc3211f5309b7e2ed0a283c6bf0bd62e4666250b91353a5ac1adaaac750f5c3970ca40531f65574900d2797004815a945504f8e5fc
diff --git a/dev-python/os-testr/os-testr-3.0.0.ebuild b/dev-python/os-testr/os-testr-3.0.0.ebuild
new file mode 100644
index 0000000000..5f1abdc8b9
--- /dev/null
+++ b/dev-python/os-testr/os-testr-3.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="
+	https://opendev.org/openstack/os-testr
+	https://pypi.org/project/os-testr/
+	https://launchpad.net/os-testr
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/os-testr-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pg8000/pg8000-1.22.0.ebuild b/dev-python/pg8000/pg8000-1.22.0.ebuild
index cf4f3b41a0..f7d89f1627 100644
--- a/dev-python/pg8000/pg8000-1.22.0.ebuild
+++ b/dev-python/pg8000/pg8000-1.22.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A Pure-Python PostgreSQL Driver"
 HOMEPAGE="
 	https://github.com/tlocke/pg8000
-	https://pypi.org/project/pg8000
+	https://pypi.org/project/pg8000/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pifpaf/pifpaf-3.1.5.ebuild b/dev-python/pifpaf/pifpaf-3.1.5.ebuild
index 992dd7e5dc..095249c6e7 100644
--- a/dev-python/pifpaf/pifpaf-3.1.5.ebuild
+++ b/dev-python/pifpaf/pifpaf-3.1.5.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python fixtures and daemon managing tools for functional testing"
 HOMEPAGE="
-	https://pypi.org/project/pifpaf
+	https://pypi.org/project/pifpaf/
 	https://github.com/jd/pifpaf
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/portio/portio-0.5.ebuild b/dev-python/portio/portio-0.5.ebuild
index 0c51a30850..de8f8e6a70 100644
--- a/dev-python/portio/portio-0.5.ebuild
+++ b/dev-python/portio/portio-0.5.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Python low level port I/O for Linux x86"
 HOMEPAGE="
 	http://portio.inrim.it
-	https://pypi.org/project/portio
+	https://pypi.org/project/portio/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pproxy/pproxy-2.7.8.ebuild b/dev-python/pproxy/pproxy-2.7.8.ebuild
index 9709866772..88fecc3c1b 100644
--- a/dev-python/pproxy/pproxy-2.7.8.ebuild
+++ b/dev-python/pproxy/pproxy-2.7.8.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 optfeature
 DESCRIPTION="TCP/UDP asynchronous tunnel proxy implemented in Python3 asyncio"
 HOMEPAGE="
 	https://github.com/qwj/python-proxy
-	https://pypi.org/project/pproxy
+	https://pypi.org/project/pproxy/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/praw/praw-7.5.0.ebuild b/dev-python/praw/praw-7.5.0.ebuild
index ad348c2126..52c36126fb 100644
--- a/dev-python/praw/praw-7.5.0.ebuild
+++ b/dev-python/praw/praw-7.5.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python Reddit API Wrapper"
-HOMEPAGE="https://pypi.org/project/praw https://github.com/praw-dev/praw"
+HOMEPAGE="https://pypi.org/project/praw/ https://github.com/praw-dev/praw"
 SRC_URI="https://github.com/praw-dev/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/prawcore/prawcore-2.3.0.ebuild b/dev-python/prawcore/prawcore-2.3.0.ebuild
index 0c0dabb691..0aa14dec3e 100644
--- a/dev-python/prawcore/prawcore-2.3.0.ebuild
+++ b/dev-python/prawcore/prawcore-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Low-level communication layer for PRAW"
-HOMEPAGE="https://pypi.org/project/prawcore https://github.com/praw-dev/prawcore"
+HOMEPAGE="https://pypi.org/project/prawcore/ https://github.com/praw-dev/prawcore"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild b/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild
index fb2addfe83..a77ccb9212 100644
--- a/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild
+++ b/dev-python/psycopg2cffi/psycopg2cffi-2.9.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Implementation of the psycopg2 module using cffi. Compatible with Psycopg 2.5."
 HOMEPAGE="
 	https://github.com/chtd/psycopg2cffi
-	https://pypi.org/project/psycopg2cffi
+	https://pypi.org/project/psycopg2cffi/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/py3nvml/py3nvml-0.2.6.ebuild b/dev-python/py3nvml/py3nvml-0.2.6.ebuild
index 081d3b5420..516df5705f 100644
--- a/dev-python/py3nvml/py3nvml-0.2.6.ebuild
+++ b/dev-python/py3nvml/py3nvml-0.2.6.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Python 3 Bindings for the NVIDIA Management Library"
 HOMEPAGE="
-		https://pypi.org/project/py3nvml
+		https://pypi.org/project/py3nvml/
 		https://github.com/fbcotter/py3nvml
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
index 96857ca1ee..85b9ab34e8 100644
--- a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
+++ b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Python package providing assets from https://github.com/Kozea/pygal.js"
 HOMEPAGE="
 	https://github.com/ionelmc/python-pygaljs
-	https://pypi.org/project/pygaljs
+	https://pypi.org/project/pygaljs/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pymemcache/Manifest b/dev-python/pymemcache/Manifest
index 5e22f019e5..9f1071a635 100644
--- a/dev-python/pymemcache/Manifest
+++ b/dev-python/pymemcache/Manifest
@@ -1 +1,2 @@
 DIST pymemcache-3.5.1.tar.gz 65073 BLAKE2B cc3e5c6db665716c9f2eb6d99a53108484827fe38b51bdfff7799354a08b212064c71801d50683ea45c0a753ee787a634ef98adb69795e7245c5596a7716a162 SHA512 da69189e7fadc8417395075d033ed3cb72a485d4f2c4ec4deb5e2ec3cb43a34ee5558111903399f27b70f618be771f8c686513c7334d2ef507a0db959c4aa27b
+DIST pymemcache-3.5.2.tar.gz 65351 BLAKE2B e515629ffb483ece7b59c43b1cb3bd41ee70a8c1cbbc3b0cde5d41d7a5aa2f74f04a0f1d7eb4c82d77384cc32d3e8199cc78408b29ba689b19f5cd040e97c2f6 SHA512 7089b3fdf424735a1922685022a30f7984686f13401a13101e4745ea1c38a3888b1c380f859653da85889e95829f3b7c6226c3c55f838baf783465321433fda5
diff --git a/dev-python/pymemcache/pymemcache-3.5.2.ebuild b/dev-python/pymemcache/pymemcache-3.5.2.ebuild
new file mode 100644
index 0000000000..29ab6563e7
--- /dev/null
+++ b/dev-python/pymemcache/pymemcache-3.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive, fast, pure-Python memcached client"
+HOMEPAGE="
+	https://github.com/pinterest/pymemcache
+	https://pypi.org/project/pymemcache/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/future[${PYTHON_USEDEP}]
+		>=dev-python/gevent-21.12.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pylibmc-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/python-memcached-1.59[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.5.1-no-coverage.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pymp4/pymp4-1.2.0.ebuild b/dev-python/pymp4/pymp4-1.2.0.ebuild
index 808858d004..f0497cb682 100644
--- a/dev-python/pymp4/pymp4-1.2.0.ebuild
+++ b/dev-python/pymp4/pymp4-1.2.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A Python MP4 Parser and toolkit"
 HOMEPAGE="
 	https://github.com/beardypig/pymp4
-	https://pypi.org/project/pymp4
+	https://pypi.org/project/pymp4/
 "
 SRC_URI="https://github.com/beardypig/pymp4/archive/${PV}.tar.gz  -> ${P}.tar.gz"
 
diff --git a/dev-python/pyngus/pyngus-2.3.1.ebuild b/dev-python/pyngus/pyngus-2.3.1.ebuild
index 2e6df7ff2f..9a8a4c0e2c 100644
--- a/dev-python/pyngus/pyngus-2.3.1.ebuild
+++ b/dev-python/pyngus/pyngus-2.3.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A connection oriented messaging framework using QPID Proton"
 HOMEPAGE="
 	https://github.com/kgiusti/pyngus
-	https://pypi.org/project/pyngus
+	https://pypi.org/project/pyngus/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/pynmea2/pynmea2-1.18.0.ebuild b/dev-python/pynmea2/pynmea2-1.18.0.ebuild
index 39ff8e2c16..352061922b 100644
--- a/dev-python/pynmea2/pynmea2-1.18.0.ebuild
+++ b/dev-python/pynmea2/pynmea2-1.18.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Python library for the NMEA 0183 protcol"
 HOMEPAGE="
 	https://github.com/Knio/pynmea2
-	https://pypi.org/project/pynmea2
+	https://pypi.org/project/pynmea2/
 "
 SRC_URI="https://github.com/Knio/pynmea2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pypandoc/Manifest b/dev-python/pypandoc/Manifest
index 633327a825..59a93f827f 100644
--- a/dev-python/pypandoc/Manifest
+++ b/dev-python/pypandoc/Manifest
@@ -1,2 +1,2 @@
-DIST pypandoc-1.7.2.tar.gz 27900 BLAKE2B f09d1e3431717be44ea396ee44d2d00c11ed0e181d7f79d6be98536b9474972efe146e7c94eb571ab3f7dd2acf32ed53581d4b738497650c37a91e54ead5985e SHA512 95387c18768e480869eac334e5dcfc4ea978033d423de055d616a4a1ef015fe1fbc6a25405c086811621f4ad2d599c9fa245e740de5504baaf801bc522a6fb29
 DIST pypandoc-1.7.4.tar.gz 30526 BLAKE2B 44ea2083e014874e4fc5ce9ce8d2dcff64319e7d0d77baffc61fa0d0c2a7fd209642f706eaf4ad258b65a4f0ad8851a9ea02d38d0db4e71c136b972a5934cb79 SHA512 01a7165974ca844b55c387e8ed9b5278c43b5879ca6ea51e0aafab9f035667d37fc06a52a5c0820e18b321ddd5185e53a49561c84e157cb0ead76c7f84d0bcc1
+DIST pypandoc-1.7.5.tar.gz 23186705 BLAKE2B 2718e2c4485a10e2a1f78e59b893b8041fcbfd6fd3393c8fcf429625fb0fbe0a0f83229323579e58fb40b6fb85fe018ecc7b597de7774e20e2736f301761fc9f SHA512 bbd5e96a98b1030aa7dfbeaea12dc5c053e9b3182c0feca6d6cec6eba9c148662a628cbe12b1ddf8a4f2891df98fe8f60fc1bde0d5d2f60664dd3e412974655f
diff --git a/dev-python/pypandoc/pypandoc-1.7.2.ebuild b/dev-python/pypandoc/pypandoc-1.7.5.ebuild
similarity index 92%
rename from dev-python/pypandoc/pypandoc-1.7.2.ebuild
rename to dev-python/pypandoc/pypandoc-1.7.5.ebuild
index 4e5cda380b..26ff6c3da4 100644
--- a/dev-python/pypandoc/pypandoc-1.7.2.ebuild
+++ b/dev-python/pypandoc/pypandoc-1.7.5.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.7.4-dont-install-examples.patch" )
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild b/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild
index 44da12eccd..d314d11ae4 100644
--- a/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild
+++ b/dev-python/pytest-instafail/pytest-instafail-0.4.2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Plugin for pytest that shows failures and errors instantly"
 HOMEPAGE="
 	https://github.com/pytest-dev/pytest-instafail
-	https://pypi.org/project/pytest-instafail
+	https://pypi.org/project/pytest-instafail/
 "
 SRC_URI="https://github.com/pytest-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.3.ebuild b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.3.ebuild
index 1cccc52b47..816f671540 100644
--- a/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.3.ebuild
+++ b/dev-python/pytest-pythonpath/pytest-pythonpath-0.7.3.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Plugin for adding to the PYTHONPATH from the pytests.ini file before tests run"
 HOMEPAGE="
 	https://github.com/bigsassy/pytest-pythonpath
-	https://pypi.org/project/pytest-pythonpath
+	https://pypi.org/project/pytest-pythonpath/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
index 68ac62e890..7d7d00ea3a 100644
--- a/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
+++ b/dev-python/python-dbus-next/python-dbus-next-0.2.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="python-dbus-next is a Python library for DBus"
 HOMEPAGE="
 	https://github.com/altdesktop/python-dbus-next
-	https://pypi.org/project/dbus-next
+	https://pypi.org/project/dbus-next/
 "
 SRC_URI="https://github.com/altdesktop/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild b/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild
index 5cb9f5c20a..74b52d3679 100644
--- a/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild
+++ b/dev-python/python-json-logger/python-json-logger-2.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Standard python logging to output log data as json objects"
 HOMEPAGE="
 	https://github.com/madzak/python-json-logger
-	https://pypi.org/project/python-json-logger
+	https://pypi.org/project/python-json-logger/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild b/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild
index 0c2ce51e6e..628dadf7a9 100644
--- a/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild
+++ b/dev-python/python-pkcs11/python-pkcs11-0.7.0.ebuild
@@ -14,7 +14,7 @@ inherit distutils-r1 docs
 DESCRIPTION="PKCS#11 (Cryptoki) support for Python"
 HOMEPAGE="
 	https://github.com/danni/python-pkcs11
-	https://pypi.org/project/python-pkcs11
+	https://pypi.org/project/python-pkcs11/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild b/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild
index c6e00f16aa..55a58cd486 100644
--- a/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild
+++ b/dev-python/python-troveclient/python-troveclient-7.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/openstack/python-troveclient
 	https://opendev.org/openstack/python-troveclient
 	https://launchpad.net/python-troveclient
-	https://pypi.org/project/python-troveclient
+	https://pypi.org/project/python-troveclient/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/scramp/scramp-1.4.1.ebuild b/dev-python/scramp/scramp-1.4.1.ebuild
index 4b1a8a9e91..120968e4f1 100644
--- a/dev-python/scramp/scramp-1.4.1.ebuild
+++ b/dev-python/scramp/scramp-1.4.1.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of the SCRAM authentication protocol."
 HOMEPAGE="
-	https://pypi.org/project/scramp
+	https://pypi.org/project/scramp/
 	https://github.com/tlocke/scramp
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index fc94d35020..205e496c9a 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Python implementation of the systemd sd_notify protocol"
 HOMEPAGE="
 	https://github.com/bb4242/sdnotify
-	https://pypi.org/project/sdnotify
+	https://pypi.org/project/sdnotify/
 "
 SRC_URI="https://github.com/bb4242/${PN}/archive/refs/tags/v${PV}.tar.gz -> bb4242-${P}.tar.gz"
 
diff --git a/dev-python/skills/skills-0.3.0.ebuild b/dev-python/skills/skills-0.3.0.ebuild
index f3a62bf862..233b949942 100644
--- a/dev-python/skills/skills-0.3.0.ebuild
+++ b/dev-python/skills/skills-0.3.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="Python Implementation of the TrueSkill, Glicko and Elo Ranking Algorithms"
 HOMEPAGE="
 	https://github.com/McLeopold/PythonSkills
-	https://pypi.org/project/skills
+	https://pypi.org/project/skills/
 "
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
 
diff --git a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
index 749cade411..c7b9009909 100644
--- a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="Apache2 licensed Python sorted collections library"
 HOMEPAGE="
-	https://pypi.org/project/sortedcollections
+	https://pypi.org/project/sortedcollections/
 	https://github.com/grantjenks/python-sortedcollections
 "
 SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild b/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
index edcfda288c..d2a0b6b246 100644
--- a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Sphinx plugin to automatically document click-based applications"
 HOMEPAGE="
 	https://github.com/click-contrib/sphinx-click
-	https://pypi.org/project/sphinx-click
+	https://pypi.org/project/sphinx-click/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild b/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
index b148c95016..ee44722ea1 100644
--- a/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
+++ b/dev-python/sphinxcontrib-fulltoc/sphinxcontrib-fulltoc-1.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="python-dbus-next is a Python library for DBus"
 HOMEPAGE="
 	https://github.com/sphinx-contrib/fulltoc
-	https://pypi.org/project/sphinxcontrib-fulltoc
+	https://pypi.org/project/sphinxcontrib-fulltoc/
 	https://sphinxcontrib-fulltoc.readthedocs.io
 "
 SRC_URI="https://github.com/sphinx-contrib/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild b/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild
index 95458e8255..3c6ba0131d 100644
--- a/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild
+++ b/dev-python/sphinxcontrib-restbuilder/sphinxcontrib-restbuilder-0.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A Sphinx builder/writer to output reStructuredText (rst) files"
 HOMEPAGE="
 	https://github.com/sphinx-contrib/restbuilder
-	https://pypi.org/project/sphinxcontrib-restbuilder
+	https://pypi.org/project/sphinxcontrib-restbuilder/
 "
 SRC_URI="https://github.com/sphinx-contrib/restbuilder/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${P/sphinxcontrib-/}"
diff --git a/dev-python/stone/stone-3.3.1.ebuild b/dev-python/stone/stone-3.3.1.ebuild
index a02a6f1168..09fba448ad 100644
--- a/dev-python/stone/stone-3.3.1.ebuild
+++ b/dev-python/stone/stone-3.3.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The Official Api Spec Language for Dropbox"
 HOMEPAGE="
 	https://www.dropbox.com/developers
 	https://github.com/dropbox/stone
-	https://pypi.org/project/stone
+	https://pypi.org/project/stone/
 "
 SRC_URI="https://github.com/dropbox/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/survey/survey-3.4.3.ebuild b/dev-python/survey/survey-3.4.3.ebuild
index d377c2dba9..b2c41aad58 100644
--- a/dev-python/survey/survey-3.4.3.ebuild
+++ b/dev-python/survey/survey-3.4.3.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="A simple library for creating beautiful interactive prompts"
 HOMEPAGE="
 	https://github.com/Exahilosys/survey
-	https://pypi.org/project/survey
+	https://pypi.org/project/survey/
 "
 SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/taskflow/taskflow-4.6.3.ebuild b/dev-python/taskflow/taskflow-4.6.3.ebuild
index 979bf1a338..a864a46488 100644
--- a/dev-python/taskflow/taskflow-4.6.3.ebuild
+++ b/dev-python/taskflow/taskflow-4.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different
 HOMEPAGE="
 	https://github.com/openstack/taskflow
 	https://opendev.org/openstack/taskflow
-	https://pypi.org/project/taskflow
+	https://pypi.org/project/taskflow/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/testrepository/testrepository-0.0.20-r200.ebuild b/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
index cbbca339e0..c8cf81bc67 100644
--- a/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20-r200.ebuild
@@ -72,7 +72,7 @@ inherit distutils-r1
 DESCRIPTION="A repository of test results"
 HOMEPAGE="
 	https://launchpad.net/testrepository
-	https://pypi.org/project/testrepository
+	https://pypi.org/project/testrepository/
 	https://github.com/testing-cabal/testrepository
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/thriftrw/thriftrw-1.8.1.ebuild b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
index fa1bb0c3bf..843024557f 100644
--- a/dev-python/thriftrw/thriftrw-1.8.1.ebuild
+++ b/dev-python/thriftrw/thriftrw-1.8.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN}-python"
 DESCRIPTION="A Thrift encoding library for Python"
 HOMEPAGE="
 	https://github.com/thriftrw/thriftrw-python
-	https://pypi.org/project/thriftrw
+	https://pypi.org/project/thriftrw/
 "
 SRC_URI="https://github.com/thriftrw/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index bbe31eadcd..08ee81f74b 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1 +1,2 @@
 DIST tooz-2.10.1.tar.gz 95627 BLAKE2B 046ac561f235c54be4a7984fb8d4f9c55e59a19284c9a2565d4001e78c55bf79e0247669e544dd8f4d4d78a3874282da92fbec05f615b561740cf7246042ecd8 SHA512 c968561ea950e2da3be47c4bb1bdc2cb5e0de62ce7f9bf371f455185b0587085b8224a853a183a9b1a8d5221ed054fa0b80da29fb6bfb1ac88b9793476f9c87c
+DIST tooz-2.11.0.tar.gz 95997 BLAKE2B a61199586e58ec6bb63133137c91445df9c284a65b91125fa73e8c19efa37a5b5da039be94bc73b983f7a83dfa2b34d4d6cd7eb702823fa5eaca9429984fc323 SHA512 feb9217908bb986aeeffe92ae765b948edb1c1311eeb011b19b7bfdccb9b94dec82139e6056bbdbbffa79b208fc9ef22d1e100f75d6e9c61f7352dee3523ab8f
diff --git a/dev-python/tooz/tooz-2.11.0.ebuild b/dev-python/tooz/tooz-2.11.0.ebuild
new file mode 100644
index 0000000000..1c1b420b04
--- /dev/null
+++ b/dev-python/tooz/tooz-2.11.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="
+	https://opendev.org/openstack/tooz
+	https://pypi.org/project/tooz/
+	https://launchpad.net/python-tooz
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+
+		dev-python/etcd3[${PYTHON_USEDEP}]
+		dev-python/etcd3gw[${PYTHON_USEDEP}]
+		dev-python/pymemcache[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sysv_ipc[${PYTHON_USEDEP}]
+		dev-python/zake[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# allow usage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests \
+		-e tooz.tests.test_coordination.TestAPI \
+		-e tooz.tests.test_memcache.TestMemcacheDriverFailures.test_client_failure_join \
+		-e tooz.tests.test_memcache.TestMemcacheDriverFailures.test_client_failure_leave \
+		-e tooz.tests.test_partitioner \
+		|| die
+}
diff --git a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
index 08a2b9b280..db9872861c 100644
--- a/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
+++ b/dev-python/trueskill/trueskill-0.4.5_p20191014.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Python Implementation of the TrueSkill Algorithm"
 HOMEPAGE="
 	https://trueskill.org
 	https://github.com/sublee/trueskill
-	https://pypi.org/project/trueskill
+	https://pypi.org/project/trueskill/
 "
 SRC_URI="https://github.com/sublee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/types-requests/Manifest b/dev-python/types-requests/Manifest
index b6786729d5..31b65555d8 100644
--- a/dev-python/types-requests/Manifest
+++ b/dev-python/types-requests/Manifest
@@ -1,2 +1,2 @@
-DIST types-requests-2.27.14.tar.gz 10258 BLAKE2B 28fefde40669a2e7298ced14e64c22a0a96f7891690023b202dfdf31cb5369130afd11d1b00ed879b78cfd487dc489c617287487e0d1db27041970661be5c8be SHA512 8f25e448688a01319432743849f27aa35e406e23bb5a6ebf43d07875db87d19359ee61831b772777df1bd5674cacd570bdadd05eb1f2eb03979509c9d966be9f
 DIST types-requests-2.27.15.tar.gz 10503 BLAKE2B 2c5c1939a9a03f217a947922de2f4c0a5d60e58ef71f03b645a7c9565388c8d325631fa0fd05fc98e0355e14721c2498bbf2eb360826f6b27a4e567ee4859f74 SHA512 8831e5a9b8928e9fc356f3996ee11d548551657026afba3909372ee2e89928757f9e2d434d7adcc41fb1567a439b3f679375ee188d62459b61390beb63753239
+DIST types-requests-2.27.16.tar.gz 10528 BLAKE2B d3a70d56d01046ea832fc75f5c1c00fa1bd01bb3a92f29785a4e0f67863b46b3ffae7a5b799e992f3baac3d05b4623598befa5b30fdd1bfc4e040eb701933a2f SHA512 62bc651f23b15dbae09d7a06eecaf7922322a573edd67dd259d31933c22dd7af9d84bca632fce55dc766ce7e3ad233d4dabf9df6393ccec52b2f5317e52e975f
diff --git a/dev-python/types-requests/types-requests-2.27.14.ebuild b/dev-python/types-requests/types-requests-2.27.16.ebuild
similarity index 100%
rename from dev-python/types-requests/types-requests-2.27.14.ebuild
rename to dev-python/types-requests/types-requests-2.27.16.ebuild
diff --git a/dev-python/uharfbuzz/Manifest b/dev-python/uharfbuzz/Manifest
index 75a0e506a5..55295a1ffc 100644
--- a/dev-python/uharfbuzz/Manifest
+++ b/dev-python/uharfbuzz/Manifest
@@ -1 +1,2 @@
 DIST uharfbuzz-0.23.0.tar.gz 36287 BLAKE2B 6f03aa991d53b6fe093879a0cb5d09b5065ad4fb31453f74323f540aadcdace2430ccdc0a466cddc43a356bb1dd62f066537074a208c1b56d51d43c4eb2062ee SHA512 8cacb54a3d48db29f025bd9eb72133e9a11cf61f6b8064cb91c5399e875e7b46f592bb3c4b284741a161f534bea5771f9c471489c8082ee768953b5948ee2c09
+DIST uharfbuzz-0.24.1.tar.gz 36603 BLAKE2B 3da4b1a7e3b2b3cc8928c06ad7a80c00ddc3f34807788d827c8e558d9a9b48e3688cb38e26e5ea2414b274d62328be4c5a4dbd6e627d45c49ff7d11c6573e643 SHA512 c1451f3aea7a6e076a621a8931e8de0222122f3788ac7ef7a0174f32a1a625c8f245d4ba0e9835387071ab8cfa7351d3e245afe6b94319c178cc6cc7fc337707
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.24.1.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.24.1.ebuild
new file mode 100644
index 0000000000..0449967f53
--- /dev/null
+++ b/dev-python/uharfbuzz/uharfbuzz-0.24.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Streamlined Cython bindings for the HarfBuzz shaping engine"
+HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
+SRC_URI="https://github.com/harfbuzz/uharfbuzz/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=media-libs/harfbuzz-4.0.0[experimental(-)]"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.28.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-2.1[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.31[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-system-harfbuzz.patch" )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+	export USE_SYSTEM_HARFBUZZ=1
+}
diff --git a/dev-python/vttlib/vttlib-0.11.0.ebuild b/dev-python/vttlib/vttlib-0.11.0.ebuild
index 0712dbb237..42e9ca0ea5 100644
--- a/dev-python/vttlib/vttlib-0.11.0.ebuild
+++ b/dev-python/vttlib/vttlib-0.11.0.ebuild
@@ -14,7 +14,7 @@ inherit distutils-r1
 DESCRIPTION="Dump, merge and compile Visual TrueType data in UFO3 with FontTools"
 HOMEPAGE="
 	https://github.com/daltonmaag/vttLib
-	https://pypi.org/project/vttlib
+	https://pypi.org/project/vttlib/
 "
 SRC_URI="mirror://pypi/${MYP:0:1}/${MYPN}/${MYP}.zip"
 
diff --git a/dev-python/webpy/webpy-0.62.ebuild b/dev-python/webpy/webpy-0.62.ebuild
index 083e62602a..0051918ae2 100644
--- a/dev-python/webpy/webpy-0.62.ebuild
+++ b/dev-python/webpy/webpy-0.62.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A web framework for python that is as simple as it is powerful"
 HOMEPAGE="
 	https://webpy.org
 	https://github.com/webpy/webpy
-	https://pypi.org/project/web.py
+	https://pypi.org/project/web.py/
 "
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/wrapio/wrapio-2.0.0.ebuild b/dev-python/wrapio/wrapio-2.0.0.ebuild
index 1d6d750ec3..b0ab5e932c 100644
--- a/dev-python/wrapio/wrapio-2.0.0.ebuild
+++ b/dev-python/wrapio/wrapio-2.0.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Handling event-based streams in Python"
 HOMEPAGE="
 	https://github.com/Exahilosys/wrapio
-	https://pypi.org/project/wrapio
+	https://pypi.org/project/wrapio/
 	"
 SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild b/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
index b0deec3300..3f2c5e9f07 100644
--- a/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
+++ b/dev-python/wsgi_intercept/wsgi_intercept-1.9.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="wsgi_intercept installs a WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.org/project/wsgi-intercept"
+HOMEPAGE="https://pypi.org/project/wsgi-intercept/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-util/gammaray/gammaray-2.11.3.ebuild b/dev-util/gammaray/gammaray-2.11.3.ebuild
index d31d81afc5..f181b0f47e 100644
--- a/dev-util/gammaray/gammaray-2.11.3.ebuild
+++ b/dev-util/gammaray/gammaray-2.11.3.ebuild
@@ -7,7 +7,7 @@ CMAKE_REMOVE_MODULES_LIST=( BackwardConfig )
 inherit cmake optfeature virtualx xdg
 
 DESCRIPTION="High-level runtime introspection tool for Qt applications"
-HOMEPAGE="https://www.kdab.com/gammaray https://github.com/KDAB/GammaRay"
+HOMEPAGE="https://www.kdab.com/gammaray/ https://github.com/KDAB/GammaRay"
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
diff --git a/dev-util/gftools/Manifest b/dev-util/gftools/Manifest
index 210355f8e2..e204848705 100644
--- a/dev-util/gftools/Manifest
+++ b/dev-util/gftools/Manifest
@@ -1,3 +1,3 @@
 DIST GlyphsInfo-e33ccf3515cc5b8005a3a50b4163663623649d20.tar.gz 576525 BLAKE2B 306146533d15e412e8e18f072a1fd55770310fd7a85e0a8cb956f1262622e40776b60c1bb729701b419c155970870a55a398cf01257e0b4f4a338c8714232c79 SHA512 7481f524273e73cbb7827ee6ddf9ae63852b44440e9ef5097c6fea643e99912195f0257e9140ca17738a208559c36d8dbec51ec9ec5f24cd9510d5989378be13
-DIST gftools-0.9.2.tar.gz 4640316 BLAKE2B 9fad40044c6d66fb8f6fe69d8f67bae62828954136b14d44108098b60f77babc964508d229eda9018fc1fd3312f1f8ecc0a6ad5f067cea71a504b58ce8d2f691 SHA512 e60d358c4754b0177532ef5f84a50734ea4a203275f13e262852819522901ac16e0e502a883eafcf6e868faa07f17440a58f923927a826364212452d96944db8
 DIST gftools-0.9.4.tar.gz 4645902 BLAKE2B e74e94d195bb3c49f453dec09372dfa2d42fc8c2abba79a23106dc605f94992efd2c239b7ace8b96e4677629cbf230c4e08d379683aebd1a0a60b6fdc4aeff1e SHA512 ab26899b844f60cbe9a15f9ad01675a3e317c64590339efcc3efc1bfb67b5a05364dfefd7dc3433246c6b5c50bd89a42d438398b4535c04782ca67c192935a3b
+DIST gftools-0.9.5.tar.gz 4649591 BLAKE2B 8bb31da074b973718c4354a2e7eafaedbe5a45927f108c16ebcf3b8f8764647800cc83b5c079d66bd54426896278bba80008e855d27a3c3c20f1aa76178f1aa5 SHA512 d996147df5be58cdb5cfd5399afd71c4f88e6199e023e749216351be8cbe1f43061b871d80961e8be13936da6d331bea19f9361e3ec5a50a66c104814117d87b
diff --git a/dev-util/gftools/files/gftools-setup.diff b/dev-util/gftools/files/gftools-setup.diff
deleted file mode 100644
index 9227b85488..0000000000
--- a/dev-util/gftools/files/gftools-setup.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -72,7 +72,6 @@ setup(
- #                      see: https://github.com/fontforge/fontforge/issues/2048
-         'setuptools',
-         'FontTools[ufo]',
--        'Flask',
-         'absl-py',
-         'glyphsLib',
-         'PyGithub',
diff --git a/dev-util/gftools/files/gftools-tests.diff b/dev-util/gftools/files/gftools-tests.diff
deleted file mode 100644
index c2c2124af7..0000000000
--- a/dev-util/gftools/files/gftools-tests.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Lib/gftools/tests/test_qa.py
-+++ b/Lib/gftools/tests/test_qa.py
-@@ -1,5 +1,6 @@
- import subprocess
- import unittest
-+import pytest
- import tempfile
- import os
- 
-@@ -38,6 +39,7 @@ class TestQA(unittest.TestCase):
-             self.assertTrue("Fontbakery" in os.listdir(qa_out))
- 
-     def test_diff_github_fonts_vs_googlefonts_vf(self):
-+        if not 'GH_TOKEN' in os.environ.keys(): pytest.skip("GH_TOKEN not provided")
-         with tempfile.TemporaryDirectory() as qa_out:
-             subprocess.call(
-                 [
---- a/Lib/gftools/tests/test_stat.py
-+++ b/Lib/gftools/tests/test_stat.py
-@@ -373,7 +373,7 @@ def test_gen_stat_tables_from_config(var
-         - name: Italic
-           value: 1
-     """
--    config = yaml.load(config_text)
-+    config = yaml.safe_load(config_text)
-     gen_stat_tables_from_config(config, var_fonts)
-     roman, italic = var_fonts
- 
diff --git a/dev-util/gftools/gftools-0.9.2.ebuild b/dev-util/gftools/gftools-0.9.5.ebuild
similarity index 97%
rename from dev-util/gftools/gftools-0.9.2.ebuild
rename to dev-util/gftools/gftools-0.9.5.ebuild
index d67dad3d86..e197ff1052 100644
--- a/dev-util/gftools/gftools-0.9.2.ebuild
+++ b/dev-util/gftools/gftools-0.9.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 COMMIT="e33ccf3515cc5b8005a3a50b4163663623649d20"
 DISTUTILS_SINGLE_IMPL=1
@@ -52,6 +52,7 @@ RDEPEND="
 		dev-python/skia-pathops[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/hyperglot[${PYTHON_USEDEP}]
+		>=dev-python/fontFeatures-1.6.2[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="
diff --git a/games-misc/gay/gay-1.2.8.ebuild b/games-misc/gay/gay-1.2.8.ebuild
index 17f5680230..13c3e5047d 100644
--- a/games-misc/gay/gay-1.2.8.ebuild
+++ b/games-misc/gay/gay-1.2.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Colour your text / terminal to be more gay"
-HOMEPAGE="https://pypi.org/project/gay https://github.com/ms-jpq/gay"
+HOMEPAGE="https://pypi.org/project/gay/ https://github.com/ms-jpq/gay"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/games-server/among-sus/among-sus-20210519.ebuild b/games-server/among-sus/among-sus-20210519.ebuild
index 58d869c9ed..1642a2adf9 100644
--- a/games-server/among-sus/among-sus-20210519.ebuild
+++ b/games-server/among-sus/among-sus-20210519.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 COMMIT="554e60bf52e3fa931661b9414189a92bb8f69d78"
 DESCRIPTION="Among Us, but it's a text adventure"
-HOMEPAGE="https://sr.ht/~martijnbraam/among-sus"
+HOMEPAGE="https://sr.ht/~martijnbraam/among-sus/"
 SRC_URI="https://tildegit.org/tildeverse/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
diff --git a/gui-apps/tessen/metadata.xml b/gui-apps/tessen/metadata.xml
index 56ee527ada..55e9ef0318 100644
--- a/gui-apps/tessen/metadata.xml
+++ b/gui-apps/tessen/metadata.xml
@@ -9,7 +9,6 @@
 		<remote-id type="github">ayushnix/tessen</remote-id>
 	</upstream>
 	<use>
-		<flag name="dmenu">Enable dmenu backend</flag>
 		<flag name="bemenu">Enable bemenu backend</flag>
 		<flag name="rofi">Enable rofi backend</flag>
 		<flag name="wofi">Enable wofi backend</flag>
diff --git a/gui-apps/tessen/tessen-2.1.2.ebuild b/gui-apps/tessen/tessen-2.1.2.ebuild
index c0d5cf2f4d..a215da0bfe 100644
--- a/gui-apps/tessen/tessen-2.1.2.ebuild
+++ b/gui-apps/tessen/tessen-2.1.2.ebuild
@@ -3,24 +3,39 @@
 
 EAPI=8
 
+inherit optfeature
+
 DESCRIPTION="an interactive menu to autotype and copy pass and gopass data"
 HOMEPAGE="https://github.com/ayushnix/tessen"
-SRC_URI="https://github.com/ayushnix/tessen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ayushnix/${PN}.git"
+else
+	SRC_URI="https://github.com/ayushnix/tessen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+pass gopass dmenu bemenu wofi rofi"
+IUSE="+pass gopass bemenu wofi rofi"
 
 REQUIRED_USE="|| ( pass gopass )
-	|| ( dmenu bemenu wofi rofi )"
+	|| ( bemenu wofi rofi )"
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dmenu? ( x11-misc/dmenu )
 	bemenu? ( dev-libs/bemenu )
 	wofi? ( gui-apps/wofi )
 	rofi? ( x11-misc/rofi )
 	pass? ( app-admin/pass )
 	gopass? ( app-admin/gopass )"
 BDEPEND=""
+
+pkg_postinst() {
+	optfeature "autotype support" gui-apps/wtype
+	optfeature "clipboard support" gui-apps/wl-clipboard
+	optfeature "URL opening support" x11-misc/xdg-utils
+	optfeature "OTP support" app-admin/pass-otp
+	optfeature "notifications support" x11-libs/libnotify
+}
diff --git a/gui-apps/tessen/tessen-9999.ebuild b/gui-apps/tessen/tessen-9999.ebuild
new file mode 100644
index 0000000000..a215da0bfe
--- /dev/null
+++ b/gui-apps/tessen/tessen-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="an interactive menu to autotype and copy pass and gopass data"
+HOMEPAGE="https://github.com/ayushnix/tessen"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ayushnix/${PN}.git"
+else
+	SRC_URI="https://github.com/ayushnix/tessen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pass gopass bemenu wofi rofi"
+
+REQUIRED_USE="|| ( pass gopass )
+	|| ( bemenu wofi rofi )"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	bemenu? ( dev-libs/bemenu )
+	wofi? ( gui-apps/wofi )
+	rofi? ( x11-misc/rofi )
+	pass? ( app-admin/pass )
+	gopass? ( app-admin/gopass )"
+BDEPEND=""
+
+pkg_postinst() {
+	optfeature "autotype support" gui-apps/wtype
+	optfeature "clipboard support" gui-apps/wl-clipboard
+	optfeature "URL opening support" x11-misc/xdg-utils
+	optfeature "OTP support" app-admin/pass-otp
+	optfeature "notifications support" x11-libs/libnotify
+}
diff --git a/gui-wm/cage/cage-0.1.3.ebuild b/gui-wm/cage/cage-0.1.3.ebuild
index 45916603c4..c5d073332c 100644
--- a/gui-wm/cage/cage-0.1.3.ebuild
+++ b/gui-wm/cage/cage-0.1.3.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A Wayland kiosk"
-HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage"
+HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/gui-wm/cage/cage-0.1.4.ebuild b/gui-wm/cage/cage-0.1.4.ebuild
index f1fd3416c1..b463a1277f 100644
--- a/gui-wm/cage/cage-0.1.4.ebuild
+++ b/gui-wm/cage/cage-0.1.4.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A Wayland kiosk"
-HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage"
+HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild
index f1fd3416c1..b463a1277f 100644
--- a/gui-wm/cage/cage-9999.ebuild
+++ b/gui-wm/cage/cage-9999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="A Wayland kiosk"
-HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage"
+HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/media-fonts/linja-pona/linja-pona-4.2.ebuild b/media-fonts/linja-pona/linja-pona-4.2.ebuild
index 65769fcc04..3b39f6c94c 100644
--- a/media-fonts/linja-pona/linja-pona-4.2.ebuild
+++ b/media-fonts/linja-pona/linja-pona-4.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit font
 
 DESCRIPTION="Font for sitelen pona, a script for toki pona"
-HOMEPAGE="http://musilili.net/linja-pona https://github.com/janSame/linja-pona"
+HOMEPAGE="http://musilili.net/linja-pona/ https://github.com/janSame/linja-pona"
 SRC_URI="https://drive.google.com/uc?export=download&id=1k4wO30a6KsScjR0GzJdLlbQY54tpZGpW -> ${P}.otf"
 S="${WORKDIR}"
 
diff --git a/media-fonts/linja-pona/linja-pona-4.9.ebuild b/media-fonts/linja-pona/linja-pona-4.9.ebuild
index f8ee37bb57..9fc2d9f65b 100644
--- a/media-fonts/linja-pona/linja-pona-4.9.ebuild
+++ b/media-fonts/linja-pona/linja-pona-4.9.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit font
 
 DESCRIPTION="Font for sitelen pona, a script for toki pona"
-HOMEPAGE="http://musilili.net/linja-pona https://github.com/janSame/linja-pona"
+HOMEPAGE="http://musilili.net/linja-pona/ https://github.com/janSame/linja-pona"
 SRC_URI="https://drive.google.com/uc?export=download&id=1ukFvjXku_0Sdqq3u4oHlPLhTlR2J9b3I -> ${P}.otf"
 S="${WORKDIR}"
 
diff --git a/media-gfx/fontbakery/fontbakery-0.7.38.ebuild b/media-gfx/fontbakery/fontbakery-0.7.38.ebuild
index 38edfea429..92fc34a04f 100644
--- a/media-gfx/fontbakery/fontbakery-0.7.38.ebuild
+++ b/media-gfx/fontbakery/fontbakery-0.7.38.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
 DESCRIPTION="Font quality assurance tool"
 HOMEPAGE="
 	https://github.com/googlefonts/fontbakery
-	https://pypi.org/project/fontbakery
+	https://pypi.org/project/fontbakery/
 "
 SRC_URI="https://github.com/googlefonts/fontbakery/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-gfx/qview/qview-4.0.ebuild b/media-gfx/qview/qview-4.0.ebuild
index 839f0f56f2..b3826a9172 100644
--- a/media-gfx/qview/qview-4.0.ebuild
+++ b/media-gfx/qview/qview-4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Practical and minimal image viewer"
-HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview"
+HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview/"
 SRC_URI="https://github.com/jurplel/qView/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/qView-${PV}"
 
diff --git a/media-gfx/qview/qview-5.0.ebuild b/media-gfx/qview/qview-5.0.ebuild
index 72842e6732..6d0e3b2f66 100644
--- a/media-gfx/qview/qview-5.0.ebuild
+++ b/media-gfx/qview/qview-5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Practical and minimal image viewer"
-HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview"
+HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview/"
 SRC_URI="https://github.com/jurplel/qView/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/qView-${PV}"
 
diff --git a/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild b/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
index 4bf17bc511..1aeff550c4 100644
--- a/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
+++ b/media-plugins/argotlunar-bin/argotlunar-bin-2.06-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 DESCRIPTION="Argotlunar is a sound granulator. Binary Linux VST"
-HOMEPAGE="http://mourednik.github.io/argotlunar"
+HOMEPAGE="http://mourednik.github.io/argotlunar/"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/media-sound/add64/add64-3.8.0.ebuild b/media-sound/add64/add64-3.8.0.ebuild
index 022b43bdf3..1296426109 100644
--- a/media-sound/add64/add64-3.8.0.ebuild
+++ b/media-sound/add64/add64-3.8.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit qmake-utils
 
 DESCRIPTION="Add64 is a realtime additive/subtractive-synthesis softsynth"
-HOMEPAGE="https://sourceforge.net/projects/add64 http://linuxsynths.com/Add64PatchesDemos/add64.html"
+HOMEPAGE="https://sourceforge.net/projects/add64/ http://linuxsynths.com/Add64PatchesDemos/add64.html"
 SRC_URI="mirror://sourceforge/project/add64/Add64-${PV}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/media-sound/add64/add64-3.9.3.ebuild b/media-sound/add64/add64-3.9.3.ebuild
index 67e6c3b2af..5cb609a308 100644
--- a/media-sound/add64/add64-3.9.3.ebuild
+++ b/media-sound/add64/add64-3.9.3.ebuild
@@ -7,7 +7,7 @@ inherit qmake-utils
 
 DESCRIPTION="Add64 is a realtime additive/subtractive-synthesis softsynth"
 HOMEPAGE="
-	https://sourceforge.net/projects/add64
+	https://sourceforge.net/projects/add64/
 	http://linuxsynths.com/Add64PatchesDemos/add64.html
 "
 SRC_URI="mirror://sourceforge/project/add64/Add64-${PV}.tar.bz2"
diff --git a/net-wireless/iwdgui/iwdgui-0.1.0.ebuild b/net-wireless/iwdgui/iwdgui-0.1.0.ebuild
index 8e6119e9b4..573bf634bf 100644
--- a/net-wireless/iwdgui/iwdgui-0.1.0.ebuild
+++ b/net-wireless/iwdgui/iwdgui-0.1.0.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1 xdg
 
 DESCRIPTION="A graphical frontend for IWD, Intel's iNet Wireless Daemon"
-HOMEPAGE="https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui"
+HOMEPAGE="https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-wireless/iwdgui/iwdgui-0.2.0.ebuild b/net-wireless/iwdgui/iwdgui-0.2.0.ebuild
index 291ab171de..1e985eddaf 100644
--- a/net-wireless/iwdgui/iwdgui-0.2.0.ebuild
+++ b/net-wireless/iwdgui/iwdgui-0.2.0.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1 xdg
 
 DESCRIPTION="A graphical frontend for IWD, Intel's iNet Wireless Daemon"
-HOMEPAGE="https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui"
+HOMEPAGE="https://gitlab.com/hfernh/iwdgui https://pypi.org/project/iwdgui/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild b/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild
index 6f351bcc17..2a1d7eb52a 100644
--- a/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild
+++ b/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 MYPN="${PN/-data/}"
 
 DESCRIPTION="Datasets for GeographicLib"
-HOMEPAGE="https://sourceforge.net/projects/geographiclib"
+HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
 S="${WORKDIR}"
 
 SLOT="0"
diff --git a/sci-libs/ann/ann-1.1.2_p7-r2.ebuild b/sci-libs/ann/ann-1.1.2_p7-r2.ebuild
index 3c1e6a077f..9c1e56d4c0 100644
--- a/sci-libs/ann/ann-1.1.2_p7-r2.ebuild
+++ b/sci-libs/ann/ann-1.1.2_p7-r2.ebuild
@@ -10,7 +10,7 @@ inherit autotools flag-o-matic
 
 DESCRIPTION="A Library for Approximate Nearest Neighbor Searching"
 HOMEPAGE="
-	https://www.cs.umd.edu/~mount/ANN
+	https://www.cs.umd.edu/~mount/ANN/
 	https://tracker.debian.org/pkg/ann
 "
 SRC_URI="
diff --git a/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild b/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild
index 2c8144ac04..77c5a31e2f 100644
--- a/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild
+++ b/sci-libs/jdqz/jdqz-0_pre19971107-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit flag-o-matic fortran-2 toolchain-funcs
 
 DESCRIPTION="Jacobi-Davidson type method for the generalized standard eigenvalue problem"
-HOMEPAGE="https://www.win.tue.nl/~hochsten/jd"
+HOMEPAGE="https://www.win.tue.nl/~hochsten/jd/"
 SRC_URI="https://www.win.tue.nl/~hochsten/jd/${PN}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
diff --git a/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild b/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild
index 062d2c971a..7c057aad78 100644
--- a/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild
+++ b/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild
@@ -12,7 +12,7 @@ VERSION="$(ver_cut 1-2)"
 DESCRIPTION="Meschach is a C-language library of routines for performing matrix computations"
 HOMEPAGE="
 	https://github.com/yageek/Meschach
-	http://homepage.divms.uiowa.edu/~dstewart/meschach
+	http://homepage.divms.uiowa.edu/~dstewart/meschach/
 "
 S="${WORKDIR}/${PN^}-${COMMIT}"
 
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index aed973eb65..03002791a8 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1 +1,2 @@
 DIST keystone-21.0.0.0rc1.tar.gz 1698152 BLAKE2B 703fb7b56a12cc3909a8990a2c21df2fca056f5eda43bd562ff8dcaeb06aa61db60b6d2ba6010d5c987f74f8d529eb66f086e648cbef25f96867e6c6b2644b29 SHA512 290e7ce13de1d7a232ef41166d51585460f6be745daf5477b8d83a8537f09eaecb82d6fabf554be777108b4a281ffb2e65457fe815a0405355a9e19c6f31f442
+DIST keystone-21.0.0.tar.gz 1697791 BLAKE2B e7c81ffa3d94ff12bd3aaeeaf4d8d7238b6d62c124419af9c8572ac47ace6eaa290bf922642d3c517dbd7ffab8b4a65705868ccea2c3715d85373bd830894961 SHA512 2214a96e058e553da5ab61423f3ebe3ba0e56a4a431d8109f845c2b967c4f2b98f5f1a15102b3b0c68ec48ebb1a3397b96576be98e991db601e916ff4e947043
diff --git a/sys-auth/keystone/keystone-21.0.0.ebuild b/sys-auth/keystone/keystone-21.0.0.ebuild
new file mode 100644
index 0000000000..662dd4ae7c
--- /dev/null
+++ b/sys-auth/keystone/keystone-21.0.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYP="${P/_/}"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 tmpfiles
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="
+	https://opendev.org/openstack/keystone
+	https://launchpad.net/keystone
+	https://pypi.org/project/keystone/
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+
+	ldap? (
+		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	)
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+	)
+
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+	)
+	acct-user/keystone
+	acct-group/keystone
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/bashate-0.5.1[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-usr-local-bin.patch" )
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	test? ( ldap )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# allow usage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	oslo-config-generator --config-file=config-generator/keystone.conf || die
+	oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	diropts -m 0750
+	keepdir /etc/keystone /var/log/keystone
+	insinto /etc/keystone
+	insopts -m 0640 -o keystone -g keystone
+	doins etc/keystone.conf.sample
+	doins etc/keystone.policy.yaml.sample
+	doins etc/logging.conf.sample
+	doins etc/default_catalog.templates
+	insinto /etc/keystone/httpd
+	doins httpd/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
+
+	newtmpfiles "${FILESDIR}/keystone.tmpfile" keystone.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/keystone.logrotate" keystone.conf
+
+	rm -r "${ED}/usr/etc" || die
+}
+
+pkg_postinst() {
+	elog "You might want to run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "if this is a new install."
+	elog "If you have not already configured your openssl installation"
+	elog "please do it by modifying /etc/ssl/openssl.cnf"
+	elog "BEFORE issuing the configuration command."
+	elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+	if [ ! -d "${ROOT}/etc/keystone/ssl" ] ; then
+		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+		read
+		"${ROOT}/usr/bin/keystone-manage" pki_setup --keystone-user keystone --keystone-group keystone
+	else
+		einfo "keystone PKI certificates directory already present, skipping configuration"
+	fi
+}
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 8b474a5d9c..e9fdf3984f 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1 +1,2 @@
 DIST cinder-20.0.0.0rc1.tar.gz 5948385 BLAKE2B f8f2e2b4b88f4c81db61bc209b1408bf8c49db54b8b89095828d5baf3a1e6789889093ecb29b9494ec580c5878cd2cffcd5930992794d970a7582f190db5c134 SHA512 90e6845d96e896ddf40bd9992e80864a8441a74b265bdf559ada75f0a95af9f3041ee75d16312a9ae3871e35a23719248c7ed879b1511688afb3bf8b09239ab1
+DIST cinder-20.0.0.tar.gz 5950094 BLAKE2B 6370f2ea4f1bfecf3602d313b46436a100b5957754750c5ed5f282ec7bdb1797fa4df7764d7eb946d01a47345fc4611bcc8ed565f076556aedf094eec994f89b SHA512 1d7d8cc26b88b1243c7c03c607591815120120257f06355d75f2aab5cc7566470d0f37f2bfc7bc1f51a36a38c8b7016fc5996de9b42d36ebe7f393585a877bb2
diff --git a/sys-cluster/cinder/cinder-20.0.0.ebuild b/sys-cluster/cinder/cinder-20.0.0.ebuild
new file mode 100644
index 0000000000..8ba86ad843
--- /dev/null
+++ b/sys-cluster/cinder/cinder-20.0.0.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYP="${P/_rc/rc}"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 linux-info systemd tmpfiles
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="
+	https://launchpad.net/cinder
+	https://opendev.org/openstack/cinder/
+	https://pypi.org/project/cinder/
+	https://github.com/openstack/cinder
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+
+# qemu is needed for image conversion
+RDEPEND="
+	>=dev-python/pbr-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.2[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.30.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.16[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.12[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-4.1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-8.3.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-11.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-12.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-6.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.12.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.2[${PYTHON_USEDEP}]
+	>=dev-python/paste-3.4.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-5.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-17.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.74[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.7[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/zstd-1.4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.16.51[${PYTHON_USEDEP}]
+
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.4.23[sqlite,${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}]
+	)
+
+	acct-user/cinder
+	acct-group/cinder
+	app-emulation/qemu
+	sys-fs/sysfsutils
+"
+DEPEND="
+	${RDEPEND}
+	app-admin/sudo
+"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( mysql postgres sqlite )
+	iscsi? ( tgt )
+	infiniband? ( rdma )
+	test? ( mysql postgres )
+"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	oslo-config-generator --config-file=tools/config/cinder-config-generator.conf || die
+	oslopolicy-sample-generator --config-file=tools/config/cinder-policy-generator.conf || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api backup scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" "cinder-${svc}"
+		systemd_dounit "${FILESDIR}/openstack-cinder-${svc}.service"
+	done
+
+	insinto /etc/cinder
+	insopts -m 0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	doins "etc/cinder/cinder.conf.sample"
+	doins "etc/cinder/policy.yaml.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user cinder
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+
+	newtmpfiles "${FILESDIR}/cinder.tmpfile" cinder.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/cinder.logrotate" cinder.conf
+
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 6f603fe99d..1a96049d47 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1 +1,2 @@
 DIST openstack-heat-18.0.0.0rc1.tar.gz 2449476 BLAKE2B d1a616bd9d5d07e4b513ac73b8ad555a9641796b85e26b5682814e8cce01cd5785a312e3a26da2a98c2fba9145f84e801090b95739a3e9c61ab9cca9b7521b42 SHA512 891e2357be5334a1e542338ddb51baeda904a553a35ed3376d1ea7ba29818b5fb517d648f48d4e192d3e7a8f407d3a1363447a0bf701a87311e6904b4716703b
+DIST openstack-heat-18.0.0.tar.gz 2449231 BLAKE2B a285cc9bb3ac9bb88c5694cefd664ae5e4ffe130317a290e39b5faadd7512cdd515fdc14bc5a03bd610bd11f4fb1f85627c5dd1974f14ad06f13f9a594c1c141 SHA512 222c9ae91a7ab189fe98908629f6c64ccb0cc7dd10fc331c206c10a31a499cc3bdc8717656d2e3c746857de8c85ae13289a8efd2c1a800b9b88553696c2e14e4
diff --git a/sys-cluster/heat/heat-18.0.0.ebuild b/sys-cluster/heat/heat-18.0.0.ebuild
new file mode 100644
index 0000000000..0d5f545e2a
--- /dev/null
+++ b/sys-cluster/heat/heat-18.0.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYP="${P/_rc/rc}"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1 linux-info systemd
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine"
+HOMEPAGE="
+	https://launchpad.net/heat
+	https://opendev.org/openstack/heat/
+	https://pypi.org/project/openstack-heat/
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/openstack-${MYP}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/openstack-${MYP}"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="+mysql +memcached postgres sqlite"
+
+RDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.28.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-ironicclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.14.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-octaviaclient-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-vitrageclient-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zunclient-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]
+
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+	)
+
+	acct-user/heat
+	acct-group/heat
+"
+DEPEND="
+	${RDEPEND}
+	app-admin/sudo
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/kombu-5.0.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="
+	test? ( mysql )
+	|| ( mysql postgres sqlite )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	oslo-config-generator --config-file=config-generator.conf
+	oslopolicy-sample-generator --config-file etc/heat/heat-policy-generator.conf
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	diropts -m 0750 -o heat -g heat
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" "heat-${svc}"
+	done
+
+	insinto /etc/heat
+	insopts -m 0640 -o heat -g heat
+	doins heat.conf.sample
+	doins etc/heat/policy.yaml.sample
+	doins "etc/heat/api-paste.ini"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+	keepdir /var/log/heat
+
+	systemd_dounit "${FILESDIR}/heat-engine.service"
+	systemd_dounit "${FILESDIR}/heat-api.service"
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}/heat.logrotate"
+
+	rm -r "${ED}/usr/etc"
+}
diff --git a/sys-cluster/libi/libi-5.0.1_p20180510.ebuild b/sys-cluster/libi/libi-5.0.1_p20180510.ebuild
index 994f2cf4d3..cd65d0a7ae 100644
--- a/sys-cluster/libi/libi-5.0.1_p20180510.ebuild
+++ b/sys-cluster/libi/libi-5.0.1_p20180510.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
 COMMIT="7375ba5bb0df87c68e58ad15e9e5e351ae020c08"
 
 DESCRIPTION="A framework for bootstrapping extreme scale software systems"
-HOMEPAGE="http://www.paradyn.org/mrnet"
+HOMEPAGE="http://www.paradyn.org/mrnet/"
 SRC_URI="https://github.com/dyninst/mrnet/archive/${COMMIT}.tar.gz -> ${P/libi/mrnet}.tar.gz"
 S="${WORKDIR}/mrnet-${COMMIT}/external/libi"
 
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 12e3ce6bad..69b88c81dc 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,4 +1,4 @@
 DIST neutron-17.1.2.tar.gz 12930231 BLAKE2B 865e849fb811b3abf8b589ea5752c9305962ed24bcd69a4998425a1d56abcadd87f224e883269b780655f252d40dd050805782080385d94163b5488ffbdbf52a SHA512 1320c96ba5b3b2de5feb313b564baa7308b3b964c628afa57e60ed8f541549b11ddaa0ea1e4025dc0265ad1d962f0961fdc93924fcdde98c9b7c3c23728a3ebd
-DIST neutron-20.0.0.0rc1.tar.gz 13257195 BLAKE2B 1c6fc5574b9d4753bf4d99d3589fb6b49b1f3107b47d0d23da7b5cfd118e90c92ffb9c739342fc3d1f2b075c81deb919aa871ae0a65c09e97b13b34eff4a777b SHA512 6b5b05fe77afc78a503f3c77473ab9bd5ebee692606acb97d2ce499b9580ec03056687496fff72f99b0ed3e1862ad6b6bc013eb5f4186df623d20638a6c0293c
+DIST neutron-20.0.0.tar.gz 13258399 BLAKE2B 6a47bb0d27e672af586dc6ba2b3a9eef490a2e60e5cb09e9ed57906ceefc9b148250e703aeedd3801c62b870534ad4b8761f38e4961e62955d4060e25622568d SHA512 52174080b33e06e377da3f07665639a2dce3e33262de120d3a842de23c1564da80d0fe7ba1905fff86a2d7c64480aebf4e8d1809b84e3b16005b8c7e857cac1d
 DIST neutron-configs-17.1.2.tar.gz 30314 BLAKE2B 885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6 SHA512 cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-ml2-plugins-17.1.2.tar.gz 9011 BLAKE2B d9f8cb4d26699ca44a4cf4cd422bd88b9bb5a2138a80fec469021491d87b158502801c2ce79316f52a900877f7706dc93c2a5a5a33c868918effeaa6b65a7931 SHA512 a225310f0f54991a079d515512189b3c08de22c5b13d58960ef24498401fc54b0878ed879d895e696b789e703a0bb3f4a184eccbbfb9ac9fe9447086cb952b37
diff --git a/sys-cluster/neutron/neutron-20.0.0.0_rc1.ebuild b/sys-cluster/neutron/neutron-20.0.0.ebuild
similarity index 100%
rename from sys-cluster/neutron/neutron-20.0.0.0_rc1.ebuild
rename to sys-cluster/neutron/neutron-20.0.0.ebuild
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index b87883dc5a..189a69fa60 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1 +1,2 @@
 DIST nova-25.0.0.0rc1.tar.gz 9446116 BLAKE2B e747588076c5bd35bab5cf3d3afca37523ee3e2643d9d18e50243ce8320c71151fabf87ef530dab180b871049cd55e5ee4dec6dc9e3d16a68d99b627870e4f93 SHA512 1c07fb6ce81efebd78a519cf6334f47d4dc08d6d949910f6c38b356f3457e2b2c4df6edb90d0760ac17740df0c0116a75eccf9ac85780757614fba110280d013
+DIST nova-25.0.0.tar.gz 9445471 BLAKE2B 5584daee1026ebec9437368b5c39ded4c474d1a15291487f9e9ee72593626a3ce2204ec8bf5acb7d579328a7b7aed57174d42db3cabca1c8e93047e49e0bc847 SHA512 c4a1423dcb97bcc96bb5faccd43f58e17293172121a2715ff13c05690c5b8868befeb45815a9dca33fa5bc387fd8c586f68984b0c931427aa02794a1d2a5179e
diff --git a/sys-cluster/nova/nova-25.0.0.ebuild b/sys-cluster/nova/nova-25.0.0.ebuild
new file mode 100644
index 0000000000..3ae0f19aaa
--- /dev/null
+++ b/sys-cluster/nova/nova-25.0.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MYP="${P//_/}"
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit bash-completion-r1 distutils-r1 linux-info systemd tmpfiles udev
+
+DESCRIPTION="Cloud computing fabric controller"
+HOMEPAGE="
+	https://launchpad.net/nova
+	https://opendev.org/openstack/nova
+	https://pypi.org/project/nova/
+"
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
+S="${WORKDIR}/${MYP}"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0 iscsi? ( GPL-2 )"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+
+RDEPEND="
+	>=dev-python/pbr-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.30.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.20.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-7.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-8.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.12.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-10.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-2.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-5.2[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.15.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-5.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]
+
+	acct-user/nova
+	acct-group/nova
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	dev-python/oslo-limit[${PYTHON_USEDEP}]
+	net-misc/bridge-utils
+	sys-apps/iproute2
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	compute-only? (
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58[${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
+	)
+	novncproxy? ( www-apps/novnc )
+	openvswitch? ( net-misc/openvswitch )
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
+	)
+	rabbitmq? ( net-misc/rabbitmq-server )
+	sqlite? (
+		>=dev-python/sqlalchemy-1.4.13[sqlite,${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-admin/sudo
+"
+BDEPEND="
+	test? (
+		>=dev-python/types-paramiko-0.1.3[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+		>=dev-python/python-ironicclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/gabbi-1.35.0[${PYTHON_USEDEP}]
+		>=dev-python/wsgi_intercept-1.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]
+
+		sys-cluster/placement[${PYTHON_USEDEP}]
+	)
+"
+
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+	test? ( mysql )
+"
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	rm nova/tests/unit/test_hacking.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	oslo-config-generator --config-file=etc/nova/nova-config-generator.conf || die
+	oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	for svc in api compute conductor consoleauth network novncproxy scheduler spicehtml5proxy xvpvncproxy; do
+		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+	done
+
+	for svc in api compute conductor metadata-api novncproxy os-compute-api scheduler; do
+		systemd_dounit "${FILESDIR}/openstack-nova-${svc}.service"
+	done
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+
+	doins etc/nova/nova.conf.sample
+	doins "${FILESDIR}/nova-compute.conf"
+	dodoc etc/nova/README*.txt
+	rm etc/nova/README*.txt || die
+	doins "${S}/etc/nova/"*
+	doins etc/nova/policy.yaml.sample
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins etc/nova/rootwrap.d/compute.filters
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	newbashcomp tools/nova-manage.bash_completion nova-manage
+
+	newtmpfiles "${FILESDIR}/nova.tmpfile" nova.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/nova.logrotate" nova.conf
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc" || die
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild b/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild
index 7126273a18..1444984fe3 100644
--- a/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild
+++ b/sys-cluster/parallel-netcdf/parallel-netcdf-1.12.2.ebuild
@@ -11,7 +11,7 @@ inherit autotools fortran-2
 DESCRIPTION="Parallel extension to netCDF"
 HOMEPAGE="
 	https://parallel-netcdf.github.io
-	http://cucis.ece.northwestern.edu/projects/PnetCDF
+	http://cucis.ece.northwestern.edu/projects/PnetCDF/
 	https://trac.mcs.anl.gov/projects/parallel-netcdf
 "
 SRC_URI="http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/${MYP}.tar.gz"
diff --git a/sys-cluster/temanejo/temanejo-1.3.ebuild b/sys-cluster/temanejo/temanejo-1.3.ebuild
index a1df168724..39e300af1a 100644
--- a/sys-cluster/temanejo/temanejo-1.3.ebuild
+++ b/sys-cluster/temanejo/temanejo-1.3.ebuild
@@ -9,7 +9,7 @@ EAPI=8
 inherit autotools #python-single-r1
 
 DESCRIPTION="a debugger for task-parallel programming"
-HOMEPAGE="http://www.hlrs.de/solutions-services/service-portfolio/programming/hpc-development-tools/temanejo"
+HOMEPAGE="http://www.hlrs.de/solutions-services/service-portfolio/programming/hpc-development-tools/temanejo/"
 SRC_URI="http://fs.hlrs.de/projects/temanejo/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/www-apps/twint/twint-2.1.20-r2.ebuild b/www-apps/twint/twint-2.1.20-r2.ebuild
index 925735b9f9..7305be1623 100644
--- a/www-apps/twint/twint-2.1.20-r2.ebuild
+++ b/www-apps/twint/twint-2.1.20-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1
 DESCRIPTION="Twitter scraping & OSINT tool written in Python that doesn't use Twitter's API"
 HOMEPAGE="
 	https://github.com/twintproject/twint
-	https://pypi.org/project/twint
+	https://pypi.org/project/twint/
 "
 SRC_URI="https://github.com/twintproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-terms/tabby-bin/tabby-bin-1.0.146.ebuild b/x11-terms/tabby-bin/tabby-bin-1.0.146.ebuild
index f9ce65f30e..4940fb2972 100644
--- a/x11-terms/tabby-bin/tabby-bin-1.0.146.ebuild
+++ b/x11-terms/tabby-bin/tabby-bin-1.0.146.ebuild
@@ -8,7 +8,7 @@ inherit desktop xdg
 MY_P="tabby-${PV}-linux"
 
 DESCRIPTION="A terminal for a more modern age"
-HOMEPAGE="https://eugeny.github.io/tabby"
+HOMEPAGE="https://eugeny.github.io/tabby/"
 SRC_URI="
 	https://github.com/Eugeny/tabby/releases/download/v${PV}/${MY_P}.tar.gz
 	https://github.com/scardracs/icons/releases/download/release/tabby-icons.tar.gz