7 files changed, 52 insertions, 44 deletions
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 9b55bb19e11a..ba26292ad43b 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1 +1,2 @@
 DIST gi-docgen-2023.1.tar.gz 2516453 BLAKE2B d97ca86f1e9c29de3b1500a08b93a1617dddfc6f29314f1d0f1cbd3ec7b367f4de7b8d7d7eba9fbe5af0a8bbcdd4c4bb0786dfd4deda0acd19ac6372dea24d0a SHA512 fb19af318a66ba475e04826d9b61163ec85e6ea4503847ec6685940424bac8108cf385546bad1de80fedd1ddbb21054644083dc4908caf7e2e616c6e0673b0e3
+DIST gi-docgen-2023.3.tar.gz 2525675 BLAKE2B eda3ce1e90fb8ce71db34d0040d3df578ea4b2848a2f2e208d0785af2219460217c173a193f60abd1b965c1ee1bab7c7d2797e87026677aa4469968818e39d1f SHA512 de9a94ee30b408cb875f7a7e8015f0f860a65140a4b39b9fc1d5f6ea445ab66b4f7c37786646040b0869a1bf1e7d5f09ae878697428e693a15966c27c5d25fa5
diff --git a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
index 112123d4d187..173db185c74e 100644
--- a/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2023.1-r1.ebuild
@@ -1,15 +1,20 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="A documentation generator for GObject-based libraries"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
+HOMEPAGE="
+	https://gitlab.gnome.org/GNOME/gi-docgen
+	https://pypi.org/project/gi-docgen/
+"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
@@ -27,8 +32,7 @@ RDEPEND="
 	')
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
+	' 3.10)
 "
-DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-util/gi-docgen/gi-docgen-2023.3.ebuild b/dev-util/gi-docgen/gi-docgen-2023.3.ebuild
new file mode 100644
index 000000000000..d4c8af598f3a
--- /dev/null
+++ b/dev-util/gi-docgen/gi-docgen-2023.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A documentation generator for GObject-based libraries"
+HOMEPAGE="
+	https://gitlab.gnome.org/GNOME/gi-docgen
+	https://pypi.org/project/gi-docgen/
+"
+
+LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-1[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2[${PYTHON_USEDEP}]
+		>=dev-python/typogrify-2[${PYTHON_USEDEP}]
+	')
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild
index e0e3afb7fd2d..6e58304c21e8 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.29.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch b/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
deleted file mode 100644
index 633a74e174d4..000000000000
--- a/dev-util/rebar/files/rebar-3.18.0-bootstrap-vendored.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c4b0d39dba07911a707f8b8f17711900d2ee786 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= <viktor.soderqvist@est.tech>
-Date: Fri, 5 Nov 2021 09:46:29 +0100
-Subject: [PATCH] Make bootstrap use _checkouts
-
-This makes it possible to run the bootstrap offline by placing the deps
-in the using the already documented _checkouts directory in advance.
----
- bootstrap | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/bootstrap b/bootstrap
-index 9632b6c77..18cc46216 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -92,7 +92,19 @@ fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
- 
-     compile(Name, ErlFirstFiles).
- 
--fetch({pkg, Name, Vsn}, App) ->
-+fetch(Source, App) ->
-+    Dir = filename:join([filename:absname("_checkouts"), App]),
-+    case filelib:is_dir(Dir) of
-+        false ->
-+            fetch_from_hex(Source, App);
-+        true ->
-+            io:format("Using ~p from ~p~n", [App, Dir]),
-+            Dest = filename:absname("_build/default/lib"),
-+            ok = filelib:ensure_dir(filename:join([Dest, "dummy"])),
-+            cp_r([Dir], Dest)
-+    end.
-+
-+fetch_from_hex({pkg, Name, Vsn}, App) ->
-     Dir = filename:join([filename:absname("_build/default/lib/"), App]),
-     case filelib:is_dir(Dir) of
-         false ->
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild
index 4535afdc6749..fd25aa30b398 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.22.2.ebuild
@@ -24,7 +24,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"
diff --git a/dev-util/uncrustify/uncrustify-0.78.1.ebuild b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
index b5c765f8dbb4..2f86f3cd8372 100644
--- a/dev-util/uncrustify/uncrustify-0.78.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.78.1.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	scm_eclass=git-r3
 else
-	KEYWORDS="~amd64 x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi