gentoo auto-resync : 26:01:2023 - 07:55:33

109 files changed, 1551 insertions, 902 deletions

diff --git a/Manifest b/Manifest
index b05422cae953..1f4ffcffbb97 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29457 BLAKE2B ba2ba0b00e6b0c76145fa7b6bdfebcbc9abf23c28113b9daf4ba6fa6c3fb47caccb027c00d4871442837b3b4391e90366c258c5b4d3652aed7656cec96bf430e SHA512 d89d869b6da67e5d160948f94f27823c415715f1af55dad9c2846b620adfb1b5ea3d7113d7aa272718385ba6c521c478d69fb92eac7643c74794580a9ccf27b4
-TIMESTAMP 2023-01-26T00:39:46Z
+MANIFEST Manifest.files.gz 29460 BLAKE2B 8a8b543a812e7de12ae7d0f0f8e02399179efe703a3346b888c2f8fcc1c3afeb9ecf9318698bab6387cf67371dd1e4edfd99497dee8bccb32e4edf1b263b8aa3 SHA512 2b72ddd006b27e9b63ed4ae45c35ae6f34e83a3fec1da9bbfc335c97b3237135dd71dafc38c91dc753e041f6baab08c79c81ed31e7bc37dced716825535bd051
+TIMESTAMP 2023-01-26T06:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPRy9JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSIDVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAtPhAAiClwUEO10pVR7qwBwewhG3a68vkPqlNIjnZVIW/Q3Sedd2NRbnDTtKuX
-RvZY0TwlbAwjIRcKzn4LgALYJEUEUdJRC6MRudJQbnAPk4GLnSfugg0foIK69hs5
-bS0/8pzjotBcL+h0SKeZhH1e2TYfJbQj75Gbm1K7g4PP25wx5wUg12K+IzVk3RhR
-703EjaxMFvhlsi9KsqtnJk38Jvot0I7PYlz1KPSgWdOC6K5D6YTU/O9GwXj7fmot
-tuBIF2g9cKM6P3IaAwzGauqDTv6UIJEwV6CdvR6Vxr9dqgASgBvduw54N0FkLGal
-LVAzA6ppfrTtFcXpAqj+yj3+85+KKQ9ne1Dt+AX5M2Cw9TohQI8mPJKcB9DE+ig2
-FLmR44wf2tH3fMbJ2sNNHytt7VMjEAmEvF/qvBYhMnGWC7M2hON7GnMww0g0Y1uO
-yhpm6IpiBWjaHU9064OfIF9RnETYs2Atmje+oXoHdKBcmBS9TGhZrCGm3mdsTRE2
-Y3ZBljOADppRmTl8PWXCriGte1XnOK+Jf2k3ezUvXGEE7npnlStxt7v6LeICAEer
-x05lAaOQqwdZ1le0MNl+QDUj143uEDlD7chaEKn31z7LSwrWs2W4cLNCisg2kQkR
-OZqGTkcO5cnlh37eZV2KDU1EjCficxCDz920WHUNPNNWPXOf2zc=
-=C2Sf
+klBx/g//R5adxillIttvMaQDqzfT44ktTIxHHHPoBBUg6BA/3m+KYe2tYXJAk2No
+1PJ9pUJJlMAN6/o4lcqiLYAPpcVrTiEe2Scwd3hSC5nfZSokIKTrNagCSQHTpo9R
+u2n6gCXK/5hU+hEbINKqpp+/OZX+13Khkae2TGAGedK+1qhF5gi1M5Kl2gM9ApIy
+w8aWIlkYQI/1kvZJap7o+8nrfyCfeRjwqJJF1a9i+L4un4eg1/I6gPa5OTmmXaRW
++FLz0L4XCD+rlYxnjH2wxTed6qVu6QPfSLFtF9UtLI1BYbLZfYScjoNePqXMMqUW
+SajGPRnTHi+UmYRrbFTDb09PhjQaTd7ZVJ75p4mZTPTkawbnhDHWEK/CzpimF+8J
+gvbSJO/9lTH5/EVAAKty8Mmk1D8b6F4/1/TBxKUtQsPpvSQXDmiN5Nu0MwRTNmtF
+zjytR8WgwtoJkaOs0Nl1h8pIzxKfPWf3sf2SLtSAxGwOGprNBUTunWcHOGinb/zB
+sgB3VrRpQo4lDec298iAXEqiBHUNf3hpxf5b9yD8tuPXVE2AdW4E1/mgjdPRNRx6
+0W+CJdgMJlroFHyUo4OnP2QTP3rbgmatfEFzzerSVo8saP/QI5JAVGZGgXw5zu1D
+vQ5qyx10WLgyeKllzak5EibGskXemdZRL/4L/KOzw1Uv91Yb+M4=
+=wbzR
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e2c253d6d34b..740088e2b8c5 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index a820d084a66c..6dd4bd61d09c 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index d18b72dfe915..242ca9ee7d4e 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,5 +1,6 @@
 AUX brltty-6.4-respect-AR.patch 385 BLAKE2B 0029b98054c21b86bb3d03ff52a358fd08585fd10dcf43443c44857c13c17e65e8a60c1e14c06e708dbf77e55760d465a7929bf35cb37cb5758b42770cd7e4c7 SHA512 d603e195d9981a608b46ebb047536acece13c5106b46d1a4b76cc7e7aad6db2fb47d338224faaa9973295e10994fdd62a6986b0a3fd193a4808d432681d3dd60
 AUX brltty.initd 241 BLAKE2B 80969e4840d2d38af6bc310ecf18e0253ef01667517135bc5a2f92e50882c2b72e8a4763b215c62ccbfd8d2250067b44ce9a4cb5d318dd6eb48b298826d8d5de SHA512 55ea97a546a2335ee1148396df71363442b66ed4526f8adb93e88c2cf489f10a21b5361658f590b3f64eec24844235491b15349bd0e1c4533fef7b1390fc3a6e
 DIST brltty-6.5.tar.xz 3631628 BLAKE2B b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee SHA512 bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3
-EBUILD brltty-6.5.ebuild 5668 BLAKE2B fac441eb3bde2e3b0de64924afe486e4e4ca78d176ce9e6484e73773648bba32e023a37836f12928b6417ff7c2bac98bf35afa5f4812906a8a76d054860bc90d SHA512 2f66e1bb281c16685bb4b0e6a5f3cff00b6b2bb4cabcbfa67f9e5343f44c72a0fcf122548b60d92c10ff53ea7fca3613c17f6a24ce81117eb11ccdc104fc8a3e
+EBUILD brltty-6.5-r1.ebuild 5690 BLAKE2B ac81eec50a4e49d1242a1902aa6e8d9699ba4f6d7dddcbea5d3607c1456e1172d71c8960aee177b42abfb116c47369141da93eac672dec1f22a846c7ceade535 SHA512 1cb4b1a1c001c1d1b612ac41c3fc97c21c72f98ff18010ea0d883802905f592ec45ff8d2941508b190a2f13ea907b9c7f09285646b9801bfde576169ee5f6ea8
+EBUILD brltty-6.5.ebuild 5683 BLAKE2B 4edd212a53bef39aec72393cffbb3c23af1302a25d4faf3ed0d4c515bdae0c3423b4ce37f5bac6cfa49aa25cca8db08d5a9c12ebe02e263b2f2dfe8ebcda945a SHA512 b689f849ac6b6cd1c60dc10ae8bdc07065771db7c6baf9f10086d18b02417a060e5ecedc1421a52dd7017d54d0de9e09fd0fb6f4f618aef1be6990ff6d12e837
 MISC metadata.xml 1640 BLAKE2B eb6127143a054eda7263e2a3bf27555ac6193c2d9363476be6e6cb4e9269f454a808890ff8587189784a51877f44ed8ff5b9231aeea8d4c3172c98f66481c856 SHA512 74017c3f562c638fe1f547ed3e23c303d2248cbcc602404a4e394439ed4ad314ca359a9dccd181ba264a19b822fc46c7c961f992ad2bce95f6c3bfb3436d461f
diff --git a/app-accessibility/brltty/brltty-6.5-r1.ebuild b/app-accessibility/brltty/brltty-6.5-r1.ebuild
new file mode 100644
index 000000000000..8bb86f80887c
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.5-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="https://brltty.app/"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
+		java louis +midi ncurses nls ocaml +pcm policykit python
+		usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+DEPEND="
+	acct-group/brltty
+	acct-user/brltty
+	dev-libs/libpcre2[pcre32]
+	bluetooth? (
+		sys-apps/dbus
+		net-wireless/bluez
+	)
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis:= )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak-ng
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.6.13-r1:= )
+	usb? ( virtual/libusb:1 )
+	xml? ( dev-libs/expat )
+	X? (
+		app-accessibility/at-spi2-core:2
+		sys-apps/dbus
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXfixes
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( virtual/libintl )
+	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.4-respect-AR.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# Override bindir for backward compatibility.
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir="${EPREFIX}"/usr/share/doc/"${P}"/html
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		# the next two lines should be removed once support is added.
+		--disable-emacs-bindings
+		--disable-lua-bindings
+		--disable-stripping
+		--with-updatable-directory="${EPREFIX}"/var/lib/brltty
+		--with-writable-directory="${EPREFIX}"/run/brltty
+		--with-privilege-parameters=lx:user=brltty
+		$(use_enable api)
+		$(use_with beeper beep-package)
+#		$(use_enable emacs emacs-bindings)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_enable louis liblouis)
+#		$(use_enable lua lua-bindings)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package)
+	)
+	# disable espeak since we use espeak-ng
+	use speech && myconf+=( --with-speech-driver=-es )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	if use python; then
+		python_build() {
+			cd "Bindings/Python" || die
+			emake -j1
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			cd "Bindings/Python" || die
+			emake -j1 INSTALL_ROOT="${D}" install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	newinitd "${FILESDIR}"/brltty.initd brltty
+	pushd Autostart/Systemd 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd || die
+	pushd Autostart/Udev 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd || die
+
+	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO}
+	if use doc; then
+		HTML_DOCS="doc/Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rm -fr "${ED}/run" || die
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot on an OpenRC system, type this command:"
+	elog "# rc-update add brltty boot"
+	elog
+	elog "If you are using systemd, type this command:"
+	elog "# systemctl daemon-reload"
+	elog
+	elog "Please reload udev by typing:"
+	elog "# udevadm control --reload"
+}
diff --git a/app-accessibility/brltty/brltty-6.5.ebuild b/app-accessibility/brltty/brltty-6.5.ebuild
index c04e292aa921..211efd5c394f 100644
--- a/app-accessibility/brltty/brltty-6.5.ebuild
+++ b/app-accessibility/brltty/brltty-6.5.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	usb? ( virtual/libusb:1 )
 	xml? ( dev-libs/expat )
 	X? (
-	app-accessibility/at-spi2-core:2
+		app-accessibility/at-spi2-core:2
 		sys-apps/dbus
 		x11-libs/libX11
 		x11-libs/libXaw
@@ -192,10 +192,10 @@ src_install() {
 	newinitd "${FILESDIR}"/brltty.initd brltty
 	pushd Autostart/Systemd 1> /dev/null || die
 	emake -j1 INSTALL_ROOT="${ED}" install
-	popd
+	popd || die
 	pushd Autostart/Udev 1> /dev/null || die
 	emake -j1 INSTALL_ROOT="${ED}" install
-	popd
+	popd || die
 
 	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO}
 	if use doc; then
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8ce2fc4fdc36..7a87e49d30b4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 14ccc483b1d3..f12b6c57b4e5 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -3,7 +3,7 @@ AUX apache-tools-2.4.54-libtool.patch 594 BLAKE2B c1b11ad580369a42fde6cbaec8d419
 AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-EBUILD apache-tools-2.4.54-r2.ebuild 2584 BLAKE2B 806ba26d6e454af5832192ff08c1d26ce119fca55f82f8bd9b4375fa07932c3abbd1b33637cb0c598f6f9959c699099be86b73a164eef6bd061fe3dcf6090764 SHA512 66abde43de1807b264eb412048ad2f613e8454f2bb6dcc4853dc2d14cdd8e81770d3bc3e1e7786b1b4a553883dbe36720739824cd3fc5859d5e27953f82a4697
-EBUILD apache-tools-2.4.54-r3.ebuild 2683 BLAKE2B bcbed908720c3edac3d4ac4d546837d88e367afb803f3f4e02d7fefac24ee296abc738df3f9567084fb087669296d0fa3b3b3629708210c1c04385e62712e988 SHA512 b5472a44904dcb91bab17b6f9d5f1c05207c71cb509c7df430f124315c001fd28a49d520f08b6859f364cd67c702baf1a50ac6eb43f4e3088a75892cf952c957
-EBUILD apache-tools-2.4.54.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
+DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
+EBUILD apache-tools-2.4.54-r3.ebuild 2677 BLAKE2B af27235ab1c8ae302c0684136208c3b598434f2fb27fe0bf908e04078052b61bbee6e1742f079ec4c226f2c66cf181a9c50f53db197f356204d8ceb8db44438c SHA512 bfd73d3bcaa27450b84bb950958c944bbaafde7e2b492147d41d5bfbd21560bef47183353a62c933012e7724afb687093e5b53e718352a6fbcc6b9b4482458a4
+EBUILD apache-tools-2.4.55.ebuild 2684 BLAKE2B fd57a865b90bf6d88526e9e15e50e06c4500ac704b2c4b55232776c458cc10caa925f9c4204b4d89983617049619c9f9052d64a46ad2baa59c7290c6ddad6f88 SHA512 d14a40b38e10270c20571cf05a47f463ac8f11d4d12e34bbed477403480fa2cd0c88b101a162e7baa1b04135e23dd71d79eb93d369548f3bbd30f213f0b7808b
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 4a6e2b8a9adc..b104b44b2d30 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.54.ebuild b/app-admin/apache-tools/apache-tools-2.4.54.ebuild
deleted file mode 100644
index bf1562cee74c..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.54.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="
-	sys-apps/which
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
index 82fccd8b06f3..78acadb3488b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,14 +11,14 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/apr-util:1=
 	dev-libs/expat
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	virtual/libcrypt:=
 	kernel_linux? ( sys-apps/util-linux )
 	ssl? ( dev-libs/openssl:0= )"
@@ -40,8 +40,8 @@ src_prepare() {
 	default
 
 	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
 	flags=()
 	for flag; do
 		if [[ ${flag} == "--version" ]]; then
@@ -50,19 +50,21 @@ src_prepare() {
 			flags+=( "${flag}" )
 		fi
 	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
 	EOF
-	chmod a+x "${T}"/pcre-config || die
+	chmod a+x "${T}"/pcre2-config || die
 
 	# Only here for libtool and which patches
 	eautoreconf
 }
 
 src_configure() {
-	# Brain dead check.
+	# Silly check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
 
 	tc-export PKG_CONFIG
+	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
 
 	local myeconfargs=(
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
@@ -70,13 +72,15 @@ src_configure() {
 		--with-z="${EPREFIX}"/usr
 		--with-apr="${ESYSROOT}"/usr
 		--with-apr-util="${ESYSROOT}"/usr
-		--with-pcre="${T}"/pcre-config
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
 		$(use_enable ssl)
 		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
 	)
+
 	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
 	econf "${myeconfargs[@]}"
+
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8d62fe5c1c74..4e1356f6541c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index d6affa8bc4d7..9428b397d208 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,6 +1,4 @@
 AUX wgetpaste-2.33-tests.patch 2742 BLAKE2B 3bb6c60de41ff4e428048816b093f40691de2a625e2a27a75b8db9f4e7333ab43778be704ddba01e2d5eb43a20f6ca6a83059f8bb2d04d08dc9d196901e53a17 SHA512 6d8a65215d4c1939c2f0acdd486171d37c4f1ef71b8ef6341fcf50db9cd057de1d616b3f3ac57820082d6fce1d8c75d72c8613865a0cf46df5fd3f5104716024
-DIST wgetpaste-2.32.tar.gz 16626 BLAKE2B a8628a47edec5797f011fdf648cccf4147043bb699fe6ebfc38b66d1bbff1840147613e1de1a2abf1048b83247e9a16026bed4174be605f99e59035cf7c64f9f SHA512 57f6194c864adf3eabffe46163d1c83a5c2c30affc4c353fee5cafe6aaf19cfa306e134cb5dd216577eb34cc93eee66b28297e5a1d4fa92d78d38597170d40bb
 DIST wgetpaste-2.33.tar.xz 16408 BLAKE2B 78baebf4edb6e6340a73127099366d306359d02c0c1eab137822c56669da0609a5479940b4fb2accbc79978df091dcd34415876618e64aa556d1584f74773736 SHA512 9bf1f379316da372b4f69296b54f9a266dcf9fdaa2a8718165a2029571f4c2c0166304ffebeb2ec4657ea6f49087793f40d9da383f5da052bce0543c90ea13ab
-EBUILD wgetpaste-2.32.ebuild 664 BLAKE2B 1eace63001f98a34bfc3b3a55ed42acaa15b99645844bca4b16cb6c39ca82622bf9f7d9016d5f0785bb872aed9bcd9c8bf75ebc42893b9863ea97e694d9cf81a SHA512 caf06b9f8c9b0e49213ee02b159d2c33f1b534771e7e694ea6fe387e524400b8a16a1a3548bfcf78cff73a35cbd50c4087068465dd9c080e75c075c72d20a2c5
 EBUILD wgetpaste-2.33-r1.ebuild 949 BLAKE2B 17d7ffd72d029337a6667be7f7398c38f950a36813da0127c8148cc0d610b086a91b5032b4c006d64c2e318f17aa5ca4dd40cef2a494cee04fd86c24a747adcd SHA512 d095a347e93368312d5808dee72bef73dd0fe4d8d047f682ca98b1d5ebbb35b192d47a867395d713081bc1f80c4281b848ccd2ebd9b9e16239a32aaa41c8ecd3
 MISC metadata.xml 566 BLAKE2B 1f63219976e414e688b0e8b5d0ce84dc4480af3e59ebbbe550d26ca5973ac22148b87d1b43304bbbfbcaba1731d14a6f7639b7352e2b77d1141f8dee6875d2ce SHA512 779b873177a5b294e6a140d8d658980469b50cdb1c65f6c4a387e8af82f996f109ed14ae208f8603cdfc80ac0f9f0a50ad00202e92c0f5c6aaea13d01ecf8862
diff --git a/app-text/wgetpaste/wgetpaste-2.32.ebuild b/app-text/wgetpaste/wgetpaste-2.32.ebuild
deleted file mode 100644
index 843df16d4406..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.32.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="https://github.com/zlin/wgetpaste"
-SRC_URI="https://github.com/zlin/wgetpaste/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+ssl"
-
-RDEPEND="net-misc/wget[ssl?]"
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 876b77356eef..e5ee387d2472 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 626f57f44833..ecc3003fc961 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,5 +1,6 @@
 AUX tcl-8.6.10-multilib.patch 382 BLAKE2B 048865231ab45fefcd7bf708ba301809f358d7eddc45adc108c022768887ffb3e9912de9ab4ab4822453efe5c70a435ebcd61d7aedaf796b4b00b574ae6a318e SHA512 d0500d5dd7ae2f382221fd4f1a63d2ef689023b8873f6682f87b482ef601bd881a16321c02010067ae0a50e70ea75ccdb8b34753d809e9f7d591c279d344d6be
 AUX tcl-8.6.12-configure-clang16.patch 1189 BLAKE2B 60a7b0262bc74ab0942d87d59b60db55d0eb56fdf2f117487079adb22a11d018e5bcd1bcd43ac974948710fa75b4e7e28e987e3fd8b12b1687e4bebfdae0c8fc SHA512 61749c22365a9b08301729a36dcb732ac773430b29a81e87a86fceab381e3b27c68f24eaefa0fffd6d1946fa5e1c30529178f63e4aae9b196d1178349aacb77c
+AUX tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch 790 BLAKE2B 74f62fcfde58c294d91c5a03ee2765b635c41e02bcb34f397f0f648efd11f8bace8558257819e804df7c61b551dd533af80f9f2567685dd28e1f9d57ea6cbe1f SHA512 73045aa190463ff78475fdcb5c9c5d59f743301ceb90faabba0acfeeead4d87b93fbaf1bf3ba936e77e63cea3664427cc23a8f085d5927ba404cbea160559af8
 AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8
 AUX tcl-8.6.9-include-spec.patch 488 BLAKE2B 06aa49163e8316b409238055d4b2ef67a3b37bdad69a190d39ce46a32dbd38320397b206036428c81e4a001ee0c01ee70f5970f584f919d0e5348000c7f93711 SHA512 ca4fc3ca2b3963d9c1b9b1c716e9c508d8c7aeaaad4b39c502472f3592c60907dbcda656369af371ec6c21f06a6dbc50fa02994a15284bedbdb22616ca9340ba
 DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2647d7af65d3029a463cf571d3fbe0bd48e15fef643e81de94296777985a36530a83718d4eb7befca4bc107ab860cc0d SHA512 fe3556c37305e3856743e9a202a320d44b1b3cbc926a1b7a4449ae5baf2f8df92214a9aa06f0a87645d032857fb71458fc864ff007fd73da60463ae5001f2d3f
@@ -7,5 +8,6 @@ DIST tcl-core8.6.12-src.tar.gz 6064625 BLAKE2B 30dc780562aa6955e2c417798cc96fabd
 DIST tcl-core8.6.13-src.tar.gz 6370805 BLAKE2B f5af3c0fa2d52c09ab16578c9147cb5ac4a06b81882c49f1ef23642bed32adccbe2a5acbddc5d18bd1757e1991daf864707d842e675f92c6de70be6f4275b95e SHA512 c1c953ac0f9a530d8256514c0cb78f166d0063db725b87fa19272716a955cd390ff8f1c5f17e791cf463284d88bb136d61194779a913a6a78f46146d485c71ee
 EBUILD tcl-8.6.11.ebuild 4016 BLAKE2B 761335036c4f86499dea605a7659b5b4d7d95d1c8ab78bc0aab0edc2bf23e42eea316251b6a6a92e1ec504955b19fafaeb4722230f7e1dc9ec04ef6b3ccb7684 SHA512 0e8bbf84e92819348121919dc625d410b5be4d921230ec11d4bdf14d1debc6e2f39517a2c53c02fbc95127b1347e0e53ab6fe3f0efdbe9cdad5c7b5bd4eebb48
 EBUILD tcl-8.6.12-r1.ebuild 3582 BLAKE2B 0707ddc347ec31ad3dd191819ffe5c39a20b49119faf545ab844d84c736279d23b52aef2828caa696f8972b356dea8d767edf52cc1aabf931f88fd47f106f59f SHA512 592504326ec61ccdac6a712c66e5a9d5137ffba1fce2f49dba798fc6e67acf441dbcafe3f455f96c7bf6ce951f4641e6740b36a4563ec58ccc36404ad07c18dd
+EBUILD tcl-8.6.13-r1.ebuild 3627 BLAKE2B b6f44e1cb4e26b4d0b0e4e21c707d375b4806b5e1866e3967cfc6b7d7e5f658912fcfcd6d87417e1c94e02472577b1690217c6848b5f0d7989e4f7380d3e7e5b SHA512 5f3bb36354b6d4d5492a3e4e91b665913c9fc37405290ea01f324fb2269361515c945ebd699451c7e3c145c632c776c97bccac8cb3d05856f205326fabce4c20
 EBUILD tcl-8.6.13.ebuild 3546 BLAKE2B 9c6c47faee89c8a6d53803a407261d52d82cab7e09f739b307e322179d96fc8b90b15ff417a8ec619ee9bdc100859bd102a9402ec4580a5fc4a382d2753ff72f SHA512 59bd2ae319f6eaec6a03157a3528797c404a6fdb2ed9d08d87df1d74d6fe632103a4d903c7389bf0d80521736d70479d64dac7c12354e453821c24d8dd2ada17
 MISC metadata.xml 421 BLAKE2B c056a7ae8f2deaddda9bb329d46ec4f322548f4d031479ba522f5d93add46bd47cc783e9876b398579898af2cbdedb053c6328433eacfd02df4bb6dcf0185766 SHA512 0e77b876a127d68c7b193db874b9d3ab38f8475abafec1d866f2a4158ea4334ae04fbd6cb1d9acc23c81e13e584fe667503e4d9352873e1880a2d6acf7dec59c
diff --git a/dev-lang/tcl/files/tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch b/dev-lang/tcl/files/tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch
new file mode 100644
index 000000000000..2ae38234ca79
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/892029
+https://core.tcl-lang.org/tcltls/tktview?name=37bbdb9fb2
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+ else
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
++    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-lang/tcl/tcl-8.6.13-r1.ebuild b/dev-lang/tcl/tcl-8.6.13-r1.ebuild
new file mode 100644
index 000000000000..c1c0521aa43a
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.6.13-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-lang/tk!
+
+inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+	"${FILESDIR}"/${PN}-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch # Bug 892029
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+
+	# httpold tests require netowk
+	rm ../tests/httpold.test \
+		../tests/env.test \
+		../tests/http.test \
+		|| die
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5ec682309292..8c8a14a42a2a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 4d0b84926b87..d03cde5d9364 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -6,5 +6,4 @@ AUX apr-util-1.6.1-mariadb-support.patch 4929 BLAKE2B 9f8a06e657386f5f773642f36f
 AUX apr-util-1.6.1-my_bool.patch 311 BLAKE2B c0fdf523983dc75ff977c8f602678cdd7d0b3e539fc266891e2266fa3b60e0971e93d77f2e28ed95959d8ca62bca4f9f566fefea525c845d49ce545ee6b5a99a SHA512 ed7d7857be8b5d29cc17a7216c1b06134798eb5129d50389bb0d5484a46e19e3169f8cea80cab7f845548e528a2cd9909b72016a7216b402092ae15879db792c
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.6.1-r10.ebuild 3837 BLAKE2B 964390753d1270160680eb8eabbee019f40568a7b9c37eea72f9bec2968c81aa2eb0d1868589d636eeee96a2310420ee92fbe6d8eb0baa9f045c44e053ab6420 SHA512 ebd329003ea8bd14b879c442ce7b802f21c5835f34f79e9082a2575ec89452f7e979cd38347dc3a620f03e70efef84e44e1aeea07af09b4bd2a1fe6af0462329
-EBUILD apr-util-1.6.1-r9.ebuild 3827 BLAKE2B bbd94dda2913e55b23d82a0d57809008ddac2a409eef4278322be55001a684cff5a8c2d89ff548edd887215d7bd6708f1ef6d064155574f242cbcc1663755aaf SHA512 de0b7ed879524b4245c4d8a5fd5bcd50c9e9567275f1887241116d4fbcaea38f9667150fa4a2303c7eeff67098ed8d547200d5142fd43377e0b3860260f85379
 MISC metadata.xml 469 BLAKE2B d4ef8b9223183a322e324290e26e78fd291bfd3e60b48a18d1345f0aaf467302cabb62ae330ee5282bf38fcdf84a020dcca1b32a8351e3494d9fecd723196031 SHA512 727443f6ab071b3c657287a698ccaccea336a3b861f199dd07c4472cd61e1252e2a25f24a86dcdd72cedcfb73fb6cb0ebe0cbdc93220223dab5501e9626ecb4e
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
deleted file mode 100644
index 42ff0c6607ef..000000000000
--- a/dev-libs/apr-util/apr-util-1.6.1-r9.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
-# APR_PV="${PV}"
-APR_PV="1.6.2"
-
-inherit autotools db-use libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Utility Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
-#RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/apr-${APR_PV}:1=
-	dev-libs/expat
-	virtual/libcrypt:=
-	berkdb? ( >=sys-libs/db-4:= )
-	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( net-nds/openldap:= )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		>=dev-db/mysql-connector-c-8
-	) )
-	nss? ( dev-libs/nss )
-	odbc? ( dev-db/unixODBC )
-	openssl? (
-		dev-libs/openssl:0=
-	)
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=(CHANGES NOTICE README)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.1-fix-gdbm-error-handling.patch
-	"${FILESDIR}"/${PN}-1.6.1-libtool.patch # 779487
-	"${FILESDIR}"/${PN}-1.6.1-mariadb-support.patch
-	"${FILESDIR}"/${PN}-1.6.1-my_bool.patch
-	"${FILESDIR}"/${PN}-1.6.1-drop-my_init.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix usage of libmysqlclient (bug #620230)
-	grep -lrF "libmysqlclient_r" "${S}" \
-		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
-		|| die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=(
-		--datadir="${EPREFIX}"/usr/share/apr-util-1
-		--with-apr="${ESYSROOT}"/usr
-		--with-expat="${EPREFIX}"/usr
-		--without-sqlite2
-		$(use_with gdbm)
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with nss)
-		$(use_with odbc)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_with sqlite sqlite3)
-	)
-
-	tc-is-static-only && myconf+=( --disable-util-dso )
-
-	if use berkdb; then
-		local db_version
-		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
-		db_version="$(db_ver_to_slot "${db_version}")"
-		db_version="${db_version/\./}"
-		myconf+=(
-			--with-dbm=db${db_version}
-			# We use $T for the libdir because otherwise it'd simply be the normal
-			# system libdir.  That's pointless as the compiler will search it for
-			# us already.  This makes cross-compiling and such easier.
-			--with-berkeley-db="$(db_includedir 2>/dev/null):${T}"
-		)
-	else
-		myconf+=( --without-berkeley-db )
-	fi
-
-	if use nss || use openssl ; then
-		myconf+=( --with-crypto ) # 518708
-	fi
-
-	econf "${myconf[@]}"
-	# Use the current env build settings rather than whatever apr was built with.
-	sed -i -r \
-		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk || die
-}
-
-src_compile() {
-	emake
-	use doc && emake dox
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
-	fi
-	if ! use static-libs ; then
-		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
-}
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 4bc5c142c2c7..9308d05c713a 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -9,6 +9,5 @@ AUX apr-1.7.0-clang-16.patch 4341 BLAKE2B 3d8a7d0e62016c4fd7f1b851d06ef595f8ddba
 AUX apr-1.7.0-dev-zero.patch 1314 BLAKE2B 22f334d721dccb71bfc3197c3b343d79f9fb33523558c0e46daad37b910aba066fd4b62e62a7875317ffa4db7dcc47004ee8bed245c7ba6fb90a67e18c1b8c6d SHA512 ad95469e7690efab945491156eb923eb95cc767bac1098b0a2ae7779cab5ea33875af23c47962cf49327cef91e02dbc3c8ecee9832978316a5c191dc20a7d07f
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.7.0-r5.ebuild 4567 BLAKE2B 4a6d38c41ab104532969f0bf6d19815dbdbf9c84de1bd1c66aade7ae37bdfc3d93018b1aac4dadf1f8c25738ad9a8d61ddff7255b0564059d0da1f3840d35d9d SHA512 009766ba30c28970c67364568e4239cf458b7a437644756ed9b6022db830266834b5233ed60db99ae88b0bae54629c5a563fce7b9d8ebaefb408e597ea87d291
 EBUILD apr-1.7.0-r6.ebuild 4667 BLAKE2B 0a48780503a9cadf9fa3463507881d314581d9270b5c28f9cc9754fe45038e6168d107f5c87993949e89593e436eb3f6e2c4c0045b29d02b9c74906b60e8b8a5 SHA512 71a1efb5b1c28b2a11a8751d82eceaf5cfe81fd95a142970d5bcb5da5a0e8b47cbf9c0d32c12c52eff269419547990426ea83eea7d96d59c48f80632fa05b889
 MISC metadata.xml 511 BLAKE2B 5b4f31f74a9e3fe93b63bb337b5e0b7396c18439c269de0ec6c8308becf69ac8474d72dc921c80c06321bcaf708d49c9e26ec282036e84a9b03c08858c942980 SHA512 82063beddf8ce88d5f151ddeb8b3b69c10124af1c7b727b4c73885b4b14a427e93cd4164ddd4e3dfcdf7175727a8dffa357f1f14c3daee192a255f8995e6b0b5
diff --git a/dev-libs/apr/apr-1.7.0-r5.ebuild b/dev-libs/apr/apr-1.7.0-r5.ebuild
deleted file mode 100644
index 28985b8993a8..000000000000
--- a/dev-libs/apr/apr-1.7.0-r5.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="https://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1/${PV%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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="doc older-kernels-compatibility selinux static-libs +urandom"
-
-# See bug #815265 for libcrypt dependency
-CDEPEND="virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-base-policy )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
-	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-	"${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353
-	"${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	eapply "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, ${PN} detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_test() {
-	# Building tests in parallel is broken
-	emake -j1 check
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 487cb397b3c4..b55f8072adaf 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index c84aba17af9a..faf2b037d6fd 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,6 +1,6 @@
 DIST seer-1.13.tar.gz 396675 BLAKE2B 9dd844688a84645c5c105f5296c86c71335ccced3880a3636c8e6904be85253b1dd4da51035e5d93f6f6415584763cdf40dd27cfb5d617ee6a2fd2b64685752a SHA512 1c54c4c304ca3a378aaf1f2e2e8de49cf41886de76257cb9f746ff85a15ec2bf9abe0d4311ca6a2e585d2c13740ec815e63f3a8dc4df7478c71bc0e2261b5d4e
 DIST seer-1.14.tar.gz 400391 BLAKE2B 9134bd62eae35e965601af56e734a29d5f0d12af2c9383e287c0ba41a6285587b24b84b49c588bb497b8b55154ebef74ac78b1ace282d018d40d544ed070e343 SHA512 1657ce26e676cb03e514e69f79e4aef614f489918329b1421d8017284387bb155b750d18b00ff8244ad73104cd0b7e078360a22c692e9ec5cfd4aa258c778dc3
 EBUILD seer-1.13.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
-EBUILD seer-1.14.ebuild 944 BLAKE2B 3fea94c17d92eb1a2af1fd45949082a345ce6898ad279f81b3023181678f44135620b6ff5963ddca54a2d87ead13a0eba1c7810b78348ecbf3ae5ad8bc54c600 SHA512 70b34e7620989dbee3d370c63211e6099e1fad52cde620a5829129788aa14b726aea35e1c0029814792bb5dfcf3ac7540d2e92b59a2eb4f0940e6d64221d9c95
+EBUILD seer-1.14.ebuild 951 BLAKE2B 2df58aa9b25dbf222f74637d321f493437448c1abbde0726c3250bfa91a0962901387780b685b13918d38419c2e6182f67a82fb44d356163fb35c4f2833d1cc8 SHA512 4358ccbc58badeff52fc06d2572efc34428843e10c7d2eb0e631c923d2d3dd0bed0d52378c03c4109b730755c3f17d8b861fb8ab2fd7e2bd3be119685ffdcebd
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.14.ebuild b/dev-util/seer/seer-1.14.ebuild
index 10f65fe03c63..207362f81cdd 100644
--- a/dev-util/seer/seer-1.14.ebuild
+++ b/dev-util/seer/seer-1.14.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 S="${WORKDIR}"/${P}/src
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 3395694510c8..335cc1bba395 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 50df33f0b074..da08a416f62c 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: apache-2.eclass
@@ -37,12 +37,6 @@ esac
 # INTERNAL VARIABLES
 # ==============================================================================
 
-# @ECLASS_VARIABLE: GENTOO_USE_PCRE1
-# @DESCRIPTION:
-# Temporary variable to allow older Apache versions to force using legacy
-# dev-libs/libpcre.  This will be removed once ebuilds using dev-libs/libpcre2
-# ar stable.
-
 # @ECLASS_VARIABLE: GENTOO_PATCHNAME
 # @DESCRIPTION:
 # This internal variable contains the prefix for the patch tarball.
@@ -138,6 +132,11 @@ _apache2_set_mpms() {
 _apache2_set_mpms
 unset -f _apache2_set_mpms
 
+NGHTTP2_VERSION=1.2.1
+if ver_test ${PV} -ge 2.4.55 ; then
+	NGHTTP2_VERSION=1.50.0
+fi
+
 # Dependencies
 RDEPEND="
 	acct-group/apache
@@ -145,39 +144,33 @@ RDEPEND="
 	dev-lang/perl
 	>=dev-libs/apr-1.5.1:=
 	=dev-libs/apr-util-1*:=[gdbm=,ldap?]
+	dev-libs/libpcre2
 	virtual/libcrypt:=
 	apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
 	apache2_modules_deflate? ( sys-libs/zlib )
 	apache2_modules_http2? (
-		>=net-libs/nghttp2-1.2.1
+		>=net-libs/nghttp2-${NGHTTP2_VERSION}:=
 		kernel_linux? ( sys-apps/util-linux )
 	)
 	apache2_modules_lua? ( ${LUA_DEPS} )
-	apache2_modules_md? ( >=dev-libs/jansson-2.10 )
+	apache2_modules_md? ( >=dev-libs/jansson-2.10:= )
 	apache2_modules_mime? ( app-misc/mime-types )
 	apache2_modules_proxy_http2? (
-		>=net-libs/nghttp2-1.2.1
+		>=net-libs/nghttp2-${NGHTTP2_VERSION}:=
 		kernel_linux? ( sys-apps/util-linux )
 	)
 	apache2_modules_session_crypto? (
 		dev-libs/apr-util[openssl]
 	)
 	gdbm? ( sys-libs/gdbm:= )
-	ldap? ( =net-nds/openldap-2* )
+	ldap? ( net-nds/openldap:= )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? (
-		>=dev-libs/openssl-1.0.2:0=
+		>=dev-libs/openssl-1.0.2:=
 		kernel_linux? ( sys-apps/util-linux )
 	)
 	systemd? ( sys-apps/systemd )
 "
-
-if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-	RDEPEND+=" dev-libs/libpcre"
-else
-	RDEPEND+=" dev-libs/libpcre2"
-fi
-
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
@@ -529,37 +522,20 @@ apache-2_src_prepare() {
 	# ${T} must be not group-writable, else grsec TPE will block it
 	chmod g-w "${T}" || die
 
-	if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-		# This package really should upgrade to using pcre's .pc file.
-		cat <<-\EOF > "${T}"/pcre-config
-		#!/usr/bin/env bash
-		flags=()
-		for flag; do
-			if [[ ${flag} == "--version" ]]; then
-				flags+=( --modversion )
-			else
-				flags+=( "${flag}" )
-			fi
-		done
-		exec ${PKG_CONFIG} libpcre "${flags[@]}"
-		EOF
-		chmod a+x "${T}"/pcre-config || die
-	else
-			# This package really should upgrade to using pcre's .pc file.
-		cat <<-\EOF > "${T}"/pcre2-config
-		#!/usr/bin/env bash
-		flags=()
-		for flag; do
-			if [[ ${flag} == "--version" ]]; then
-				flags+=( --modversion )
-			else
-				flags+=( "${flag}" )
-			fi
-		done
-		exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-		EOF
-		chmod a+x "${T}"/pcre2-config || die
-	fi
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre2-config || die
 }
 
 # @FUNCTION: apache-2_src_configure
@@ -571,8 +547,8 @@ apache-2_src_configure() {
 	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
 
 	# Sanity check in case people have bad mounts/TPE settings. #500928
-	if ! "${T}"/pcre-config --help >/dev/null && ! "${T}"/pcre2-config --help >/dev/null ; then
-		eerror "Could not execute ${T}/pcre-config (or pcre2-config); do you have bad mount"
+	if ! "${T}"/pcre2-config --help &>/dev/null ; then
+		eerror "Could not execute ${T}/pcre2-config; do you have bad mount"
 		eerror "permissions in ${T} or have TPE turned on in your kernel?"
 		die "check your runtime settings #500928"
 	fi
@@ -603,21 +579,12 @@ apache-2_src_configure() {
 		--enable-layout=Gentoo
 	)
 
-	if [[ -n ${GENTOO_USE_PCRE1} ]] ; then
-		export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre-config
-
-		MY_CONF+=(
-			--without-pcre2
-			--with-pcre="${T}"/pcre-config
-		)
-	else
-		export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
 
-		MY_CONF+=(
-			--without-pcre
-			--with-pcre2="${T}"/pcre2-config
-		)
-	fi
+	MY_CONF+=(
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
+	)
 
 	econf "${MY_CONF[@]}"
 
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 48e02b88394f..3a327febc0f1 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest
index 38275fcb144c..4a30597bcfdc 100644
--- a/kde-plasma/plasma-welcome/Manifest
+++ b/kde-plasma/plasma-welcome/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-welcome-5.26.90.tar.xz 786708 BLAKE2B 884f4791da8625e90f80febe69151f89b5c18741add6f438428087389fb98042b3f4c87f11b9ae28d14e5a72c60d4fc5df1b2a97d9580c09d1a421efc9adab87 SHA512 33f07771740199c076a3ddb7cf6ebcc10ad01e3ec6b6a0fbffe678438c2b3e7e567135613f443736d14d413e84382b386ed6ebe73c65d22e6f26cfa56c0387c5
-EBUILD plasma-welcome-5.26.90.ebuild 1114 BLAKE2B 9aadbb782655f696497d1a1254fac089291b1fad19fe4d74736535d37afe1a5250339b216796466886b0e24f33808bd180ac025e44b14cc466e9ba2798c3ab8c SHA512 1e5a65d832d4acc1588c97ccd656c2148bebdf8756fa139b24f34c412e1d627dee6c081bd32db253e29d9d35f6185fd14a23aab35ae2c7c1c806b30c904a5d89
+EBUILD plasma-welcome-5.26.90.ebuild 1126 BLAKE2B a5bb1db715646b132a429c2d0a83234760e51dbcfa1140cb6398ef232dc95dcd2a77c59e413d024abfa1597c357ef1a49431f0425ac0239621c747420833cbe1 SHA512 53fe6bb17685e020cebb034327ab2a8e8a72d83baaf61fcae81395d443a2f4fb142dfff08d1df3bd46f050fbb5d815676450beb8517573012556843b85bd125b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.26.90.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.26.90.ebuild
index 2a6d1472fda9..17e914db7d67 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-5.26.90.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-5.26.90.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A friendly onboarding wizard for Plasma"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6c3ada0ec3bc..1225619e9513 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f509c530bad2..453f6d3e853f 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,8 @@
 AUX xine-lib-1.2.12-dav1d-1.0.0.patch 805 BLAKE2B 83b97835c46ff547636c9a39836ee4ace2213f3d75dc258071bf2be040f37dd6c53c4201f13201d511c1df9651d9c381bfe7c10d51a437ad424e184f9acedfd6 SHA512 3182d082b028b664abd1899c19a689213a02214cce13f7f3c9a7dc95deb2ec7c8f13438ec812b2151476d638b170be8e1d832b303b73eb962c2389d2ecb161b4
 AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc267f57124de6b80705214537c9d788bafb3f80bcec35915ca50fb50935ffcbc612187dc1f0e0d71e80279d4d9e3fcbe54a4ebd SHA512 f642612419abd03b765f8dbf787aa675a1e5a031878db9b51c7f2a829caa19c153f9cabe733dbd21cbbbe55ce1ce5d5793b75e9b32c229e3fb57b548d39a6aa5
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
+DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924
 EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
-EBUILD xine-lib-1.2.9999.ebuild 5376 BLAKE2B cc4f65f60c48750baef54eaf25fdd79794195b0986697b0c1006f4a72931620d98a35e4ed634c03e0794a79a9b7dbfcfedbad9e81bd568c2567a62be82ab74ff SHA512 ea2ed69072de70d02c8f80942a7b7894dd1e320f9e0a617361303d1a68abccf40dc28441abba6c205d5e56231ed28f274eccee418a11dd3b132ba9513cc93fa6
+EBUILD xine-lib-1.2.13.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
+EBUILD xine-lib-1.2.9999.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.13.ebuild b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
new file mode 100644
index 000000000000..a7cce97ce1ac
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="https://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
+"
+
+RDEPEND="
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	media-video/ffmpeg:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	dav1d? ( media-libs/dav1d:= )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac:= )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( virtual/jack )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng:= )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	nfs? ( net-fs/libnfs:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pulseaudio? ( media-libs/libpulse )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+	)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+	)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+	)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( media-libs/libva:=[opengl,X] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:=[-minimal]
+	)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	vpx? ( media-libs/libvpx:= )
+	wavpack? ( media-sound/wavpack )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libxcb:=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )
+"
+DEPEND="
+	${RDEPEND}
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)
+	xv? ( x11-base/xorg-proto )
+	xvmc? ( x11-base/xorg-proto )
+	xinerama? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-directfb
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--enable-avformat
+		--enable-ipv6
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		--without-fusionsound
+		# Added dav1d for now. Could support both? Does it need to be XOR?
+		--without-libaom
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable bluray)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable nfs)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable sftp)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_enable wayland)
+		$(use_with alsa)
+		$(use_with dav1d)
+		$(use_with flac libflac)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with X xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index b8b6b6b69e5d..a7cce97ce1ac 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,25 +12,28 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
 	NLS_RDEPEND="nls? ( virtual/libintl )"
 fi
 
 DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
+HOMEPAGE="https://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
 IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
+REQUIRED_USE="
+	vidix? ( || ( X fbcon ) )
+	wayland? ( opengl )
+	xv? ( X )
+	xinerama? ( X )
 "
+
 RDEPEND="
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
@@ -61,7 +64,7 @@ RDEPEND="
 		virtual/glu
 		virtual/opengl
 	)
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	sdl? ( media-libs/libsdl )
@@ -78,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[X] )
+	vaapi? ( media-libs/libva:=[opengl,X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
@@ -100,7 +103,8 @@ RDEPEND="
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -111,10 +115,10 @@ DEPEND="${RDEPEND}
 	xvmc? ( x11-base/xorg-proto )
 	xinerama? ( x11-base/xorg-proto )
 "
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/libtool-2.2.6b
+	virtual/pkgconfig
 "
 
 src_prepare() {
@@ -214,7 +218,7 @@ src_configure() {
 	)
 	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
-	econf "${myconf[@]}"
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
 }
 
 src_compile() {
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 87db1f6f4857..36da8ea58b87 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 28d7bd0e645e..10f53aee6e15 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -13,7 +13,7 @@ AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed5
 DIST pipewire-0.3.63.tar.bz2 1485423 BLAKE2B 8629bce6d11959d4b3930d7db4e0ad201981002d52c6b73b3ee2b0ac141518f553f7b0e47aef4157b3c3ef71c6b544889f60f4be0fadb01b8a35c1d457edb1aa SHA512 0a45e9017bbcd74f21c6a1f388c5b58123deec083bbc9a9e695948ea95e67b6384acfff6e5ab685ea7287b4696e01176e257b73286ecd03c2d2e43d80fd60805
 DIST pipewire-0.3.64.tar.bz2 1490475 BLAKE2B 9a4d9e23a5d60da7c5788ce5145ce083f13fe771f3f5bcb3dfd1e9560d982f20415f32f756b875081464e1b175ef80af56d7babb3bbbd7a5eaf034c9c43b810a SHA512 4dff77cf1ab9fefffad1b6f7182115dbb5e4f0339f052dcfcc34b62687b461d25a6f891d1ad0246dab5a8cb80ca190d97d358a6494da8c6a8cc64e0b38452093
 EBUILD pipewire-0.3.63-r2.ebuild 16344 BLAKE2B 2897cf44a92dc35a2444f088f3e119bfe004cdce7ed84949244477e28a6fc27a3ef1e6fec7f4f5b475c75779fd79847d4184210ad6a141d7a3d6dd80b62f2070 SHA512 ec27287f348b4989b9c0950006cb83969971c65a86698feaee983d328bf08c1478d953176f32ac1b5de815bc3ea470cd5ac048e092004f07f17052a58e3e379d
-EBUILD pipewire-0.3.64-r2.ebuild 16354 BLAKE2B 84136a657c2db4e7b4e4749d3f125521779e400f3da6c7e7a33b301edfffa3c4dc694dcb73457c1d34ffc61a90ec0795a0e6307919bc5db3bc8298113be546ae SHA512 5585a237d9a7d7d933c3868beea447829a3037abcd1166719522f839875412f3984c2383131d38c1c8b6a3adcd44119eed9db084bfb316864c7fb070555a8518
+EBUILD pipewire-0.3.64-r2.ebuild 16375 BLAKE2B 776c12e939de524b096165c5b794637e8caee90b437068da593c8bd186128a2948db44d91ac1a20ce981f27a0729078a5a0abb4521c12e77abaf8be6b9682c7c SHA512 40cda83b4df6885887d4bf841a97c6682919ea9d91bc2cbcc7517858b1d04e0ae74b6a79a81270e02d349697f6b39b6bf5f642dcd85e65975f855606bbd9c9fb
 EBUILD pipewire-0.3.64.ebuild 16187 BLAKE2B f9036abc280611f3e9a82733e6f8ecdf9ec123d491f86c46734346ea3e890b19e72e0806fd532f31dbefb9fca964fb8a15a94386d85b7364cb2a30834f005459 SHA512 2311b635e07226a064c5e0ea55ea12fbe58c163dbf8813d343cadfc67f859fb32b6649bcf2134e52f5e34c6e84eaf7b3fb6e138df91442bd7ce0b4777dde6820
-EBUILD pipewire-9999.ebuild 16354 BLAKE2B 84136a657c2db4e7b4e4749d3f125521779e400f3da6c7e7a33b301edfffa3c4dc694dcb73457c1d34ffc61a90ec0795a0e6307919bc5db3bc8298113be546ae SHA512 5585a237d9a7d7d933c3868beea447829a3037abcd1166719522f839875412f3984c2383131d38c1c8b6a3adcd44119eed9db084bfb316864c7fb070555a8518
+EBUILD pipewire-9999.ebuild 16375 BLAKE2B 776c12e939de524b096165c5b794637e8caee90b437068da593c8bd186128a2948db44d91ac1a20ce981f27a0729078a5a0abb4521c12e77abaf8be6b9682c7c SHA512 40cda83b4df6885887d4bf841a97c6682919ea9d91bc2cbcc7517858b1d04e0ae74b6a79a81270e02d349697f6b39b6bf5f642dcd85e65975f855606bbd9c9fb
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/pipewire-0.3.64-r2.ebuild b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
index 8de21fdb95cc..ec34788a440c 100644
--- a/media-video/pipewire/pipewire-0.3.64-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.64-r2.ebuild
@@ -53,6 +53,7 @@ modemmanager pipewire-alsa readline sound-server ssl system-service systemd test
 # If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
 # When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
 REQUIRED_USE="
+	bluetooth? ( dbus )
 	jack-sdk? ( !jack-client )
 	modemmanager? ( bluetooth )
 	system-service? ( systemd )
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 8de21fdb95cc..ec34788a440c 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -53,6 +53,7 @@ modemmanager pipewire-alsa readline sound-server ssl system-service systemd test
 # If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
 # When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
 REQUIRED_USE="
+	bluetooth? ( dbus )
 	jack-sdk? ( !jack-client )
 	modemmanager? ( bluetooth )
 	system-service? ( systemd )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3905d4387491..e42539bef375 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fd2600bfb2ce..c1b2fb61525a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 00:39:42 +0000
+Thu, 26 Jan 2023 06:39:44 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 437a45909272..0a9240c5bc88 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-26T00:39:45Z
+TIMESTAMP 2023-01-26T06:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPRy9FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSIDRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBVsxAAmEUl52/ecXMQFqHduuOeYqMqmmVPCX6wUnKQPz0zsDdsSbCFDWYI+sMY
-b7iFiSTua8l25p/Fd5sg0glFztCh97aVV7Evn19Ph0bBiEGgMBTszQ++Ig4yjHyE
-CpJqgPtGDdr1xhHW9ieTp+4Y1phi8Kzl021zj0qnBjAg8y7ErZlaCBlwfq5TGX6+
-iDCAIkWaNHCepkIlrd7qR168Pee6mjPOXaz6AGaQSnLlOR1UE108ERTH/Mh5mlkD
-6msiulrrxg+Q5wL+RPdwdcOfTId2iBXjTPBnfGIKUaNHluxevRPrJlrvIA6MecVz
-bITG7ZMSwHwpg5rT3QQFt0zmilobNxy52rl4nYJBclttjPDu/KCBdbma/iL/lrF3
-+XDlwBCE8gfiWe9CfAeuB7lJ2KJ0Mp9BMc+4btmMGKCv/Odt3ax5JSFvCCP+I7EU
-TUUznwRFExWJVWhu8ipchNe1pBlToixew2khAl4MqXBJ8wE/rd8mmA1880gXuFbZ
-04709Y++2dB9UvHLEuRUfg7xYfkJdQNrBU7h2ThcPDkYthT+o8FPlaY+0XLT8OV7
-nMRCKTzllKN64vWbbzO5fBd7TB5gpe+GTZhEfNEnowrc4Tq7mKKgTLqx4g7IVRAa
-UvdXN1y5OMaCNiW5mn2bv1fFa49UfWHF3JRhE210j1dGseA4Ipg=
-=WBWr
+klBgSxAAlRdXFq3crhOA2MSL7gjl/KzWi962ETl7bLgL35AUIn2Em1Lh1PjVFaiX
+jc15fOwsjL1d/8Fm7CAmeYCr4tV0/6MDRsC0YK0nEWGPkxBXtho3W8/axHmbqfMo
+9MkHmZUKpze7hx0CEGrAgYKiP3XNxu0m+WBzJ+lmn8az48ojgItQZIv+mZErLThf
+23pqh+dBJyyljlNtzfXr+hSQJhKqcy+D1nS/IaEsDfYZScJ2UaM4AJQQ7h4O7FFD
+C+CML0XcfndF5np8Lf1GE0cy9PR782TOamdPuuxcrFoBUBsUHeqDxg48KGtRDdJO
+MMVFBLNOIXcExFgHoRqDpV5zy7G5kJOPM6Ae9TnNTh75wUeWkGOfyTUv9qdYd5Ez
+8Ycz6p1+Yj8MrZystM9BLXB8tel2GmjIi3XFv/UYBk4XoCa6U/RjipwNjBw7p1tl
++j8ickSlLvITXYw983Rjiyo6zzc3SQTvPeFgETQMpPpDmwY2y7YLqyoApqjfP8cq
+rSJCVr9tCpwbeLtKiRlgImtgmeCd/K7auOn/mmnBjmqItw5Ao246kZmQXAu2yapJ
+dvz9cS1m4m25Y9sGORtxwn2hyuD9VlgqCNxW4r85LjGsC6zR3lnN9MJ52KwuD+Rx
+7vOeVEyHs234lHg9CHTUS2PNzpFc4pgK+Rp8paErnor1b3d6oRQ=
+=1JN6
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index df31adc92af0..229b0e7d9815 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 00:39:43 +0000
+Thu, 26 Jan 2023 06:39:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5eb1bc14074e..9cb661c18064 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 118991bc5750..1bca01bb0508 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.5 b/metadata/md5-cache/app-accessibility/brltty-6.5
index 7e4295d6498e..9374f65498eb 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.5
+++ b/metadata/md5-cache/app-accessibility/brltty-6.5
@@ -13,4 +13,4 @@ REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.5.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	findlib	d8fa93cf137156660d0b72144b1e31d9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4839245a617a88cce1411d9a958a4df1
+_md5_=c84e66de5aba664aa0adc67daa2f15de
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.5-r1 b/metadata/md5-cache/app-accessibility/brltty-6.5-r1
new file mode 100644
index 000000000000..0cfb45d7e5f6
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/brltty-6.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.8:* ) nls? ( virtual/libintl ) python? ( >=dev-python/cython-0.16[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) ocaml? ( >=dev-ml/findlib-1.0.4-r1[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
+EAPI=8
+HOMEPAGE=https://brltty.app/
+INHERIT=findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+IUSE=+api +beeper bluetooth doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=acct-group/brltty acct-user/brltty dev-libs/libpcre2[pcre32] bluetooth? ( sys-apps/dbus net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) speech? ( app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.8:* ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) tcl? ( api )
+SLOT=0
+SRC_URI=https://brltty.app/archive/brltty-6.5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	findlib	d8fa93cf137156660d0b72144b1e31d9	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b761fa47420c17bb149f8e198dcc4a69
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 124cc367fc5d..519f545b07cd 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.54 b/metadata/md5-cache/app-admin/apache-tools-2.4.54
deleted file mode 100644
index 7e7e6545ed0a..000000000000
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.54
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/which virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) sys-devel/libtool
-DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
-EAPI=8
-HOMEPAGE=https://httpd.apache.org/
-INHERIT=toolchain-funcs
-IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=8a0e5507eada9f2c12b03532478d2bc0
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r3 b/metadata/md5-cache/app-admin/apache-tools-2.4.54-r3
index 7e8c343a1896..9766e5c943b8 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r3
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.54-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=autotools toolchain-funcs
 IUSE=ssl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fb33426a23c2ef98ca5f1a38e2549011
+_md5_=8edf626e89f3bdc633d66b95538a9e5d
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2 b/metadata/md5-cache/app-admin/apache-tools-2.4.55
index b0a4cbced988..f4b227a29012 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.54-r2
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.55
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) sys-devel/libtool
+DEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= ) sys-devel/libtool
 DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=8
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=autotools toolchain-funcs
 IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
+RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre2 virtual/libcrypt:= kernel_linux? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2
+SRC_URI=mirror://apache/httpd/httpd-2.4.55.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=03f9456b01dca0052cfb15c63731f043
+_md5_=7776dd1392b43f000495cb57e70dd6d9
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 9d0892d8c770..07aa8e87a950 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/wgetpaste-2.32 b/metadata/md5-cache/app-text/wgetpaste-2.32
deleted file mode 100644
index 07eb63ee96e1..000000000000
--- a/metadata/md5-cache/app-text/wgetpaste-2.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command-line interface to various pastebins
-EAPI=7
-HOMEPAGE=https://github.com/zlin/wgetpaste
-IUSE=+ssl
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=net-misc/wget[ssl?]
-SLOT=0
-SRC_URI=https://github.com/zlin/wgetpaste/archive/2.32.tar.gz -> wgetpaste-2.32.tar.gz
-_md5_=b8764520a9f1b9d96c0d82a3bb8d0f8b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 548a252d9b31..18b4e873fdfb 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.13-r1 b/metadata/md5-cache/dev-lang/tcl-8.6.13-r1
new file mode 100644
index 000000000000..4e322fe2084b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.13-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Tool Command Language
+EAPI=7
+HOMEPAGE=http://www.tcl.tk/
+INHERIT=autotools flag-o-matic multilib-minimal multilib toolchain-funcs
+IUSE=debug +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=tcltk
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/8.6
+SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.13-src.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6d327ba84557fc75f1bf95b6f192962c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index fed6b2ffd369..933327e4317c 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/apr-1.7.0-r5 b/metadata/md5-cache/dev-libs/apr-1.7.0-r5
deleted file mode 100644
index b5b09da7d4d0..000000000000
--- a/metadata/md5-cache/dev-libs/apr-1.7.0-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Apache Portable Runtime Library
-EAPI=7
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools libtool toolchain-funcs
-IUSE=doc older-kernels-compatibility selinux static-libs +urandom
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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
-LICENSE=Apache-2.0
-RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
-SLOT=1/1.7
-SRC_URI=mirror://apache/apr/apr-1.7.0.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5c3fbf23a67903914a6298ca6f705df2
diff --git a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9 b/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
deleted file mode 100644
index 17e74d2042e1..000000000000
--- a/metadata/md5-cache/dev-libs/apr-util-1.6.1-r9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/apr-1.6.2:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) >=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen )
-DESCRIPTION=Apache Portable Runtime Utility Library
-EAPI=7
-HOMEPAGE=https://apr.apache.org/
-INHERIT=autotools db-use libtool multilib toolchain-funcs
-IUSE=berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/apr-1.6.2:1= dev-libs/expat virtual/libcrypt:= berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) mysql? ( || ( dev-db/mariadb-connector-c >=dev-db/mysql-connector-c-8 ) ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 )
-SLOT=1
-SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=17fdd438f5d23005fe153a189e6343c2
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1fc8f05ffbef..0fc066d6a6e3 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/seer-1.14 b/metadata/md5-cache/dev-util/seer-1.14
index 44427b72256d..427f239b2ffa 100644
--- a/metadata/md5-cache/dev-util/seer-1.14
+++ b/metadata/md5-cache/dev-util/seer-1.14
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/epasveer/seer
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake desktop xdg
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc64
 LICENSE=GPL-3+ CC-BY-3.0 CC-BY-4.0
 RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
 SLOT=0
 SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.14.tar.gz -> seer-1.14.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=da44c08fe2dd0129e52cd5b4de0572f9
+_md5_=67c3fd40cab6687fbe51c34d0fb40098
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c11e4f8cdcd2..b137858e8549 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/plasma-welcome-5.26.90 b/metadata/md5-cache/kde-plasma/plasma-welcome-5.26.90
index faaeba6c70f9..2cd572bfd336 100644
--- a/metadata/md5-cache/kde-plasma/plasma-welcome-5.26.90
+++ b/metadata/md5-cache/kde-plasma/plasma-welcome-5.26.90
@@ -7,11 +7,11 @@ HOMEPAGE=https://kde.org/plasma-desktop
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm plasma.kde.org
 IUSE=telemetry debug
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.7:5[widgets] >=dev-qt/qtgui-5.15.7:5 >=dev-qt/qtnetwork-5.15.7:5 >=dev-qt/qtquickcontrols2-5.15.7:5 >=dev-qt/qtsvg-5.15.7:5 >=dev-qt/qtwidgets-5.15.7:5 kde-apps/kaccounts-integration:5 >=kde-frameworks/kconfig-5.102.0:5 >=kde-frameworks/kconfigwidgets-5.102.0:5 >=kde-frameworks/kcoreaddons-5.102.0:5 >=kde-frameworks/kdbusaddons-5.102.0:5 >=kde-frameworks/ki18n-5.102.0:5 >=kde-frameworks/kio-5.102.0:5 >=kde-frameworks/kirigami-5.102.0:5 >=kde-frameworks/knotifications-5.102.0:5 >=kde-frameworks/kservice-5.102.0:5 >=kde-frameworks/kwindowsystem-5.102.0:5 telemetry? ( dev-libs/kuserfeedback:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=mirror
 SLOT=5
 SRC_URI=mirror://kde/unstable/plasma/5.26.90/plasma-welcome-5.26.90.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	ecm	f9903a91512290fdc47404898ba8a954	flag-o-matic	69394e25812406faa1f90edaf4969395	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1043e0682b3ad976be484c12ab5a1833
+_md5_=cb233da92094d27dca489717889c2bb6
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 282b799eee34..562ca5dd04f9 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.13 b/metadata/md5-cache/media-libs/xine-lib-1.2.13
new file mode 100644
index 000000000000..a851539d3edb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.13
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
+DESCRIPTION=Core libraries for Xine movie player
+EAPI=8
+HOMEPAGE=https://xine.sourceforge.net/
+INHERIT=flag-o-matic libtool multilib
+IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
+SLOT=1
+SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.13.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=75cf8204d6949c7ce38cc9f612bc4ebb
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 29edb18625d5..d990fb2d3c23 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 dev-vcs/mercurial
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=8
-HOMEPAGE=http://xine.sourceforge.net/
+HOMEPAGE=https://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool multilib autotools mercurial
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
-REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
+RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2f1ce0f35d3f5f480721deeb7209187e
+_md5_=75cf8204d6949c7ce38cc9f612bc4ebb
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ed7618c2c335..da28d54d2250 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.64-r2 b/metadata/md5-cache/media-video/pipewire-0.3.64-r2
index 3739a381b715..4af4da823c14 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.64-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.64-r2
@@ -10,9 +10,9 @@ KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+REQUIRED_USE=bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.64/pipewire-0.3.64.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b4e7fc8dd0d423e42d204136f10d93f1
+_md5_=81bf6fb6f7082b54b95747dcfa05e541
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index f3a3b13e18d6..67478d50bac0 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -10,8 +10,8 @@ LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 PROPERTIES=live
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) gsettings? ( >=dev-libs/glib-2.26.0:2 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
+REQUIRED_USE=bluetooth? ( dbus ) jack-sdk? ( !jack-client ) modemmanager? ( bluetooth ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b4e7fc8dd0d423e42d204136f10d93f1
+_md5_=81bf6fb6f7082b54b95747dcfa05e541
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 88b1a0abf1e5..773c2f51c820 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.15.1 b/metadata/md5-cache/sci-mathematics/pari-2.15.1
deleted file mode 100644
index e416b3441585..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( virtual/latex-base )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
-DESCRIPTION=Computer-aided number theory C library and tools
-EAPI=8
-HOMEPAGE=https://pari.math.u-bordeaux.fr/
-INHERIT=flag-o-matic toolchain-funcs
-IUSE=data doc fltk gmp test threads X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.15.1.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=bd66a8ffb9c78a3b9fea2a180507a5e4
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.15.2 b/metadata/md5-cache/sci-mathematics/pari-2.15.2-r1
index 02c3c085dbe6..f01adce12cc1 100644
--- a/metadata/md5-cache/sci-mathematics/pari-2.15.2
+++ b/metadata/md5-cache/sci-mathematics/pari-2.15.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Computer-aided number theory C library and tools
 EAPI=8
 HOMEPAGE=https://pari.math.u-bordeaux.fr/
 INHERIT=flag-o-matic toolchain-funcs
-IUSE=data doc fltk gmp test threads X
+IUSE=data doc examples fltk gmp test threads X
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.15.2.tar.gz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=53f067a261dbcb13813f0bb9b805d983
+_md5_=b500bd31bc373f468853826fa042c2df
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 43b6446be01a..862dbcb81969 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index a4601c959aeb..d9c2528471ad 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=!sys-apps/baselayout-prefix
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=65875241bd4247fe8ba304ee47f25a6b
+_md5_=e604c0d24dc3f42ad433ad377f8b5b2c
diff --git a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19 b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
index d34e1fad6f99..e46ba0759e08 100644
--- a/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
+++ b/metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r19
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz mirror://qmail/ucspi-rss.diff http://smarden.org/pape/djb/manpages/ucspi-tcp-0.88-man.tar.gz http://xs3.b92.net/tomislavr/ucspi-tcp-0.88-rblspp.patch ipv6? ( https://www.fefe.de/ucspi/ucspi-tcp-0.88-ipv6.diff20.bz2 )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	8b4becd598c7db847f08a4384525cd18	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=621902516fb7b75c496fa3592719c6e5
+_md5_=8d28e81748373083fd5eba4c9ab62a8b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 6bed3f741246..486d56ef15d2 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gdb-12.1-r4 b/metadata/md5-cache/sys-devel/gdb-12.1-r4
new file mode 100644
index 000000000000..3ad5ccdee5f3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-12.1-r4
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+DESCRIPTION=GNU debugger
+EAPI=8
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-12.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-12.1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gdb/gdb-12.1-patches-1.tar.xz mirror://gentoo/gdb-12.1-patches-1.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b3440b159dece376825ad57ae9d5c0b2
diff --git a/metadata/md5-cache/sys-devel/gdb-13.0.90_p20230126 b/metadata/md5-cache/sys-devel/gdb-13.0.90_p20230126
new file mode 100644
index 000000000000..8a4d9001568c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-13.0.90_p20230126
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=GNU debugger
+EAPI=8
+HOMEPAGE=https://sourceware.org/gdb/
+INHERIT=flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+IUSE=cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-2.1+
+RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-13.0.90.20230126.tar.xz https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-13.0.90.20230126.tar.xz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d858c2580b72a9991df39fcb5a920293
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index 109857b49f2f..4b8c7a5c17c3 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -1,5 +1,5 @@
 BDEPEND=app-arch/xz-utils sys-apps/texinfo app-alternatives/yacc nls? ( sys-devel/gettext ) source-highlight? ( virtual/pkgconfig ) test? ( dev-util/dejagnu ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=GNU debugger
 EAPI=8
@@ -10,7 +10,7 @@ LICENSE=GPL-3+ LGPL-2.1+
 PROPERTIES=live
 RDEPEND=dev-libs/mpfr:0= dev-libs/gmp:= >=sys-libs/ncurses-5.2-r2:0= >=sys-libs/readline-7:0= sys-libs/zlib elibc_glibc? ( net-libs/libnsl:= ) lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) guile? ( >=dev-scheme/guile-2.0 ) xml? ( dev-libs/expat ) source-highlight? ( dev-util/source-highlight ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-RESTRICT=ia64? ( test ) !test? ( test ) test
+RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c419f6d11aee21e2624ba48e4e49189e
+_md5_=d858c2580b72a9991df39fcb5a920293
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index dcb53a489862..803d50477e90 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54-r7 b/metadata/md5-cache/www-servers/apache-2.4.54-r7
index e335b2383d2d..246900ecd1eb 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54-r7
+++ b/metadata/md5-cache/www-servers/apache-2.4.54-r7
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre2
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre2 virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10:= ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
 DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=apache-2 systemd tmpfiles toolchain-funcs
 IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.54
-RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre2 virtual/tmpfiles
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre2 virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10:= ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
 REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	85202d93708ce383dcd78d1864be942e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b7d7c988fa5d7d18884d620c938d7f52
+_eclasses_=apache-2	d8baadbcaf3ad722e93d8bd68640532d	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d99baa61682d4a7eb67d3927ce3590e2
diff --git a/metadata/md5-cache/www-servers/apache-2.4.54-r6 b/metadata/md5-cache/www-servers/apache-2.4.55
index 3c767b37f5cf..56e7da341199 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.54-r6
+++ b/metadata/md5-cache/www-servers/apache-2.4.55
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 ssl? ( dev-libs/openssl:0 ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre2 virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.50.0:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10:= ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.50.0:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd )
 DESCRIPTION=The Apache Web Server
 EAPI=7
 HOMEPAGE=https://httpd.apache.org/
 INHERIT=apache-2 systemd tmpfiles toolchain-funcs
 IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
-PDEPEND=~app-admin/apache-tools-2.4.54
-RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:0= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre virtual/tmpfiles
+PDEPEND=~app-admin/apache-tools-2.4.55
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] dev-libs/libpcre2 virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.50.0:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10:= ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.50.0:= kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( dev-libs/apr-util[openssl] ) gdbm? ( sys-libs/gdbm:= ) ldap? ( net-nds/openldap:= ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-1.0.2:= kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) virtual/tmpfiles
 REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
-SRC_URI=mirror://apache/httpd/httpd-2.4.54.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
-_eclasses_=apache-2	85202d93708ce383dcd78d1864be942e	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6cff6089b8840b428f61494e128ec9ad
+SRC_URI=mirror://apache/httpd/httpd-2.4.55.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
+_eclasses_=apache-2	d8baadbcaf3ad722e93d8bd68640532d	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ba68624da292ea77b76d384a1f1e1cd8
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b8c8c41a5b74..86d36c032249 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-26T00:39:45Z
+TIMESTAMP 2023-01-26T06:39:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPRy9FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPSIDRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klATlQ/+MRVk3Vz9C6WFcM4y/WsQpoSp5V8voxvYkAPEODzYCCgAFOG9HTHUQs6B
-a/czmg1dZn9MhPZ/q5f8I5+zKaIkZ2iMGBVbi9GQNPRGKK7BDqmJY9Krm4N+4rJK
-D6FkiR33P7qcAg/WLcSJuXQ9COVgiHAEt/G05+qaEfsIIFmgovSGeVqr14PjNoRU
-ky6IzHcEw9tDz7m2OU4KIT1vHtjgJ7KATMyPhzvaZeeSSz+URNdg3aa4pB9veNRq
-Z8hA6yQHeWT/cGv/cenMfj+G8BcV/O4WWvCHWhsJ/GFrEjrsO6wOWfctqGp8Q9jn
-PR3W9ndNWUba9GaGfExWOsdhJ81boExbHWP7jg/5gs+Geu5/sA6t4e5qgAMevbaB
-hObEgfdtO8EHtqXey94we72KbTvpoI7ZxH03sd68jzhwxlLHMYJoyXT8LYuVS4Q6
-8lAa2B9KJtvqjXvSiXCe3S4Ww8y7YWeFGtCg2+VNK2cXrVLQ1V/5LjstpqfKt25F
-+b9k+YhW3I9G7AsLebp7aKkbFOeUdZLck9xVRDM4r/bBRl4EYc5IcsnnMf3TFEuf
-jEt38HjYw2WXCDmSNiDbwXB0LT87tv4yatndwWMcVOqPFVoUiUWcg53RxVWMAr23
-c1lhwq14d4liWegNRX8GV4ImO8RdShpnNgHtG5CvKuvYL9v6JC4=
-=j9oZ
+klDgfw/+MRpL4yL6rKblQLKeIOSEgKt8aobXdgb5p/OP51hAZhbU/5mtzfLDqyU/
+RGekHwgp0Bn+MWVzIIiOMhzeg8SacFeY4u9kogCpYrcleO6+RLj8c9LPitwlCbGC
+wORCDW8XckMjfTiMe/KWvBPYdFHMmaTU4r0Drxn+irMWiUcrp3Ve2kWcTfLi/qS3
+9i2PzZvULtdwfBV3ElNnZoYpJUaSN9Q72tnByqejRqGIDj8CqBb6m+W9xWKrDVuk
+gtcZjw5WCh5FquN8fFgcXj95v6iy4TUlu15ijU2mDeciap98xSmMmQNnDVt6ZBMr
+AK9Nv5M+7igjM/dVfxkkD47KdLgsY0A0rVr+mBQJSU3UYm1h5kyx3NZqp366J9Vs
+vG/qnuPSw+tt/qQpYi8IpLHS3eVBIN+uQzD6byMX88qMbNFhsisKPlMRUHFrvr1z
+NeBnvd7Z1G/COWtSiAf3jKNpQ7xkfzzzXr1UkkRJMjjrtUXtLN+6WjXALKkUqC0Q
+cDIhkUfRGa5aORPNSmNjiwM3j9g0rfn/PcZN55HS6NmrXPGhcwa6TN7Wc2UZX0C6
+DwmISmTbeRWGnKmZvoJlgBwAJQ5DLW40MbJBegMnIXZsyDQdYL1zIuvAjtjRN9PT
+LJ7BNyxa0RgKTA2Pui1lSJuxF0MUcT+h5T6rMp7gHFGP7RmHzkI=
+=Mkq+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index df31adc92af0..229b0e7d9815 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 00:39:43 +0000
+Thu, 26 Jan 2023 06:39:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 6bcc5771016e..011e4bc8b958 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jan 26 12:39:42 AM UTC 2023
+Thu Jan 26 06:39:44 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 889bf61c6c1b..011d01aa5dc9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 00:45:01 +0000
+Thu, 26 Jan 2023 06:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 53c48aa23cb1..073fb032a449 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-cd36549d23f7f064f38cb2fdb709b0e840091843 1674692994 2023-01-26T00:29:54+00:00
+d652f91037cdf41a6e573dced77031d31ff21377 1674714510 2023-01-26T06:28:30+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index fb658639023f..61b81e237c7a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674693601 Thu 26 Jan 2023 12:40:01 AM UTC
+1674715201 Thu 26 Jan 2023 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fd2600bfb2ce..229b0e7d9815 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 26 Jan 2023 00:39:42 +0000
+Thu, 26 Jan 2023 06:39:45 +0000
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d7d0173b318a..8a866c65f803 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index d3b75c1ceef6..f1c7bd81df15 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -2,13 +2,12 @@ AUX pari-2.11.2-Makefile-LDFLAGS.patch 394 BLAKE2B 534fcd325397a388545acbce5d96b
 AUX pari-2.11.2-Makefile-docinstall.patch 867 BLAKE2B e8b83357ef42ebcb00abfe7bb5adc30414d1975fbde128ffe84c42898374969c608cd6f3b8b0061023681f6416e86552c80552ac51aa884e260d716f79b750c1 SHA512 089ab09532b2e888a272495606f5c0eeb6e12f764f3605c268a3e4e20e707d87c33feea2a745f7441e2cff6e7402df64f17f7b118350a8d4a0972ad8a5a82c69
 AUX pari-2.11.2-no-automagic.patch 2349 BLAKE2B 6c2cdda84342109bad0cbfb3d5188eedbbfc08e5b40bce3f045309cef936f88356324b6d721c5cdb458a2343fb4ee6473238571dd779b74506e7e2b7d835e0c7 SHA512 549acaeaa393b0b42818e3648c21fdba3162abfefef147a1429d0e39f58ece0a46e94a6ee953435549c23d62b115b2dab0ee261eda2eb7fd0a2b430223f5f59c
 AUX pari-2.15.2-ellsea.patch 1078 BLAKE2B 25d72bbfbd14498e1e3c104c5e0379e54ec7a9da2fbc2664983997618751cfec608fa8e982d939bb432edeb1e9c953ddee03d0ce0310a185568ec8ee7d1fd3a5 SHA512 0d23e5bc789ed5886181fdc31ff5c34d4c5961c8d7f6185126a4dbf1f6dc1c4eb727673290a702cb68a33030c6512ad70ec37f8991e7bc2c17dacfb587a41ab7
+AUX pari-2.15.2-install-doctex.patch 1249 BLAKE2B 85172256638ecff209f42882230a3e9fe6633718d44373621880bfb41979c703c7dc21168414db4724957da8d4ec0857f090311d5c901842e584d70e4bacb697 SHA512 f2c41595205a65775d030be411a21ca34e35a703088db7a3959580e91fb1333764e5dafbc9cb698ef7c91702dd77dd4de801eead48af8e9111dff8fdf2bb7d85
 AUX pari-2.9.4-fltk-detection.patch 572 BLAKE2B 1c2e1fa6e52521c7865c3fd011824c83fa92623903dd1e056bda29c6735eb01013e7937f66d6ffff42d0de83f7ed104c7f933d232ee37be7c4351788e76f8daa SHA512 2ec0d8035a87b693ee6a4dfa913f0b24eed20bb4db7f8cd1a47db444310d33d19e6651d475c635be747e79a02df2705e42f6f7032b60dc763583cf9fa8633b29
 AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
 AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST pari-2.13.4.tar.gz 4772735 BLAKE2B 5a3eebd380f1e47f38746b03ddde9a715ed74e7e8e4ed30ef8f2d62cf7289694b800fc8396557150ce9d79245c244fb56cecddac867c6057b438da4df68505e6 SHA512 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9
-DIST pari-2.15.1.tar.gz 5175706 BLAKE2B abc04a8bd75f756ad62937941c3b88f910bf57d58e7c4eda20649292ce5ba390688abe463d27cb22af0aee0249967e67a6f929beb9ef328d00d05648af5bf72e SHA512 8f536c1cabff3a082f67febd00240506eef5288c7e85c97d23018e8cdd01109dfb8ebe2fa71dc0e929c55ca00f31349fd145030689c988289201de2ddbcf0a5c
 DIST pari-2.15.2.tar.gz 5176694 BLAKE2B b3aa021cb0b786dfde691b150d38c0ee9e9844ff5d2554d7a4f0cd85b27c8077696433b14c0b2128930b7db2191e7db99bdebc200e03607554cc4a9394ea42a4 SHA512 fa9e8713484ab5d659dcf7cf65de0fbaf28334969f443bfaffb8fc19c2305631435fc5635e090cbd8033758ea18200a62c47e8434067af9a86565832e96d489c
 EBUILD pari-2.13.4-r1.ebuild 3669 BLAKE2B 50694a82d37f3d7315e61f804029a6271afc2193a28378e8321cef7d4cedac8f04b4e972547427f58712e3b003eea7371df7a2f21f990eb81e8ec667bca62e06 SHA512 d58c360d15d93cc4131a3f54438e34522ccdb1b42b5298551f73f86e619f8b6219e6472c97e44bb3a3bb22c9bd0b5bc174a85a38e15f3415e89fcda53293debf
-EBUILD pari-2.15.1.ebuild 3675 BLAKE2B c7cc9d29d7bb60856905b32d64578a2fef367ca74dc27bec8d989ec98d165f8659f8a11009c3f91ec7917d1aedd20bba68023420e02f42e5fdda78f62dd4077b SHA512 292496875ba48172d00ce1bb7a67a916e3d21730ae1941aad77f299990c23a6deba73d54823e33e6bbe754635946c1cbd985d6f730beb5fd22982a8297d85415
-EBUILD pari-2.15.2.ebuild 3887 BLAKE2B b7e518af2b0295d031921cd055127e78498632255dc4be054d1ebc5f62c681c03a0d286ac9c42dacff6c028a06b339d5bb943730c6ccb4ee1f33651e75cab081 SHA512 cb31a749c521f52be3208482a4480fa1232ac8cda5e949b88ec30ab0a5c64db3b51c3293eddf953963783a434a61ee585c5c8f041059216cf59dcaa9365d92a1
+EBUILD pari-2.15.2-r1.ebuild 4096 BLAKE2B 72af23fb75882b05fd270ba2cced745fa990c904d37ca37bcf2ae251b945dc382c778cf626ea97c6e5b220f8400b9b79eb4451d74c876625982d870f489790f9 SHA512 846b8d46587d37d957461382ec47825fcc3bed1c794dc21e0de01a1beefdee51e18ba9a6c7db90213fd94357f4ce7b206a00ea30301b8918f9886ee6bb62acdb
 MISC metadata.xml 1770 BLAKE2B d730330ac80159a9e46a7c892049d00e28bfe9e4d4c61616c033ccaf526cfef6f95a03bac803bf70c59760e1833e35fce5bc535038aadc8db68dca878c7bde78 SHA512 387a8eb845634e8568a3e98f44f9b92bd7819870ebb6cb57b28e96c0df022b4436074fa526771f5e6793ce59c010c0c0437abb63f03ec9890bca3c301afcf9ee
diff --git a/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
new file mode 100644
index 000000000000..d504326b7b43
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.15.2-install-doctex.patch
@@ -0,0 +1,25 @@
+From 0888050e8f3fc8c07e42331651c970d80c8d6a90 Mon Sep 17 00:00:00 2001
+From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
+Date: Wed, 25 Jan 2023 18:42:09 +0100
+Subject: [PATCH] TOP_Make.SH: add target install-docvi, install-doctex [#2444]
+
+---
+ config/TOP_Make.SH | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/TOP_Make.SH b/config/TOP_Make.SH
+index d2543c91eb..e60fd5f6ee 100644
+--- a/config/TOP_Make.SH
++++ b/config/TOP_Make.SH
+@@ -42,7 +42,7 @@ all::
+ 	@\$(MAKE) gp
+ 	@-cd doc && \$(MAKE) doc
+ 
+-gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
++gp bench test-kernel test-all install cleanall cleanobj cleantest nsis link-data install-bin install-doc install-doctex install-docdvi install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
+ 	 if test ! -d \$\$dir; then echo "Please run Configure first!"; exit 1; fi;\\
+ 	cd \$\$dir && \$(MAKE) \$@
+-- 
+2.30.2
+
diff --git a/sci-mathematics/pari/pari-2.15.1.ebuild b/sci-mathematics/pari/pari-2.15.1.ebuild
deleted file mode 100644
index 212fed3f24df..000000000000
--- a/sci-mathematics/pari/pari-2.15.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="https://pari.math.u-bordeaux.fr/"
-SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-
-# The subslot is the value of $soname_num obtained from
-# upstream's config/version script.
-SLOT="0/8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="data doc fltk gmp test threads X"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )
-"
-DEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1= )
-	gmp? ( dev-libs/gmp:0= )
-	X? ( x11-libs/libX11:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.9.4-strip.patch
-	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
-	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
-	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-LDFLAGS.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
-)
-
-src_prepare() {
-	default
-
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-
-	# These tests fail when LaTeX is not installed (which we don't
-	# require without USE=doc), most likely due to output formatting
-	# issues but I haven't deleted my LaTeX installation to check.
-	# There's no real upstream support for enabling/disabling the LaTeX
-	# docs, so this is probably the correctest way to skip these tests.
-	if ! use doc; then
-		rm src/test/{in,32}/help || die
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX PKG_CONFIG
-
-	# Workaraound to "asm operand has impossible constraints" as
-	# suggested in bug #499996.
-	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
-
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
-	# sysdatadir installs a pari.cfg stuff which is informative only.
-	# It is supposed to be for "architecture-dependent" data.  It needs
-	# to be easily discoverable for downstream packages such as gp2c.
-	# We set LD="" and DLLD="$CC" so that the "shared library linker"
-	# always gets set to the value of the compiler used. Pari's build
-	# system does not cope very well with a naked linker, it is
-	# expecting a compiler driver. See bugs 722090 and 871117.
-	LD="" DLLD="$(tc-getCC)" ./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}/usr/share/${PN}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysdatadir="${EPREFIX}"/usr/share/pari \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-readline-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ncurses-lib="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_with fltk) \
-		$(use_with gmp) \
-		--without-qt \
-		$(usex threads "--mt=pthread" "" "" "") \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	emake gp
-
-	if use doc; then
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}/fonts" emake docpdf
-	fi
-}
-
-src_test() {
-	# Welcome to the jungle, where the tests fail if you make your
-	# terminal bigger.
-	emake COLUMNS=80 test-all
-}
-
-src_install() {
-	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
-	default
-
-	if use doc; then
-		docompress -x "/usr/share/doc/${PF}"
-		emake \
-			DESTDIR="${D}" \
-			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
-			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-doc
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.15.2.ebuild b/sci-mathematics/pari/pari-2.15.2-r1.ebuild
index 058eac35d8b0..8a767ad7f37d 100644
--- a/sci-mathematics/pari/pari-2.15.2.ebuild
+++ b/sci-mathematics/pari/pari-2.15.2-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 # upstream's config/version script.
 SLOT="0/8"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="data doc fltk gmp test threads X"
+IUSE="data doc examples fltk gmp test threads X"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -35,8 +35,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}"-2.9.4-ppc.patch
 	"${FILESDIR}/${PN}"-2.11.2-no-automagic.patch
 	"${FILESDIR}/${PN}"-2.9.4-fltk-detection.patch
-	"${FILESDIR}/${PN}"-2.11.2-Makefile-docinstall.patch
 	"${FILESDIR}/${PN}"-2.15.2-ellsea.patch
+	"${FILESDIR}/${PN}"-2.15.2-install-doctex.patch
 )
 
 src_prepare() {
@@ -65,13 +65,6 @@ src_configure() {
 	# suggested in bug #499996.
 	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
 
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
 	# sysdatadir installs a pari.cfg stuff which is informative only.
 	# It is supposed to be for "architecture-dependent" data.  It needs
 	# to be easily discoverable for downstream packages such as gp2c.
@@ -115,17 +108,28 @@ src_test() {
 src_install() {
 	DOCS=( AUTHORS CHANGES* COMPAT NEW README* )
 
+	# Install examples to a junk location by default because "make
+	# install-nodata" includes the examples with it. Only if the user
+	# has USE=examples set do we provide the correct directory.
+	local exdir="${T}"
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		exdir="${ED}/usr/share/doc/${PF}/examples"
+	fi
+
 	# Use "true" in place of "strip" to sabotage the unconditional
 	# binary stripping.
-	emake DESTDIR="${D}" STRIP="true" install
+	emake DESTDIR="${D}" \
+		  EXDIR="${exdir}" \
+		  STRIP="true" \
+		  install-nodata install-data
 	einstalldocs
 
 	if use doc; then
 		docompress -x "/usr/share/doc/${PF}"
 		emake \
 			DESTDIR="${D}" \
-			EXDIR="${ED}/usr/share/doc/${PF}/examples" \
 			DOCDIR="${ED}/usr/share/doc/${PF}" \
-			install-doc
+			install-docpdf install-doctex
 	fi
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 190d1b9a15e4..e3afad947e1b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index d39843cac3ee..5979411d7ed7 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,5 +1,5 @@
 DIST baselayout-2.9.tar.bz2 30200 BLAKE2B 3a997e847e853a5bcdce7eb06d50fda4727a6c408ca614bdc8dd576bfc9296d3c625c4e8791dbdb078dd5088f818e5ee98eea5d14d737f465ed225554da26180 SHA512 c07726141446c9d9202bac19642baf819b28a838814e1dd3c200d1768af64a913bd9188923029e0b0edf7e420d5aad7bdde278d6c24c4f40029fddbad28d8e02
 EBUILD baselayout-2.9-r1.ebuild 11649 BLAKE2B bbfa4904f9052ac570c3949f3e5cddc59a97e874e6a60a67e1d8b8540e44ee5c94b6af389f4e4c81bce4972cffcc0af2b833499cc89b6544f1c22ac70b319798 SHA512 5c944df0f77037d242899a733654c8c7c567f97cebf0592d3bea85a50f1562414e44b2a18e9041df105c923655f87993e40b18bf9296ea96f7de24d8ef3df845
 EBUILD baselayout-2.9.ebuild 11818 BLAKE2B f60a5ccef7e0e77177dc2ad7e15048e3c83bf94981f7274264c0a9d18d2ac0a102456f2c06116a6e3f39bc01a3275d702c3bf7df64a3f81ee34ef744787da321 SHA512 2b07ce978ad790e0f97021af002731015f40291f8b881c08586c856011ebde4b0e4941d7fb557ba413e3c422023412f441803e5ce8860a39e27c7193b1f69537
-EBUILD baselayout-9999.ebuild 11935 BLAKE2B cbdcc765322b16862b45d9bc7fb7df4035498f0612c2391319d734d26fab1dcaf92a473e29f1a2fac87a3cd05d70550d9c94b6119271257e0d28143d25401db5 SHA512 eae8786a90d8d3f76d1ad9bce49b38e4843cba7d5d3abb2f905e41b527a3642bf634170cd17aa123168592173a5103c053b31b40e7ee7ba51a7520d70828d6eb
+EBUILD baselayout-9999.ebuild 11788 BLAKE2B 7c3c389950d564e6d4e1e4cf3f17f6931de7d1049753d722640964c3c65b40e6a370a1b928d0e29122fff7174ce59b5d9645fc0fbd1a6d586897ffb074db6caa SHA512 26834ef0485f4d730f7df775f052b443aeb2d0e306dc5762558336803d7f2fe2a4161c41eb9a555dc2793fb12daeb99b9000f08caefb244fb892cec7ff1f3b7e
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index de1e77f28689..a5cb994667ce 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -259,12 +259,6 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 
-	# FHS compatibility symlinks
-	dosym ../proc/self/mounts /etc/mtab
-	dosym ../run /var/run
-	dosym ../run/lock /var/lock
-	dosym ../var/tmp /usr/tmp
-
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# add SDK path which contains development manpages
 		echo "MANPATH=${EPREFIX}/MacOSX.sdk/usr/share/man" \
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 2a741fe160d7..0482dcf706e4 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -1,6 +1,7 @@
 AUX 0.88-ar-ranlib.patch 545 BLAKE2B c0b9b9c67e7e9682cbf1aefd194c0a590bbe17592a242bd7e140cd0e3cd201197f3cedb2d79cbaad2a647da0c804944f6b4dc84f7f373f7f2d94bffb3c133871 SHA512 9788fff2aaa01f24ae101a1fd45512218dd5032946614eb73ab033d839b21ce9fa9ff967593eb7add15ba4735dd5656e67f79beaaee720d2a2cae1fe8889b7e9
 AUX 0.88-bigendian.patch 458 BLAKE2B 940a5aba8b3aa103d8cf2e64ce3d9dd09464f1fe643f6ca194198db3d2dd4ed23205cacc9ab05e1551b04542c582d6ecb54acd65b83116231daeb9cf7ca6e22e SHA512 042d2810a8fc968cc8b456216465a349bbde19402a26a64204fb3c9bd2621dfda8ceed1283b11812df8d33ba0eb2f4133de289306ef906060b9a9f5775db3918
-AUX 0.88-implicit-int.patch 4481 BLAKE2B cd53ad86b84061e10839a9a3b56f579b85dd5370abf65da737fd5140f3b5f9a79b4fa990d16cbd7650a35b7a9905b0b064015028e6fec45eb411421e1234d043 SHA512 ba99d51350a758b56271a2e1e0fbb93262ad09345173124053668c789a40cf41abbab296a55dd7521a58c8e80eabe0f7450d003b4d0b0c3a4a50c09b5dd3dc70
+AUX 0.88-implicit-int-ipv6.patch 182 BLAKE2B 99675e559fb924c1bdebe8d0bc21c4ab0209d7dc116a7a0e45fc4d0c8c4825a5881ec95837ee43dddca36ffd48a4e9f237c722eed6cd69b6f5217aff2e7db47b SHA512 deb42bac6eed4ee67333968bb5a8fb18831a55c55560268a4bee49d678d042cea66ad81271a77b00263fbb547d7adcb83f279594433bf20dcfc0fe7a2e504e02
+AUX 0.88-implicit-int.patch 4299 BLAKE2B f93ef5874043d94345453ea5f9bb4b34e8d891ff5ccaea0684c73957a5da1f97e2a024efc83b447737392096426a95dc2d39006cb09307179b6d95cf451fcb8a SHA512 ea7d94ae1c2888f9266b7a9c6efde1e6bd6ea54bf0fa7cb3bb94657dbc51f72d33a59e2ffe207b5dd43a2db5331e6f872ebb2df4916b9012bb904100dfb847ae
 AUX 0.88-large-responses.patch 772 BLAKE2B 6c1cfc91d76094a282e4cd2a4084e52409b3a4193dff8f89fdb477ef54fcb2bd102b082128eed906422ca87f7a1ef0ea018ea1e9ad297c4390395ad7a1e049f1 SHA512 d429065d9fa232207e21c6fb1c2359b0e7d35ac0142ed28ee6b00e150b0b3c5756e7eb684ee1b8aea35236986bdb046eff529e127c9c09994c4ced41370c26b7
 AUX 0.88-protos-ipv6.patch 2127 BLAKE2B fbef8e74c8ea24246db9d09e26c4b3e4af50ce8ff43ea3efc8f3203d7760d53012d46cd6546efc3ce88cac349e3083bc680429338300402c968d35d1813ac1b9 SHA512 953b3a53246ad16636276f679c84c5f1b86f3dc49a910017fa9c05b175d25a184ed870a920437f4305e2b54021ee2aa2a1d6fa8b7e8d5a367bbc060617b3eb8f
 AUX 0.88-protos-no-ipv6.patch 671 BLAKE2B d0c052a53833d9034b92d6ace244aad487c30c17fec5778b9df474aed9de194e92061f496216c50667da41b9dbbf88c8ef439ebbdb0be3c4001fba16425ef3f5 SHA512 56557365c1951e437b6a6b0b8c80d865adc16e2d1fb464a85b367af2d43fbce99e64a6e5a6c8fd4aa0cff53025db6c1ed25458f96316b3c51189d20c5688c0ed
@@ -17,5 +18,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B 888ce733f7f4e86c3706c5009c77e67ca398f50511dfdf3b14ecfb98bb02d33619d05f40135250d909b19688530ecd10e24cb2dce822756a3cd2b46cb6a3c519 SHA512 7c222bd080916fcdac32f551d29a79c89dc81eb442ec7119d93f6de97a54c594946718aab584234ba43f2e2c9d41970875437c96e5933da78bb5292e75116c40
-EBUILD ucspi-tcp-0.88-r19.ebuild 2167 BLAKE2B bdeec5502bffd2fbb409a608ba0906b599bbf0b834d8c5aa8a316d525dedb166b6cc81adc95f749ee1f3a5bf67fd7feb29368f580e0f2bc2f27d7d5569050f60 SHA512 cdf05c029c3c5700e8df64313659a781ea43b5064c04a138d1bb357ab06c6acc982f71fd76df93aba0ec20e02ba9f2e9950fb9d567e50d8cb8d7fa93c8d43158
+EBUILD ucspi-tcp-0.88-r19.ebuild 2220 BLAKE2B 35fee864663748d97f5751cd161d67c57a9afaa695186f80e790311d1eb88225184d3e8145227b07c4134e92caa9ab6f782d967ce5f64f36f96d5554ad5acac0 SHA512 6cd2fce31b8c15ec7e619b8d67405ee93d6c40fa057c215e22a1972d309957ccfceb399bc0c6e9af141bddb37db592c12026f08250f325b47b441a5da4a7f31a
 MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
diff --git a/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch b/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch
new file mode 100644
index 000000000000..aee400dc48c3
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch
@@ -0,0 +1,11 @@
+--- a/tryip6.c
++++ b/tryip6.c
+@@ -2,7 +2,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ 
+-main() {
++int main() {
+   struct sockaddr_in6 sa;
+   sa.sin6_family = PF_INET6;
+ }
diff --git a/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch
index 8c4bbf327800..b2e39abd838e 100644
--- a/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch
+++ b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch
@@ -182,17 +182,6 @@
  {
  #ifdef NeXT
    printf("nextstep\n"); exit(0);
---- a/tryip6.c
-+++ b/tryip6.c
-@@ -2,7 +2,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- 
--main() {
-+int main() {
-   struct sockaddr_in6 sa;
-   sa.sin6_family = PF_INET6;
- }
 --- a/trylsock.c
 +++ b/trylsock.c
 @@ -1,4 +1,4 @@
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
index af7bfc881cea..89c830ef2cfe 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PV}-protos-ipv6.patch
 		eapply "${FILESDIR}"/${PV}-tcprules.patch #135571
 		eapply "${FILESDIR}"/${PV}-bigendian.patch #18892
+		eapply "${FILESDIR}"/${PV}-implicit-int-ipv6.patch
 	else
 		eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch
 	fi
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a2369b9c8adb..bf5705887e1f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 63fef2accfc1..376e37c1f114 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -2,10 +2,14 @@ AUX gdb-12.1-configure-clang16.patch 2893 BLAKE2B 15079fc458db3f57a99340800afcce
 AUX gdb-12.1-core-file-detach.patch 5853 BLAKE2B 4442a9d6357f751f9953236a068ffc5e8a1f57eef1bf9e118d572614164486197db44cb6e5f1ab20906ae97ca1c4805a01ce5c2c3cbd1509bb383c108b6b8b1e SHA512 e044053dec340e6373b4a3546adf36ea121bb63a5277d6a1f24f5551edb0cf408f3f862076d6760b27501d54025063afd4a9375914c3f2321f5410466a89f75b
 AUX gdb-12.1-readline-8.2-build.patch 926 BLAKE2B f483dd1054b019d44dd4731ba22113551d3530a9da1af8c5e83aeae3ba820d96b8a1c2cb7758ecc3fbe8a56cdc7232cdece809d15c30dbfffadc30d81738a7ca SHA512 f865349953181fe3502abbe6042ebab249e2ebbc4c0017ebad756aadfd63e72f57b009fe2e7d036543f326e54518a656101bef572d03a7a7170c9ec305807ed8
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
+DIST gdb-12.1-patches-1.tar.xz 12340 BLAKE2B 071ff492f6cf7b0969d76db6f7414eeec564daf773c3334fb0d3f669e328bb4ae403ba8c709f3e33a56caa92273f762a5597a34dd7e7a1056f473b7ede2d8e59 SHA512 dc4a1a8d501dd1adfdcd6dcbd2559f1e2cc6aadeb18eacb2e9152f6858510e7392253db9568fe782da6d160221412e3e13dfd42a47a2a4a1addba2c1804a45b5
 DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd SHA512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d
 DIST gdb-weekly-13.0.90.20230110.tar.xz 24802804 BLAKE2B d13bc0ce3bfd0197be31610385014df815c72a86f34b44beced0882267e8b5eecdd50545a85d84c5648771bb9a01b7e63680a424ad36e4d23c15470af6270f21 SHA512 d0c186c661b4648668213a5210f10d09ccbceb077e9e61a88cb1431e8feae4ad2ce74365024bb5f282f78225e118e808c5df30af9c46c4c368a41d4385f8918f
+DIST gdb-weekly-13.0.90.20230126.tar.xz 24808672 BLAKE2B 5331e3f60d2dde7fb139e1e9e2507cbcc7e72d7b6f2afd8f284997955f21f4138fd05e2ee1eeb07c3d3ab1b5ab35046774ab9580013822231a56849f8cc2168c SHA512 53d2623b23edfa8c25bdc26cb87577060cbd2a030eb47df84f5c025339e1a344d28c970e7d196fbb91f5f9dfba0647cf370acf4d17f6492aa2f4e14763623321
 EBUILD gdb-12.1-r2.ebuild 8059 BLAKE2B 1fe85d05fb4153cc66929f89ec5cadb54885d157e4b0332b6f1a50e7ff8b4275b5444821a70b700ab20f7c37cbaea446a42c2fc718c076566d6c550bd730008d SHA512 0f42b99989377b2f6602cfb3039963a449ea40750af1c12a71f3f584dd1fa0db23f499a54016cad3e3e78a9e3abc0d8bdb6a35bda20d1f2d9891983672346f9c
 EBUILD gdb-12.1-r3.ebuild 8101 BLAKE2B 476d029a59a1ab7bd2f2177b915568f6b39c8bfa6b2c45b9e4bb69bb75b5209ed8b6f969d4b3ce960166901447cc9d9a0bf7e314cdde4f5cb5584e04f475a5d1 SHA512 94a1fcc7b78479857f6221c08239aa37c03f518a58a8ee53d67e09282604700ba5e3990b7f07f93445cfd6ea27acf167670f845036b9312c79191ce04c6881a7
+EBUILD gdb-12.1-r4.ebuild 8352 BLAKE2B b70813155233f843c45cc853b4b1d5d14d9abc861fd9d244c67b14fe6e708cbc452fdc0064f8e0183c247c0c62ffb9e1390f843ad0b7344c75a177570a8fb4b5 SHA512 1d407f528c52b3b7930df48658d9c956fd7ff1416cb9e8ca01325febf689b69fbcffaa60fb55245a3e98de46c55a5390a5d63d3748be8da0b39a83a5519a42f6
 EBUILD gdb-13.0.90_p20230110.ebuild 8247 BLAKE2B 7ee2145ca858bde3f4a26d6bc997a0cffc418c85b9e529747d21f9ab16ffd055accd4b5bf3ee18b801dfa449f3daffe9db72d9ce7a1c11bfe6bdeb143b6e13cc SHA512 227d576fe8e8f83e24ec248ff7eb2e24fcbb84aa73195da1a784eea67319cc6c10cb564992bf6c95cb61a35915fbae7060196404a80d7cab8fa755b914584b34
-EBUILD gdb-9999.ebuild 8247 BLAKE2B 7ee2145ca858bde3f4a26d6bc997a0cffc418c85b9e529747d21f9ab16ffd055accd4b5bf3ee18b801dfa449f3daffe9db72d9ce7a1c11bfe6bdeb143b6e13cc SHA512 227d576fe8e8f83e24ec248ff7eb2e24fcbb84aa73195da1a784eea67319cc6c10cb564992bf6c95cb61a35915fbae7060196404a80d7cab8fa755b914584b34
+EBUILD gdb-13.0.90_p20230126.ebuild 8387 BLAKE2B eb22e688172567333aca7a898e8e3eedad759d2f8952f096d38af967a831c036c6512a39d3c5a61c31dc7bcbb6f4f42b08542ae52df1de71eea8405a7890ca5f SHA512 9b452b94bba647f86ea68a81fb556052e8a4e7e5cbc73aa78d16b186c0a6e5d201c6fba03abb8154b14c2f06a75087dab6fcfe4572cf8553c1cefb4492a316a1
+EBUILD gdb-9999.ebuild 8387 BLAKE2B eb22e688172567333aca7a898e8e3eedad759d2f8952f096d38af967a831c036c6512a39d3c5a61c31dc7bcbb6f4f42b08542ae52df1de71eea8405a7890ca5f SHA512 9b452b94bba647f86ea68a81fb556052e8a4e7e5cbc73aa78d16b186c0a6e5d201c6fba03abb8154b14c2f06a75087dab6fcfe4572cf8553c1cefb4492a316a1
 MISC metadata.xml 1242 BLAKE2B 368d8798d7d3b610653f635eb36ee5517912e8a2cb392622b32ac0aa90f336e3b391ba25811dee110644e50fabec0d64f6bcf3b219cdd240ec806e709a198eed SHA512 192fa340899680413c3d6c886ecd7d2262475a33aecc452192e5fe1d8e3eb5cf17546e57181e720128cf9b39cd8e4b1b1a73cb1f0c9887866c0ce88b288636e2
diff --git a/sys-devel/gdb/gdb-12.1-r4.ebuild b/sys-devel/gdb/gdb-12.1-r4.ebuild
new file mode 100644
index 000000000000..6bb7083f4b01
--- /dev/null
+++ b/sys-devel/gdb/gdb-12.1-r4.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50.2???????)
+		# weekly snapshots
+		SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+			ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+		;;
+esac
+
+PATCH_DEV="sam"
+PATCH_VER="1"
+
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+	"${FILESDIR}"/${P}-readline-8.2-build.patch
+	"${FILESDIR}"/${P}-core-file-detach.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	[[ -d "${WORKDIR}"/${P}-patches-${PATCH_VER} ]] && eapply "${WORKDIR}"/${P}-patches-${PATCH_VER}
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable sim)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-13.0.90_p20230126.ebuild b/sys-devel/gdb/gdb-13.0.90_p20230126.ebuild
new file mode 100644
index 000000000000..a79f0ab1957d
--- /dev/null
+++ b/sys-devel/gdb/gdb-13.0.90_p20230126.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit flag-o-matic python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50_p2???????| *.*.90_p2???????)
+		# Weekly snapshots
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
+			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="
+			mirror://gnu/gdb/${P}.tar.xz
+			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
+		"
+		;;
+esac
+
+PATCH_DEV=""
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+
+if [[ ${PV} != 9999* ]] ; then
+	# for testing on loong only
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~loong"
+fi
+
+IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/mpfr:0=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:0=
+	>=sys-libs/readline-7:0=
+	sys-libs/zlib
+	elibc_glibc? ( net-libs/libnsl:= )
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( >=dev-scheme/guile-2.0 )
+	xml? ( dev-libs/expat )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# We need to set both configure options, --with-sysroot and --libdir,
+		# to fix cross build issues that happen when configuring gmp.
+		# We explicitly need --libdir. Having only --with-sysroot without
+		# --libdir would not fix the build issues.
+		# For some reason, it is not enough to set only --with-sysroot,
+		# also not enough to pass --with-gmp-xxx options.
+		--with-sysroot="${ESYSROOT}"
+		--libdir="${ESYSROOT}/usr/$(get_libdir)"
+	)
+
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable sim)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+		$(use_with zstd)
+	)
+
+	if use sparc-solaris || use x86-solaris ; then
+		# Disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 5a1837450675..a79f0ab1957d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -41,11 +41,15 @@ case ${PV} in
 		;;
 esac
 
+PATCH_DEV=""
+PATCH_VER=""
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/"
-SRC_URI="${SRC_URI}
-	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
@@ -58,16 +62,7 @@ fi
 
 IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash zstd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# In fact, gdb's test suite needs some work to get passing.
-# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
-# As of 11.2, on amd64: "# of unexpected failures    8600"
-# Also, ia64 kernel crashes when gdb testsuite is running.
-RESTRICT="
-	ia64? ( test )
-	!test? ( test )
-	test
-"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/mpfr:0=
@@ -233,6 +228,18 @@ src_compile() {
 	emake V=1
 }
 
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
 src_install() {
 	emake V=1 DESTDIR="${D}" install
 
@@ -275,10 +282,6 @@ src_install() {
 		dodoc gdbserver/README
 	fi
 
-	if [[ -n ${PATCH_VER} ]] ; then
-		dodoc "${WORKDIR}"/extra/gdbinit.sample
-	fi
-
 	# Remove shared info pages
 	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index f4aa05e98d91..407c2feb0940 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f57d1be40d34..0ffba15d4ca9 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -6,6 +6,7 @@ AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc
 AUX apache2.4-hardened.service 933 BLAKE2B 60cbe1a55ded29299ba7fc453a6f13c456bc702ec77a31ede0904a52c9d726d57ec4d477df74d46e4edab157a2bf930750620c8d369a0b6900b049d9a4619a5c SHA512 711899777ea59995cecda007dca8d9ff6d0650b80990ea3b387f914e923df703e0c71ebaee5d967590c46fc5c588d35390d7c34023ef673c1791a60850efd0e8
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-EBUILD apache-2.4.54-r6.ebuild 8076 BLAKE2B e8d2665032f91daa7f6db08e59f23183262104cbf4b2d4056daff5e78690d948248c9cd82d8b5aa1bb8ba2833a00aa441f97d596f001542ed904c701403f8a9c SHA512 0a002c018aac87f98c39aa01d9665a69fe49ce954d7335a527af550bfd2afb4d4e2b5e2b32aa9775de42278f1ddb02692e673270028a2a287d5c293c0f190da8
-EBUILD apache-2.4.54-r7.ebuild 8062 BLAKE2B d1f81c018425bcf7627e71211df51c0060ea1a74ff28a534fd9f07b65dc537713d47837580a69eda5986e887f29a387c9054b2ee480a08a4aeff42c2a3e3b893 SHA512 feadbd6a1db0a164b5e6b504238597ec4aa29d6b47cbec2eb3045815221e9aa799380122e2c7ae25dc845fb2f425eb0132f84acab8f43876652ba4d717fa65e6
+DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
+EBUILD apache-2.4.54-r7.ebuild 8056 BLAKE2B ca82a295a082b11fbc36010ebff9132eae3ddf5657003e9b0aa6160b4075f73f407cbb71a3bd7e0eb7eeecf3a28f15416ae36494c354dbe4f66a62a4b97c9877 SHA512 0d585393040e104089eec5aade35f71c02840995db1e674847f0e7fb9337961646b31fce709c96e865729085d178fbbbe55c837d0a6fe72ca9fbbb84d20accbf
+EBUILD apache-2.4.55.ebuild 8063 BLAKE2B 89090307dd9abfdda2f74ef93a7bc38df0787de0d0381ac2d20d22ffe836df5db4bf1c8c0f982d4d2d48203f03ce93cc511ce366bb8b5c1f89e95fb85bd62ffe SHA512 ff758e2ff3a13178f9f160077c09f62588ed9388368519282f2c7b143c04ba174a59423911832d0be1296c9e44c621c8dd5d38f580833ca52bb4528e4283ba60
 MISC metadata.xml 978 BLAKE2B 2b2b82339fb2419da3d4e9d77f2c4495235b04a8f5006e61316bf638f307227ea26e2f9eaa26fca5d10118ebdd0bff9fac7319687ae62e2440b49e509e7080e0 SHA512 4a1842f1754473f7168fd38ef4ac2720fddf0f4ad8bfc5df3215b7a50f454cb3fc372e5a84d030a2b84e9744d599f8a38caf3ad5688a93cee7d52bac3d89b43b
diff --git a/www-servers/apache/apache-2.4.54-r7.ebuild b/www-servers/apache/apache-2.4.54-r7.ebuild
index 9d7216e126de..22298cd5637a 100644
--- a/www-servers/apache/apache-2.4.54-r7.ebuild
+++ b/www-servers/apache/apache-2.4.54-r7.ebuild
@@ -144,7 +144,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
diff --git a/www-servers/apache/apache-2.4.54-r6.ebuild b/www-servers/apache/apache-2.4.55.ebuild
index 08db9349fe4d..632d6506f31f 100644
--- a/www-servers/apache/apache-2.4.54-r6.ebuild
+++ b/www-servers/apache/apache-2.4.55.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-GENTOO_USE_PCRE1=1
-
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20210212"
 GENTOO_DEVELOPER="polynomial-c"
@@ -146,7 +144,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868