diff --git a/app-misc/brightness-control/brightness-control-2.4.ebuild b/app-misc/brightness-control/brightness-control-2.4.ebuild
index c438a5e0c2..c44041a9fa 100644
--- a/app-misc/brightness-control/brightness-control-2.4.ebuild
+++ b/app-misc/brightness-control/brightness-control-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=poetry
DISTUTILS_SINGLE_IMPL=1
diff --git a/dev-python/sphinx-click/Manifest b/dev-python/sphinx-click/Manifest
index 5a5a6771e0..5e3d8fc71c 100644
--- a/dev-python/sphinx-click/Manifest
+++ b/dev-python/sphinx-click/Manifest
@@ -1,2 +1 @@
-DIST sphinx-click-4.1.0.tar.gz 21146 BLAKE2B 0510bdcfa051e1272796ef049b4fe40e936526937b99bec5c20b714507d285a5524bd341f41042a74c1b6715fbda7a892e14aee08a397df61ff47f39b2ebc52a SHA512 a57efbcfe8ab4f82298917937b573480401a51ce81889eb37b56f6eac0b2d6123a94a877f5bc460c4998c55040072453a48400f9c94d902a7cab6cd622d13d62
DIST sphinx-click-4.2.0.tar.gz 21265 BLAKE2B 3f0cd707d6eb26bb63d81cd86324b715eecbb85d038a94104599034563be024d4d4cab5ed488b1d1fb55d4f7c6abb599f48c96f8ea582be0c3d4a37169e7638d SHA512 9b9fee96b17242a1a2cfc097a49aaaa0134e47d250231481d13c438abfdd17b149adf2bde9c3591a94e4e17f02dc800c2b48002eb74994b43fec0d50ddb1083e
diff --git a/dev-python/sphinx-click/metadata.xml b/dev-python/sphinx-click/metadata.xml
index b82b8eb840..26b8bd2c9d 100644
--- a/dev-python/sphinx-click/metadata.xml
+++ b/dev-python/sphinx-click/metadata.xml
@@ -4,7 +4,7 @@
sphinx-click is a Sphinx plugin that allows you to automatically extract documentation from a click-based application and include it in your docs.
-
+
click-contrib/sphinx-click
sphinx-click
diff --git a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild b/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
deleted file mode 100644
index 5bad9a5e5e..0000000000
--- a/dev-python/sphinx-click/sphinx-click-4.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx plugin to automatically document click-based applications"
-HOMEPAGE="
- https://github.com/click-contrib/sphinx-click
- https://pypi.org/project/sphinx-click/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
- >=dev-python/click-7.0[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
-"
-BDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
index 5bad9a5e5e..7097975ba7 100644
--- a/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.2.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
inherit distutils-r1 pypi
diff --git a/dev-python/trailrunner/trailrunner-1.2.1.ebuild b/dev-python/trailrunner/trailrunner-1.2.1.ebuild
index 8b8626b466..64f5bf6b19 100644
--- a/dev-python/trailrunner/trailrunner-1.2.1.ebuild
+++ b/dev-python/trailrunner/trailrunner-1.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 pypi
diff --git a/dev-python/tweepy/tweepy-4.14.0.ebuild b/dev-python/tweepy/tweepy-4.14.0.ebuild
index 9839a91ddd..9a6686f586 100644
--- a/dev-python/tweepy/tweepy-4.14.0.ebuild
+++ b/dev-python/tweepy/tweepy-4.14.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1
diff --git a/dev-python/volatile/volatile-2.1.0.ebuild b/dev-python/volatile/volatile-2.1.0.ebuild
index 9d4c460cb7..fcbddf598a 100644
--- a/dev-python/volatile/volatile-2.1.0.ebuild
+++ b/dev-python/volatile/volatile-2.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1
diff --git a/dev-python/webpy/webpy-0.62.ebuild b/dev-python/webpy/webpy-0.62.ebuild
index d2e5a9ff19..21d0dfedbc 100644
--- a/dev-python/webpy/webpy-0.62.ebuild
+++ b/dev-python/webpy/webpy-0.62.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
diff --git a/dev-python/zopfli/zopfli-0.2.2.ebuild b/dev-python/zopfli/zopfli-0.2.2.ebuild
index 98369b6927..b27a0dab33 100644
--- a/dev-python/zopfli/zopfli-0.2.2.ebuild
+++ b/dev-python/zopfli/zopfli-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_EXT=1
inherit distutils-r1 pypi
diff --git a/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild b/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
index 7d87b58a15..ca2650562a 100644
--- a/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
+++ b/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..13} )
+
inherit distutils-r1 linux-info pypi
DESCRIPTION="Helper tool for developing and building postmarketOS"
diff --git a/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild b/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild
index f1c64cbf59..47b6783b8a 100644
--- a/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild
+++ b/dev-util/upstream-ontologist/upstream-ontologist-0.1.35-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=1
PYPI_NO_NORMALIZE=1
diff --git a/net-client/offpunk/Manifest b/net-client/offpunk/Manifest
index 3da266abd5..c1284c9a9b 100644
--- a/net-client/offpunk/Manifest
+++ b/net-client/offpunk/Manifest
@@ -1,2 +1 @@
-DIST offpunk-1.8.tar.gz 210217 BLAKE2B 574bb06700247be57e440ab9b45d5373831d28fd2eff16a28309759946dfe9046c01f0730cc83159a50a817e92f1bf4a9f05ede5f718c483274f0e204c2cd83a SHA512 452c5707a3c0b7c935d5a4bd9e28606756a6dc395a18c12414fe077daa39c5128dca6a734f0dfaa7cdf2d5994a5bf3214c6788d706a9549c0ad0c1de3c6ca331
DIST offpunk-1.9.1.tar.gz 210135 BLAKE2B ade7ec4e2bd51e1279ded8aa639884d489f35cbc7d6ec058db28f918c6de604be2185e0f8a5e8a45bb033f3918789eed6104a806b46ee8812d6f4dd9f32c0714 SHA512 8b61302490907673002cabead825f54859cb2aa0ea588cb59790c3926f8213ec5653756f392f847e753efa88c2eeba0f5dea696e71ef3210a009d3c9f37cd688
diff --git a/net-client/offpunk/offpunk-1.8.ebuild b/net-client/offpunk/offpunk-1.8.ebuild
deleted file mode 100644
index f7295cd19d..0000000000
--- a/net-client/offpunk/offpunk-1.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Offline-First Gemini/Web/Gopher/RSS reader and browser"
-HOMEPAGE="https://sr.ht/~lioploum/offpunk/"
-SRC_URI="https://git.sr.ht/~lioploum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DOCS=( doc/. CHANGELOG README.md )
-
-pkg_postinst() {
- optfeature "HTML support" "dev-python/beautifulsoup4 dev-python/readability-lxml"
- optfeature "HTTP support" dev-python/requests
- optfeature "RSS/Atom feed support" dev-python/feedparser
- optfeature "XDG support" x11-misc/xdg-utils
- optfeature "better TOFU certificate validation" dev-python/cryptography
- optfeature "clipboard support" x11-misc/xsel
- optfeature "custom process title support" dev-python/setproctitle
- optfeature "external MP3 player" media-sound/mpg123
- optfeature "external OGG player" media-sound/vorbis-tools[ogg123]
- optfeature "external PDF viewer" app-text/zathura
- optfeature "external image viewer support" media-gfx/feh
- optfeature "inline images support" media-gfx/chafa
-}
diff --git a/net-client/offpunk/offpunk-1.9.1.ebuild b/net-client/offpunk/offpunk-1.9.1.ebuild
index feebaf7e41..993b578f2a 100644
--- a/net-client/offpunk/offpunk-1.9.1.ebuild
+++ b/net-client/offpunk/offpunk-1.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature
diff --git a/net-nntp/inn/inn-2.7.1.ebuild b/net-nntp/inn/inn-2.7.1.ebuild
index f18c4a4867..c461d2ccb0 100644
--- a/net-nntp/inn/inn-2.7.1.ebuild
+++ b/net-nntp/inn/inn-2.7.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-inherit optfeature perl-functions python-single-r1 systemd tmpfiles verify-sig
+PYTHON_COMPAT=( python3_{10..13} )
+inherit optfeature perl-functions python-single-r1 tmpfiles verify-sig
DESCRIPTION="InterNetNews - the Internet meets Netnews"
HOMEPAGE="
@@ -112,10 +112,6 @@ src_install() {
rm "${ED}"/usr/share/doc/${PF}/{GPL,LICENSE} || die
rm -r "${ED}"/run "${ED}"/var/tmp || die
- if [[ ${REPLACING_VERSIONS} ]]; then
- rm "${ED}"/var/db/news/* || die
- fi
-
for svc in cnfsstat innwatch; do
newinitd "${FILESDIR}"/${svc}.initd ${svc}
newconfd "${FILESDIR}"/${svc}.confd ${svc}
diff --git a/net-nntp/inn/metadata.xml b/net-nntp/inn/metadata.xml
index 8a64657a99..817f21679b 100644
--- a/net-nntp/inn/metadata.xml
+++ b/net-nntp/inn/metadata.xml
@@ -19,8 +19,6 @@ have some slight variances from the NNTP protocol.