Merge updates from master

13 files changed, 248 insertions, 325 deletions

diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index bd47ea5de82b..41007c9966b0 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,2 +1 @@
-DIST gnucash-docs-4.12.tar.gz 76306600 BLAKE2B 78fb413099701da8c251681fa9724867f94cd731f396a80fd2be647790f32285a45eb857bfeae4ed6c36f5ec7664bc5aabfbdc2237d155a9f95aab78bf3227fa SHA512 29db1a402f7d417ad1a2f4db683974447add597e1b9e1b421789f3d2c8f987d1692202bb9052548b5ce544973c12bd538abab5ff33d3253330f0535ef920c8f7
 DIST gnucash-docs-4.13.tar.gz 76306335 BLAKE2B 61944e3da12d4f7b4a26f1301e640deca87656c4a9c7cd935f4c52ae69e49bf746850f09513d8fbd92314827f683c3a9c83c59479d583c192d977afdf9d8fce4 SHA512 7081a84c3426ef84e88aef520458a0d06382853cb9a51880766033b655f873d0926848387d573a38eca82cf0c6bceecdbd56704ab9ecb3068c78d7ce5c8d4da0
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.12.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.12.ebuild
deleted file mode 100644
index b9750234b9d6..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-4.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-office/gnucash
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake optfeature
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
-LOCALES=( de it ja pt )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2
-	dev-libs/libxslt
-"
-
-src_compile() {
-	cmake_src_compile -j1
-}
-
-src_install() {
-	local doc_type my_lang
-
-	for doc_type in manual guide; do
-		for my_lang in C ${L10N}; do
-			[[ -z ${my_lang} ]] && continue
-
-			case "${my_lang}" in
-				# Both help and guides translated
-				C|de|it|pt) ;;
-				ja|ru) # Only guides translated
-					if [[ "${doc_type}" == "manual" ]] ; then
-						elog "Help documentation hasn't been translated for ${my_lang}"
-						elog "Will do English instead."
-						continue
-					fi
-					;;
-				*)
-					die "Invalid locale: ${my_lang}"
-					;;
-			esac
-
-			emake \
-				-C "${BUILD_DIR}/${doc_type}/${my_lang}" \
-				DESTDIR="${D}" \
-				install
-		done
-	done
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	optfeature "generating PDF files" dev-java/fop
-	optfeature "viewing the docs" gnome-extra/yelp
-}
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index f9528018322d..55cde8404d6d 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,2 +1 @@
-DIST gnucash-4.12.tar.bz2 14552115 BLAKE2B 6d5faf2fa1d096315bd6c346e0291109669fd9df4bc0404f4dbc2fc56c8a361aeff57e3535fea862f21ff59391319010b7f28c9bd7df658a1b0c518894862585 SHA512 4c930dfc9a10dfd06d3c52874a61e533ddc39deb1c334162dc3a096d998dbdfcac61520ae94dedbc6742b7807e250ff92d26067a70c4ab156e46bed333bbfd37
 DIST gnucash-4.13.tar.bz2 14658572 BLAKE2B 027151a800194b854ad8bbe5175b24c99e924331f2b0a35745870542c2ade1e7347d2cbc3e400f621c6b5c1bb708633609a1891e729f8923d0c717537f884ca9 SHA512 7f1f5a6c6e537aca7e88c806461c58e90256954842026d801dba48586fa5817519220f532b9e460bc34751c94e6be4a80aac06325b7bada716616a735e2de3d3
diff --git a/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch b/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch
deleted file mode 100644
index b271be896c03..000000000000
--- a/app-office/gnucash/files/gnucash-3.8-examples-subdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/doc/examples/CMakeLists.txt
-+++ b/doc/examples/CMakeLists.txt
-@@ -21,6 +21,6 @@
-   web.qif
- )
- 
--install(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
-+install(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR}/examples)
- 
- set_dist_list(examples_DIST ${examples_DATA} CMakeLists.txt )
diff --git a/app-office/gnucash/files/gnucash-4.12-fix-test.patch b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
deleted file mode 100644
index 03b4bba29c24..000000000000
--- a/app-office/gnucash/files/gnucash-4.12-fix-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://github.com/Gnucash/gnucash/pull/1472
-
-From 6fe2028bca49f455b7841d178a712baec8f72919 Mon Sep 17 00:00:00 2001
-From: Marco Scardovi <mscardovi@icloud.com>
-Date: Thu, 24 Nov 2022 23:20:07 +0100
-Subject: [PATCH] Fix test
-
-Signed-off-by: Marco Scardovi <mscardovi@icloud.com>
---- a/libgnucash/engine/mocks/fake-qofquery.cpp
-+++ b/libgnucash/engine/mocks/fake-qofquery.cpp
-@@ -59,8 +59,8 @@ static class QofFakeQueryPool
-     {
-         ASSERT_TRUE(query_used((QofQuery*)query));
-         auto it = std::find(m_queriesUsed.begin(), m_queriesUsed.end(), query);
--        m_queriesUsed.erase(it);
-         m_queriesConsumed.push_back(*it);
-+        m_queriesUsed.erase(it);
-     }
- 
-     /* Remove a formerly added QofFakeQueryObject from the pool */
diff --git a/app-office/gnucash/gnucash-4.12-r1.ebuild b/app-office/gnucash/gnucash-4.12-r1.ebuild
deleted file mode 100644
index b6ca92039c22..000000000000
--- a/app-office/gnucash/gnucash-4.12-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with app-doc/gnucash-docs
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test"
-RESTRICT="!test? ( test )"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
-	examples? ( gui )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	smartcard? ( aqbanking )
-"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
-	>=dev-libs/glib-2.56.1:2
-	>=dev-scheme/guile-2.2.0:=[regex]
-	>=sys-libs/zlib-1.1.4
-	dev-libs/boost:=[icu,nls]
-	dev-libs/icu:=
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	aqbanking? (
-		>=net-libs/aqbanking-6[ofx?]
-		>=sys-libs/gwenhywfar-4.20.0:=
-		smartcard? ( sys-libs/libchipcard )
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gui? (
-		>=x11-libs/gtk+-3.22.30:3
-		gnome-base/dconf
-		net-libs/webkit-gtk:4=
-		aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
-	)
-	mysql? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[mysql]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.12:= )
-	postgres? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[postgres]
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_USEDEP}]
-		')
-	)
-	quotes? (
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/Date-Manip
-		dev-perl/HTML-TableExtract
-	)
-	sqlite? (
-		dev-db/libdbi
-		dev-db/libdbi-drivers[sqlite]
-	)
-"
-
-# gtest is a required dep
-# see https://bugs.gnucash.org/show_bug.cgi?id=795250
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/gettext-0.20
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/libtool
-	>=dev-cpp/gtest-1.8.0
-"
-BDEPEND="
-	dev-lang/swig
-	>=dev-util/cmake-3.10
-	virtual/pkgconfig
-"
-PDEPEND="
-	doc? (
-		~app-doc/gnucash-docs-${PV}
-		gnome-extra/yelp
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.8-examples-subdir.patch"
-	"${FILESDIR}/${PN}-3.8-exclude-license.patch"
-	"${FILESDIR}/${P}-drop-broken-test.patch"
-	# will be fixed on future version, see
-	# https://github.com/Gnucash/gnucash/pull/1472
-	"${FILESDIR}/${P}-fix-test.patch"
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage false positive, bug #677600
-QA_PREBUILT='*[.]go'
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Fix tests writing to /tmp
-	local fixtestfiles=(
-		gnucash/report/test/test-report-html.scm
-		gnucash/report/reports/standard/test/test-invoice.scm
-		gnucash/report/reports/standard/test/test-new-owner-report.scm
-		gnucash/report/reports/standard/test/test-owner-report.scm
-		gnucash/report/reports/standard/test/test-transaction.scm
-		gnucash/report/reports/standard/test/test-portfolios.scm
-		gnucash/report/reports/standard/test/test-charts.scm
-		gnucash/report/test/test-report.scm
-		gnucash/report/test/test-commodity-utils.scm
-		gnucash/report/test/test-report-extras.scm
-		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
-		libgnucash/backend/xml/test/test-xml-pricedb.cpp
-	)
-	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of ${S}/${x} failed"
-	done
-}
-
-src_configure() {
-	export GUILE_AUTO_COMPILE=0
-
-	local sql_on_off="OFF"
-	if use mysql || use postgres || use sqlite ; then
-		sql_on_off="ON"
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILE_GSCHEMAS=OFF
-		-DDISABLE_NLS=$(usex !nls)
-		-DENABLE_REGISTER2=$(usex register2)
-		-DWITH_AQBANKING=$(usex aqbanking)
-		-DWITH_OFX=$(usex ofx)
-		-DWITH_PYTHON=$(usex python)
-		-DWITH_SQL=${sql_on_off}
-		-DWITH_GNUCASH=$(usex gui)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	LOCALE_TESTS=
-	if type locale >/dev/null 2>&1; then
-		MY_LOCALES="$(locale -a)"
-		if [[ "${MY_LOCALES}" != *en_US* ||
-				"${MY_LOCALES}" != *en_GB* ||
-				"${MY_LOCALES}" != *fr_FR* ]] ; then
-			ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
-		else
-			LOCALE_TESTS=true
-		fi
-	else
-		ewarn "'locale' not found."
-	fi
-
-	if [[ ! "${LOCALE_TESTS}" ]]; then
-		ewarn "Disabling test-qof and test-gnc-numeric."
-		echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
-			> "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
-	fi
-
-	cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
-	XDG_DATA_HOME="${T}/$(whoami)" eninja check
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/examples
-	fi
-
-	if use python ; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/gnucash/python
-	fi
-}
-
-pkg_postinst() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	if use gui ; then
-		xdg_icon_cache_update
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild b/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild
new file mode 100644
index 000000000000..bd3938b77c2c
--- /dev/null
+++ b/dev-perl/XML-LibXML/XML-LibXML-2.20.800-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=2.0208
+DIST_EXAMPLES=("example/*")
+inherit perl-module
+
+DESCRIPTION="Perl binding for libxml2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="minimal"
+
+# >= on XML-Sax needed to avoid "miscompilation" (essentially empty install), as newer XML-Sax
+# has the ROOT check fixed. Didn't happen with XML-SAX-Expat, but best to be careful.
+# bug #840053
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Encode
+	>=virtual/perl-Exporter-5.570.0
+	virtual/perl-IO
+	virtual/perl-Scalar-List-Utils
+	>=dev-perl/XML-NamespaceSupport-1.70.0
+	>=dev-perl/XML-SAX-1.20.0-r1
+	dev-perl/XML-SAX-Base
+	>=dev-libs/libxml2-2.6.21:2=
+	virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	dev-perl/Alien-Build
+	>=dev-perl/Alien-Libxml2-0.140.0
+	test? (
+		!minimal? (
+			dev-perl/Test-LeakTrace
+		)
+	)
+"
+DEPEND=">=dev-libs/libxml2-2.6.21:2="
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.20.800-modern-c.patch
+)
+
+PERL_RM_FILES=(
+	"t/cpan-changes.t" "t/pod-files-presence.t" "t/pod.t"
+	"t/release-kwalitee.t" "t/style-trailing-space.t"
+	"t/11memory.t"
+)
+
+src_compile() {
+	export SKIP_SAX_INSTALL=1
+	perl-module_src_compile
+}
+
+pkg_postinst() {
+	pkg_update_parser add XML::LibXML::SAX::Parser
+	pkg_update_parser add XML::LibXML::SAX
+}
+
+pkg_postrm() {
+	pkg_update_parser remove XML::LibXML::SAX::Parser
+	pkg_update_parser remove XML::LibXML::SAX
+}
+
+pkg_update_parser() {
+	# pkg_update_parser [add|remove] $parser_module
+	local action=$1
+	local parser_module=$2
+
+	if [[ -z "${ROOT}" ]] ; then
+		einfo "Update Parser: $1 $2"
+		perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
+			|| ewarn "Update Parser: $1 $2 failed"
+	else
+		elog "To $1 $2 run:"
+		elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
+	fi
+}
diff --git a/dev-perl/XML-LibXML/files/XML-LibXML-2.20.800-modern-c.patch b/dev-perl/XML-LibXML/files/XML-LibXML-2.20.800-modern-c.patch
new file mode 100644
index 000000000000..609db4ac7123
--- /dev/null
+++ b/dev-perl/XML-LibXML/files/XML-LibXML-2.20.800-modern-c.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/883711
+https://github.com/shlomif/perl-XML-LibXML/pull/75
+
+From 25451c0a56ef8d3b32fd23847bef516486bd8ed4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 16 Jan 2023 18:50:10 -0800
+Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers
+
+This is now detected with latest clang16+
+
+Fixes
+error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types]
+                xmlHashScan(r, PmmRegistryDumpHashScanner, NULL);
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/perl-libxml-mm.c
++++ b/perl-libxml-mm.c
+@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table)
+ extern SV* PROXY_NODE_REGISTRY_MUTEX;
+ 
+ /* Utility method used by PmmDumpRegistry */
+-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name)
++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name)
+ {
+ 	LocalProxyNodePtr lp = (LocalProxyNodePtr) payload;
+ 	ProxyNodePtr node = (ProxyNodePtr) lp->proxy;
+@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy)
+ /* PP: originally this was static inline void, but on AIX the compiler
+    did not chew it, so I'm removing the inline */
+ static void
+-PmmRegistryHashDeallocator(void *payload, xmlChar *name)
++PmmRegistryHashDeallocator(void *payload, const xmlChar *name)
+ {
+ 	Safefree((LocalProxyNodePtr) payload);
+ }
+@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy)
+  * internal, used by PmmCloneProxyNodes
+  */
+ void *
+-PmmRegistryHashCopier(void *payload, xmlChar *name)
++PmmRegistryHashCopier(void *payload, const xmlChar *name)
+ {
+ 	ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy;
+ 	LocalProxyNodePtr lp;
+
diff --git a/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch b/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch
new file mode 100644
index 000000000000..605301ca0fd1
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-libxml2-2.11.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/906227
+https://github.com/dajobe/raptor/issues/59
+https://github.com/dajobe/raptor/pull/58
+
+From 4dbc4c1da2a033c497d84a1291c46f416a9cac51 Mon Sep 17 00:00:00 2001
+From: David Anes <david.anes@suse.com>
+Date: Thu, 4 May 2023 11:54:02 +0200
+Subject: [PATCH] Remove the access to entities 'checked' private symbol for
+ libxml2 2.11.0
+
+Since version 2.11.0, some private symbols that were never intended
+as public API/ABI have been removed from libxml2, therefore the field
+'checked' is no longer present and raptor fails to build in this
+scenario.
+--- a/src/raptor_libxml.c
++++ b/src/raptor_libxml.c
+@@ -246,10 +246,11 @@ raptor_libxml_getEntity(void* user_data, const xmlChar *name)
+     
+     ret->owner = 1;
+ 
+-#if LIBXML_VERSION >= 20627
++#if LIBXML_VERSION >= 20627 && LIBXML_VERSION < 21100
+     /* Checked field was released in 2.6.27 on 2006-10-25
+      * http://git.gnome.org/browse/libxml2/commit/?id=a37a6ad91a61d168ecc4b29263def3363fff4da6
+      *
++     * and was later removed in version 2.11.0
+      */
+ 
+     /* Mark this entity as having been checked - never do this again */
+
diff --git a/media-libs/raptor/raptor-2.0.15-r8.ebuild b/media-libs/raptor/raptor-2.0.15-r8.ebuild
new file mode 100644
index 000000000000..5b4f113ba487
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r8.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="https://librdf.org/raptor/"
+SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs"
+
+DEPEND="
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	dev-libs/libxslt[${MULTILIB_USEDEP}]
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	!media-libs/raptor:0
+"
+BDEPEND="
+	>=sys-devel/bison-3
+	>=sys-devel/flex-2.5.36
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
+HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
+
+PATCHES=(
+	"${FILESDIR}/${P}-heap-overflow.patch"
+	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
+	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxml2.patch"
+	"${FILESDIR}/${P}-use-pkg-config-icu.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxslt.patch"
+	"${FILESDIR}/${P}-clang-pointer-integer-warning.patch"
+	"${FILESDIR}/${P}-configure-clang16.patch"
+	"${FILESDIR}/${P}-libxml2-2.11.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #552474
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
+
+	local myeconfargs=(
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		$(usex curl --with-www=curl --with-www=xml)
+		$(use_enable debug)
+		$(use_with json yajl)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/gupnp/gupnp-1.6.3.ebuild b/net-libs/gupnp/gupnp-1.6.3.ebuild
index 980f8813702c..c9e04a37efcb 100644
--- a/net-libs/gupnp/gupnp-1.6.3.ebuild
+++ b/net-libs/gupnp/gupnp-1.6.3.ebuild
@@ -47,6 +47,9 @@ BDEPEND="
 src_prepare() {
 	default
 	use vala && vala_setup
+
+	# This makes sense for upstream but not for us downstream, bug #906124.
+	sed -i -e '/-Werror=deprecated-declarations/d' meson.build || die
 }
 
 multilib_src_configure() {
diff --git a/sys-apps/goawk/Manifest b/sys-apps/goawk/Manifest
index 8162e9818798..8d50b437d60f 100644
--- a/sys-apps/goawk/Manifest
+++ b/sys-apps/goawk/Manifest
@@ -1,2 +1,2 @@
-DIST goawk-1.21.0.tar.gz 1674139 BLAKE2B 782cbba57efecd8cb707d5eeaf5021756b5472232a7ef9ce4a55645c31b46f90a187c65f05acc05ea39ca2a225cdc65e96d25c6ecb44d814b5f7c0a085c14712 SHA512 32d4ad87db9eb40ecd90dee5aa34c312c96d223d59298bab5781621fa3f933492a1fab9cc4738faf24fe8eb38c802224f9cbbcde368ea7c2f136cde82f7eeca5
 DIST goawk-1.22.0.tar.gz 1676447 BLAKE2B 315874b8ee6334dd74fc86727340d3e14e01aac08880d562bd6297bcf42ae577e2ab6aa187e2f82616029b2fea9c64074193869fed01a8baa4423a5bfe73f45c SHA512 4109ca6e73f2eb87ef9d5b123634fb01cc92e8867aeec19be3d5b4744c7bd07747330fc6a371adbb52f2cab1fb51b43e9be6d8a851a0f0c5287c6039d497147c
+DIST goawk-1.23.0.tar.gz 1678139 BLAKE2B 0289ff64bfcfc7f14e48fc7d0e60e287b52d78d48dc8b21687ccdd13ada1cc8f193b12a112ccb898ef89893cf0f9e5502271f1433d77f21b1db5b1e9df56a4a8 SHA512 e2a8dda1d2a8cad1aee5ec7107cac30ff9aa691c5d0d78d91691dba21921fcbdac1dde4c61aff8a7d1280f174caaefcb44e937df84e0bf46e7818085da26f902
diff --git a/sys-apps/goawk/goawk-1.21.0.ebuild b/sys-apps/goawk/goawk-1.23.0.ebuild
index 7f7a8282cd24..e138a7adbd3d 100644
--- a/sys-apps/goawk/goawk-1.21.0.ebuild
+++ b/sys-apps/goawk/goawk-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/benhoyt/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 src_compile() {
 	ego build