diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1c0bab8..776a52b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: check-useless-excludes
       - id: check-hooks-apply
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude: '\.patch$'
diff --git a/README.rst b/README.rst
index 08b193e..5be7276 100644
--- a/README.rst
+++ b/README.rst
@@ -86,7 +86,7 @@ should look something like this::
   deploy/6.5.8-arm64-r1.Image
   deploy/config-6.5.8-arm64-r1
 
-To use the ebuild on an arm64 host with the above build output, the steps 
+To use the ebuild on an arm64 host with the above build output, the steps
 are essentially:
 
 * drop the artifacts in your local distfiles
diff --git a/dev-python/decor/decor-2.0.1.ebuild b/dev-python/decor/decor-2.0.1.ebuild
index 46df9b6..cef088c 100644
--- a/dev-python/decor/decor-2.0.1.ebuild
+++ b/dev-python/decor/decor-2.0.1.ebuild
@@ -1,9 +1,12 @@
-# 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_{9..11} )
-PYPI_PN="py${PN}"
+PYPI_PN="pydecor"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+MY_P="decor-${PV}"
 
 inherit distutils-r1 pypi
 
@@ -12,7 +15,7 @@ HOMEPAGE="https://github.com/mplanchard/pydecor"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/six[${PYTHON_USEDEP}]
@@ -21,7 +24,7 @@ DEPEND="dev-python/six[${PYTHON_USEDEP}]
 
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PYPI_PN}-${PV}"
 
 distutils_enable_tests pytest
 
diff --git a/dev-util/ymltoxml/ymltoxml-0.2.2.ebuild b/dev-util/ymltoxml/ymltoxml-0.2.2.ebuild
index b2959e2..55a6c95 100644
--- a/dev-util/ymltoxml/ymltoxml-0.2.2.ebuild
+++ b/dev-util/ymltoxml/ymltoxml-0.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit distutils-r1
 
diff --git a/dev-util/ymltoxml/ymltoxml-9999.ebuild b/dev-util/ymltoxml/ymltoxml-9999.ebuild
index b2959e2..55a6c95 100644
--- a/dev-util/ymltoxml/ymltoxml-9999.ebuild
+++ b/dev-util/ymltoxml/ymltoxml-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit distutils-r1
 
diff --git a/media-gfx/drawing/drawing-1.0.2.ebuild b/media-gfx/drawing/drawing-1.0.2.ebuild
index de632c1..5857090 100644
--- a/media-gfx/drawing/drawing-1.0.2.ebuild
+++ b/media-gfx/drawing/drawing-1.0.2.ebuild
@@ -13,7 +13,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/maoschanz/drawing.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/maoschanz/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index 86c1207..4bbf9ef 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -45,5 +45,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mjpg-streamer</remote-id>
+		<remote-id type="github">jacksonliam/mjpg-streamer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/fpnd/fpnd-0.9.10-r1.ebuild b/net-misc/fpnd/fpnd-0.9.10-r1.ebuild
index f9a14c7..5c40c6b 100644
--- a/net-misc/fpnd/fpnd-0.9.10-r1.ebuild
+++ b/net-misc/fpnd/fpnd-0.9.10-r1.ebuild
@@ -1,9 +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
 
-PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 linux-info systemd
diff --git a/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild b/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild
index 78dfbac..910743d 100644
--- a/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild
+++ b/net-proxy/pyforwarder/pyforwarder-0.12.35.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 PYPI_PN="forwarder"
-PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
 MY_P="${PYPI_PN}-${PV}"
 
 inherit distutils-r1
@@ -23,7 +25,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
 
diff --git a/net-proxy/pyforwarder/pyforwarder-9999.ebuild b/net-proxy/pyforwarder/pyforwarder-9999.ebuild
index 78dfbac..910743d 100644
--- a/net-proxy/pyforwarder/pyforwarder-9999.ebuild
+++ b/net-proxy/pyforwarder/pyforwarder-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 PYPI_PN="forwarder"
-PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
 MY_P="${PYPI_PN}-${PV}"
 
 inherit distutils-r1
@@ -23,7 +25,6 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
 
diff --git a/sys-block/bmap-tools/bmap-tools-3.6.ebuild b/sys-block/bmap-tools/bmap-tools-3.6.ebuild
index 2a2ca47..376c682 100644
--- a/sys-block/bmap-tools/bmap-tools-3.6.ebuild
+++ b/sys-block/bmap-tools/bmap-tools-3.6.ebuild
@@ -1,7 +1,8 @@
-# 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_{8..10} )
 
 inherit distutils-r1