gentoo auto-resync : 20:02:2023 - 20:21:39

18 files changed, 203 insertions, 574 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index baeb2734ff88..26280e75f520 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest
index 002d67cc14d5..fa870d552e49 100644
--- a/dev-util/b2/Manifest
+++ b/dev-util/b2/Manifest
@@ -3,7 +3,9 @@ AUX b2-4.9.2-darwin-gentoo-toolchain.patch 399 BLAKE2B 213ddbeac6be079df8383ac51
 AUX b2-4.9.2-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c826ae3d6964acfcfc0850ff3c75d3c71b043587bccac6b96797229c6dec39beb593893d16ae93a4d7fd16b969129fe63f73d0b SHA512 99bc1260f3d36faf60ab2837039466201bddfeec5c60f65c1c5e52d6d6c1667d419376328f8202596aa2b66448308175d2504062ee6e1708ea0f44d02988ceb4
 AUX b2-4.9.2-no-implicit-march-flags.patch 8376 BLAKE2B 50e0b8effbb268467d90cc51df70dc4bd234789b352a279d9bb3e60161be80296f5f31f4a0d2a3d1ae2380f3079f7b950b24ef494574e25bbda48b516c6aacbb SHA512 0089a48cbe3e9e4f222e5cd1e9e12a5c4d16857b002a1c849f4cf6f8d7935c0a9b1e0f51ced51bf5346c2fdcbd214ce05e3c144c98fbf82a9842c45b59c19740
 AUX b2-4.9.2-odr.patch 1109 BLAKE2B 0bf70f2b2237369acd5089d1d1c6e1362f1d3528b036a7f7b9c5c4d077e60850f45c87a67c830f441297e09be2f7dd8bf41ea45a2c66b307678404c4a0db0ed5 SHA512 90ca58661322b35c4af6543558015368385a1b0e12740cd76723d893f95411645ec4a3a23694503863dd786b73a0ec9b0cb34b473e357334d8e82d973f800e4b
+AUX b2-4.9.3-fix-apple-m1-crash-by-explicit-pointer-cast.patch 2408 BLAKE2B 94cc164f8f02a4525d1f6f694a1bb61d034c4131736e8425e4f5031404756810968f079c34a5a9abc779c16e1c939ec495dc11f0a7850ec6fcc4ef057c8d0496 SHA512 e6b1d3b55f5446e5e60cecde23b161952ad1f8d57d52d9b164e7c57be6d22f39539e8482007a0df73deebe62203e41be9310be021d37e70ab0a720a6f86db688
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST b2-4.9.3.tar.gz 975934 BLAKE2B 8d16e7227676786408f0d84efb577806e304a9181b89656dad1243b5b0b48e67d4226fa51ea97d4ea10110e4ea86f3ae2884d711fa4b04e36bdaa68dff0a4710 SHA512 8f861074a50720ad5469277a469523ef5f87ef2aab65d745f4c5e6af0ed8f40af91c43cd42b7845982c065974026ce1ecc77a831cd0c698c7e22fa848cc81009
+EBUILD b2-4.9.3-r1.ebuild 2029 BLAKE2B bfeba4deecda66a255c445b2f90a0eaa39aa0031659d92977d889d01c8a9887f9856c4b2970cc682711adb5f555b2ec235c3b01ebf42870c51a89dcb175b8801 SHA512 95a9ca2b4915cc4cd7e4660f32ffa340371c7cec5846073c6511732eee0fa47a6b24d51805e5a4d63c0cd8b30705d103bdf1d824edf0006b71fd1173ef3b65a7
 EBUILD b2-4.9.3.ebuild 1944 BLAKE2B 2487d363573179e6b58170a919bdb403b7881fcef352ca70fba2d7ca04c511c57d6493a761601f01a066bcfcc6639f85a6e4f2a90f02e5cc9a13e6e8c441ee6e SHA512 287e1119b91dadebe54424d7f31ca1de11566c73ca596bd4e8b190c1ec2d9a03d740caf2bc2631be79473b291ea1041174c962b3a0dad56682eb55da8ac4a25a
 MISC metadata.xml 320 BLAKE2B e32bcf6d7bfe5e8a0f36d34022d49ef8baf1d4c0324fa7e7b25e1fa41ac81c21e010a8e49d456b7ce6027c51af57b6b07f3bdc8b7e05daa18b288c63a58a171e SHA512 767da992cd650d91b393848e73d6f0626febcb02eba350a16d390e8416a2832c49b1ca2608be98a9f4abd9ae2078a7f1a543a387be139e5533f90d82171796bf
diff --git a/dev-util/b2/b2-4.9.3-r1.ebuild b/dev-util/b2/b2-4.9.3-r1.ebuild
new file mode 100644
index 000000000000..2bf203c180e1
--- /dev/null
+++ b/dev-util/b2/b2-4.9.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://www.bfgroup.xyz/b2/"
+SRC_URI="https://github.com/bfgroup/b2/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="!dev-util/boost-build"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch
+	"${FILESDIR}"/${PN}-4.9.2-odr.patch
+	"${FILESDIR}"/${PN}-4.9.3-fix-apple-m1-crash-by-explicit-pointer-cast.patch
+)
+
+src_configure() {
+	# need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+	append-lfs-flags
+}
+
+src_compile() {
+	cd engine || die
+
+	# upstream doesn't want separate flags for CPPFLAGS/LDFLAGS
+	# https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424
+	edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" -d+2 --without-python
+}
+
+src_test() {
+	# Forget tests, b2 is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/b2
+
+	insinto /usr/share/b2/src
+	doins -r "${FILESDIR}/site-config.jam" \
+		bootstrap.jam build-system.jam ../example/user-config.jam \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/b2/files/b2-4.9.3-fix-apple-m1-crash-by-explicit-pointer-cast.patch b/dev-util/b2/files/b2-4.9.3-fix-apple-m1-crash-by-explicit-pointer-cast.patch
new file mode 100644
index 000000000000..753c60fd14ce
--- /dev/null
+++ b/dev-util/b2/files/b2-4.9.3-fix-apple-m1-crash-by-explicit-pointer-cast.patch
@@ -0,0 +1,55 @@
+https://github.com/bfgroup/b2/issues/152
+https://github.com/bfgroup/b2/pull/214
+https://bugs.gentoo.org/895524
+
+From 62dc6ff74a0b9717b4a8dd61ce06770e6fb7c177 Mon Sep 17 00:00:00 2001
+From: Yifeng Li <tomli@tomli.me>
+Date: Mon, 20 Feb 2023 09:52:32 +0000
+Subject: [PATCH] Fix #152 crash on Apple M1 by casting 0 to (OBJECT *)
+ explicitly.
+
+Currently, when the NULL-terminated variadic function call_rule()
+is invoked, the value "0" is passed as the last argument to act
+as a terminator. However, this is an integer value, which is
+incompatible with the pointer data type expected by call_rule().
+
+This is undefined behavior in C, correct operation is not
+guaranteed. In fact, it causes b2 to crash on Apple M1 when GCC
+is used - the loop is not terminated when it should, instead, it
+keeps running, creating the following error:
+
+> lol_add failed due to reached limit of 19 elements
+
+In some cases, it can even corrupt the internal state of the program,
+creating an infinite loop.
+
+This commit fixes the problem by explicitly casting the value 0 to
+the correct pointer type (OBJECT *).
+
+Signed-off-by: Yifeng Li <tomli@tomli.me>
+---
+ src/engine/modules/property-set.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/engine/modules/property-set.cpp b/src/engine/modules/property-set.cpp
+index 6e190a7639..b0d3c2dab8 100644
+--- src/engine/modules/property-set.cpp
++++ src/engine/modules/property-set.cpp
+@@ -162,7 +162,7 @@ LIST * property_set_create( FRAME * frame, int flags )
+         OBJECT * rulename = object_new( "new" );
+         OBJECT * varname = object_new( "self.raw" );
+         LIST * val = call_rule( rulename, frame,
+-            list_new( object_new( "property-set" ) ), 0 );
++            list_new( object_new( "property-set" ) ), (OBJECT *) 0 );
+         LISTITER iter, end;
+         object_free( rulename );
+         pos->value = object_copy( list_front( val ) );
+@@ -183,7 +183,7 @@ LIST * property_set_create( FRAME * frame, int flags )
+                 import_module( imports, frame->module );
+                 rulename = object_new( "errors.error" );
+                 call_rule( rulename, frame,
+-                    list_new( object_new( message->value ) ), 0 );
++                    list_new( object_new( message->value ) ), (OBJECT *) 0 );
+                 /* unreachable */
+                 string_free( message );
+                 list_free( imports );
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 09757ba48b40..6bb050e358ae 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,5 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
-DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
 DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
-EBUILD gdbus-codegen-2.74.3.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
-EBUILD gdbus-codegen-2.74.4.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
 EBUILD gdbus-codegen-2.74.5.ebuild 2197 BLAKE2B ac5f5eceed9ee2673b2d8145032615e44b0ccefe23b82abace8b5d54ef8c52d517ff5fd5d3dc4774d5870c54e1bb907d8af22ed1cc9913cdf4d96334853f5c9f SHA512 2632236a58cb71ece53bbecd61622c52ffc15a9fb6a683ab3be1ecd1f12ba8ac860f750b049a05552612a9f10b3006c8111032f607a9643340d2b9d74f448bed
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild
deleted file mode 100644
index d4ca839d3013..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild
deleted file mode 100644
index d4ca839d3013..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 72c8d59d3f73..cb2a8ba6a949 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,5 +1,3 @@
-DIST gi-docgen-2022.2.tar.gz 2515533 BLAKE2B d624fe287628ca01cb5746a08dc43bb97375ca538524481f5ee068fb3484e4526c875f374e01ffff02345d13b2d966dd54ad01c8f4e692116fac050cf5277d94 SHA512 adbcfecb6cc93785d372fa877e02b1fe08f9965fea52256a63c988a95f100738f564ae64c971a4a7ddded6ef792609d2a8e8e9461d81e982816abe96c2139ee9
 DIST gi-docgen-2023.1.tar.gz 2516453 BLAKE2B d97ca86f1e9c29de3b1500a08b93a1617dddfc6f29314f1d0f1cbd3ec7b367f4de7b8d7d7eba9fbe5af0a8bbcdd4c4bb0786dfd4deda0acd19ac6372dea24d0a SHA512 fb19af318a66ba475e04826d9b61163ec85e6ea4503847ec6685940424bac8108cf385546bad1de80fedd1ddbb21054644083dc4908caf7e2e616c6e0673b0e3
-EBUILD gi-docgen-2022.2.ebuild 987 BLAKE2B 3a0976f791458272005968a30911d31ff02aa2b744f971dd9b470f1fb0438ac9aa2c473cf8bd12eaa50db19cdc42a10d99b954b667eec8c2bee9b61c47ae6590 SHA512 d99801e3005c67785edfda969549760d803efeb7376a484cada638bcdd50c3c98388a620412751937db3f2b8687c6b56d6858d89f4383f17da4acd265a0d40d0
 EBUILD gi-docgen-2023.1-r1.ebuild 1027 BLAKE2B 4744ea9cad2e148acf40c0631ea495371971a06fe50d3374bcdff231231441b360c0c7add25ace9aa8d2d8d075109e430b362d3ac5c25cad45e57c6e92675c0f SHA512 b05956da0aaf0c9962f26cb11a7e55269121749a518ca37070cd24dea9d08f45d7760be19c07cb7364f065ebf06c2f0771ac09ab78a031c855c1c0ec188e2c6a
 MISC metadata.xml 350 BLAKE2B 157af2fde028e5332e19fa28df298bd81e9aa0d61981ed034f4a270cb41de1ed1b8aa96c1537c4ea6e6588811d08456ba65678c47747bc744ceecf45531bdb2a SHA512 6aab61ec8a175dd2d6a1010753d1e70df2e7a030d708acb61ee4158dc0d2afc214aed20f0e01fa565c7b463617305f2a2d3347e5e80259f9b5b2e03383870c80
diff --git a/dev-util/gi-docgen/gi-docgen-2022.2.ebuild b/dev-util/gi-docgen/gi-docgen-2022.2.ebuild
deleted file mode 100644
index 890d30e399ad..000000000000
--- a/dev-util/gi-docgen/gi-docgen-2022.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="A documentation generator for GObject-based libraries"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 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/pygments-2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/typogrify-2[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 54bc3586701f..99afc9d6a14e 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,3 @@
-DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
-DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
 DIST glib-2.74.5.tar.xz 5211852 BLAKE2B 5bf0069cbf949a946357127682e4f687c7e7b8565037024a232b3e905e65bebb86d016832b6274f743005ec8fe5fcd31eaf99ccece82d9d7c3f924d17502c409 SHA512 2716e0fe984cc5d0714e91fe0de47ee71a8bd0b4c85caee337ddb7e02ac2fb3c8c007ccc1207b29cf901c30a7ec8e3bcca75d69c6fab2a32a8cf14bff974e614
-EBUILD glib-utils-2.74.3.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
-EBUILD glib-utils-2.74.4.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
 EBUILD glib-utils-2.74.5.ebuild 2332 BLAKE2B 0732180201fd68ab2775d231ba1eddf10ee8cc5092cecd1a50b2161417fb27c8d299c1908b933711013fc5b8b881d15a298b7ad60f743f39fb82fbcb2f5aa093 SHA512 fe9cac3eaca77c746a09d5ff451e308b8274c986a8dd8dedf974b1536a44235dadb963843b6ad4067b477e5269b668008289b5e8405ede4b03269080926b3d48
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.74.3.ebuild b/dev-util/glib-utils/glib-utils-2.74.3.ebuild
deleted file mode 100644
index d94a24e0b19e..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.74.4.ebuild b/dev-util/glib-utils/glib-utils-2.74.4.ebuild
deleted file mode 100644
index d94a24e0b19e..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index a67766c78527..09fb8f1bf8ff 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,7 +1,5 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
-DIST gnome-builder-43.5.tar.xz 10289424 BLAKE2B b0676ebf4b475a6223a57f79d135371d3cfcadd3d4dd37abf48f000f9fc0d0b3e48fb615bc07ed1415324f7661a8f4c7b05c3f31f41a70870f9c4b320d33160c SHA512 24533109c0be9bd595b04ab2abceb2a894034c648837181e8f21fb52e54b8f0e0d043f4d89ab2fff0f84cf0114d3824e05fc8f466745e9e4b577f298cafb483f
 DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
 EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B 4fcfccd449d726ffb335101546cc1d8610fa48f93247413ac5c87b3207e005c61194c9963a3ef6896819861b3712b3e920ee7e7e926f157da66be6a2c2ab3cde SHA512 b90fea7c51cd3cc40f1ef4a2c4bca0852d9fa662b977f404832856f9eaa3759ac510550f89d5afe19fc58263533d3f4bff842140c18717264caa331c66ea0c54
-EBUILD gnome-builder-43.5.ebuild 8734 BLAKE2B dd1e2fc4af766378c4884d1642907421a89d468f12f3ff1feeb0c39fe6546ecf178a3762397727817a86f0210be07d67156546bfbf41be3f75bc901a2fbf6829 SHA512 d5bf9352f64e5a3e7b2c08cc5e91aa52b17490806906c28be0fee60b585dc9c437597c92c89309c6532bd200acbb43ac4052b9d42895b90d1fca91eb73129038
 EBUILD gnome-builder-43.6.ebuild 8734 BLAKE2B dd1e2fc4af766378c4884d1642907421a89d468f12f3ff1feeb0c39fe6546ecf178a3762397727817a86f0210be07d67156546bfbf41be3f75bc901a2fbf6829 SHA512 d5bf9352f64e5a3e7b2c08cc5e91aa52b17490806906c28be0fee60b585dc9c437597c92c89309c6532bd200acbb43ac4052b9d42895b90d1fca91eb73129038
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.5.ebuild b/dev-util/gnome-builder/gnome-builder-43.5.ebuild
deleted file mode 100644
index b62a1a10fd38..000000000000
--- a/dev-util/gnome-builder/gnome-builder-43.5.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/glib-2.73.3:2
-	>=gui-libs/gtk-4.7.1:4[introspection]
-	>=gui-libs/libadwaita-1.2.0:1
-	>=gui-libs/libpanel-1.0.0:1
-	>=gui-libs/gtksourceview-5.5.2:5[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.42.0:=
-	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.36.0:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
-	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
-	app-text/editorconfig-core-c
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-3:3.0
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-1.1.0[ssh]
-	)
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
-	)
-	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* virtual/rust for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dchannel=other
-
-		-Ddevelopment=false
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-		-Dwith_safe_path=''
-		-Dgnome_sdk_version=master
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-		-Dnetwork_tests=false
-		-Dctags_path=''
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_bash_language_server=true
-		-Dplugin_blueprint=true
-		-Dplugin_buildstream=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		-Dplugin_deviced=false # libdeviced not packaged?
-		$(meson_use d-spy plugin_dspy)
-		-Dplugin_editorconfig=true
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_gopls=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_html_completion=true
-		$(meson_use webkit plugin_html_preview)
-		-Dplugin_intelephense=true
-		-Dplugin_jdtls=true
-		-Dplugin_jedi_language_server=true
-		-Dplugin_jhbuild=true
-		-Dplugin_make=true
-		-Dplugin_make_templates=true
-		$(meson_use webkit plugin_markdown_preview)
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_meson_templates=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_pygi=true
-		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_shellcmd=true
-		-Dplugin_shellcheck=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use webkit plugin_sphinx_preview)
-		-Dplugin_stylelint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_sysroot=true
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_valac=true
-		-Dplugin_vala_indenter=true
-		-Dplugin_valgrind=true
-		-Dplugin_vls=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" virtual/rust
-	optfeature "CMake" dev-util/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-util/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 8da63277083e..4bde01f3501d 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,3 +1,5 @@
+AUX hfstospell-0.5.3-gcc-13-fix.patch 505 BLAKE2B 96e97a6b2969759dd864e30f3beb9dad5eb97cb8682fd1fc91b97b578daa9a18c6e30eea174174d64bb186380ed6812e231f30cbc4a89b6bead4fa7ac2ea97b3 SHA512 3b6573c4fd3e27026f07f1c2a3abd22b788c682f759b25743c540c2b1bdb83f72db2e7d7bdc85f963acf789dacbdc68c1c5af71cc90f676aa4bdcd10b3df756e
 DIST hfstospell-0.5.3.tar.gz 152654 BLAKE2B f77c86e18b9dcb098460bdaec2f6a148b4bf515670aad3d17002b3027026483658d0df924a5d71b12251128ba89bee3a9d7c1d03a5983830accf0340445a1331 SHA512 f25bae6c083894139ba1e3dbd24f010e1c4695bdfe4c2499d31f2f0bd2f5688b662ea15666b46f174fc75f0aa6f5cd114456f735b1d49bcf33322221b6f57ff5
+EBUILD hfstospell-0.5.3-r1.ebuild 1081 BLAKE2B 69f172c3d1afb4e425a94c45669cf0a3038e12243d722e246d0969e595b46d064f95401604f30ce25ef3779d1edcac9f3e3ca65e1b924d7bc84ca58ed5bdf375 SHA512 ac5459590bfeb90913718f33b5639afa10729394291a9d48c0944f33249da1fa58e55d7428999fb7f597d820d288a77244f367a8659d5c866114c09708118a9e
 EBUILD hfstospell-0.5.3.ebuild 1018 BLAKE2B 73fe117faca691ad9558b4563feb2fcbb9efefec2dd5426c1b12b6e81c8bc22c85126038d953385006eb04c7e71651533bf580aa22a09cc4fef9753a1e460930 SHA512 51b2d0db29a9b2bd5f0ddad714aeeba9fea094369d0e8ba5665473f575d26bf209adff627dd940776a48b9147cac1c6a145adf8b94f2cbef5d2f0c3abef69020
-MISC metadata.xml 351 BLAKE2B 9cdc83b2e5d95339cda3177ecc3e365a30a1ebc43aadd34b455150adbb47103ea1bc5d45e05cbc6a6274f6bcbfd6cf81a4b7d46c8d144d4afc37d4d15f5c4a18 SHA512 678b8c4ded8d14c4a044ed866880e0bd3794a8456925e7e66ee610263ec347a0e28ce8f2f27be7f3f6b2217467b6e30218c4b2c29d9f133bca7cd8c730c48b8e
+MISC metadata.xml 436 BLAKE2B 3ed5583ea7f135568d9dcc00182ddde46c89ddb1923a03bc6f88606fecc5ff3956b768a1ca4de16b9e84179a3e57196d56b9789006cc1c6ea9482e5dd72b8e52 SHA512 9b902cff3f380d68348a756774f99ca4aafd807cb637ecb591d0f3a63d23fae6c688b542a6018fdbcce6e2dac34ef1d8e122b0bab671f31d99383ea4aa8f52bb
diff --git a/dev-util/hfstospell/files/hfstospell-0.5.3-gcc-13-fix.patch b/dev-util/hfstospell/files/hfstospell-0.5.3-gcc-13-fix.patch
new file mode 100644
index 000000000000..d5dc32d57a7e
--- /dev/null
+++ b/dev-util/hfstospell/files/hfstospell-0.5.3-gcc-13-fix.patch
@@ -0,0 +1,21 @@
+From 7481bffbf622bc9aee3547183fbe8db9cf8b22ce Mon Sep 17 00:00:00 2001
+From: Tino Didriksen <mail@tinodidriksen.com>
+Date: Sun, 3 Jul 2022 23:16:52 +0200
+Subject: [PATCH] Include cstdint (fixes #57)
+
+---
+ hfst-ol.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hfst-ol.h b/hfst-ol.h
+index 0a83ec5..ee59b14 100644
+--- a/hfst-ol.h
++++ b/hfst-ol.h
+@@ -28,6 +28,7 @@
+ #include <climits>
+ #include <cstdio>
+ #include <cstdlib>
++#include <cstdint>
+ #include <iostream>
+ #include <cstring>
+ #include <set>
diff --git a/dev-util/hfstospell/hfstospell-0.5.3-r1.ebuild b/dev-util/hfstospell/hfstospell-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..80b70860f0f0
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="clang"
+
+DEPEND="app-arch/libarchive:=
+	dev-libs/icu:=
+	!clang? (
+		dev-cpp/glibmm:2
+		dev-cpp/libxmlpp:2.6
+		dev-libs/glib:2
+		dev-libs/libsigc++:2
+		dev-libs/libxml2
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+PATCHES=( "${FILESDIR}"/hfstospell-0.5.3-gcc-13-fix.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# https://github.com/hfst/hfst-ospell/issues/48
+	if tc-is-clang; then
+		econf --without-libxmlpp --without-tinyxml2
+	elif use clang; then
+		econf --without-libxmlpp --without-tinyxml2
+	else
+		default
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
diff --git a/dev-util/hfstospell/metadata.xml b/dev-util/hfstospell/metadata.xml
index a5bd9f8e3448..a75f124455fb 100644
--- a/dev-util/hfstospell/metadata.xml
+++ b/dev-util/hfstospell/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="clang">Use different logic in ebuild when clang is used</flag>
   </use>
+  <upstream>
+    <remote-id type="github">hfst/hfst-ospell</remote-id>
+  </upstream>
 </pkgmetadata>