gentoo auto-resync : 01:08:2023 - 10:47:11

143 files changed, 4406 insertions, 1174 deletions

diff --git a/Manifest b/Manifest
index 39d0535c7936..614b5ad3bed2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29309 BLAKE2B 07579a8d718d2e8ad6e49ab69ec7a2999dc39acaea097ec5a4a9a0f2011aa2a0f7b40d911d6c0ec5e4ae51ee5afe4bd5283bbe2e62843168b69fc6599dab0f14 SHA512 63ba1b4a203d82bfe7118c214d0f2959f9b4f8b46056c2a0e6e3743f360fe63934acd52faa53e1fdf460fb201ce2711a32dfa04d179a5eac4370ce23f5bf8338
-TIMESTAMP 2023-08-01T03:10:07Z
+MANIFEST Manifest.files.gz 29324 BLAKE2B f6a9f2e7bce6203351754de5dabd23cd2ef54d0e572b6f61b5b1dc72003b4e9dc9bdab14e09ec333b789148079b14f22679494b4689e30fe28ed077ff35349ae SHA512 a4a67a34c8fcc9328a04704a143db3de68c35b4d505d483428b0f82a03979809d4dd8cfa1c01dc03c4dda399703897c60418bb815b85ae603299c5de22eb8dfa
+TIMESTAMP 2023-08-01T09:10:07Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTId49fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTIy+9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD4+xAApgtgMPSnVkU5204ziyTgGxtJDGFKs/KBnar6hSmyKJJPn/PBgixlASuX
-jmzyz97iTaD9HHNbcuWpnvySaToKhivQM1HDUxJiATdRT5MSRmnS9y9tPdip+7yT
-mRj2PLp8AmVz7zDm8PKO3tiCAAZ5siMpkuOdyMEbbp0l3jh8jzVEeybV+IellRpr
-Lk4aGHe9BtY6Obw1uSuUexXzmhfTozhfiggEu1lUN4Nzb3vD2+WtoS3Cj9H8vwnU
-eFWUWo2LxtpbC4TTdxLorF2HmsStq//PgTTalDGocN5ly1NO+thhyF+QZJhksp8U
-mtWWVUTCU0lQ3In2+t852cDhVOm/3HAeOQw2oRCfzGGuPZMdQFBzRtyYyAvosKTf
-aShsNPp5lAn3aylirjC5lGxnKyvf5NUZrmQYICt3gRj/dRNNilzaLpZ4YK5r/STH
-xywXZM6G32HSelRlJb/aP3sqL/Z2NZlISTD35e5gByjvXvmpbL2XiJ5+Ggq5ypjj
-iMlDl6JkPhyNB6u0pQHiSgR44/gEFTI9uRHcuc2N/wjgJxP2uuRcVw8Qpkd+F+Rp
-3JSDsn1XtuwY9zaV5sH9LLtS5w5R0ijF5W5YUcs3AMn0WT0Ntp8FO0CPSHnekIiX
-bgvTvdTw9tMYKIC+c8X2TUkWDZY3Pl3hgSSsCxarUT+6KlX03Qo=
-=5Wf5
+klB0mBAAscjs38YujyCQ2oBZCZ3uovXq5IEUCJ7nIWqDbzOGkyu532pkzm0BpbQe
+YJ21oRczd08dpumkvQFIs+MwMiMaeyzFV0HtWGDOw9q/1jqIEoQjWDku65MR744Q
+Vg7cxo3eXKWr8/clS7wYpfFpf5IlSSGyXqJomSV+2kDnJuPxBlRNvPrUisXPik1O
+QSmZwUWfHys1ZTsGmRyQagHduuomUY6QWexZA3wRUTJxQZJFm1nTC4d+kVY9j/8s
+iD6ttgoagrG7sgrKYsLa9qDeH6sYgi+bhTCm95GInTihohM4WS6ccp14iOQBVfUb
+yKPOuo97ACqjkd+X+UutsncV3cC+D291X/obie85oK/4Cl/5NCEQdhm0tQvanpO5
+oVPJxgLBZPZJuPB4gmPvdNnNSu3r2TOXv1BbZLYnZWo/7wtEpcCbILWddEdmJpPS
+ojhQUUV9rrgBYQvr0BVCXNNcUuecgznhSeuLhLs6/ET0+XuoMBpLYx6BqZYm83Qh
+aur+bLVHXHHqfmcZOMxSVMi7RTEA1tUiIH3fvCR2h6RvQMY6mg9DhBNUMM+Fsl1h
+MYNSDhfba7SRo0LZzbgFD0i3Ehb5FwfeR5OSktlHI9d51HwjszAmPLQARGyZzOaS
+A8IOs1s0rRnAlOiJLa/yVX2Khtrevcumm/8qlfowijkxXe1rynI=
+=G9Nl
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e63a37b2e346..09e947ff248d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dc3b26fca9de..835d65eeecfd 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 16595e5bb19c..819c2a4dad33 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -3,7 +3,9 @@ AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9dfa416470da658a9ac742437050c81a6e62b42763b038b8dc5d8cfab2ba30d049e269b08a66882f6d3f99863ee7b SHA512 434609dd11951b37d62b5371a2aef66424bb15ae4c98cba44762e8338ac135b37a453e5a4f40492ab80bce9b72faefc9a0ad065753f4cc5f7595911477b26e4a
 DIST sysklogd-2.5.0.tar.gz 459695 BLAKE2B ab8185e114f7da2c35b6ba3e3b42e13f3697155b43ccfa923229d95150e3734f74db6f732bcbc999068d8a2f8124a404ee893d2e6ce4c154f89301b3b523df39 SHA512 4599f153b046317977de990455b1eea195967da81f68451f1bda4fadba6fe685d7fe533aba3b39f4daa456d6c4931743162a021067e0a16f072a7c77908286f9
+DIST sysklogd-2.5.1.tar.gz 461179 BLAKE2B efb1e1ef6456644935b0c5341bf844fe87ed910aec3fd0725da2cc2d6b3f0e1f8d4667e45525b61fa3a249387a23757291daa33aac2a72d4fcd89d325e12ab89 SHA512 24d8a76cab4c25b646d879676b46f98bb56c2079badab4f351bf983015479134e4a3e4d64fb50faade26fea8dd7e31c2c45610c17420c147c36bbbe054634983
 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
 EBUILD sysklogd-2.5.0.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
+EBUILD sysklogd-2.5.1.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
 EBUILD sysklogd-9999.ebuild 2064 BLAKE2B acf2bd8b56cae02e6cfd784a1dafc4c98edde26ba41830f3e2d5621a357280fafed0a588826e2848d97bd596648e94d13e5ad9491a2fb2e07c343ab9652c2852 SHA512 e27ba295080d0865b0ed1079cda1547219b6d4adab587431b4afaaf3c20a5795a23fa46c10b29cb763bd7ecbd6e80407c3a41503e3cb88a2587ef58571adbca4
 MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/sysklogd-2.5.1.ebuild b/app-admin/sysklogd/sysklogd-2.5.1.ebuild
new file mode 100644
index 000000000000..24bef0bd0a53
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.5.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate"
+# Needs network access
+RESTRICT="test"
+
+DEPEND="
+	logger? ( sys-apps/util-linux[-logger(+)] )
+"
+RDEPEND="
+	${DEPEND}
+	logrotate? ( app-admin/logrotate )
+"
+
+DOCS=( ChangeLog.md README.md )
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	append-lfs-flags
+	tc-export CC
+
+	local myeconfargs=(
+		--disable-static
+		--runstatedir="${EPREFIX}"/run
+		--with-systemd=$(systemd_get_systemunitdir)
+		$(use_with logger)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 598390b321fd..f5bf5c34d18d 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index e13e05a6ab25..ed4f2e95d4f2 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -8,8 +8,10 @@ DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd
 DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf SHA512 c60c5ff8ec99b7552e485768908920658fdd8035ff7a6fa370fb6881957dc8b7e5f18ff1a8f49bd6aa22909ede2a7c084986d8244f12074ccd33ebe40a0c411f
 DIST qemu-8.0.0.tar.xz 127835148 BLAKE2B 9b54aae10fe09691a26e68374723ded5fdda6409673b4de9461a25ee060cfd03968a16ddeadc21d48b9262e53aa6d4e5eb645376969f97c65807fad19607b04f SHA512 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
 DIST qemu-8.0.2.tar.xz 126707132 BLAKE2B f2b1a63e10c42aabfe39722c7732d0f04818ad367b769b3deb29c5bf9adcabc3aca1706f3c40fafeeb57ac1f7a61ded5066de32134c483e2fd27bc65b4b7d30a SHA512 4e915d33a662bf55b09247fb85150be376c92270d3764e3d6470c452cb70cc558f54e84de5610dd60a9eb3ea02d5d4277b1ec75c9804967d278fa8361c7f9b9a
+DIST qemu-8.0.3.tar.xz 126710536 BLAKE2B 071cc1a35209a02e8c5dd4f43cb112f110b4655adb0f870a04fdf9a6e2c761699574e8c9426f70f60787a99acf252d7a64d94a8e837cdfeda93d89428d7866f3 SHA512 18b2ccb65f7ec2ae92f0e04406539620c881e2b75f63816588c86043a07464bb99d16a83e792ed9508de393f4b694c46d52f4d07edf52741e85224c8b8d5d5c3
 EBUILD qemu-guest-agent-6.0.0.ebuild 1674 BLAKE2B ad81005cee9c80175b2b2b1c0bad0138fc5f22428e9568df133c46ebf5ad27f53dc97161a1e88f37bde5b29874870173dd5813102745a31ef6367203a1024975 SHA512 7ce6fdd8a583059ed7cab97c5baba5e402e01019e05b16511afe89674d5a9fc06fc840c8b253bbf015beaa69ff65a9b557131bd1ce42af86f6b82e1ae282ad9d
 EBUILD qemu-guest-agent-7.1.0.ebuild 1754 BLAKE2B 532de7069a16db006f2a9611867f32376128fe061d4406904d6af1fb5da42caca4abe7925b8daa694e210f0c646ed7d6038a5fd1d3a0721e8bfcd31dcff934e7 SHA512 ebd0ea1cc2be832e12cde6d456c3e1e1899d464c281eec4944d7589c71107747fff97b74480622f4061265761171243192488ce13ef5b5464908a63c7df0a00f
 EBUILD qemu-guest-agent-8.0.0.ebuild 1684 BLAKE2B 5847f283493ade44de1b58eb955929cda76703f3edadebac676d978ca2909b10139eaaf8b46c4e1345c7837743a6fb8266dcc8fa44d416903d6bfa308261d5c6 SHA512 29ee2a7ab833bc6a19d4c57eb96e0448185f4db31592ff7838ea69921643ad5ca59506d9caa05fdff75161317ad19474dd92605bd485e7207b820bc358cfbbb1
 EBUILD qemu-guest-agent-8.0.2.ebuild 1686 BLAKE2B d8efe482367caaabe21bd2d98aca1c6af35b9b130e3425cd9ed76126ff539108723e4e4f1656e5feeac7272184cb9e59d7aa68c9698c47fc50dfa98697d78975 SHA512 4b53217dd4a83eeb5b70c0d01ef8866fcdf83875cd7afd72cd635d07bd601feea29f9cf3315ca4ea13eefd4b2bdb1875de17a12deffca1d3823e5db5e947d92b
+EBUILD qemu-guest-agent-8.0.3.ebuild 1715 BLAKE2B 8b8407d8068d44afa642cb5aac72f554725e1eabbae38b7e187b3b8df6f9d52f01e2511605cc74be1f22cdccc47a85ae7c18c779770f74a7effd9f57a4502806 SHA512 723fca9fd9860b0c24f22ec01788a63c31036c4bdb713cb6de1727da1d28ca8866a85b3a4464b1e1872fdac724a95e2e36afe88ec58a6b72d5b06f9958617d97
 MISC metadata.xml 588 BLAKE2B 32aa23e19bdc88885534d8b58c9ad1aeabbcb94b4deb064c8cb10c72bc57999a677c8cdf9dd0fd389bd64a9b1a5dc379a20235a191e58f67ea671b5a7b92a1a8 SHA512 aee2dc28a40e0a68196eb4cff9450e6bc940565ee37d4405690e943c63ca9c05b66dcd6af69dbbdd6274cd4ac1c1b833ff15af4f3071ed0a2cd07358ac985866
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
new file mode 100644
index 000000000000..c0c5794a73ac
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.0.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit edo systemd toolchain-funcs python-any-r1 udev
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	dev-util/ninja"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+)
+
+src_configure() {
+	tc-export AR LD OBJCOPY RANLIB
+
+	local myconf=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir="/usr/$(get_libdir)"
+		--localstatedir=/
+		--disable-bsd-user
+		--disable-linux-user
+		--disable-system
+		--disable-strip
+		--enable-tools
+		--disable-werror
+		--without-default-features
+		--enable-guest-agent
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+	)
+
+	edo ./configure "${myconf[@]}"
+}
+
+src_install() {
+	dobin build/qga/qemu-ga
+
+	# Normal init stuff
+	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+	# systemd stuff
+	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+		qemu-guest-agent.service
+}
+
+pkg_postinst() {
+	elog "You should add 'qemu-guest-agent' to the default runlevel."
+	elog "e.g. rc-update add qemu-guest-agent default"
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c976df791a0f..69a669ea7236 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index e0b5a81c9860..970fcb2c4f1a 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -1,5 +1,5 @@
 DIST nnn-4.7.tar.gz 250038 BLAKE2B b63da6ac8a0ac6b8b2bce0ed45c43c9e707f11f99e6b456131728d7fde5f638162d8e3bbf1b3a0fadba315d38d9cc1b38c0d4a644ee800fbea00ffe1c92beef0 SHA512 28ec9b9ab93f979d77e80957df2a70ec687e56ada6d5e8555c121f2454b5c049466120e5eb3570174411a61e3855c869f96d306a43516cceff8c4cb7f1075875
 DIST nnn-4.8.tar.gz 253547 BLAKE2B 36e6e1dc39bfbce7fa72fd322339395fa78a410c93043860be845ff3d5be3178fd37966f57da17f115cab8a6973462d44243052a6c736665ef9a180cd9fd6978 SHA512 932e27ec1d7cd3db6ccba33edb3d1ad2620109cde3c4114b734eef3e04d6c6c22ddaa1c4727908dba2a107dd4cfe1f5193aec450f680a390671f48e63d0133bd
 EBUILD nnn-4.7-r1.ebuild 2839 BLAKE2B e91f853480152bccc19d53d9fad6f50ada4f19e16f9c5f5fa823dd90a2bc68ec030a8ce414f1f4a94d3e3db51f7ba25f0f02a967ce89affe9e21cf4d88893977 SHA512 cadf7e87fa3eadb497f608eb29c6d746a956bffc8858091b0212edaf1195ff77df214e5e529c67ce46b12c2273cd4f44cc097b10f17330311d8a6161a68cca82
-EBUILD nnn-4.8.ebuild 3173 BLAKE2B 907ee9f572cc43695c7e238fbd2872090e6e162f796dfad366537f8f95aefae909bb07876d4e2f3ba5e2eeb22a86a6ccc0ec07ff3d9c1f14d929c6089d4e844d SHA512 0e64c01eed43245ea98cf762d97d08da848f361bd7b38c49f026cdfd4ebc4157159e4e14d36c2ed0c2002b26961f50ef08c95ec7c7e9037e841e52376e23b42a
+EBUILD nnn-4.8.ebuild 3172 BLAKE2B e08054dfbf5d37ef5f5f2893a7ff1a19a5bc85361d3355e520ccdd02b616b73effb61cc828e87fd27897eecb1e91990c78aa22beb7deed0c1aa48a77de928937 SHA512 cc5f215d7d099b03227dca7951cd23d06f6c143d01bbf02e395fc12cb978b250d83a0e43cad993a6c409f1d3dc76dddac8e5d977ccb5724faa695187aa3aa3df
 MISC metadata.xml 1236 BLAKE2B 9afb37cabe29313f3b7203be1583fab01e067c798d5a9bb0ab5a4d5bf172d016feae30f2bf02577d390378d3292bb1f51aa4ffeeaf34c738c330bea020bbe80d SHA512 05ada5daf33b0fa8df18bca4432dea9a1dd9bfb0e74ecb4ae6d4b0860437aaf5f3850ef67283a28a4edb49fe747fb65ef9a27b829529992ed6826436530d07df
diff --git a/app-misc/nnn/nnn-4.8.ebuild b/app-misc/nnn/nnn-4.8.ebuild
index 3666ef82e251..c4e9d82febc1 100644
--- a/app-misc/nnn/nnn-4.8.ebuild
+++ b/app-misc/nnn/nnn-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="8contexts colemak colemak-dh emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview"
 
 DEPEND="sys-libs/ncurses:=
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3e2e8402a215..2b1c4dd5d602 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index d880b101d569..56d24868f3cb 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,5 +1,3 @@
-DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687
 DIST asm-ASM_9_5.tar.bz2 1372645 BLAKE2B 3eac319c9322dfd9fff1324b032a2248127592107c0256adec6f0c592cf55298b9f060603e1697e7560db9b337585f59bfebea684dcefaf0b4a149061ebb915c SHA512 6c1b4624789435b347b43db50e6605cf60008c73125245e1495e11eef03770e49308963ee152654fa45ac9b05150e8ff4d646d69b69aef27296069f4a7343301
-EBUILD asm-9.4.ebuild 2363 BLAKE2B 36b4ba331468998e388a6d240c99d0c195cee271c135f8180cdaebdce6546a6837c4a1533333889aee4dec0352dbc883de936d86bea6c80477e616c01cdd3b57 SHA512 2ead6c41436c36bc9011963a74d2fac092ffc22e31ca9cf7f5d5fcbfe05754223d3ca88f2bea77b4c72c3ef610978a23b525513e16b1d6e151a4590aad6889b4
 EBUILD asm-9.5.ebuild 2489 BLAKE2B 8ba1a29735898ac4d40660154cf37f54d4ac02807a02675985e5c97716bc649edfe6853b5443e66f05f48be16497a124858f4180a67bc370590d3f2cbf19f0ba SHA512 2a7f00119625129681e73c51070647cdccb9926322f0b60d629abde270ff05effacd840a0df413f7c49abdc375359dc1921d5dd6b6d936b74840818c9bbfe9a9
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild
deleted file mode 100644
index b7a5d43489a8..000000000000
--- a/dev-java/asm/asm-9.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# No tests because:
-# package org.junit.jupiter.api does not exist
-# package org.junit.jupiter.params does not exist
-JAVA_PKG_IUSE="doc source"
-MAVEN_PROVIDES="org.ow2.asm:asm-bom:9.4 org.ow2.asm:asm:9.4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="9"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos"
-
-DEPEND=">=virtual/jdk-11:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-ASM_MODULES=( "asm" "asm-tree" "asm-analysis" "asm-commons" "asm-util" )
-
-S="${WORKDIR}/asm-${MY_P}"
-
-src_prepare() {
-	default
-	local module
-	touch "${T}/asm.module" || die
-	for module in "${ASM_MODULES[@]}"; do
-		module=${module/-/.}
-		cat > ${module/./-}/src/main/java/module-info.java <<-EOF || die
-			open module org.objectweb.${module/analysis/tree.analysis} {
-				$(cat ${T}/asm.module)
-				requires java.base;
-				exports org.objectweb.${module/analysis/tree.analysis};
-			}
-		EOF
-		echo "requires transitive org.objectweb.${module/analysis/tree.analysis};" \
-			>> "${T}/asm.module" || die
-	done
-	sed -e '/^$/d' \
-		-e '/asm;/p;s:\(asm\)\(;\):\1.signature\2:' \
-		-i  asm/src/main/java/module-info.java || die
-	sed -e '/analysis/d' \
-		-i  asm-commons/src/main/java/module-info.java || die
-	sed -e '/commons/d' \
-		-i  asm-util/src/main/java/module-info.java || die
-}
-
-src_compile() {
-	local module
-	for module in "${ASM_MODULES[@]}"; do
-		einfo "Compiling ${module}"
-		JAVA_JAR_FILENAME="${module}.jar"
-		JAVA_SRC_DIR="${module}/src/main/java"
-		java-pkg-simple_src_compile
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
-		rm -r target || die
-	done
-
-	if use doc; then
-		einfo "Compiling javadocs"
-		JAVA_JAR_FILENAME="ignoreme.jar"
-		JAVA_SRC_DIR=()
-		for module in "${ASM_MODULES[@]}"; do
-			rm "${module}/src/main/java/module-info.java" || die
-			JAVA_SRC_DIR+=("${module}/src/main/java")
-		done
-		java-pkg-simple_src_compile
-	fi
-}
-
-src_install() {
-	local module
-	for module in "${ASM_MODULES[@]}"; do
-		java-pkg_dojar ${module}.jar
-		if use source; then
-			java-pkg_dosrc "${module}/src/main/java/*"
-		fi
-	done
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-	default
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f809fdd307bd..73eee1910fb7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 5d500723f83b..e73e1ea7e8b7 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,3 @@
-DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
 DIST mpc-1.3.1.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
-EBUILD mpc-1.2.1.ebuild 895 BLAKE2B 25be0fbb65d92b455e69b684eff2f4673cc6ac05e914b75452203e81bee353cc5ad5d744c3b2b8c87b420b4ab5412ec50a2705c14dd1adedd4723215a4a9840b SHA512 1265aa1f9dba25e9a27dd64d1213178824ebfbd0d74907da13c99b2e383a4edf1ed081fd01ec58d94721e90e15230fa9fd834a6e2084de7571fc295be52fef88
-EBUILD mpc-1.3.1.ebuild 1349 BLAKE2B 3a83bbe4f9d56f1a3581cd32b429aa392b0c3309c9731c61ad47c040f69016e4e7d88582b51126942445baa8b5eb0b9ce4efdc9401ac3fd6c2bb1570cf72584d SHA512 c2cf21acf956cadd76b78f442e56558f52e8bf40c536291d46370d2b2c05233a99c200d2887d5f6986d3b89f5d5a53cc90fe27e7ad839ba12c2a0e9d9594460f
+EBUILD mpc-1.3.1.ebuild 1045 BLAKE2B 11aaa4850cdc31f0c6f52781a5b6c5ddafa21efd2a533e58e169497324431ac651240b827a27477a344a5bfd88f5a87534a1846c94b1ed197d9880bea6984556 SHA512 355c80b0652bd8ff4cd186d6e370d93d5a24983443400f790414c2c589ff01d354b29d520fee381c9bc594bebf0edbb62d158a759c331b475f3d7e4142e1632c
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
deleted file mode 100644
index 91a97cb7c994..000000000000
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-4.1.0:0=[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
index 9fac63aa632d..f6c284c4dbe5 100644
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ b/dev-libs/mpc/mpc-1.3.1.ebuild
@@ -10,20 +10,16 @@ HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
 
 if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.gz"
-	#S="${WORKDIR}"/${P/_}
 	S="${WORKDIR}"/${PN}-$(ver_cut 1-3)
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/3" # libmpc.so.3
 IUSE="static-libs"
-# 1.3.1_rc1 is identical to 1.3.0-r1 so just keyword it and later RCs
-# contain further build fixes for consumers.
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	>=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 49f7e6e0f17d..e14ffd0ca091 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 00cda9439f16..05d82735224e 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,22 +1,19 @@
 AUX numpy-1.22.0-no-hardcode-blasv2.patch 2710 BLAKE2B 71da07805e25acc58120da2b8d8692ec5893040eee3c2842620e2a9186062936082f34610d3056c44e44a921116f99158dfb7481c4eccc82d33b3b18a63b379e SHA512 87bcecee3435dedcd87128c81d0002a786b4b23928973216f32c8d12b797d6a9948c3e7b41142235abe35734683e6ef84c02ffe255ba492a0ad43626071dc5a9
 AUX numpy-1.24.3-fix-c++-linkage.patch 993 BLAKE2B 9ad31b995b209ea0674ee144a72dfa6b6bf5e10e3676a8c3dda9327ff9befed5cbdcfc0819a9053e1d281862ea8df40514e8e0fc05fee8c4a743faf8f56f5e72 SHA512 29a1e287f04a68785284005d8d2ee56e26f5180e42bc4a7ba0dc06f5523c91447a5a749bd4492ecf7ba5c916f80f03e619429f75ae3636cef24c4f11f29a6d23
-AUX numpy-1.25.0-fix-long-double-check.patch 5788 BLAKE2B c004fa342349a22dda30566d3015257146cee89e5b15c32d9b0bdbd44f4c7be76749f248e792d9ffd77ea8a674a2dfe0d183a9de48a1bb0f450e7a3f2f9688b0 SHA512 d2ecea4bc1878cb3df1b730b705bfa445f8f74356a5232de7ef5c94624847703985ac51d6b5bc3b961be6ef4b854804a531b5645e57ae4f6197d5aedb2e1c459
 AUX numpy-1.25.0-skip-python3.12-irrelevant-tests.patch 7363 BLAKE2B ca4581f61fb1350803915bcc8e3198bd13c75e0c7e178c86e72682222cbafff396f23afad9d7427d9d2a4be625f84626c899493045a0b8cc7ee3d031d36712c3 SHA512 cce36c856beb2254436f2753ed94b7a933d1e4c06fe0a96c2be70d944f91bb13f3358f50981398d0b9169c0e01b64695c3adb797db15cb6b695488318e276886
 AUX numpy-1.25.0_rc1-meson-pyproject.toml.patch 16917 BLAKE2B 6cdda647c1c4f003adcaff3d634cbaa2f6c1624f2e44bfff1b6542189693a1dc99bf8a3da38d5e9a5dd2b3a6382d0430f03eb3c39811cf3b72e85a1bbae9ea0e SHA512 0a51b1c84356704f373ba1188dc63152e45fdb7bc71881e8ab08b67bfbf2e8f1e9b5544eedf6e3d8b4b872e294e28233e9f059dfdad42ff835bba22ee66d0d93
 AUX numpy-1.25.1-fix-scalartypes.patch 2745 BLAKE2B 97b80e877bf6d9036c0911b135869e2f3d0eab6828b4b1acdc957581d5a32063981b1aa688c46627cdb6f8be7fb839aadeb66012157e0f8f5e623e6d572441eb SHA512 144fd807dee3a844f8279cb7443ecd400862b257d36c42d6197c90514b8405c60466473436509983ed13ce9d23a137ef953ce21e3f4a2a2e16cb27a0fecb174a
 AUX replace_cpuflags.awk 405 BLAKE2B 1ac5f362a174793274a2e63fad73a7cf260b1fb139c479279c8cad7f400a376712b17312ee41defb785a7a2c84ec8e679aae48b41e88394a816f12f1cd366e56 SHA512 cce2253e00e2e56f3038782ff989703a9ef3d5f97d1b1f2570f6e23396d7abb7cff7f34588b67ec6c395cb192d7e3bfa6a8262ddf45193a2d0c91c2063efcf6d
 DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
-DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
 DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
-DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589 SHA512 e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909
 DIST numpy-1.25.1.tar.gz 10428993 BLAKE2B ee3edaf5416ac858b995f0cb8df75962af01619969a2c70fa10b4e0d0a1c96a3b441ee470a463cdb7c60910d8823af1c41d37933f87bcaa0a724655d052ed20a SHA512 69cc5426f657a21a6a1fb3bb043b8acec90b87969f90177abb6d7294ca96d04f723ddf90fa40822704b16147a390abafbcda9702e40405ea6b6e22377aade71d
+DIST numpy-1.25.2-patches.tar.xz 7212 BLAKE2B 718331b2d9f8380df239bf2ad9c24d79924e08797825d7c8655124a55e059790f96641633cdb42c597646764ca9efcaf277d5f5b75f042f533c28f2a81d5a5a8 SHA512 bcc0c55710b8d874e1dd9a57fad5698e09e3c96254922db32a8beeae9a5a54532cb0660d3ce43ca68e70fa7227bca9e0d12a0298aa6972ad2cbcecfe4aee3e85
+DIST numpy-1.25.2.tar.gz 10805282 BLAKE2B f138eaf237f3e8052cafbe9fc98b4b62fb0748079df8599fc0950624c856294157410a2ec6fe381eaa8386b1530a39f7037ae1887c9fcfe2e77a3d7ad1ca0171 SHA512 6846d558c227329b6e700965ffa4c7886a7ca5f35234a56d734bc8201d19f7ac87d8ea081094bca13685130dce7bfb98ee4aa3a9dbd538288f10f1d9d82fb699
 EBUILD numpy-1.24.0.ebuild 4196 BLAKE2B a7359b00b007339381f458502457b2d2f9f07daf4f9affa239944de9ef3afef4318d063d7a934da394707d3ba5d53b043f68bb59f903ded5847122f0fce35567 SHA512 90500a1ee3a0a5a9ebd741dd9c870e6d57ec27e5da7dc4fc4dcac46f59212cabd777f806110180c11a55c4ffccbfdcaf0d0b5d1598beb5359779b6d6ba6a1c00
 EBUILD numpy-1.24.2.ebuild 4366 BLAKE2B a7a396b29efaf6a07bd68f76e0cae0d069f530a4d4d915b89cf5a47a42a4e9cf29215089f0a8f819fd24961280fe83f103f28b6be90758eb78f3f408ab5eb23b SHA512 b1186214bf08642b6ca267d0a84ec03c8f4b6256e728eb17d789eb34a43760bf87ea18696ef30b12494bff23a3b8b6f1980085c900c5341c8d43b8da468549f5
-EBUILD numpy-1.24.3-r1.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
-EBUILD numpy-1.24.3.ebuild 4581 BLAKE2B bf5f6eebf4a61a9d6c78c1e203db03e29f53064df3edabb2e2b1a0dc44abd5a13003d1d6d85e29eac3f44a5dfaeaf690be6f014896b0eed5fb1bb47a76b56916 SHA512 8900cb724bfeb570c812f073ce4b53c5242c342183d160950cedff2ae7159638f717a8006aed7f9f451e8bb3bd48830c975b0494aebe69e0f3189340f03df22a
 EBUILD numpy-1.24.4-r1.ebuild 5156 BLAKE2B 25bec383fd68bee81b0652f5f1845b2e598db5f3b9923c3e9d0d00e6d93fb9430e6845c673cce1c0a29791966acf1933db6d9074b8385c1cded6becfdb361a8c SHA512 9396face806a2c17952c2bc0802acc54f0c5c29bc9cc1a3265f60b0d72cc5094c2c6f9065e02bc4d6bb051f9201f6d1f4a74c936843fb4148811bcf6420a2765
 EBUILD numpy-1.24.4.ebuild 4628 BLAKE2B f6562a9a62262c0b78105ae9033537c65ee06ba79df7fb8e7ad6ecde01c7393dfc5e13234446e1642aaa3b05b1c8e9af4c7b6854a3c3a5f85931b259fb82d574 SHA512 ace98f02994fd18fb67e2879c2bcbe6fba39ed16cc3ee43acb75f50755175b4c6dfe6d72a21eb28a86e5ec2638f07ba6506d38a89b4b3155c41ba1827459f951
-EBUILD numpy-1.25.0-r2.ebuild 3970 BLAKE2B 1c389a3487d90170531396cdd2c84891280724d33771e5c7e49c5eeb15bae338d1becc232f76d7183a880b633a0da6119b301e320a6f37f9a8adf5376c20115c SHA512 f3a6ec2f32237913c0ed18d829b6495dfc609824a4c89b436b67b3d4313d8fc10510f25b44741e265340dc447e696fed8d2339158c84b81259bd22a79f7240f6
 EBUILD numpy-1.25.1-r3.ebuild 4444 BLAKE2B bc98460d27c6acd233ed219af855f93da93e6dd43db721195fd7e318256509145907136a1336f5d21c7252d05330eaf6b8f83f3f2bd4e4915d92ff447c57b564 SHA512 8dd4d5a3367d1260aa242558048d02da616695aa54f4b666b494d24aac7bef306bf7467fb73e6a7138f67086af51d3d191830a47c14b73062bf0836c345f4397
+EBUILD numpy-1.25.2.ebuild 4989 BLAKE2B a10f6a0c10619fa1859f6926620931f686f03243657b62e9aa203bd7c0a5be2b80ccbae5cb1a50e1acdd85f4910b28b6ba023efe4cb5052d012082e41067496a SHA512 c31349b3eccb781862007a9edbce57a21011897423f0565746a16526b65312db2321b2f2b6e6aee78f2fe41ac52d657bcd900354ce81701d75ec1200e9fbb05b
 MISC metadata.xml 932 BLAKE2B 7a4af31f613bab05ff542da48bf6ff1484d9df2459f559516e71329451dd739d3df0fead507c8033d94ab9ed516b68efe7f21819a8cd6ca303643d8c8bc34e86 SHA512 32cb8c1ab61521a02cbec38f6ea383f074e50d46aa3462ddcb85710f9d348e8e628cf2a5725e3cd921cc32f02885a1b5f02125639f0ec885384eeeff7f468a06
diff --git a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch b/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
deleted file mode 100644
index 4f3ef21c93b3..000000000000
--- a/dev-python/numpy/files/numpy-1.25.0-fix-long-double-check.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-https://github.com/numpy/numpy/commit/de0b2d5c6dee9303c4a055e7591978ed5a06e403
-
-From de0b2d5c6dee9303c4a055e7591978ed5a06e403 Mon Sep 17 00:00:00 2001
-From: matoro <matoro@users.noreply.github.com>
-Date: Sun, 18 Jun 2023 19:39:06 -0400
-Subject: [PATCH] BLD: Port long double identification to C for meson
-
-This ports the old Python code for identifying the long double
-representation to C, so that it can be easily invoked by meson.  The
-original implementation is at https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434
-
-The C portion of the code has been tested and confirmed to work on
-systems with the following formats, either natively or via an
-alternative ABI:  INTEL_EXTENDED_16_BYTES_LE, IEEE_QUAD_BE,
-IEEE_QUAD_LE, IBM_DOUBLE_DOUBLE_BE, IBM_DOUBLE_DOUBLE_LE,
-IEEE_DOUBLE_BE, INTEL_EXTENDED_12_BYTES_LE.
-
-The original meson port includes an error condition with the comment
-"This should not be possible, 12 bits of "content" should still result
-in sizeof() being 16."  As far as I can tell this is incorrect, as
-compiling on an x86_64 system with 32-bit ABI (gcc -m32) does indeed
-have sizeof(long double)==12.  This is reflected in the C code.
-
-Closes gh-23972, closes
-https://github.com/mesonbuild/meson/issues/11068.
----
- numpy/core/meson.build | 110 ++++++++++++++++++++++++++++++++---------
- 1 file changed, 87 insertions(+), 23 deletions(-)
-
-diff --git a/numpy/core/meson.build b/numpy/core/meson.build
-index 3427de408f1..92b393e4bc1 100644
---- a/numpy/core/meson.build
-+++ b/numpy/core/meson.build
-@@ -361,29 +361,93 @@ foreach intrin: optional_intrinsics
-   endif
- endforeach
- 
--# long double representation detection (see setup_common.py)
--# TODO: this is still incomplete, and different from how it's done in the
--# numpy.distutils based build, see https://github.com/mesonbuild/meson/issues/11068
--longdouble_size = cc.sizeof('long double')
--if longdouble_size == 8
--  if host_machine.endian() == 'little'
--    longdouble_format = 'IEEE_DOUBLE_LE'
--  else
--    longdouble_format = 'IEEE_DOUBLE_BE'
--  endif
--elif longdouble_size == 12
--  error('This should not be possible, 12 bits of "content" should still result in sizeof() being 16. Please report this error!'
--  )
--elif longdouble_size == 16
--  if host_machine.endian() == 'little'
--    # FIXME: this varies, there's multiple formats here! Not yet implemented.
--    #        TBD how we deal with the mess of old long double formats.
--    longdouble_format = 'INTEL_EXTENDED_16_BYTES_LE'
--  else
--    error('No idea what this is ....')
--  endif
--else
--  error('Unknown long double size: ' + londouble_size)
-+# This is a port of the old python code for identifying the long double
-+# representation to C.  The old Python code is in this range:
-+# https://github.com/numpy/numpy/blob/eead09a3d02c09374942cdc787c0b5e4fe9e7472/numpy/core/setup_common.py#L264-L434
-+# This port is in service of solving gh-23972
-+# as well as https://github.com/mesonbuild/meson/issues/11068
-+longdouble_format = meson.get_compiler('c').run(
-+'''
-+#include <stdio.h>
-+#include <string.h>
-+
-+#define repcmp(z) (memcmp((const char *)&foo.x, z, sizeof(foo.x)) == 0)
-+
-+const struct {
-+  char before[16];
-+  long double x;
-+  char after[8];
-+} foo = {{'\0'}, -123456789.0, {'\0'}};
-+
-+int main(void) {
-+  switch (sizeof(foo.x)) {
-+  case 8: {
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301}))) {
-+      fprintf(stdout, "IEEE_DOUBLE_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IEEE_DOUBLE_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  case 12: {
-+    if (repcmp(((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353,
-+                               0031, 0300, 0000, 0000}))) {
-+      fprintf(stdout, "INTEL_EXTENDED_12_BYTES_LE");
-+      return 0;
-+    }
-+    if (repcmp(((const char[]){0300, 0031, 0000, 0000, 0353, 0171, 0242, 0240,
-+                               0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "MOTOROLA_EXTENDED_12_BYTES_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  case 16: {
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0000, 0240, 0242, 0171, 0353,
-+                            0031, 0300, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "INTEL_EXTENDED_16_BYTES_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0300, 0031, 0326, 0363, 0105, 0100, 0000, 0000,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IEEE_QUAD_BE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000,
-+                            0000, 0000, 0100, 0105, 0363, 0326, 0031, 0300}))) {
-+      fprintf(stdout, "IEEE_QUAD_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0000, 0000, 0000, 0124, 0064, 0157, 0235, 0301,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IBM_DOUBLE_DOUBLE_LE");
-+      return 0;
-+    }
-+    if (repcmp(
-+            ((const char[]){0301, 0235, 0157, 0064, 0124, 0000, 0000, 0000,
-+                            0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000}))) {
-+      fprintf(stdout, "IBM_DOUBLE_DOUBLE_BE");
-+      return 0;
-+    }
-+    fprintf(stdout, "UNKNOWN");
-+    return 1;
-+  }
-+  }
-+}
-+''').stdout()
-+if longdouble_format == 'UNKNOWN' or longdouble_format == 'UNDEFINED'
-+  error('Unknown long double format of size: ' + cc.sizeof('long double').to_string())
- endif
- cdata.set10('HAVE_LDOUBLE_' + longdouble_format, true)
- 
-
diff --git a/dev-python/numpy/numpy-1.24.3-r1.ebuild b/dev-python/numpy/numpy-1.24.3-r1.ebuild
deleted file mode 100644
index 50f9ea27a06d..000000000000
--- a/dev-python/numpy/numpy-1.24.3-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-	"${FILESDIR}"/numpy-1.24.3-fix-c++-linkage.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.24.3.ebuild b/dev-python/numpy/numpy-1.24.3.ebuild
deleted file mode 100644
index 66d2ac04315a..000000000000
--- a/dev-python/numpy/numpy-1.24.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
-inherit toolchain-funcs
-
-DOC_PV=${PV}
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="
-	https://numpy.org/
-	https://github.com/numpy/numpy/
-	https://pypi.org/project/numpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	<dev-python/cython-3[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
-	lapack? (
-		virtual/pkgconfig
-	)
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-		' 'python*')
-		dev-python/charset-normalizer[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Allow use with setuptools 60.x
-	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very disk- and memory-hungry
-		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
-		numpy/lib/tests/test_io.py::test_large_zip
-
-		# precision problems
-		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
-
-		# runs the whole test suite recursively, that's just crazy
-		numpy/core/tests/test_mem_policy.py::test_new_policy
-
-		# very slow, unlikely to be practically useful
-		numpy/typing/tests/test_typing.py
-	)
-
-	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
-		EPYTEST_DESELECT+=(
-			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
-		)
-	fi
-
-	if use x86 ; then
-		EPYTEST_DESELECT+=(
-			# https://github.com/numpy/numpy/issues/18388
-			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
-			# https://github.com/numpy/numpy/issues/18387
-			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
-			# more precision problems
-			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-		)
-	fi
-
-	case "${ABI}" in
-		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
-			EPYTEST_DESELECT+=(
-				# too large for 32-bit platforms
-				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
-			)
-			;;
-		*)
-			;;
-	esac
-
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TEST_DIR}/lib" || die
-	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.25.0-r2.ebuild b/dev-python/numpy/numpy-1.25.2.ebuild
index 61b8eb41ef9c..423366aad0e7 100644
--- a/dev-python/numpy/numpy-1.25.0-r2.ebuild
+++ b/dev-python/numpy/numpy-1.25.2.ebuild
@@ -17,12 +17,13 @@ HOMEPAGE="
 	https://github.com/numpy/numpy/
 	https://pypi.org/project/numpy/
 "
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.25.2-patches.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
 IUSE="lapack"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 RDEPEND="
@@ -34,7 +35,6 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=dev-util/meson-1.1.0
-	<dev-python/cython-3[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
 	lapack? (
 		virtual/pkgconfig
@@ -51,9 +51,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.25.0_rc1-meson-pyproject.toml.patch
-	"${FILESDIR}"/${PN}-1.25.0-skip-python3.12-irrelevant-tests.patch
-	"${FILESDIR}"/${PN}-1.25.0-fix-long-double-check.patch
+	"${WORKDIR}"/${PN}-1.25.2-patches
 )
 
 distutils_enable_tests pytest
@@ -76,18 +74,39 @@ python_configure_all() {
 
 python_test() {
 	local EPYTEST_DESELECT=(
-		# very disk-and-memory-hungry
-		lib/tests/test_io.py::test_large_zip
+		# Very disk-and-memory-hungry
+		lib/tests/test_io.py::TestSaveTxt::test_large_zip
+		lib/tests/test_io.py::TestSavezLoad::test_closing_fid
+		lib/tests/test_io.py::TestSavezLoad::test_closing_zipfile_after_load
 
-		# precision problems
+		# Precision problems
 		core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
 
-		# runs the whole test suite recursively, that's just crazy
+		# Runs the whole test suite recursively, that's just crazy
 		core/tests/test_mem_policy.py::test_new_policy
 
+		# XXX: I've no idea why this ends up being needed in deselect and not ignore
 		typing/tests/test_typing.py
+		# Uses huge amount of memory
+		core/tests/test_mem_overlap.py
 	)
 
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			typing/tests/test_isfile.py::TestIsFile::test_isfile
+			tests/test_public_api.py::test_all_modules_are_expected_2
+			tests/test_public_api.py::test_api_importable
+
+			random/tests/test_extending.py
+			tests/test_ctypeslib.py
+		)
+
+		EPYTEST_IGNORE+=(
+			random/tests/test_extending.py
+			tests/test_ctypeslib.py
+		)
+	fi
+
 	if [[ ${EPYTHON} == pypy3 ]]; then
 		EPYTEST_DESELECT+=(
 			# TODO: crashed
@@ -96,8 +115,7 @@ python_test() {
 	fi
 
 	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
-		# Degenerate case. arm32 chroot on arm64.
-		# bug #774108
+		# Degenerate case of arm32 chroot on arm64, bug #774108
 		EPYTEST_DESELECT+=(
 			core/tests/test_cpu_features.py::Test_ARM_Features::test_features
 		)
@@ -114,6 +132,17 @@ python_test() {
 		)
 	fi
 
+	if use hppa ; then
+		EPYTEST_DESELECT+=(
+			# TODO: Get selectedrealkind updated!
+			# bug #907228
+			# https://github.com/numpy/numpy/issues/3424 (https://github.com/numpy/numpy/issues/3424#issuecomment-412369029)
+			# https://github.com/numpy/numpy/pull/21785
+			f2py/tests/test_kind.py::TestKind::test_real
+			f2py/tests/test_kind.py::TestKind::test_quad_precision
+		)
+	fi
+
 	if [[ $(tc-endian) == "big" ]] ; then
 		# https://github.com/numpy/numpy/issues/11831 and bug #707116
 		EPYTEST_DESELECT+=(
@@ -121,6 +150,7 @@ python_test() {
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
 			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
+			f2py/tests/test_kind.py::TestKind::test_int
 		)
 	fi
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4e54e78d5dcb..4b719937b5bc 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index db8d70556311..2f709a9c104d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-242.tar.gz 3167814 BLAKE2B d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795 SHA512 3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
 DIST diffoscope-245.tar.bz2 3088217 BLAKE2B 4317baf3c64076ce34eb9a93ac30099ce01629e0e3136d79ef848d1fdccacdf76537827a1aa19a0b404a413e0e38a28d68b2eb215ccf1df7bfb6705ea0290a8a SHA512 b7120e060b0799078dd3de3463aef74c1980c8d15e67628854a3dc6a7e3dfd14f47e57e8522186d02839f2f131757814b3c208117004d4290fed68f0aac4dad3
+DIST diffoscope-246.tar.bz2 3090809 BLAKE2B 36b9ed0e759cd9a508e10c78b935df954ac55b52e5edf09988bd8d62890de0a1380abb9e09966bad666a0202d01f1d8edd42abc116006dffa70d10de7821f787 SHA512 dbedcc2cc218b6f6c504a0546103bfe6f6f397e0b1a48d8ef3107d42ca162098328cf20705de3f5c6a10e44de187f2c953596a8fc3d7df3c0624810be0c93374
 EBUILD diffoscope-242-r2.ebuild 3666 BLAKE2B 5f7f5b7db5f02fb7ad637e0a4152881a30b2817d79b085872a08a376bb0fb22e7006e4c97fc0963e59b7323e3f44af5fd76ea388722d961548785149c93080c0 SHA512 c00320a868e58de03cc73520a89da428ce01ce3efe24ce1c5799bcc10a966050104f5e2342fcdd7b66fbfd7fb0e376da9386a12974dde71dcc06f7b8e342ba71
 EBUILD diffoscope-245.ebuild 4034 BLAKE2B 5ff0b1c77bfdc35189d9b5a5ec02df3911d1c1eb6bbec15705a05556271910ee3933517845aef2f66f751f63d9894f6afdb8c8c73545c132c96795ed9f95bd3c SHA512 79231217e3b16d9e5a11c9d6d7b289e0564ab4d5b4a826a65b83b735afa8d46dbfaca241e7d708e6ba1049ac9fe659d957afab7f5ebe90d23c08d001147fa4b1
+EBUILD diffoscope-246.ebuild 4352 BLAKE2B aa2049509dde912d2fc637b7956c21e3c8390df0d1e52f0b8a28993d8b44a8d1ae824a42aaf4f55eb81e53a25112bce0ce094f63124cdc66ffd885e13966353d SHA512 917b6f05e2211892cf87c586fa7d6e06115c79c2bfd90386d138db86c68f497d0a4e2ceccea021246652447a0091780378448a139ff6a87cb1d4cacbf4962771
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-246.ebuild b/dev-util/diffoscope/diffoscope-246.ebuild
new file mode 100644
index 000000000000..3c8460272f04
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-246.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+# No 3.12 yet as these two tests fail:
+# ERROR tests/comparators/test_elf.py::test_differences_with_dbgsym - TypeError: sequence item 1: expected str instance, bytes found
+# ERROR tests/comparators/test_elf.py::test_original_gnu_debuglink - TypeError: sequence item 1: expected str instance, bytes found
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+# We could use pypi, but upstream provide distribution tarballs, so let's use those.
+# TODO: verify-sig
+SRC_URI="https://diffoscope.org/archive/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/pypdf[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( virtual/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	#tests/comparators/test_macho.py::test_llvm_diff
+	#tests/comparators/test_elf.py::test_libmix_differences
+
+	# Fails with file-5.46 (https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/346)
+	tests/comparators/test_cpio.py::test_symlink
+	tests/comparators/test_cpio.py::test_compressed_files
+	tests/comparators/test_uimage.py::test_nested_symlink
+	tests/comparators/test_uimage.py::test_nested_compressed_files
+)
+
+distutils_enable_tests pytest
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index b2e10f3b7654..24d920a8787e 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 58320325752c..86e0c03102d5 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,4 +1,6 @@
 AUX corsix-th-0.66-cmake_lua_detection.patch 499 BLAKE2B 939992cced1c18dc5a6c53b892e8d2adbe084e9bf028c4c858e3c809a4bc5df0b304aae020994d8b94052bcda60486affb080096c688eb6120950ea626f5db9b SHA512 bcdbbe851610afb863b6c58700ab03f3c426cd6f9a9795d853a819bde3e9ac0d89a1d99eb04f2559f9ac80344c03aa1fc8c99cbc80c7b81e4e3739af6db6bdf4
 DIST corsix-th-0.66.tar.gz 4117046 BLAKE2B 7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75 SHA512 a5cea74e7754132a7edbe188c63c08eb40ba8a8bbef6dc7441e41c5f46e96cacaa077d00bead4f8b3af3b8e07eadb4cfd08b1fb147e1397e2f9aa02642d29105
+DIST corsix-th-0.67_rc1.tar.gz 4127427 BLAKE2B c6f7c40dac0780b0c00de0ec7432b86aa4c09a0ffb0eaf87e58abee7b934b2c9fc9e151b86a7edf588ca1a65d42b27eeb9f63ec64f1a5250e2b7e1f60d2d3226 SHA512 cb104ba81a1c70bcdf49f0659bd544fc003b8a89dd8bbfa504676086da35b4817702b02933b4fcf239f6ac784c091d28867db246a8f6242952f3abdfdb959690
 EBUILD corsix-th-0.66-r1.ebuild 1901 BLAKE2B 0e3161eae51fbcc795490e3a9182ef3be13adb1d79058c10435f647fe66340b62a19634f8335a14cefa4ef92af1c7c958f02d2833cdaaae1e2014dbce972147f SHA512 66224bc0718f3f0d0c297209334dc08dc6b5bec62073b46b23c34b00550ab9f420ad103db1706ca81c5c72e3f55c15170c91b3c1ecaf328305ff8bf1d1572f8e
-MISC metadata.xml 717 BLAKE2B c32582188f6a89239fbec43977d4d126075de2d599c8496ebf01e0a7d919550739913d0290afb24544cc8ea4ff2177a89bbcdaa14ba5e4654d8a7f7db07be294 SHA512 3b3387491e7c51efcc777675e9b996c5648b8e0f5fc7319345a500e60aad08c2a5ca5a9fc0d46928fc60346151232daaf719e7a5ed5fb8a1bc03c40313652ca5
+EBUILD corsix-th-0.67_rc1.ebuild 2031 BLAKE2B 436e7ffa5a506d31cbaa2bc8fbcebb201aa63d928dfa7d7a0fe1425bd9c2022d440e3a71e64fbc9d94955124f118a34ae32c0cc883dcb0bbd7fd752abe7f8e90 SHA512 e3278ddac798ec71b35b607d604d45e7ee28b416e76346187fc8a904aedf3dbd4b2de6620b8026c6bb855d4532a76f76fb7597426b9448ca9929afcfe6d62431
+MISC metadata.xml 780 BLAKE2B 604dff99fbb107226d6edf80a3648ebb5b7d5793745d4275ed106d8e313cbb2319510490279071807bc5bb293458c96a4f5f7a5e6442e397f2331d62f518d2ae SHA512 38586db6e150a9f87988c32e7e69afef5f079e1b49803452b4655a407bdc810b9d829be2406c278f81e315c11033d43e51afabef1a91c2c84638b6afab706c92
diff --git a/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild b/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
new file mode 100644
index 000000000000..fb20bf9d939b
--- /dev/null
+++ b/games-simulation/corsix-th/corsix-th-0.67_rc1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake lua-single xdg
+
+MY_PN="CorsixTH"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Open source clone of Theme Hospital"
+HOMEPAGE="https://corsixth.com"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+IUSE="doc +midi +sound tools +truetype +videos"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		>=dev-lua/luafilesystem-1.5[${LUA_USEDEP}]
+		>=dev-lua/lpeg-0.9[${LUA_USEDEP}]
+		>=dev-lua/luasocket-3.0_rc1-r4[${LUA_USEDEP}]
+	')
+	media-libs/libsdl2[opengl,video]
+	sound? ( media-libs/sdl2-mixer[midi?] )
+	truetype? ( >=media-libs/freetype-2.5.3:2 )
+	videos? ( >=media-video/ffmpeg-2.2.3:0= )
+"
+
+DEPEND="${RDEPEND}"
+
+# Technically, build-time generation of documentation could use any version
+# of Lua (or to be precise: if in src_configure cmake has been told to use
+# LuaJIT documentation generation looks for LuaJIT, otherwise any
+# dev-lang/lua slot will do; see the first few lines of the bundled file
+# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
+# with the other slots of same, try to keep the deptree sane until we get
+# rid of unslotted Lua.
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		${LUA_DEPS}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.66-cmake_lua_detection.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DLUA_VERSION=$(lua_get_version)
+		-DBUILD_TOOLS=$(usex tools)
+		-DWITH_AUDIO=$(usex sound)
+		-DWITH_FREETYPE2=$(usex truetype)
+		-DWITH_MOVIES=$(usex videos)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+	dodoc changelog.txt CONTRIBUTING.md
+
+	docinto html
+	use doc && dodoc -r "${BUILD_DIR}"/doc/*
+}
diff --git a/games-simulation/corsix-th/metadata.xml b/games-simulation/corsix-th/metadata.xml
index 3dac5f6d9022..500a549db1fe 100644
--- a/games-simulation/corsix-th/metadata.xml
+++ b/games-simulation/corsix-th/metadata.xml
@@ -13,6 +13,7 @@
 	</longdescription>
 	<use>
 		<flag name="midi">Adds support for background MIDI music via SDL_mixer</flag>
+		<flag name="tools">Build tools for decoding RNC files</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">CorsixTH/CorsixTH</remote-id>
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 04bb32a787df..53bdebb7fe2f 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,10 +1,8 @@
 AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358
 AUX openttd.confd-r1 376 BLAKE2B 9208c9da8c90d74d36204c2c78f14b28fa3bf5ec730e2f56b6ae163b474b2169b003fb4d869810a2404cc0ad2e0e5bf9c78417057a762e965787b955431db629 SHA512 a3ca192781b0bf4a1105f13890bc34b3d68a365637adb2254b7b048fa5a1fde80b95415711010b8144135465c2a9cd1a8822cc3bbd2e0161a728c16acb1d0509
 AUX openttd.initd-r3 1052 BLAKE2B b4f57691ef749e8aae4be2fb3cf1826b00fa609afbd1f0d863fb6177fe70e4b6254831ea5c89aa74bac9e2dfddf050656dc43790a412870add8baefeb57d9500 SHA512 5064fb633aea2d2720f189a3a5a9f07541394d7760274465bd9837ec4a04009597b984821424f234941972958754db33bc5cc174b7b075c8915fb2231dd3e6f8
-DIST openttd-13.0-source.tar.xz 7422316 BLAKE2B 8aa384847681a61c74e1d56c86600fe7ba273d4721bf2b290dcbdced830e7b6872ae458d02d986877c92d5027bbfe8e9eccbcc74b791b3e9332c142fbc078953 SHA512 a2436eb8aae6967e1e3bcf5f67c2346a8f80af723509d668157e785424c2245086b10077783857acf8840068a37a0e9094f04fda36887ef7e799f360075a8e8a
-DIST openttd-13.1-source.tar.xz 7407360 BLAKE2B 2d289defa38583c95f90322964ba43756468d7fa50087267119f00ccc3688e68e22631f41b091d44b1afaa878f8621f27ba58a0623d5be9420b61833dba8d6e7 SHA512 059eb71da295e8d7bdf939d9c02ff0bb5dbfbfe3fe1f40e7d370918b4c6b7a57c56d039a72c3fb42067159cbb08d956d07f700828f8a9e1e938a5d6550033813
 DIST openttd-13.3-source.tar.xz 7417568 BLAKE2B dbeacb0e40af76feda5fd9946a63267e4ce9f342be4479bca24e04be7dbf05453184396e2b78f62ee045d636f70f5969ee1b1f045c68961a80875f7788a570d2 SHA512 bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
-EBUILD openttd-13.0.ebuild 3667 BLAKE2B 0614a19402473bff873779d828df265be0a017a7b97ea34c1c80e9f7071a7351c781356581c3d68e2150820d4c2301ff4a2a5e058cf06a25e86e68c3bcf64299 SHA512 5e3f315c26d01f4c0034a102de0476899bcd7895e91ab6605ef060c2165d4021ab397be9bde27f68a4396bfa3dda9cee2598707a0b9a863a56955784c1067b76
-EBUILD openttd-13.1.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
+DIST openttd-13.4-source.tar.xz 7428012 BLAKE2B 0ef635e40fe47185168bd13e4b8ce24a8ff9c4afe3eced6197298986127ee196a6dcb379643bbb1de9bb552e71cda5df5b5b35006ed2b43d6e33e8513b1cd550 SHA512 84f57a39c0dade44f0e6153dff7a40eec0da8e2f892ce870d5f9e037f80daa5c7c46ff786fa51c3671366dd5056504cd7ccbc1c4e5bce8b2c5575533b454c001
 EBUILD openttd-13.3.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
+EBUILD openttd-13.4.ebuild 3899 BLAKE2B 8cded051484ef6273ca0cfd9b0ea4dc21746dbae0aeee21594308775765355105809faaa11d031219374988dad7f93bfe9c0532c2005734341d5ba099363c19c SHA512 4e695e3bf8b8e327336b7d2464c0675e3ac4df84672f120f61dea2b150ccbf2aee662f1ec07eabaec94bdeefe5177eeaf6ae705cacacf132d734242c0eca80a8
 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf
diff --git a/games-simulation/openttd/openttd-13.0.ebuild b/games-simulation/openttd/openttd-13.0.ebuild
deleted file mode 100644
index abf0f06f0a0e..000000000000
--- a/games-simulation/openttd/openttd-13.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-RDEPEND="
-	dedicated? (
-		acct-group/openttd
-		acct-user/openttd
-		app-misc/dtach
-	)
-	!dedicated? (
-		allegro? ( media-libs/allegro:5 )
-		fluidsynth? ( media-sound/fluidsynth )
-		icu? (
-			dev-libs/icu-layoutex:=
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		sdl? ( media-libs/libsdl2[sound,video] )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=games-util/grfcodec-6.0.6_p20210310
-	virtual/pkgconfig
-"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			>=games-misc/openmsx-0.4.0
-			>=games-misc/opensfx-1.0.1
-		)
-	)
-	openmedia? ( >=games-misc/opengfx-0.6.1 )
-	timidity? ( media-sound/timidity++ )
-"
-
-DOCS=( docs/directory_structure.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_prepare() {
-	# Drop automagic LTO usage
-	sed -i -e '/check_ipo_supported(RESULT IPO_FOUND)/d' CMakeLists.txt || die
-
-	# Don't force _FORTIFY_SOURCE via CMake
-	# (we already set it in the toolchain by default with a minimum level
-	# of _FORTIFY_SOURCE=2)
-	sed -i -e '/-D_FORTIFY_SOURCE/d' cmake/CompileFlags.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR=bin
-		-DCMAKE_INSTALL_DATADIR=share
-		-DOPTION_DEDICATED=$(usex dedicated)
-		-DOPTION_USE_ASSERTS=$(usex debug)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		# N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
-		# with USE="allegro -sdl" combination flags. There no other way to
-		# completely disable SDL1 support.
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use dedicated ; then
-		newconfd "${FILESDIR}"/openttd.confd-r1 openttd
-		newinitd "${FILESDIR}"/openttd.initd-r3 openttd
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use openmedia ; then
-		elog
-		elog "OpenTTD was compiled without the 'openmedia' USE flag."
-		elog
-		elog "In order to play, you must at least install"
-		elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-		elog "following 6 files from a version of Transport Tycoon Deluxe"
-		elog "(Windows or DOS) to shared or personal location."
-		elog "See ${EROOT}/usr/share/doc/${PF}/directory_structure.md for more info."
-		elog
-		elog "From the Windows version you need: "
-		elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-		elog "OR from the DOS version you need: "
-		elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-	fi
-}
diff --git a/games-simulation/openttd/openttd-13.1.ebuild b/games-simulation/openttd/openttd-13.4.ebuild
index 20010db20802..20010db20802 100644
--- a/games-simulation/openttd/openttd-13.1.ebuild
+++ b/games-simulation/openttd/openttd-13.4.ebuild
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 34a7c0f96085..5f45cf29a53d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 46d60eff31e8..6e900e3d04e1 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,5 +3,5 @@ AUX alsa-lib-1.2.8-clang16-macro.patch 1171 BLAKE2B d9c48d70ece2365ce8d4783b4e5f
 DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4 SHA512 865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
 DIST alsa-lib-1.2.9.tar.bz2 1094660 BLAKE2B ec0c6966802196016679652292a579c6301cce33a2e887fce79cdb80629b6df047269787445cf0645e6cf43d3d2aae8fa57ddad5ab79fc254ee65a0ed695f449 SHA512 8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a
 EBUILD alsa-lib-1.2.8-r1.ebuild 2540 BLAKE2B f4aff12b1da6ed6a5b3be7955d918a1dfbf3995ca17fbd7f7e947addb17b8570bd1f18e59d0d47c091ff493163f2fc61363558d52eb22ea19369904f7d162cc1 SHA512 114feb897ac54c94c8527af2953a3fc02c94fe6a32c3638e1056c3184e005a8e1f3f289447274a5a0155c8dbe0ef64ac55aa52b4edcfb07a3f186c16c56b9389
-EBUILD alsa-lib-1.2.9.ebuild 2596 BLAKE2B 7a7e75315e12f9a4ccef381f4bb137d00cd3efe44c6141943a0b9b892e9dfa391fb6330f956e69c20cb71714ffe7d08b96a9fcef0c3dff343c87275fd5769165 SHA512 58bf21238afafde170882874ba54b065a610e19d070259f353f509cc156e5bca651823476ed5dabfad173d3452dfa0dd131a7509724b592e883a95ea5b4395fc
+EBUILD alsa-lib-1.2.9.ebuild 2594 BLAKE2B 0959ddc3322ff6d7f50e3ef0f95911340ebfa1496d59dd8aae85a85f6e341e5d64a01bd3250ead7b8efd6316506a4433b4945354ef8dc39cf5053f86a40d99ff SHA512 883bc663bd6a5e00560a2aa05ecc9921047ef5ad990f96c39a70614ff09c28f27d48515ea7cd99bc410f8fdbdd5b793c1e61f65e3a5ad1f0b5851fce6f304f39
 MISC metadata.xml 562 BLAKE2B e5944d48c846097392d401c5aec1c25adc58aa78cc441df8ac6ecc351ee338094f70cbe526cb0c8b9b87750b76d11bd24ddfab63d9ef87938ee25d5a9930b23f SHA512 d2ea1565bc3dcd9899ce0c108aca7ecc50a89621fcfda7d2dc111dc12c83e7551468a54c08bc7ffbbab4884d2a8bcb280005e54d11f12e9c31770f94a7728c02
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild
index ecf9ef984c18..59d9c14865f1 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.9.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index 57487160a87b..999fb4498a24 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -2,5 +2,5 @@ AUX alsa-ucm-conf-1.2.9-fix-sof-essx8336.patch 653 BLAKE2B 0b985d5767f5e6f842a16
 DIST alsa-ucm-conf-1.2.8.tar.bz2 37843 BLAKE2B f2281a3a5d8b4fcbc4c75ce99a911a4ce3230abfa6f6d0aff8e175fe1b870750f43c087339490ed9f4d5ab314fda391e06e41cbed79239a16326a8f2d02ac262 SHA512 a15a9ca52c108ee95a421b91f3fad4329f1e9fb1c004a40d5ff1a57d6701bad19a31d5a296426d26439be9b87d2d543ce51588a98402d24c17f0f92aaf1096ca
 DIST alsa-ucm-conf-1.2.9.tar.bz2 42802 BLAKE2B fe71790aa8658ab12378baa55f95a03aaebd3eb0aef2535b65b89884de6cb404a75b44fd238d2089e0a005ca81720f3c44d1912452908e97aa75fcda513908cf SHA512 3aced4d4df76044a5525f1217851e05f7ad177389d2008e3e3dd0fb4d2cf72cd0897b140659a7729cc37d5b737c2d0cf5b607df4f576647044accd560d8cb87b
 EBUILD alsa-ucm-conf-1.2.8.ebuild 517 BLAKE2B 86309cde65282c8d01ea47e2bf1d7e12e0e141bc7289b9af6deee856267175e907db7b40d111b891982f0457ad60d7e1f24b5528c9b003da46b677627939d4b4 SHA512 6b8e3406d1eaeb6a5dc3361ed1a4ec8e22ec039eb3236d6c10370e2323441db025dd4993b897051c021d6eecc4643b68d152c58558202d32214a8336ea03feb3
-EBUILD alsa-ucm-conf-1.2.9.ebuild 568 BLAKE2B c7ad4348a28d6aaeb0f4a8d9b49d58ff16644e68983873f60938844eb768e579e90247a8c40ef4928952faec900fec6001c942346d63f88c15559212caebddfc SHA512 8da04415defeb353cddb01de692ca355648c7cf23bd7f3fb708cd7bf7c976ec0f687cc2042a362f318625918583b42d25c30412bc2b091751feb6d99fbf15e5e
+EBUILD alsa-ucm-conf-1.2.9.ebuild 566 BLAKE2B c3620b7908d1661580c1260ac1ca17822449dcc7a27e1d42d077f648c2f9d3bfc17d49eff09f96e74dd2ab241a90aaa37b00efecaa4cd13dfe284eb500132993 SHA512 cb67260dea9e73428680b6b662f2ac2aed849e31f28d3b886565f2f84afa313882105a5e7a1aa0b1f1ed63833ffb2ea25bc7bc0baa9e191d61449983afface26
 MISC metadata.xml 457 BLAKE2B 68d8f949d705562928ce4f6a25faf692611f14d63e659723ca5095be6befb5c03bf7dca73a158973d58ac242626a8a4b6f7d8835377e21d5bc8d2307906fee7b SHA512 8b65e913e4d6fbdcd2c760c383d9d026cf053dd10a63689b782f19f88b199443542488bacb08fa02ffffff09165813323dcde06529c9ff744182b728aead0c6d
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild
index 460feee1c028..d789cc1623aa 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="!<media-libs/alsa-lib-1.2.1"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index a7b6ad29da10..f7795f86050b 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,8 +2,10 @@ AUX harfbuzz-8.0.0-arm-cast-align.patch 1036 BLAKE2B 37c45c3ac04f021d644820d4b80
 DIST harfbuzz-7.3.0.tar.xz 18867940 BLAKE2B 7b1f6fb0c4c7483ff7a7c27f613b8579af30a304432e1a4e157aec4344449aed93e68443df1f2bc741be6780a6b2214d54804e2df9a20d83c8256b5f98c7fcda SHA512 e1fb484e4117cedc72bd473ee91b2f6143533fb467ec9a64361f0c7ffd8b5a44ad2ea42daa948a2d5d85297ace4b640fcd24a8291b0d75a1d4ee468c629febe9
 DIST harfbuzz-8.0.0.tar.xz 18793316 BLAKE2B b37ef67734af2b0e0f4587fc5e43b3046d669d4fac50c0f2bf9710a9e84384b9a22141999299476d715ce148b33236a42aa0f5d250114f0aef3074f6c401170b SHA512 8f4b72ec5f4fca56162e6d6fd6c60aa68958861ca5683e34a9ed96dd09d203253d5dbbfb2987b161fabda9b3abf61120e928a4dd6e9e9e6b6842294cfdf08402
 DIST harfbuzz-8.0.1.tar.xz 18792332 BLAKE2B e69305e5cddee2f9a928ab38b6904cc3e6fbafb319ad268047178667639a2a361576051a9a6443352b51adca47bb8998ca5c533afe12eac456c3170e171c1839 SHA512 e1292f059b07a5aa2f3fbf345b893209cac895c461b4abf30b8b76bcd03c79dd09f911450293403070e1a0bb08496a7f37693ba5a62a9d423dd6ba55e744444d
+DIST harfbuzz-8.1.0.tar.xz 18803264 BLAKE2B cc8792e7a33a615cf19768e58b1ec6f7eab5137bacf0e94a2ae5e2cd6fa44a2f512211f30d240df3a69c8c959e27ee2f9af5e2a33f1a2658289d79bb624bf1d1 SHA512 7e7612e0b04979e156c40bbadf3e9412e5793f897924135e424a046072872964214116606d9edcdff9070d2ce2d4417278dc1d097ae6b9cacb7aefe97dbe812f
 EBUILD harfbuzz-7.3.0.ebuild 2689 BLAKE2B 0d5961de148f670843dba116990fb1f55efa4c9fc99fb4f228b56daa6e3c336f6d26fb962d5de975e8b3c8520acb46c5db9b16b026b25452cfa5f480a0aa1647 SHA512 44be08a204dd2beaa976f92b22b71f2317bbba0d8277ad48c2047fc02bdb1287a19836b2a04ae88986ec4fb47591cfef834e89ef10b8a8c3caf7fb827c8222f4
 EBUILD harfbuzz-8.0.0-r1.ebuild 2767 BLAKE2B 7921ffa4911de8325b5d4feada0ea0fd0c758df8493fe49044daee888f2176dd006b1656497b33b3bcaf7930e8c4dcc76c243d93ea95ea567afb24554060e84b SHA512 927c2eebb0e282c6fc754b21e2d9c534852a49a270363ef814860f268aff254894883c31ddba55f7d2200376a925e27269c74b70ea28c6f633327349abbeeb7f
 EBUILD harfbuzz-8.0.1.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
+EBUILD harfbuzz-8.1.0.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
 EBUILD harfbuzz-9999.ebuild 2713 BLAKE2B b72f5d07a27e84e98af56ff704a766cd1d19df6984eaf008255e88a9c413c6a3d4a2c0e977f2a522e80e2a064849843a30ad16e34bf07e1b64c5b5dee054374f SHA512 c176dd6d8c448ad34375e5991212896c33ab53c0eb6c983112e99e9f4d79e64fa6ac6c2ae9d51d11089d2c887235f847561dd0f873b206e51b1a1ebad99b1c25
 MISC metadata.xml 649 BLAKE2B a03eb9e2b09fab01af900957a9f5d0a43836a77ce770bc2327bc8da299139d1175b59cc413d0a02d74d4fc4169ff3c9180a5c1cf8d6ff570b054bbceb55e89ba SHA512 94c0c007157e240abc17056e2efe877770ee0267bf9d710fdbac796110f4507d2bc628c3b22f74652a9c568e7c60fa513e680aeeb8895831aafede268c14be70
diff --git a/media-libs/harfbuzz/harfbuzz-8.1.0.ebuild b/media-libs/harfbuzz/harfbuzz-8.1.0.ebuild
new file mode 100644
index 000000000000..c114ab1668f9
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-8.1.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/harfbuzz/harfbuzz/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+# 0.9.18 introduced the harfbuzz-icu split; bug #472416
+# 3.0.0 dropped some unstable APIs; bug #813705
+# 6.0.0 changed libharfbuzz-subset.so ABI
+SLOT="0/6.0.0"
+
+IUSE="+cairo debug doc experimental +glib +graphite icu +introspection test +truetype"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:=[${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.34
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-util/glib-utils )
+"
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# bug #726120
+	sed -i \
+		-e '/tests\/macos\.tests/d' \
+		test/shape/data/in-house/Makefile.sources \
+		|| die
+
+	# bug #790359
+	filter-flags -fexceptions -fthreadsafe-statics
+
+	if ! use debug ; then
+		append-cppflags -DHB_NDEBUG
+	fi
+
+	# bug #762415
+	local pyscript
+	for pyscript in $(find -type f -name "*.py") ; do
+		python_fix_shebang -q "${pyscript}"
+	done
+}
+
+multilib_src_configure() {
+	# harfbuzz-gobject only used for introspection, bug #535852
+	local emesonargs=(
+		-Dcoretext=disabled
+		-Dchafa=disabled
+		-Dwasm=disabled
+
+		$(meson_feature cairo)
+		$(meson_feature glib)
+		$(meson_feature graphite graphite2)
+		$(meson_feature icu)
+		$(meson_feature introspection gobject)
+		$(meson_feature test tests)
+		$(meson_feature truetype freetype)
+
+		$(meson_native_use_feature doc docs)
+		$(meson_native_use_feature introspection)
+		# Breaks building tests..
+		#$(meson_native_use_feature utilities)
+
+		$(meson_use experimental experimental_api)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	# harfbuzz:src / check-static-inits times out on hppa
+	meson_src_test --timeout-multiplier 5
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 81ae1757f52e..3ef52b39b794 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 52201d99d153..5e3cead6038d 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,6 +1,6 @@
 AUX alsa-tools-1.2.5-hdspmixer-crash.patch 761 BLAKE2B a2290baa6b4436a2d1cfdfd12039b42ee83017a991b7f05bb8118e27942c7b60bdb0a5636a0859d035290472069a485c2c1d6d45491c9b560b56cd80c36a859e SHA512 220fc805687d04e43914ae13ebfd6f9cfcf4415f7e9a25b0f9d57ee399656a5cc0aa17d75b8e27ee634dd3d66e88bb93fe8caed84b37c0e90bb154f086b3b71f
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.2.5.tar.bz2 1880907 BLAKE2B 1ecd7d24771e3f5899a7084a69196c9301b549dd331cbbbc55b6f0c694566147a9d5642cf94f0ad5ca5fcedb77daa1cb4615ce0ec0be157b32c9d756611a7cca SHA512 1c4ff947d9f2424056a6748e04a1250fb73443a3f470f61d0b563c91be082bc42d56e550d6cc27eaed3edcea2066a107e20455c959b053b5deafa2d811b7e498
-EBUILD alsa-tools-1.2.5-r1.ebuild 3518 BLAKE2B 66e02a05dcdfc6362848b1ac57009584f9cc6b1530b218a61cb7135b110f4946d60cedeba77bbf4c761f67ebe1b24e580110c1ad6eadaf9426e53c3781783028 SHA512 2c24020837b362c271b1dae0c6e9e7e5b54426e60415ed8968f6c3101e239d8960906f041dd45b1a1e281254e0370f9190df2431769dacb4d7d08647204cad74
+EBUILD alsa-tools-1.2.5-r1.ebuild 3517 BLAKE2B e25d4ac488f7cc2b00c7e5fe560034de999678de12ef36ae2d78a67a9523ecc87121cc9301c8d69d7315e22f6ac87ce1f5d0c77b8aa343314e40f28d61e5d8e4 SHA512 6533d1abc1816e492c7bcf08b068f8ba5f6f79c876be5709abd15109269b327886cd264b1e954f4fbe8ec07db13243ea8a953b82d4a36ce170d23befad1bbe91
 EBUILD alsa-tools-1.2.5.ebuild 3434 BLAKE2B a87004f9e64483af2ff4f5ce67d923f5e566d026d4bdb89a889eba0d31ecce97c51dd4f043aec4d24742a8c9565f98c22a95f7c00a74417400baaa210f8ec0e7 SHA512 68c2eeefaf39675582f76cc11f0d562481fa867235cc6a2917cf986a523b104495343ba26b2ff0563b5cdc86fd6b9b775eb6ae979ead469a2232105886be471b
 MISC metadata.xml 310 BLAKE2B 1e82b52e947ac2e811104c837f168f7020c2864c5ece3b1da5e06578a3e63b39b06bdb4993ac7d5cbd90d5e359df63c49aba4a4f309bf8f9c003190942b0d9b3 SHA512 45fc98227626d78099dfae8b44df697c436d1df13e61e6e05bbd29ec63218961aadc5124c813c6d076f29da6617f2c901b73ff8a021817973d13a809d0240f4d
diff --git a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
index c205d3ebade2..c6b611df207f 100644
--- a/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 74d59fd0ef58..71022816736e 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,5 +4,5 @@ AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b76
 DIST alsa-utils-1.2.8.tar.bz2 1560162 BLAKE2B 4b9676957e775be51076b4798dfd384db4eea440c682899024034d3dd593ba24f1d42b8d742c312e041a37f0dbbc12b16635d79f6e6633a3459cc21f80739b5e SHA512 882e6f67467596ed273bf554fcce87d8ef287806bbdabd6c103de4980981f9e2102fb3800c6e8628ee8e86ffb165c1c92f9370c8145f28a6cb7cca563942330b
 DIST alsa-utils-1.2.9.tar.bz2 1598424 BLAKE2B 9d75f63c7ff8b0d7ee835a1ad8fc242dee9b59770b1ad0ff9cd233caf50ac844323fb2ebb8e649f03a0a30a161ec72cba472ac79e390c3f0eb6e2a184d8f576c SHA512 f46e13fd57ed05ee38d3fa655e57b14335ecf0664dbe03275808383d87d28df153a81151e2e9d8786625f09929c567c89e145508a706a70eeb91ac1b11fb2fd4
 EBUILD alsa-utils-1.2.8-r2.ebuild 2496 BLAKE2B f897dbb5d0363e643efde8b228e205a7b57ef14498937e4f58bcd584f816b76ef974eac6bf8fc12ffa6af1e1c0446f1516b86a9074f9bd6c54ef49c04f06abb3 SHA512 06f9bca8bf127107fdebf1d044e88579d0bca24047fea0b1c1888e60981960ff0e0ed0bdb30ec08e4805c527bb696e53cf89f800fbe8daec1a34ef670cedd00d
-EBUILD alsa-utils-1.2.9.ebuild 2500 BLAKE2B 12252fbca81abe7195a347b06f7f5223f8e9a134f6ed9b109929f6c9d3182889be3b6ae5f0efc8987825ef683ddb1a5b325f90f2d227d0f37287350dfc46e0a0 SHA512 d09d8f7919dda07ce3df441cfbd74a65a4c7eb1f71de57488a2d1852e8c95c5fa0579127c3d661cb867e53aaae29d3ada57325866ea9c5654982f6d942ce2251
+EBUILD alsa-utils-1.2.9.ebuild 2498 BLAKE2B 79275e2eac9579a9dd23ea7958c929062f72983ff7d013812c761f05d6f13d8bd4c6cedc74bd4d68477121f3a916ad6fac05cd29299b8129c7e2b7fc295633d6 SHA512 d4a0900d0da0e7e4b24cd0f52e89508d8d9a1824c26cfdd0d9c090fdeed599211ee9d769bf53c036ff573dd9216d8630080d2510785bc1d9085af725fabf7534
 MISC metadata.xml 630 BLAKE2B 297896d48e1b947e3d8fdb0e8508846ac5f11740101a80d1d492e8fdd6bb042d629c654583d3262c00a0e33d31ecf3b6f4b3c07c73ede339b4ed168d4c5deae0 SHA512 1e26d146329b58c509ee8a9e6683bd0bc15651d942a7d400383106d3e61df0d3148322bedf0d10e445db74109ee1ee759310eb72c5e3fb1ae4ec258892d378b2
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild
index b147c4b64d8c..1e272cf144e1 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE="bat doc +libsamplerate ieee1394 +ncurses nls selinux"
 
 DEPEND="
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index f90d62ecf315..b9bfb7894f20 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -1,4 +1,5 @@
 AUX gmorgan-0.79-clang.patch 519 BLAKE2B dbe18a3592fdcc0b2ec546f4bb36b2ed281c048c1eafce72c8206313def848d6eca2b67b4eac61e0f0ada0ca2799a9b05677bba294a19e4d6e95837ac7ee84f4 SHA512 27b9466083e97fa2db05b47d2dc56b24310bfbb6af3424ea2afcdd282c9652a64c2d538521c53727b95dcdadaf5b436b846ecd3f7c66fc83e7ef3b1d20b5da3b
+AUX gmorgan-0.79-clang16.patch 4334 BLAKE2B e3d57355e78f8c52218e93f45aabe0fbbbc2dda267a4ad83e3148ae251edb30e2cb08097c1bdf04a9575833d8de749b0e5c43347e898ed97b8ac21e75edbaaf3 SHA512 b504d1da30a76636404218d7b8090f24ab4967c4f6432a1f563296777eba782ebc33d2fbfcffa191347779e966b3bd7c04240e55837be18000b1fbb7ca359ef8
 AUX gmorgan-0.79-gcc6.patch 1903 BLAKE2B 513f0f7e0097d2f6c3352557ca01afb0df0020d0c331defc0c1c7c3395f188f44a03c4e8198a23f7d826e449ae78605f33c6c063c8fd9d79be3da25d34dc2816 SHA512 64fe047175335d9c09de0e4a6ad9294e767500d1dd1835db1c1e434c91b28cf920d8cd7789af3c4aa92b90b9ac87e777184dbf7705872028b7a19a9ff4822eb7
 AUX gmorgan-0.79-manpages.patch 1199 BLAKE2B 6989a057f92e75e5dc607e3483408446423b58939ca4ae883b539cc706f0e64e547224eb5cfff95c1c4498ae673ceeef13b29e5692c0aeeb339dbc9bfc745eef SHA512 0841c0e281374489682f7c585c84ae879348d0703199216e53a4a3babecd44d6d735318c24a1c72034c21f53272a79b0c26a628660783336515095b3c5c81895
 AUX gmorgan-0.79-remove-dirs.patch 760 BLAKE2B 34b638a52d737ecc87219d59560449da339d5467ca6a1ba31551036610ff3fc62a7466ee33db6c073aaecc5e58646227a4e64f2c54044c44ac91ec96fde55148 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f
@@ -6,4 +7,5 @@ AUX gmorgan-0.79-remove-gettext-version-check.patch 947 BLAKE2B 61a1ca75ea7d3061
 AUX gmorgan-0.79-remove-old-docs.patch 736 BLAKE2B 584fe41e8f2c227fed77da87699b799090a52415a1acf193446462cac103475a8fe58edc1837b15febba8fb0119991548562268329582743f79db48b6181994e SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108
 DIST gmorgan-0.79.tar.gz 8055701 BLAKE2B d847fdf668e46b3e9c0a5d8b81b7680fac4c4d0236ab07fb2ffb1e093938dc2f8856ce384252841a31a531f285c85375c80ba7b4989b134028c4f92f6b706d0f SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0
 EBUILD gmorgan-0.79-r2.ebuild 898 BLAKE2B f05ca8311a4b6278825fd72a0e56133a56b88145be299803933ae2b2e9aaabe053935909f665da3bd5b064f368262049786ec30006c1806f840140dbc3957d97 SHA512 907e646b2e5eaa72357bd2ae3c2599cb330ea20cc46480d5faaccd932ca2cf78a8361941880e5db204c0bf546afb515fb221ab6b3758ffce84445749d30a72c4
+EBUILD gmorgan-0.79-r3.ebuild 934 BLAKE2B 744fe876c84fe92ddd4afc629e9a40d2ec161d9bea37f9884174449faf32e16d7c3eaabd7f40d416152ccd767627d5b5d7ff90c12f9fb5963e0358734223590e SHA512 e7f1efed6274131f4dd3c2513fb499e5ecb6379998c0e56dcd9b97086e279fcf383efa2b92f61645f41a2df116d0c66a5b5db9e7abb928017a32cf2555893e96
 MISC metadata.xml 337 BLAKE2B ea863d2c89c6aa3e4cb89f02a9b8809e333a4a56d8eca25489a19aad35bb7a77686a0c3b535e7a95fba43a12b83e01db16d315bc85c8ee278c784b352cc59160 SHA512 2a81a419410c2f0ad4ff4518f2f36325469918bb2854a1dcc976391742085959215ddc040afaa55c77fde5af6cd4d6dafb48fc55e09903f0554132f88a4b9478
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
new file mode 100644
index 000000000000..2571757244fb
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-clang16.patch
@@ -0,0 +1,182 @@
+Bug: https://bugs.gentoo.org/896430
+--- a/src/GMorgan.h
++++ b/src/GMorgan.h
+@@ -41,7 +41,7 @@ using namespace std;
+ #define MAGIC_TRACK 0x4d54726b
+ 
+ extern int Pexitprogram, espera, programa, vum, vumvum, tum, cambialo;
+-extern int vavi, pr, pr1, count, ulcount, canaledit, notplaying;
++extern int vavi, pr, pr1, count_t, ulcount, canaledit, notplaying;
+ extern int veloplus[65];
+ extern const char *FilePreset;
+ extern const char *FileDrums;
+--- a/src/NotGenerated.cxx
++++ b/src/NotGenerated.cxx
+@@ -9105,7 +9105,7 @@ GMORGAN::cb_PtBro_i (Fl_Browser *, void *)
+       else
+ 	{
+ 	  gmo->sposi = 0;
+-	  count = 1;
++	  count_t = 1;
+ 	  gmo->negra = 0;
+ 	  gmo->semi = 0;
+ 	  gmo->ncompas = 0;
+@@ -24432,7 +24432,7 @@ GMORGAN::preparast ()
+   gmo->nfundi = 0;
+   gmo->ya = 0;
+   gmo->anticipa = 0;
+-  count = 1;
++  count_t = 1;
+   gmo->negra = 0;
+   ulcount = 0;
+   N1->value (0);
+@@ -24792,7 +24792,7 @@ GMORGAN::PutStyle (int i)
+   else
+     {
+       gmo->sposi = 0;
+-      count = 1;
++      count_t = 1;
+       gmo->negra = 0;
+       gmo->semi = 1;
+       gmo->ncompas = 0;
+@@ -26772,7 +26772,7 @@ GMORGAN::ActualizaEntrada ()
+ 	  else
+ 	    {
+ 	      gmo->sposi = 0;
+-	      count = 1;
++	      count_t = 1;
+ 	      gmo->negra = 0;
+ 	      gmo->semi = 1;
+ 	      gmo->ncompas = 0;
+--- a/src/Stk.cpp
++++ b/src/Stk.cpp
+@@ -123,7 +123,7 @@ void Stk :: setRawwavePath( std::string path )
+ 
+ void Stk :: swap16(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 2nd bytes
+   val = *(ptr);
+@@ -133,7 +133,7 @@ void Stk :: swap16(unsigned char *ptr)
+ 
+ void Stk :: swap32(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 4th bytes
+   val = *(ptr);
+@@ -149,7 +149,7 @@ void Stk :: swap32(unsigned char *ptr)
+ 
+ void Stk :: swap64(unsigned char *ptr)
+ {
+-  register unsigned char val;
++  unsigned char val;
+ 
+   // Swap 1st and 8th bytes
+   val = *(ptr);
+--- a/src/gmorgan.C
++++ b/src/gmorgan.C
+@@ -88,7 +88,7 @@ int
+   splashcounter,
+   clicksplash;
+ int
+-  count,
++  count_t,
+   ulcount,
+   ponfin;
+ int
+@@ -184,7 +184,7 @@ GMO::GMO ()
+   tick = 0;
+   negra = 0;
+   ncompas = 0;
+-  count = 0;
++  count_t = 0;
+   queue_id = 0;
+   elbar = 1;
+   HMode = 0;
+@@ -608,7 +608,7 @@ GMO::GMO ()
+       if (strlen (temp) > 2)
+ 	for (i = 0; i <= (int) strlen (temp) - 2; i++)
+ 	  HelpFilename[i] = temp[i];
+-	cout << "helpfile: " << HelpFilename << endl;
++	  std::cout << "helpfile: " << HelpFilename << endl;
+       bzero (temp, sizeof (temp));
+       fgets (temp, sizeof temp, fs);
+       if (strlen (temp) > 2)
+@@ -712,14 +712,14 @@ GMO::organo ()
+ 	{
+ 	  semi = 1;
+ 	  negra++;
+-	  count++;
+-	  if (count >= Rt[sp].blackn + 1)
++	  count_t++;
++	  if (count_t >= Rt[sp].blackn + 1)
+ 	    {
+ 	      elbar++;
+ 	      if (elbar > Rt[sp].bars)
+ 		elbar = 1;
+ 	      negra = 0;
+-	      count = 1;
++	      count_t = 1;
+ 	      ncompas++;
+ 	      sprintf (elbart, "%d", ncompas + 1);
+ // 
+@@ -1246,7 +1246,7 @@ GMO::GeneraChord ()
+ 
+   if (bplay)
+     {
+-      switch (count)
++      switch (count_t)
+ 	{
+ 	case 1:
+ 	  strcpy (elacorde, S[nb].ch1);
+--- a/src/gmorgan.MIDIExport.C
++++ b/src/gmorgan.MIDIExport.C
+@@ -306,18 +306,18 @@ GMO::generatracks ()
+ 	}
+       for (neg = 1; neg <= SNomi; neg++)
+ 	{
+-	  count = neg;
++	  count_t = neg;
+ 	  if (MTempo)
+ 	    MiraCambioTempoM (tcompas, neg);
+ 	  GeneraChord ();
+ 	  for (sem = 1; sem <= 4; sem++)
+ 	    {
+-	      if ((S[nb].ar8 == 1) && (count == SNomi) && (sem == 3))
++	      if ((S[nb].ar8 == 1) && (count_t == SNomi) && (sem == 3))
+ 		{
+ 		  anticipa = 1;
+ 		  GeneraChord ();
+ 		}
+-	      if ((S[nb].ar16 == 1) && (count == SNomi) && (sem == 4))
++	      if ((S[nb].ar16 == 1) && (count_t == SNomi) && (sem == 4))
+ 		{
+ 		  anticipa = 1;
+ 		  GeneraChord ();
+--- a/src/main.C
++++ b/src/main.C
+@@ -195,9 +195,9 @@ LastBar = 1;
+      }
+ 
+  if (vumvum != vum) gmoUI->VUI1->value(vum);
+-  if ((gmo.stst) && (ulcount != count))
++  if ((gmo.stst) && (ulcount != count_t))
+      {
+-      ulcount = count;
++      ulcount = count_t;
+       int rvtempo = gmoUI->CTEMPO->value();
+ 	if (gmo.bplay != 1)
+ 	{
+@@ -219,7 +219,7 @@ LastBar = 1;
+  	 gmoUI->LightIt(nbar);
+          }
+ 	if (nbar > 127) nbar = 127;	
+-      switch(count)
++      switch(count_t)
+       {
+          case 1:
+                 gmoUI->N1->setonly();
diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
new file mode 100644
index 000000000000..a9adb56a1c6f
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="https://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-gettext-version-check.patch
+	"${FILESDIR}"/${P}-manpages.patch
+	"${FILESDIR}"/${P}-remove-dirs.patch
+	"${FILESDIR}"/${P}-remove-old-docs.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	doman man/gmorgan.1
+}
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index bf92616db48d..a3e02108c89d 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,5 +1,7 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
+AUX mp3blaster-3.2.6-drop-register-keyword.patch 17322 BLAKE2B cd4d00de182047d4352f6ade4f611ced8126efd52749780cde30eeac73ebdab7e2ef65ddf5c7c8ec1febe449d9cc1c634ec3373161c891ab4f8c8cb7d11dfcd5 SHA512 642e77e3ab5c2e056d31fcaba441e7613a73fe78e473f9efde80fe632e8e3e19f4f6c2259cc6588423325d5bb1a624c416b724c92a0519918ceee2223639adc3
 DIST mp3blaster-3.2.6.tar.gz 354019 BLAKE2B 7fcb9011c436015c2f81a1a28b19896dffdba578969edb8cc29ed20fef7f222be3c23a1409c5c0a4c2ecb5b10432178c5581837938ede23ee76fe3205eecbb51 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d
 EBUILD mp3blaster-3.2.6-r1.ebuild 1565 BLAKE2B ca920b6964b34fb1c37fb05ae497cbce9fe437a87a58c0e7f4464682758255528c80d46f9e1e5c957dcb23f7844d5dc1940d9b5201da5c34901973f9136b6a9d SHA512 ac10082ca77cb9f2f281e1bab6699d43354b6298f176ef4563cf45006d81217d450e7fa646742c2b099adfd2785534bf70d892950c00030cd90407457c8bd3b0
+EBUILD mp3blaster-3.2.6-r2.ebuild 1626 BLAKE2B c52e40ce5b8ff911d48b20fb3dbc28123c0b61c8404db52f1584c449c3859828c67d056f496236cfc15370c80264057de13ff26a7d68979c00e0e89201fd99d4 SHA512 c86a19233e959eaa0627af99a65dc4e2d791438556648e371a4a4df8c0e8bbbfb18da78dcac5eb22be3e06c25674fae3097e9e8c6a456ac8993aa492b1070367
 MISC metadata.xml 433 BLAKE2B 4f113956ab8327011a21b00b5c05d1d1719ab58e9a39975e01cb4938bf95517614620c483f659e1ff83ed7ebf62d76c661cbff6f0e7a983159b2c91d72cd278b SHA512 a680b2e39fed703c6a78e2e043d57063a20e7beb17061f7220434ae6d04549ae2e4524be7e9056d24b141df45739856b8d74fd5169703b3252117ff7a74a073e
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch
new file mode 100644
index 000000000000..9ef2dd6e3226
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.6-drop-register-keyword.patch
@@ -0,0 +1,593 @@
+Bug: https://bugs.gentoo.org/897790
+--- a/mpegsound/filter.cc
++++ b/mpegsound/filter.cc
+@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ 
+   // compute new values via a fast cosine transform:
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
+     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
+@@ -59,7 +59,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
+ 
+   {
+-    register REAL tmp;
++    REAL tmp;
+ 
+     tmp=p6+p7;
+     OUT2(36)=-(p5+tmp);
+@@ -84,7 +84,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   }
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
+     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
+@@ -165,8 +165,8 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ inline void Mpegtoraw::generatesingle(void)
+ {
+   int i;
+-  register REAL r, *vp;
+-  register const REAL *dp;
++  REAL r, *vp;
++  const REAL *dp;
+   int raw;
+ 
+   i=32;
+@@ -251,8 +251,8 @@ inline void Mpegtoraw::generate(void)
+ {
+   int i;
+   REAL r1,r2;
+-  register REAL *vp1,*vp2;
+-  register const REAL *dp;
++  REAL *vp1,*vp2;
++  const REAL *dp;
+   int raw;
+ 
+   dp=filter;
+--- a/mpegsound/filter_2.cc
++++ b/mpegsound/filter_2.cc
+@@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ 
+   // compute new values via a fast cosine transform:
+   /*  {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
+     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
+@@ -41,7 +41,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   qe=hcos_32[6]*(p6-p9);qf=hcos_32[7]*(p7-p8); */
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12];
+     q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8];
+@@ -70,7 +70,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
+ 
+   {
+-    register REAL tmp;
++    REAL tmp;
+ 
+     tmp=p6+p7;
+     OUT2(36)=-(p5+tmp);
+@@ -95,7 +95,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+   }
+ 
+   {
+-    register REAL *x=fraction;
++    REAL *x=fraction;
+ 
+     /*    p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
+     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
+@@ -186,8 +186,8 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
+ inline void Mpegtoraw::generatesingle_2(void)
+ {
+   int i;
+-  register REAL r, *vp;
+-  register const REAL *dp;
++  REAL r, *vp;
++  const REAL *dp;
+   int raw;
+ 
+   i=32/2;
+@@ -273,8 +273,8 @@ inline void Mpegtoraw::generate_2(void)
+ {
+   int i;
+   REAL r1,r2;
+-  register REAL *vp1,*vp2;
+-  register const REAL *dp;
++  REAL *vp1,*vp2;
++  const REAL *dp;
+   int raw;
+ 
+   dp=filter;
+--- a/mpegsound/mpeglayer1.cc
++++ b/mpegsound/mpeglayer1.cc
+@@ -45,7 +45,7 @@ void Mpegtoraw::extractlayer1(void)
+   int bitalloc[MAXCHANNEL][MAXSUBBAND],
+       sample[MAXCHANNEL][MAXSUBBAND];
+ 
+-  register int i,j;
++  int i,j;
+   int s=stereobound,l;
+ 
+ 
+--- a/mpegsound/mpeglayer2.cc
++++ b/mpegsound/mpeglayer2.cc
+@@ -429,8 +429,8 @@ void Mpegtoraw::extractlayer2(void)
+ 
+ // Bitalloc
+   {
+-    register int i;
+-    register const int *t=bitalloclengthtable[tableindex];
++    int i;
++    const int *t=bitalloclengthtable[tableindex];
+ 
+     for(i=0;i<s;i++,t++)
+     {
+@@ -444,18 +444,18 @@ void Mpegtoraw::extractlayer2(void)
+ 
+   // Scale selector
+   if(inputstereo)
+-    for(register int i=0;i<n;i++)
++    for(int i=0;i<n;i++)
+     {
+       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
+       if(bitalloc[RS][i])scaleselector[RS][i]=getbits(2);
+     }
+   else
+-    for(register int i=0;i<n;i++)
++    for(int i=0;i<n;i++)
+       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
+ 
+   // Scale index
+   {
+-    register int i,j;
++    int i,j;
+ 
+     for(i=0;i<n;i++)
+     {
+@@ -600,7 +600,7 @@ void Mpegtoraw::extractlayer2(void)
+ 
+ // Read Sample
+   {
+-    register int i;
++    int i;
+ 
+     for(int l=0;l<SCALEBLOCK;l++)
+     {
+@@ -611,7 +611,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	{
+ 	  if(group[LS][i])
+ 	  {
+-	    register const REAL *s;
++	    const REAL *s;
+ 	    int code=getbits(codelength[LS][i]);
+ 
+ 	    code+=code<<1;
+@@ -666,7 +666,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	{
+ 	  if(group[LS][i])
+ 	  {
+-	    register const REAL *s;
++	    const REAL *s;
+ 	    int code=getbits(codelength[LS][i]);
+ 
+ 	    code+=code<<1;
+@@ -705,7 +705,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[LS][l>>2][i];
++	    REAL t=scalefactor[LS][l>>2][i];
+ 	    fraction[LS][0][i]*=t;
+ 	    fraction[LS][1][i]*=t;
+ 	    fraction[LS][2][i]*=t;
+@@ -720,7 +720,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[RS][l>>2][i];
++	    REAL t=scalefactor[RS][l>>2][i];
+ 	    fraction[RS][0][i]*=t;
+ 	    fraction[RS][1][i]*=t;
+ 	    fraction[RS][2][i]*=t;
+@@ -737,7 +737,7 @@ void Mpegtoraw::extractlayer2(void)
+ 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
+ 	    }
+ 
+-	    register REAL t=scalefactor[LS][l>>2][i];
++	    REAL t=scalefactor[LS][l>>2][i];
+ 	    fraction[LS][0][i]*=t;
+ 	    fraction[LS][1][i]*=t;
+ 	    fraction[LS][2][i]*=t;
+--- a/mpegsound/mpeglayer3.cc
++++ b/mpegsound/mpeglayer3.cc
+@@ -29,7 +29,7 @@ inline void Mpegbitwindow::wrap(void)
+ 
+   if(p>=point)
+   {
+-    for(register int i=4;i<point;i++)
++    for(int i=4;i<point;i++)
+       buffer[WINDOWSIZE+i]=buffer[i];
+   }
+   *((int *)(buffer+WINDOWSIZE))=*((int *)buffer);
+@@ -37,15 +37,15 @@ inline void Mpegbitwindow::wrap(void)
+ 
+ inline int Mpegbitwindow::getbit(void)
+ {
+-//  register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
+-  register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
++//  int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
++  int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+   bitindex++;
+   return r;
+ };
+ 
+ inline int Mpegbitwindow::getbits9(int bits)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -134,7 +134,7 @@ void Mpegtoraw::layer3initialize(void)
+ 
+   // Calculate win
+   {
+-    register int i;
++    int i;
+ 
+     for(i=0;i<18;i++)
+       win[0][i]=win[1][i]=0.5*sin(PI_72*(double)(2*i+1))/cos(PI_72*(double)(2*i+19));
+@@ -153,11 +153,11 @@ void Mpegtoraw::layer3initialize(void)
+       win[2][i]=0.5*sin(PI_24*(double)(2*i+1))/cos(PI_24*(double)(2*i+7));
+   }
+ 
+-  for(register int i=0;i<9;i++)
++  for(int i=0;i<9;i++)
+     cos_18[i]=cos(PI_18*double(i));
+-  for(register int i=0;i<9;i++)
++  for(int i=0;i<9;i++)
+     hsec_36[i]=0.5/cos(PI_36*double(i*2+1));
+-  for(register int i=0;i<3;i++)
++  for(int i=0;i<3;i++)
+     hsec_12[i]=0.5/cos(PI_12*double(i*2+1));
+ 
+   for(int i=0;i<40;i++)
+@@ -365,7 +365,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr)
+ 			  {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}};
+ 
+   layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+-  register layer3scalefactor *sf=(&scalefactors[ch]);
++  layer3scalefactor *sf=(&scalefactors[ch]);
+   int l0,l1;
+ 
+   {
+@@ -498,7 +498,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch)
+ 
+   int sb[54];
+   layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]);
+-  register layer3scalefactor *sf=(&scalefactors[ch]);
++  layer3scalefactor *sf=(&scalefactors[ch]);
+ 
+   {
+     int blocktypenumber,sc;
+@@ -660,7 +660,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y)
+     level>>=1;
+     if(!(level || ((unsigned)point<ht->treelen)))
+     {
+-      register int xx,yy;
++      int xx,yy;
+ 
+       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
+       yy=(h->ylen<<1);
+@@ -689,7 +689,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h,
+   {
+     if(h->val[point][0]==0)
+     {   /*end of tree*/
+-      register int t=h->val[point][1];
++      int t=h->val[point][1];
+ 
+       if(t&8)*v=1-(wgetbit()<<1); else *v=0;
+       if(t&4)*w=1-(wgetbit()<<1); else *w=0;
+@@ -761,7 +761,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT])
+   for(i=0;i<e;)
+   {
+     const HUFFMANCODETABLE *h;
+-    register int end;
++    int end;
+       
+     if     (i<region1Start)
+     {
+@@ -867,10 +867,10 @@ void Mpegtoraw::layer3dequantizesample(int ch,int gr,
+ 		{
+ 			cb_width=(sfBandIndex->s[cb+1]-sfBandIndex->s[cb])>>1;
+ 
+-			for(register int k=0;k<3;k++)
++			for(int k=0;k<3;k++)
+ 			{
+-				register REAL factor;
+-				register int count=cb_width;
++				REAL factor;
++				int count=cb_width;
+ 
+ 				factor=globalgain*
+ 					layer3twopow2_1(gi->subblock_gain[k],gi->scalefac_scale,
+@@ -1249,7 +1249,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
+ 			do{
+ 				if(is_pos[i]==7)
+ 				{
+-					register REAL t=in[LS][0][i];
++					REAL t=in[LS][0][i];
+ 					in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
+ 					in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
+ 				}
+@@ -1278,7 +1278,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
+ 		{
+ 			int i=ARRAYSIZE-1;
+ 			do{
+-				register REAL t=in[LS][0][i];
++				REAL t=in[LS][0][i];
+ 
+ 				in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
+ 				in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
+@@ -1400,7 +1400,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr,
+ 					  REAL  in[SBLIMIT][SSLIMIT],
+ 					  REAL out[SBLIMIT][SSLIMIT])
+ {
+-  register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
++  layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+ 
+   if(gi->generalflag)
+   {
+@@ -1438,7 +1438,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+     MACRO0(v); }
+ 
+   {
+-    register REAL *in = inbuf;
++    REAL *in = inbuf;
+    
+     in[17]+=in[16];in[16]+=in[15];in[15]+=in[14];in[14]+=in[13]; 
+     in[13]+=in[12];in[12]+=in[11];in[11]+=in[10];in[10]+=in[ 9];
+@@ -1450,10 +1450,10 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+     in[ 9]+=in[ 7];in[7] +=in[ 5];in[ 5]+=in[ 3];in[ 3]+=in[ 1];
+ 
+     {
+-      register REAL *c = cos_18;
+-      register REAL *out2 = prevblk2;
+-      register REAL *out1 = prevblk1;
+-      register REAL *ts = out;
++      REAL *c = cos_18;
++      REAL *out2 = prevblk2;
++      REAL *out1 = prevblk1;
++      REAL *ts = out;
+       
+       REAL ta33,ta66,tb33,tb66;
+ 
+@@ -1513,7 +1513,7 @@ static void dct36(REAL *inbuf,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+ }
+ 
+ 
+-static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,register REAL *out)
++static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out)
+ {
+ #define DCT12_PART1   \
+         in5=in[5*3];  \
+@@ -1547,7 +1547,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+ 
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb1=prevblk1;
++    REAL *pb1=prevblk1;
+     out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2];
+     out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5];
+  
+@@ -1556,7 +1556,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+     {
+       REAL tmp0,tmp1=(in0-in4);
+       {
+-	register REAL tmp2=(in1-in5)*hsec_12[1];
++	REAL tmp2=(in1-in5)*hsec_12[1];
+ 	tmp0=tmp1+tmp2;
+ 	tmp1-=tmp2;
+       }
+@@ -1581,7 +1581,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+   in++;
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb2 = prevblk2;
++    REAL *pb2 = prevblk2;
+  
+     DCT12_PART1;
+ 
+@@ -1614,7 +1614,7 @@ static void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,register REAL *wi,regis
+   in++; 
+   {
+     REAL in0,in1,in2,in3,in4,in5;
+-    register REAL *pb2 = prevblk2;
++    REAL *pb2 = prevblk2;
+     pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0;
+ 
+     DCT12_PART1;
+@@ -1719,14 +1719,14 @@ void Mpegtoraw::extractlayer3(void)
+ 				 
+ 		if(issync())
+ 		{
+-			for(register int i=layer3slots;i>0;i--)  // read main data.
++			for(int i=layer3slots;i>0;i--)  // read main data.
+ 			{
+ 				bitwindow.putbyte(getbyte());
+ 			}
+ 		}
+ 		else
+ 		{
+-			for(register int i=layer3slots;i>0;i--)  // read main data.
++			for(int i=layer3slots;i>0;i--)  // read main data.
+ 			{
+ 				bitwindow.putbyte(getbits8());
+ 			}
+@@ -1799,7 +1799,7 @@ void Mpegtoraw::extractlayer3(void)
+ 			layer3reorderandantialias(RS,gr,b2.lr[RS],b1.hin[RS]);
+ 			layer3hybrid (RS,gr,b1.hin[RS],b2.hout[RS]);
+ 
+-			register int i=2*SSLIMIT*SBLIMIT-1;
++			int i=2*SSLIMIT*SBLIMIT-1;
+ 
+ 			do{
+ 				NEG(b2.hout[0][0][i		]);NEG(b2.hout[0][0][i- 2]);
+@@ -1814,7 +1814,7 @@ void Mpegtoraw::extractlayer3(void)
+ 		}
+ 		else
+ 		{
+-			register int i=SSLIMIT*SBLIMIT-1;
++			int i=SSLIMIT*SBLIMIT-1;
+ 			do{
+ 				NEG(b2.hout[0][0][i		]);NEG(b2.hout[0][0][i- 2]);
+ 				NEG(b2.hout[0][0][i- 4]);NEG(b2.hout[0][0][i- 6]);
+@@ -1844,12 +1844,12 @@ void Mpegtoraw::extractlayer3_2(void)
+ 	 
+     if(issync())
+     {
+-      for(register int i=layer3slots;i>0;i--)  // read main data.
++      for(int i=layer3slots;i>0;i--)  // read main data.
+ 	bitwindow.putbyte(getbyte());
+     }
+     else
+     {
+-      for(register int i=layer3slots;i>0;i--)  // read main data.
++      for(int i=layer3slots;i>0;i--)  // read main data.
+ 	bitwindow.putbyte(getbits8());
+     }
+     bitwindow.wrap();
+@@ -1912,7 +1912,7 @@ void Mpegtoraw::extractlayer3_2(void)
+       layer3reorderandantialias(RS,0,b2.lr[RS],b1.hin[RS]);
+       layer3hybrid (RS,0,b1.hin[RS],b2.hout[RS]);
+ 
+-      register int i=2*SSLIMIT*SBLIMIT-1;
++      int i=2*SSLIMIT*SBLIMIT-1;
+       do{
+ 	NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]);
+ 	NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]);
+@@ -1922,7 +1922,7 @@ void Mpegtoraw::extractlayer3_2(void)
+     }
+     else
+     {
+-      register int i=SSLIMIT*SBLIMIT-1;
++      int i=SSLIMIT*SBLIMIT-1;
+       do{
+ 	NEG(b2.hout[0][0][i-16]);NEG(b2.hout[0][0][i-18]);
+ 	NEG(b2.hout[0][0][i-20]);NEG(b2.hout[0][0][i-22]);
+--- a/mpegsound/mpegsound_locals.h
++++ b/mpegsound/mpegsound_locals.h
+@@ -8,6 +8,8 @@
+ #ifndef _L__SOUND_LOCALS__
+ #define _L__SOUND_LOCALS__
+ 
++#include "mpegsound.h"
++
+ extern void debug(const char*, ... );
+ // Inline functions
+ inline int Mpegtoraw::getbyte(void)
+@@ -20,7 +22,7 @@ inline int Mpegtoraw::getbyte(void)
+ 
+ inline int Mpegtoraw::getbits9(int bits)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -32,7 +34,7 @@ inline int Mpegtoraw::getbits9(int bits)
+ 
+ inline int Mpegtoraw::getbits8(void)
+ {
+-  register unsigned short a;
++  unsigned short a;
+   int offset=bitindex>>3;
+ 
+   a=(((unsigned char)buffer[offset])<<8) | ((unsigned char)buffer[offset+1]);
+@@ -44,7 +46,7 @@ inline int Mpegtoraw::getbits8(void)
+ 
+ inline int Mpegtoraw::getbit(void)
+ {
+-  register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
++  int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+ 
+   bitindex++;
+   return r;
+--- a/mpegsound/mpegtoraw.cc
++++ b/mpegsound/mpegtoraw.cc
+@@ -779,8 +779,8 @@ inline void parseID3(Soundinputstream *fp,ID3 *data)
+ // Mpeg header class
+ bool Mpegtoraw::initialize(const char *filename)
+ {
+-	register int i;
+-	register REAL *s1,*s2;
++	int i;
++	REAL *s1,*s2;
+ 	REAL *s3,*s4;
+ 	static bool initialized=false;
+ 
+@@ -1153,7 +1153,7 @@ void Mpegtoraw::clearbuffer(void)
+ //header is not found at the exact location of the filepointer at call time.
+ bool Mpegtoraw::loadheader(bool lookahead)
+ {
+-	register int c;
++	int c;
+ 	bool flag;
+ 	int bytes_read = 0;
+ 
+--- a/mpegsound/rawplayer.cc
++++ b/mpegsound/rawplayer.cc
+@@ -326,8 +326,8 @@ int Rawplayer::fix_samplesize(void *buffer, int size)
+ 
+ 	if(forcetomono || forceto8)
+ 	{
+-		register unsigned char modify=0;
+-		register unsigned char *source,*dest;
++		unsigned char modify=0;
++		unsigned char *source,*dest;
+ 		int increment=0,c;
+ 
+ 		source=dest=(unsigned char *)buffer;
+@@ -381,8 +381,8 @@ bool Rawplayer::putblock(void *buffer,int size)
+ 
+ 	if(forcetomono || forceto8)
+ 	{
+-		register unsigned char modify=0;
+-		register unsigned char *source,*dest;
++		unsigned char modify=0;
++		unsigned char *source,*dest;
+ 		int increment=0,c;
+ 
+ 		source=dest=(unsigned char *)buffer;
+@@ -408,7 +408,7 @@ bool Rawplayer::putblock(void *buffer,int size)
+ 	}
+ 
+ #if defined(AUDIO_NONBLOCKING) || defined(NEWTHREAD)
+-	register ssize_t
++	ssize_t
+ 		wsize,
+ 		remainsize = modifiedsize;
+ 	char *wbuf = (char*)buffer;
+--- a/src/splay_common.cc
++++ b/src/splay_common.cc
+@@ -66,7 +66,7 @@ const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ static bool argsflag=false;
+ void arglist(int argc,char *argv[],int start)
+ {
+-  register int i;
++  int i;
+ 
+   argsflag=true;
+   for(i=start;(i<argc) && (splay_listsize<MAXLISTSIZE); i++)
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild
new file mode 100644
index 000000000000..26d46c0cf53f
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Text console based program for playing audio files"
+HOMEPAGE="http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="lirc oss +sdl sid vorbis"
+REQUIRED_USE="|| ( oss sdl )"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	lirc? ( app-misc/lirc )
+	sdl? ( media-libs/libsdl )
+	sid? ( media-libs/libsidplay:1 )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="
+	${RDEPEND}
+	oss? ( virtual/os-headers )"
+BDEPEND="x11-misc/imake"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
+	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
+	"${FILESDIR}"/${PN}-3.2.6-drop-register-keyword.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay{,_mp3blaster}.1 || die
+}
+
+src_configure() {
+	# libpth and newthreads support are both broken
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
+		$(use_with lirc) \
+		$(use_with vorbis oggvorbis) \
+		$(use_with sid sidplay) \
+		--without-esd \
+		$(use_with sdl) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+
+	# relocate everything except commands.txt because it's used by src/main.cc
+	mv -vf "${ED}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+
+	# file collision with media-sound/splay
+	mv -vf "${ED}"/usr/bin/splay{,_mp3blaster} || die
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 8d8eb0d6bf3d..def811d8808c 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e8b952ef3aa5..f4d836cbcdaa 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Aug 2023 03:10:03 +0000
+Tue, 01 Aug 2023 09:10:02 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 6f226398f961..e720f6868447 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-01T03:10:06Z
+TIMESTAMP 2023-08-01T09:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTId45fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTIy+5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDItw//VkyTV1ygi1YfxpY8H6C/Uh/H54gnXO29y9F5a4mG+UHr+AR09kT/HO3D
-53zbXQINY0B3sJdNZ9xA0c1fatEZb+QUOrKf4LzgKXCtg5BfXTnrINDNsEVGbYSt
-49F6QRKTtdPZ+7PuPx2YNeY8N2GOcHftIesLARsNOCh1U417o79cM9qFKt8oYQup
-jG3EqrI1HlqcZJSSXgeN11XfF+fkGrlecTMjYBf0cAT2mgGDtqVT6VlaACwX7BwC
-PNqEStkWSpTI7ExYKety1GwIS/r0xuY9IHwrGJLQNLqCloTLGvffWqbB1v8WWFMx
-4maIdQn5DdOLGTE5ZUFC98d5c932qQgzYGjrIxxpDgBp00Znz5nFnjMfs+UBWb7M
-P4WLzFCnco8NQ2zYk+sx38ZQGjjVcjfioc/MtmXu8D+au0RV2c1B2Cs0hhLzfTRv
-RrMxbfNWLdFPK9fuR87pUWd7M/plpV+1wXkOb9R2CcYvtELsJnYzz0ooug4u2JSY
-5pkYtt+90nVbUXEDODbxMTKZLUk6mxOwwbCJSuAg2+TYIqUF8O3O8hZ0sR3BkuY6
-01Qy/c+HAVoZ2/QZgy1ejtALZP74u0BH6wM0L8tGkmfRTV0PBQJCbq9zxktGhv+C
-Ak57J67UCiTezKyKXRGk+PlXBpRZJKZt6aj6u5V8u62i0/du7g4=
-=22cW
+klA+xg/9FaswbQ+l5MMlKdinSfM73+ay4iXaUPGLTwbU5Jlm5oJnLA1r+Xoq3d4a
+yXXExwoMx/7JRvPkOWeIFKcv5bUfMZvypVuW7rvdry7gP9M8vmQLCJsvoCKPBdrE
+gBSVP1+MR/euOUndaSISoEJ5roJLZEl6Yft1dLpCptBS0RGa7aN0Eiy0Z5Wf0Gs0
+qP1tTn3Jv2KA+ZqMQgPzMwlurbck17doK/Knr+UjtZY9GXcta2Cvasb/lhMzqMG6
+l+6WlUxNttNXtvWmrsqDBGJ8XoGK+AsLbVYxPzCobCfgsb0bGwdDy9ixZRSDz3w3
+qC5ixKIlbxW8ftpWH9e+2G/hsjsiHVbVtQ6f26j5oBltWJ8/zi/f1Kw1S7I2fvS6
+x3/1UCOjNETfA4vaRg1yL+ZIrIr7XEUwSF0RqofLchROTYvzXvX6eGqA3RzfvaZO
+cGoW+136tx1xZ3JRhQ6/wjcbLjO2p0iKYoxec00vfEz6AVALUscCFX8UqmsVkOTp
+4641mHPn9pTvuQXmAQfhJ/ZBjKqdsJskVSOE7CqHJ6ZSE/3BlxLR8m/vu9iRwYxY
+NgWG+ShplU6szR8PIqjemIGt0v7HUWJY3Jm+iUgrQWZ0tmYAYXPwIt4hygvWkMBo
+AWmZRTrJeHyy34iGDdHfVFhW9YPwOVz2kyv1t2cVk7D2TbQ5t1o=
+=t9SB
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e8b952ef3aa5..f4d836cbcdaa 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Aug 2023 03:10:03 +0000
+Tue, 01 Aug 2023 09:10:02 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 42bdea85d252..f9cd6fc1b6ad 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index c4b7fd65fcc2..71ca4b717ecb 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/sysklogd-2.5.1 b/metadata/md5-cache/app-admin/sysklogd-2.5.1
new file mode 100644
index 000000000000..b8ab98271d8a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysklogd-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=logger? ( sys-apps/util-linux[-logger(+)] )
+DESCRIPTION=Standard log daemons
+EAPI=8
+HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
+INHERIT=flag-o-matic systemd toolchain-funcs
+IUSE=logger logrotate
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=logger? ( sys-apps/util-linux[-logger(+)] ) logrotate? ( app-admin/logrotate )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.5.1/sysklogd-2.5.1.tar.gz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=459e82ea4bd5cf50fd65dcbefbf5a04a
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index fd5520e4bc19..c269c27cdd2f 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3 b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3
new file mode 100644
index 000000000000..f4ca4b25e387
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-8.0.3
@@ -0,0 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.11 dev-lang/python:3.10 ) dev-lang/perl dev-util/ninja virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=dev-libs/glib
+DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
+EAPI=8
+HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
+INHERIT=edo systemd toolchain-funcs python-any-r1 udev
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 BSD-2
+RDEPEND=dev-libs/glib
+SLOT=0
+SRC_URI=http://wiki.qemu.org/download/qemu-8.0.3.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=3518d044dabf34b199cd96292c58ec6a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 579fcdf13ea2..a2b9c9c8a9a0 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/nnn-4.8 b/metadata/md5-cache/app-misc/nnn-4.8
index a673bbad46c6..51be2ef21ac6 100644
--- a/metadata/md5-cache/app-misc/nnn-4.8
+++ b/metadata/md5-cache/app-misc/nnn-4.8
@@ -7,11 +7,11 @@ HOMEPAGE=https://github.com/jarun/nnn
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=bash-completion-r1 flag-o-matic toolchain-funcs xdg
 IUSE=8contexts colemak colemak-dh emoji gitstatus icons namefirst nerdfonts pcre qsort +readline restorepreview
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:= pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) elibc_musl? ( sys-libs/fts-standalone )
 REQUIRED_USE=?? ( icons nerdfonts emoji ) ?? ( colemak colemak-dh )
 SLOT=0
 SRC_URI=https://github.com/jarun/nnn/archive/v4.8.tar.gz -> nnn-4.8.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=141eaf95e64da20f064d1498d02ebf28
+_md5_=d34de494822b1b0d917a440e64d1ad92
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9a20a30d82c2..18e4fdcb3aae 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/asm-9.4 b/metadata/md5-cache/dev-java/asm-9.4
deleted file mode 100644
index e5102379f8be..000000000000
--- a/metadata/md5-cache/dev-java/asm-9.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Bytecode manipulation framework for Java
-EAPI=8
-HOMEPAGE=https://asm.ow2.io
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=9
-SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_4/asm-ASM_9_4.tar.bz2
-_eclasses_=java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-pkg-simple	1c8a695f6cae6a50261276f4b3da9914	java-utils-2	8c72ea36a4935f626b13a30141d0d39c
-_md5_=ccff5e12a3cc549d89f6c731d27e2e5d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index daa93f268ac0..d77591a92d17 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/mpc-1.2.1 b/metadata/md5-cache/dev-libs/mpc-1.2.1
deleted file mode 100644
index b2dceedf3974..000000000000
--- a/metadata/md5-cache/dev-libs/mpc-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.1.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
-EAPI=7
-HOMEPAGE=https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc
-INHERIT=multilib-minimal
-IUSE=static-libs 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.1.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0/3
-SRC_URI=mirror://gnu/mpc/mpc-1.2.1.tar.gz
-_eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=4c5e54aef2c558f6c66f0b33238ab146
diff --git a/metadata/md5-cache/dev-libs/mpc-1.3.1 b/metadata/md5-cache/dev-libs/mpc-1.3.1
index 6654d3c6514b..9d209e0e3eea 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.3.1
+++ b/metadata/md5-cache/dev-libs/mpc-1.3.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.3.1.tar.gz
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=d519b4771982ebd3f3586d81e107d0db
+_md5_=7de693234dc052a344c7784a7d75145f
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 60a831272cfb..73a1f061ed16 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/numpy-1.24.3 b/metadata/md5-cache/dev-python/numpy-1.24.3
deleted file mode 100644
index ac7be390319b..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.24.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) <dev-python/cython-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.30[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/charset-normalizer[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-5.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
-INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-IUSE=lapack test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.24.3.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=c946210011beb52f27cfdb63bdd7693f
diff --git a/metadata/md5-cache/dev-python/numpy-1.24.3-r1 b/metadata/md5-cache/dev-python/numpy-1.24.3-r1
deleted file mode 100644
index 85492fc7f16e..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.24.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) <dev-python/cython-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cython-0.29.30[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/pkgconfig ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/charset-normalizer[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-5.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytz-2019.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
-INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-IUSE=lapack test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.24.3.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=8db51eb95365e0741f87730e189ddbe4
diff --git a/metadata/md5-cache/dev-python/numpy-1.25.0-r2 b/metadata/md5-cache/dev-python/numpy-1.25.0-r2
deleted file mode 100644
index 297cfc85ae7b..000000000000
--- a/metadata/md5-cache/dev-python/numpy-1.25.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-util/meson-1.1.0 <dev-python/cython-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/cython-0.29.30[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/pkgconfig ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/charset-normalizer[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-5.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2019.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) lapack? ( virtual/fortran )
-DESCRIPTION=Fast array and numerical python library
-EAPI=8
-HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
-INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
-IUSE=lapack test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) lapack? ( virtual/fortran )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.25.0.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=31cab59f1a2bc2fb29dbb35fc533a1de
diff --git a/metadata/md5-cache/dev-python/numpy-1.25.2 b/metadata/md5-cache/dev-python/numpy-1.25.2
new file mode 100644
index 000000000000..d6d57b9acd4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numpy-1.25.2
@@ -0,0 +1,17 @@
+BDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-util/meson-1.1.0 >=dev-python/cython-0.29.30[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/pkgconfig ) test? ( python_targets_python3_10? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( >=dev-python/cffi-1.14.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/charset-normalizer[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hypothesis-5.8.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytz-2019.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/meson-python-0.13.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] lapack? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) lapack? ( virtual/fortran )
+DESCRIPTION=Fast array and numerical python library
+EAPI=8
+HOMEPAGE=https://numpy.org/ https://github.com/numpy/numpy/ https://pypi.org/project/numpy/
+INHERIT=distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
+IUSE=lapack test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=lapack? ( >=virtual/cblas-3.8 >=virtual/lapack-3.8 ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) lapack? ( virtual/fortran )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/numpy/numpy-1.25.2.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-python/numpy/numpy-1.25.2-patches.tar.xz
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=c61484b4180caaf2776098cb0cae4438
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 97be30ff99de..6f06e3d6dd38 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/diffoscope-246 b/metadata/md5-cache/dev-util/diffoscope-246
new file mode 100644
index 000000000000..61541d5a708e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-246
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://diffoscope.org/archive/diffoscope-246.tar.bz2
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	b3f874304c1bda6ffc3450ebb4ae5169	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=6cf4e9d0185f5fa633b21bdee16afed1
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 0c2e46a90ee4..2bc5c16e68e3 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/corsix-th-0.67_rc1 b/metadata/md5-cache/games-simulation/corsix-th-0.67_rc1
new file mode 100644
index 000000000000..f359d0226146
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/corsix-th-0.67_rc1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] 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 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
+DESCRIPTION=Open source clone of Theme Hospital
+EAPI=8
+HOMEPAGE=https://corsixth.com
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake lua-single xdg
+IUSE=doc +midi +sound tools +truetype +videos lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
+LICENSE=MIT
+RDEPEND=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 ) lua_single_target_lua5-1? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-1(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-1(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-3(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-3(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( >=dev-lua/luafilesystem-1.5[lua_targets_lua5-4(-)] >=dev-lua/lpeg-0.9[lua_targets_lua5-4(-)] >=dev-lua/luasocket-3.0_rc1-r4[lua_targets_lua5-4(-)] ) media-libs/libsdl2[opengl,video] sound? ( media-libs/sdl2-mixer[midi?] ) truetype? ( >=media-libs/freetype-2.5.3:2 ) videos? ( >=media-video/ffmpeg-2.2.3:0= )
+REQUIRED_USE=^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
+SLOT=0
+SRC_URI=https://github.com/CorsixTH/CorsixTH/archive/v0.67-rc1.tar.gz -> corsix-th-0.67_rc1.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=0edf34d1ea87be3a0d40b58965c69429
diff --git a/metadata/md5-cache/games-simulation/openttd-13.0 b/metadata/md5-cache/games-simulation/openttd-13.0
deleted file mode 100644
index c68919627025..000000000000
--- a/metadata/md5-cache/games-simulation/openttd-13.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=games-util/grfcodec-6.0.6_p20210310 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dedicated? ( acct-group/openttd acct-user/openttd app-misc/dtach ) !dedicated? ( allegro? ( media-libs/allegro:5 ) fluidsynth? ( media-sound/fluidsynth ) icu? ( dev-libs/icu-layoutex:= dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) sdl? ( media-libs/libsdl2[sound,video] ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib:= ) ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
-DESCRIPTION=A clone of Transport Tycoon Deluxe
-EAPI=8
-HOMEPAGE=https://www.openttd.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake xdg
-IUSE=allegro cpu_flags_x86_sse debug dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=!dedicated? ( openmedia? ( >=games-misc/openmsx-0.4.0 >=games-misc/opensfx-1.0.1 ) ) openmedia? ( >=games-misc/opengfx-0.6.1 ) timidity? ( media-sound/timidity++ )
-RDEPEND=dedicated? ( acct-group/openttd acct-user/openttd app-misc/dtach ) !dedicated? ( allegro? ( media-libs/allegro:5 ) fluidsynth? ( media-sound/fluidsynth ) icu? ( dev-libs/icu-layoutex:= dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) sdl? ( media-libs/libsdl2[sound,video] ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib:= ) ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
-REQUIRED_USE=!dedicated? ( || ( allegro sdl ) )
-SLOT=0
-SRC_URI=https://cdn.openttd.org/openttd-releases/13.0/openttd-13.0-source.tar.xz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ac87febcd222763aef5314924e7f799d
diff --git a/metadata/md5-cache/games-simulation/openttd-13.1 b/metadata/md5-cache/games-simulation/openttd-13.4
index 391cbadd846a..e7d87761e0c8 100644
--- a/metadata/md5-cache/games-simulation/openttd-13.1
+++ b/metadata/md5-cache/games-simulation/openttd-13.4
@@ -13,6 +13,6 @@ PDEPEND=!dedicated? ( openmedia? ( >=games-misc/openmsx-0.4.0 >=games-misc/opens
 RDEPEND=dedicated? ( acct-group/openttd acct-user/openttd app-misc/dtach ) !dedicated? ( allegro? ( media-libs/allegro:5 ) fluidsynth? ( media-sound/fluidsynth ) icu? ( dev-libs/icu-layoutex:= dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) sdl? ( media-libs/libsdl2[sound,video] ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib:= ) ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo:2 ) png? ( media-libs/libpng:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=!dedicated? ( || ( allegro sdl ) )
 SLOT=0
-SRC_URI=https://cdn.openttd.org/openttd-releases/13.1/openttd-13.1-source.tar.xz
+SRC_URI=https://cdn.openttd.org/openttd-releases/13.4/openttd-13.4-source.tar.xz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=42df6f74dc12fb371d45cbb2a4f34f09
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 62b119a64a03..76ec9d57f32d 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/alsa-lib-1.2.9 b/metadata/md5-cache/media-libs/alsa-lib-1.2.9
index 4816009e8900..f681fb416ba7 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.9
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 INHERIT=autotools multilib-minimal flag-o-matic python-single-r1
 IUSE=alisp debug doc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/alsa-topology-conf media-libs/alsa-ucm-conf python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.9.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=17f25895b1f8034a5e33e36b3c2e0211
+_md5_=6ae32b338682c9dfab6f2c48fee52aee
diff --git a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.9 b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.9
index 7fb2dfc0d8fd..60b9feb94903 100644
--- a/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.9
+++ b/metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.9
@@ -3,9 +3,9 @@ DEPEND=!<media-libs/alsa-lib-1.2.1
 DESCRIPTION=ALSA ucm configuration files
 EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RDEPEND=!<media-libs/alsa-lib-1.2.1
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-ucm-conf-1.2.9.tar.bz2
-_md5_=65db5d8298c015eac78c487beedf7f81
+_md5_=91b088b428e45fec6cd105a475797898
diff --git a/metadata/md5-cache/media-libs/harfbuzz-8.1.0 b/metadata/md5-cache/media-libs/harfbuzz-8.1.0
new file mode 100644
index 000000000000..21c90d14354e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-8.1.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
+DESCRIPTION=An OpenType text shaping engine
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
+INHERIT=flag-o-matic meson-multilib python-any-r1 xdg-utils
+IUSE=+cairo debug doc experimental +glib +graphite icu +introspection test +truetype 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 ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=introspection? ( glib )
+RESTRICT=!test? ( test )
+SLOT=0/6.0.0
+SRC_URI=https://github.com/harfbuzz/harfbuzz/releases/download/8.1.0/harfbuzz-8.1.0.tar.xz
+_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	845fed6b6dfc35679a4fea289272ddc0	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1620a95947d4b06999ca1c016b0f6f1e
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d50da70f1954..39dd33360485 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.2.5-r1 b/metadata/md5-cache/media-sound/alsa-tools-1.2.5-r1
index 2e63a9343008..8eaf959cacda 100644
--- a/metadata/md5-cache/media-sound/alsa-tools-1.2.5-r1
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.2.5-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools flag-o-matic libtool xdg
 IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.5 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( dev-libs/gobject-introspection x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/tools/alsa-tools-1.2.5.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=deab2716a1213e3cfb9a709a7504bd81
+_md5_=5f47d5b97facefb09cc2021126b07ee0
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.9 b/metadata/md5-cache/media-sound/alsa-utils-1.2.9
index 9d61ed431111..6ad6d35be61e 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.9
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://alsa-project.org/wiki/Main_Page
 INHERIT=systemd udev
 IUSE=bat doc +libsamplerate ieee1394 +ncurses nls selinux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.9 libsamplerate? ( media-libs/libsamplerate ) ieee1394? ( media-libs/libffado ) ncurses? ( >=sys-libs/ncurses-5.7-r7:= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.9.tar.bz2
 _eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=bc33adffc2af2e6084fa677b1a7126ee
+_md5_=ec527ae0e3f4d2e2a974bb57a43dde66
diff --git a/metadata/md5-cache/media-sound/gmorgan-0.79-r3 b/metadata/md5-cache/media-sound/gmorgan-0.79-r3
new file mode 100644
index 000000000000..0d026eec5f68
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gmorgan-0.79-r3
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) 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=configure install prepare
+DEPEND=media-libs/alsa-lib x11-libs/fltk:1
+DESCRIPTION=Opensource software rhythm station
+EAPI=8
+HOMEPAGE=https://gmorgan.sourceforge.net/
+INHERIT=autotools
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib x11-libs/fltk:1
+SLOT=0
+SRC_URI=mirror://sourceforge/gmorgan/gmorgan-0.79.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=db2b163b53813f16fa8bf5653ba5c3df
diff --git a/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r2 b/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r2
new file mode 100644
index 000000000000..b6d01dd33d4b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mp3blaster-3.2.6-r2
@@ -0,0 +1,16 @@
+BDEPEND=x11-misc/imake 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=configure install prepare
+DEPEND=sys-libs/ncurses:= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis ) oss? ( virtual/os-headers )
+DESCRIPTION=Text console based program for playing audio files
+EAPI=8
+HOMEPAGE=http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster
+INHERIT=autotools
+IUSE=lirc oss +sdl sid vorbis
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:= lirc? ( app-misc/lirc ) sdl? ( media-libs/libsdl ) sid? ( media-libs/libsidplay:1 ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( oss sdl )
+SLOT=0
+SRC_URI=mirror://sourceforge/mp3blaster/mp3blaster-3.2.6.tar.gz
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=5caa29cd2ce732e56f19d69c7a648123
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 3602481b3527..31da0c166580 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.20 b/metadata/md5-cache/net-analyzer/zabbix-6.0.20
new file mode 100644
index 000000000000..5ba55132af6f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.20
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.20.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.20-go-deps.tar.xz )
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=807e53768757712518b7288e093f07d0
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.4.5 b/metadata/md5-cache/net-analyzer/zabbix-6.4.5
new file mode 100644
index 000000000000..3850a0e8e94a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.4.5
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre2:= net-analyzer/fping[suid] ) selinux? ( sec-policy/selinux-zabbix ) server? ( app-admin/webapp-config dev-libs/libpcre2:= net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.4
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.4/zabbix-6.4.5.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.4.5-go-deps.tar.xz )
+_eclasses_=go-module	8624eede24936fd7666e5298e5332f22	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	user-info	9951b1a0e4f026d16c33a001fd2d5cdf	webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=1ee70fce2c8064b23262116cc7930737
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index de1c398a783e..01d24f1da4d7 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libssh2-1.11.0 b/metadata/md5-cache/net-libs/libssh2-1.11.0-r1
index a8d1334fc1f5..a569b3030dac 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.11.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.11.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.11.0.tar.xz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5cc97f97193e91e209a21a637f216f2
+_md5_=08b155a2fba062028d8c1c875697800e
diff --git a/metadata/md5-cache/net-libs/libssh2-9999 b/metadata/md5-cache/net-libs/libssh2-9999
index bb2f8fa8e0a0..48efcd7a8e52 100644
--- a/metadata/md5-cache/net-libs/libssh2-9999
+++ b/metadata/md5-cache/net-libs/libssh2-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( gcrypt mbedtls )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	ad475baa777c9978fa035216c8264a10	git-r3	2358a7b20091609e24bd3a83b3ac5991	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=955bc1a8189895844c0a4f204c962810
+_md5_=56c726082c8436b2723e9e7a9cb200ed
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index bd018330d1cc..5ae5e7faa754 100644
--- a/metadata/md5-cache/net-nds/Manifest.gz
+++ b/metadata/md5-cache/net-nds/Manifest.gz
diff --git a/metadata/md5-cache/net-nds/openldap-2.5.16 b/metadata/md5-cache/net-nds/openldap-2.5.16
new file mode 100644
index 000000000000..c308a2fbd5f9
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.5.16
@@ -0,0 +1,17 @@
+BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) 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
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.31:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) ) sys-apps/groff
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=7
+HOMEPAGE=https://www.openldap.org/
+INHERIT=autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+IUSE=systemd argon2 +cleartext crypt experimental minimal samba tcpd overlays perl autoca debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test kerberos kinit pbkdf2 sha2 smbkrb5passwd cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=OPENLDAP GPL-2
+RDEPEND=kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.31:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
+REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext debug sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )
+RESTRICT=!test? ( test )
+SLOT=0/2.5
+SRC_URI=https://gitlab.com/openldap/openldap/-/archive/OPENLDAP_REL_ENG_2_5_16/openldap-OPENLDAP_REL_ENG_2_5_16.tar.bz2 mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=09a8fe4bd571eb167dec39fbc879c459
diff --git a/metadata/md5-cache/net-nds/openldap-2.6.6 b/metadata/md5-cache/net-nds/openldap-2.6.6
new file mode 100644
index 000000000000..736f55593271
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.6.6
@@ -0,0 +1,17 @@
+BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) 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
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libevent:= dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.31:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) ) sys-apps/groff
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=8
+HOMEPAGE=https://www.openldap.org/
+INHERIT=autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+IUSE=systemd argon2 +cleartext crypt experimental minimal samba tcpd overlays perl autoca debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test kerberos kinit pbkdf2 sha2 smbkrb5passwd cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=OPENLDAP GPL-2
+RDEPEND=kernel_linux? ( sys-apps/util-linux ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libevent:= dev-libs/libltdl sys-fs/e2fsprogs >=dev-db/lmdb-0.9.31:= argon2? ( app-crypt/argon2:= ) crypt? ( virtual/libcrypt:= ) tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( dev-libs/openssl:0= ) smbkrb5passwd? ( dev-libs/openssl:0= kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
+REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( cleartext sasl ) autoca? ( !gnutls ) ?? ( test minimal ) kerberos? ( ?? ( kinit smbkrb5passwd ) )
+RESTRICT=!test? ( test )
+SLOT=0/2.6
+SRC_URI=https://gitlab.com/openldap/openldap/-/archive/OPENLDAP_REL_ENG_2_6_6/openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	ad475baa777c9978fa035216c8264a10	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	ssl-cert	33f6c352c602e87ceda767a86f3b7131	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=8a494e7dcbffa37ae8484734e44a9698
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 4423e3774191..396661306f59 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/caffe2-2.0.1-r2 b/metadata/md5-cache/sci-libs/caffe2-2.0.1-r3
index ca7c14bcb983..27d79939a510 100644
--- a/metadata/md5-cache/sci-libs/caffe2-2.0.1-r2
+++ b/metadata/md5-cache/sci-libs/caffe2-2.0.1-r3
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_t
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
-INHERIT=python-single-r1 cmake cuda flag-o-matic
+INHERIT=python-single-r1 cmake cuda flag-o-matic prefix
 IUSE=cuda distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v2.0.1.tar.gz -> pytorch-2.0.1.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=78789f42df37f47756cda9076dced989
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cuda	13d76baf0dc95e560610c6b7dfa79db4	flag-o-matic	ad475baa777c9978fa035216c8264a10	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f780ebd9b4d1a43d19f54dd8b59c4061
diff --git a/metadata/md5-cache/sci-libs/gdal-3.7.0 b/metadata/md5-cache/sci-libs/gdal-3.7.0
index 9ea0c6999b71..a485d50040ff 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.7.0
+++ b/metadata/md5-cache/sci-libs/gdal-3.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gdal.org/
 INHERIT=cmake java-pkg-opt-2 python-single-r1
 IUSE=armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd java python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre2 dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[cxx,szip] ) java? ( >=virtual/jdk-1.8:*[-headless-awt] ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( >=sci-libs/ogdi-4.1.0-r1 ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) png? ( media-libs/libpng:= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/numpy[python_targets_python3_11(-)] ) ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) ) spatialite? ( sqlite ) test? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/33
 SRC_URI=https://download.osgeo.org/gdal/3.7.0/gdal-3.7.0.tar.xz test? ( https://download.osgeo.org/gdal/3.7.0/gdalautotest-3.7.0.tar.gz )
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	ad475baa777c9978fa035216c8264a10	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d749caaff41581e46c34e07d4676746d
+_md5_=bd636235d38d1ca238f1c8eb31588afa
diff --git a/metadata/md5-cache/sci-libs/pytorch-2.0.1 b/metadata/md5-cache/sci-libs/pytorch-2.0.1-r1
index 477067fd567b..10dc301deb14 100644
--- a/metadata/md5-cache/sci-libs/pytorch-2.0.1
+++ b/metadata/md5-cache/sci-libs/pytorch-2.0.1-r1
@@ -4,7 +4,7 @@ DEPEND=python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_t
 DESCRIPTION=Tensors and Dynamic neural networks in Python
 EAPI=8
 HOMEPAGE=https://pytorch.org/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 prefix
 IUSE=python_single_target_python3_10 python_single_target_python3_11 debug
 KEYWORDS=~amd64
 LICENSE=BSD
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v2.0.1.tar.gz -> pytorch-2.0.1.tar.gz
-_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=32e11381d449b2021f4089cb3ba54a17
+_eclasses_=distutils-r1	b7cd5736a595ec0df9b164d5aec6f228	flag-o-matic	ad475baa777c9978fa035216c8264a10	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	7661dc585f75dd1f81eccefe37bef093	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
+_md5_=353ce3f8ff69fc21255d9049160b07f3
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1f5e712201e2..ea41a5e8df76 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/pv-1.7.0 b/metadata/md5-cache/sys-apps/pv-1.7.0
deleted file mode 100644
index 032f21cd4a68..000000000000
--- a/metadata/md5-cache/sys-apps/pv-1.7.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pipe
-EAPI=8
-HOMEPAGE=https://www.ivarch.com/programs/pv.shtml
-INHERIT=flag-o-matic linux-info toolchain-funcs plocale
-IUSE=debug nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=Artistic-2
-SLOT=0
-SRC_URI=https://www.ivarch.com/programs/sources/pv-1.7.0.tar.bz2
-_eclasses_=flag-o-matic	ad475baa777c9978fa035216c8264a10	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=3533db216e3fdbebdcc97aaae3352a14
diff --git a/metadata/md5-cache/sys-apps/pv-1.7.18 b/metadata/md5-cache/sys-apps/pv-1.7.24
index 91fa797d2dd1..f853c8f52d68 100644
--- a/metadata/md5-cache/sys-apps/pv-1.7.18
+++ b/metadata/md5-cache/sys-apps/pv-1.7.24
@@ -7,6 +7,6 @@ IUSE=debug nls
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=Artistic-2
 SLOT=0
-SRC_URI=https://www.ivarch.com/programs/sources/pv-1.7.18.tar.bz2
+SRC_URI=https://www.ivarch.com/programs/sources/pv-1.7.24.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b
-_md5_=491724040639b637db9b9913079e7e94
+_md5_=7d4906f86a36a6bba223e1999a1ab46b
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 08835730930b..90a1b29a5fac 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-bin-115.0.2 b/metadata/md5-cache/www-client/firefox-bin-115.0.2
deleted file mode 100644
index 30418ff9f0a6..000000000000
--- a/metadata/md5-cache/www-client/firefox-bin-115.0.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst setup unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
-DESCRIPTION=Firefox Web Browser
-EAPI=8
-HOMEPAGE=https://www.mozilla.com/firefox
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop linux-info optfeature pax-utils xdg
-IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=rapid
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/en-US/firefox-115.0.2.tar.bz2 -> firefox-bin_x86_64-115.0.2.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-i686/en-US/firefox-115.0.2.tar.bz2 -> firefox-bin_i686-115.0.2.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ach.xpi -> firefox-115.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/af.xpi -> firefox-115.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/an.xpi -> firefox-115.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ar.xpi -> firefox-115.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ast.xpi -> firefox-115.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/az.xpi -> firefox-115.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/be.xpi -> firefox-115.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/bg.xpi -> firefox-115.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/bn.xpi -> firefox-115.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/br.xpi -> firefox-115.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/bs.xpi -> firefox-115.0.2-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ca-valencia.xpi -> firefox-115.0.2-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ca.xpi -> firefox-115.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/cak.xpi -> firefox-115.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/cs.xpi -> firefox-115.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/cy.xpi -> firefox-115.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/da.xpi -> firefox-115.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/de.xpi -> firefox-115.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/dsb.xpi -> firefox-115.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/el.xpi -> firefox-115.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/en-CA.xpi -> firefox-115.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/en-GB.xpi -> firefox-115.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/eo.xpi -> firefox-115.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/es-AR.xpi -> firefox-115.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/es-CL.xpi -> firefox-115.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/es-ES.xpi -> firefox-115.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/es-MX.xpi -> firefox-115.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/et.xpi -> firefox-115.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/eu.xpi -> firefox-115.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/fa.xpi -> firefox-115.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ff.xpi -> firefox-115.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/fi.xpi -> firefox-115.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/fr.xpi -> firefox-115.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/fy-NL.xpi -> firefox-115.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ga-IE.xpi -> firefox-115.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/gd.xpi -> firefox-115.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/gl.xpi -> firefox-115.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/gn.xpi -> firefox-115.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/gu-IN.xpi -> firefox-115.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/he.xpi -> firefox-115.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/hi-IN.xpi -> firefox-115.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/hr.xpi -> firefox-115.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/hsb.xpi -> firefox-115.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/hu.xpi -> firefox-115.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/hy-AM.xpi -> firefox-115.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ia.xpi -> firefox-115.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/id.xpi -> firefox-115.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/is.xpi -> firefox-115.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/it.xpi -> firefox-115.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ja.xpi -> firefox-115.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ka.xpi -> firefox-115.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/kab.xpi -> firefox-115.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/kk.xpi -> firefox-115.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/km.xpi -> firefox-115.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/kn.xpi -> firefox-115.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ko.xpi -> firefox-115.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/lij.xpi -> firefox-115.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/lt.xpi -> firefox-115.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/lv.xpi -> firefox-115.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/mk.xpi -> firefox-115.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/mr.xpi -> firefox-115.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ms.xpi -> firefox-115.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/my.xpi -> firefox-115.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/nb-NO.xpi -> firefox-115.0.2-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ne-NP.xpi -> firefox-115.0.2-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/nl.xpi -> firefox-115.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/nn-NO.xpi -> firefox-115.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/oc.xpi -> firefox-115.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/pa-IN.xpi -> firefox-115.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/pl.xpi -> firefox-115.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/pt-BR.xpi -> firefox-115.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/pt-PT.xpi -> firefox-115.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/rm.xpi -> firefox-115.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ro.xpi -> firefox-115.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ru.xpi -> firefox-115.0.2-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sco.xpi -> firefox-115.0.2-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/si.xpi -> firefox-115.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sk.xpi -> firefox-115.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sl.xpi -> firefox-115.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/son.xpi -> firefox-115.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sq.xpi -> firefox-115.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sr.xpi -> firefox-115.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/sv-SE.xpi -> firefox-115.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ta.xpi -> firefox-115.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/te.xpi -> firefox-115.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/th.xpi -> firefox-115.0.2-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/tl.xpi -> firefox-115.0.2-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/tr.xpi -> firefox-115.0.2-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/trs.xpi -> firefox-115.0.2-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/uk.xpi -> firefox-115.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/ur.xpi -> firefox-115.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/uz.xpi -> firefox-115.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/vi.xpi -> firefox-115.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/xh.xpi -> firefox-115.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/zh-CN.xpi -> firefox-115.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/115.0.2/linux-x86_64/xpi/zh-TW.xpi -> firefox-115.0.2-zh-TW.xpi )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6c3f45567d09154f57717d871a81cade
diff --git a/metadata/md5-cache/www-client/firefox-bin-116.0 b/metadata/md5-cache/www-client/firefox-bin-116.0
new file mode 100644
index 000000000000..a3a075da730a
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-bin-116.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
+DEFINED_PHASES=install postinst postrm preinst setup unpack
+DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) )
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop linux-info optfeature pax-utils xdg
+IUSE=+alsa +ffmpeg +gmp-autoupdate +pulseaudio selinux wayland l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca-valencia l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_eo l10n_es-AR l10n_es-CL l10n_es-ES l10n_es-MX l10n_et l10n_eu l10n_fa l10n_ff l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gn l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_km l10n_kn l10n_ko l10n_lij l10n_lt l10n_lv l10n_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_ne l10n_nl l10n_nn l10n_oc l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sco l10n_si l10n_sk l10n_sl l10n_son l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tl l10n_tr l10n_trs l10n_uk l10n_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) !www-client/firefox-bin:0 !www-client/firefox-bin:esr >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/alsa-lib media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/pango-1.22.0 alsa? ( !pulseaudio? ( media-sound/apulse ) ) ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-libs/libpulse ) selinux? ( sec-policy/selinux-mozilla )
+RESTRICT=strip
+SLOT=rapid
+SRC_URI=amd64? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/en-US/firefox-116.0.tar.bz2 -> firefox-bin_x86_64-116.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-i686/en-US/firefox-116.0.tar.bz2 -> firefox-bin_i686-116.0.tar.bz2 ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ach.xpi -> firefox-116.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/af.xpi -> firefox-116.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/an.xpi -> firefox-116.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ar.xpi -> firefox-116.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ast.xpi -> firefox-116.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/az.xpi -> firefox-116.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/be.xpi -> firefox-116.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/bg.xpi -> firefox-116.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/bn.xpi -> firefox-116.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/br.xpi -> firefox-116.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/bs.xpi -> firefox-116.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-116.0-ca-valencia.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ca.xpi -> firefox-116.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/cak.xpi -> firefox-116.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/cs.xpi -> firefox-116.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/cy.xpi -> firefox-116.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/da.xpi -> firefox-116.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/de.xpi -> firefox-116.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/dsb.xpi -> firefox-116.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/el.xpi -> firefox-116.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/en-CA.xpi -> firefox-116.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/en-GB.xpi -> firefox-116.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/eo.xpi -> firefox-116.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/es-AR.xpi -> firefox-116.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/es-CL.xpi -> firefox-116.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/es-ES.xpi -> firefox-116.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/es-MX.xpi -> firefox-116.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/et.xpi -> firefox-116.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/eu.xpi -> firefox-116.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/fa.xpi -> firefox-116.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ff.xpi -> firefox-116.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/fi.xpi -> firefox-116.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/fr.xpi -> firefox-116.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-116.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-116.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/gd.xpi -> firefox-116.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/gl.xpi -> firefox-116.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/gn.xpi -> firefox-116.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-116.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/he.xpi -> firefox-116.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-116.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/hr.xpi -> firefox-116.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/hsb.xpi -> firefox-116.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/hu.xpi -> firefox-116.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-116.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ia.xpi -> firefox-116.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/id.xpi -> firefox-116.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/is.xpi -> firefox-116.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/it.xpi -> firefox-116.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ja.xpi -> firefox-116.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ka.xpi -> firefox-116.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/kab.xpi -> firefox-116.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/kk.xpi -> firefox-116.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/km.xpi -> firefox-116.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/kn.xpi -> firefox-116.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ko.xpi -> firefox-116.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/lij.xpi -> firefox-116.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/lt.xpi -> firefox-116.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/lv.xpi -> firefox-116.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/mk.xpi -> firefox-116.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/mr.xpi -> firefox-116.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ms.xpi -> firefox-116.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/my.xpi -> firefox-116.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-116.0-nb-NO.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-116.0-ne-NP.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/nl.xpi -> firefox-116.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-116.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/oc.xpi -> firefox-116.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-116.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/pl.xpi -> firefox-116.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-116.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-116.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/rm.xpi -> firefox-116.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ro.xpi -> firefox-116.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ru.xpi -> firefox-116.0-ru.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sco.xpi -> firefox-116.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/si.xpi -> firefox-116.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sk.xpi -> firefox-116.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sl.xpi -> firefox-116.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/son.xpi -> firefox-116.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sq.xpi -> firefox-116.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sr.xpi -> firefox-116.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-116.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ta.xpi -> firefox-116.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/te.xpi -> firefox-116.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/th.xpi -> firefox-116.0-th.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/tl.xpi -> firefox-116.0-tl.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/tr.xpi -> firefox-116.0-tr.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/trs.xpi -> firefox-116.0-trs.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/uk.xpi -> firefox-116.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/ur.xpi -> firefox-116.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/uz.xpi -> firefox-116.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/vi.xpi -> firefox-116.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/xh.xpi -> firefox-116.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-116.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/116.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-116.0-zh-TW.xpi )
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	0c8a0b0d318eb5d5180d114bd3f6592b	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=6c3f45567d09154f57717d871a81cade
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c501dc988d57..18204b50b1ba 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-08-01T03:10:06Z
+TIMESTAMP 2023-08-01T09:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTId45fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTIy+5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCjmA/8CxqYjZV6UxAsVKaVEfRIKcovr65ODgwfFmhgA34Bu+PCe51O7EGG0VNx
-DMtsfLfgTSkimv52w6TqKhledpEfzI25O7A59Ny3tExXbx4FheUFzLjWbV3D9LMO
-/PDnsFe9uEWMUBW0IqGVswgO6dFzBvDLNZ8xLIW34OaHieavS3omO0S0mpdkjiMG
-F4YixMtfPE4Leb1PGwIBBOCcmvtboUDXdHVlyUl8YbFZti+4FipAJiPF93GhGJVc
-hPdRV69+QnSxZnS/x8AnyPSlNCrR+VMWUy9W3TDMAhEnQkuAoz8xz4WRhsC9L2pv
-0Iflf/v1qXFUxAe7Dc4B4s7GGnhvoH+ko2WEeT//YAkqlU9RcOiAHxR3JyeaBbyM
-Tc2Df44AcZWW7bCvdjaA9QJJoqesqwlWl/3KXcp1jpdFTYKhvyOpaaYJm8v7EgK2
-yY1lN9y+qvO/MCNWPsLfAOKA+Bc25U4buMEgZwH5yb9zUOw7b4uVj8SbjLVqC1qH
-IaPnECfw6MR2/ihve4P1/Wo5UsXKIzXpMkhdHoeBqaCXQ5GOGpD5OU9JNzti+r2V
-3vhdmniQJH+KRMNYDZ8G6ZjIkAqHw45X0Vpqp4tlCxWt+xr70pA8j7+Nh7/YV75k
-HgCluc4BZe+Xqeufsznioc/t1DDzShPu0660nfYLpz0OCXJOP7Y=
-=/Iiv
+klDVEg//bEkCuUZQxixSZouZ1NMN6W6D0Cp8BszMEOOvmpqbIlLnGFOULPL1qMjs
+9uO6ElUMMNey0GBDlZpxA3GUU7oEZaGlnRgk1zO6k9q021KNrWr88+e+x5U5Kdhg
+xB+fEZzo9jv6yhDT1xBqm4qBAhdmcJYlnNP0KvFEYvSSRqdLS7oQ9ewpMs1HLeEj
++6xhWlxhW+7gVrDRDg3jOcmYnmPgNn4k3ClooL/QAXdhMJk2Gcv/o0ofjipvfwVh
+/69jbehuWaVd7j89WyCnuRMCKCRkkN9LUyQyL/Qd2AIk+8kmvI7gBgoIpxoMVVqR
+XdiAGuVyweLtz673l3o9XGHN6H908gBXpyggeaYKX8uMjNNvAd0O3GDBCto0Fdeu
+pCAMszz+f6AbkbCqJ+0Ih4/noAi8LozmH2LKqdEalFa3TQ9cXbPi79iYJ8B+WtIB
+K/h4AXBImKKTax8AZmrb5cJvPro7KMX7TRzU4up/GDtVVkBS6t8kC/I8FhhPQyDT
+qm5y0HuHgjE3WTIioq/pmaqCnQda6wXUeBpmokM2z1almfxbgoMu6ms6r2uBnHuq
+6SIgfPsAnYRedcIrQ3zBHd/9zH4JJ7dgzGbU0I084ABI5xI03wrEs8V+auRBJlA9
+qXxhJzln2pWih8su62jX3G2uN4JOlGMQl7OdvK5wFbmEAfiRO64=
+=XOfb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e8b952ef3aa5..f4d836cbcdaa 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Aug 2023 03:10:03 +0000
+Tue, 01 Aug 2023 09:10:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f14158a58bf5..c814b547ce6b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Aug  1 03:10:03 AM UTC 2023
+Tue Aug  1 09:10:02 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a3406a5f1c26..194f4001e149 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Aug 2023 03:15:01 +0000
+Tue, 01 Aug 2023 09:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index b6b1063a33e8..28f98c4bb38d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1ce6e1d73c772d34729cba5ff7d1a3fceb7526ec 1690858884 2023-08-01T03:01:24+00:00
+ddc7461a8516d10e43d5b6a34223ae461cefeef8 1690876121 2023-08-01T07:48:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 789a5b356441..e8cd3b3ffeab 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1690859401 Tue 01 Aug 2023 03:10:01 AM UTC
+1690881001 Tue 01 Aug 2023 09:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e8b952ef3aa5..f4d836cbcdaa 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 01 Aug 2023 03:10:03 +0000
+Tue, 01 Aug 2023 09:10:02 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 84cfb513117b..fbdc1e5c719c 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index f89cc1c87afd..37ef3f01e789 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -27,16 +27,22 @@ DIST zabbix-6.0.18-go-deps.tar.xz 18727444 BLAKE2B 2a8e9a929857574104c7af6b423bb
 DIST zabbix-6.0.18.tar.gz 41926243 BLAKE2B db7c5556896ad6cea107791f4bf5c5128862b941a3dedab74a44d5f3f0770f36122338c5e493c26c4ac07f43091291a9f4c1916b742e97bdf8f70cc9cb07d280 SHA512 775da1d47e095c233c6fdaab0c94dd4eee356825401ac885a8f000681caccda54f0ef508bcf8cb7d1f6def0178cb0aa17b37ec15ae9db032aaaa7faec7542e3d
 DIST zabbix-6.0.19-go-deps.tar.xz 18942932 BLAKE2B f53a00b89c024f0e52941f9a1dd1abfadbbf79c7b2da884379505edb762c9e1b93542b1e68b572c7d0e99a80b759f44015dddf49968ef42c4b7eb4e0017b7e67 SHA512 04073b6e30a8bb9284ce7780d3149f774dfcd94ea4d4e5c64bf06f6b7e0d41a8536aa461ad435cad6954c5cc9210382af60eb95791bc0100f1ff80d9abd7b7e3
 DIST zabbix-6.0.19.tar.gz 41953882 BLAKE2B b454a3622d3fdeda886ce4722e24116c44c74768bc5dcfe1cd6aa7c90a245121532d24842cfd47538349d08ca5b6577b6f0e75eec165f304a050512eafe608ba SHA512 9738d30a21bd237e68ad4cf037e3d997fcd8b8a6781f3f4f22c6ef0de4bf555d96c41322ea5dda7b0a2a546b9a2ecd42e1761ff8ec43ddd2eca672a174ce1e8e
+DIST zabbix-6.0.20-go-deps.tar.xz 18980960 BLAKE2B 447cdbf656d5b5fdad08be8ffec4bf0ba8bda351b48dcee4a67ce296e228e8d7e5c78b939c7211d2aa68b020ec0b41e4f5de638fe9abef98bb7b1936481e00fe SHA512 c806b052bf28cbe4802f31b1e717c61918a1b15d11a107eb0a758343e387d9761f93bd10bd65016f81a467002689cea74525a9812ec50ee29fc967b9a6e91e76
+DIST zabbix-6.0.20.tar.gz 42016423 BLAKE2B 5155ddb608432beddf72e35ad5b8f3723ca883f9c0c22adfd9bc668ba223335d67db76ad6211417d93a71ed20eb74f2c1b0370378755c5c0d988ab5ed4b46e30 SHA512 8f4fa955eb20ba4c4539bb3b6744c942e89db61dc50c998e61c4cf065cf07fddddfacce3992b8402851dc2f55e41fbff40e814d86b8c4ed9802931b8fe4a172b
 DIST zabbix-6.4.3-go-deps.tar.xz 21580912 BLAKE2B a8d67ca707ebc0b7c873ebc9210643c8409975931e316556ceb47fd8e89eb998a13b7581643f4031de3d1d167e860752edb4589ea4d89037f18b2c14423d954c SHA512 277271b2a15e3fb04a1e30dcfe4b499f874d93e2509283b5acf2b6380f1ad4fb2627d8021c401076277d84f1a2031f6bfae285cbd4e6f2f45ec7daa42294bc59
 DIST zabbix-6.4.3.tar.gz 43369742 BLAKE2B a19cc8fa1fec26b152f84427394d1e1dd947aae62bce69eeb0f7cb3326d84a9eae9e79f17e7583cef36fbb7c6f39560ee0c495cfa61eaf9983238618bb33c406 SHA512 ddb90a0a7699a7cf007ee2efcbc807e573221b92bf4fb104b8dfb07355d79235b5bbd1aae8c70a7edcc42555b5f182230057162cf2bd899ba4b62ed433711f69
 DIST zabbix-6.4.4-go-deps.tar.xz 21588740 BLAKE2B 4f02c2c6fbfc44ec65bd697a1494dae26d528ce18bc060939e8a86bfcee1bf513dfe51440338c0ca0209ac260abff429da6ba0f9e6c381c96ac96cd8cc7f0d9f SHA512 ce0c2f4df1c42c45db7b3f42c75973f01b83996eb1f04b7d456ee6e5b7fab99a4ed224d7bab7ac4d9ed37fd35fbbee4f40ba826849a9c4007044384310c50b09
 DIST zabbix-6.4.4.tar.gz 43403307 BLAKE2B c6616045da913aa681543d038348f5273853621ee698e21fbf196935d4ef16f6c18052ca5f9b00526d0fb0710e833a24b7fac8987affb19f2e836a5c3426f366 SHA512 f01fb33707e16a2784fbc4102222418277eb4abf4d83d01f7981b0bf085c2db8510362366c4f2bbd69790a3da5a8e563415d6b3dd36a70c1cf94f8b57ee9e283
+DIST zabbix-6.4.5-go-deps.tar.xz 21631800 BLAKE2B 5f4e819f1fb3e4646ef26f1ce270de7a8ada9d69b0aabc1e9a2e1639620fa959f9071be57de188fe83fa150de4c09cffff0177373eff6688fea3acd33fc08946 SHA512 f2faa9a8a3450df7d8e2b4c0ab103d7a6863a7e7fdb851be460f4866839cc974e71144a17a9a5719d26c789a5d552a85e63c5015f520bb4c250eaa5cc95fd67b
+DIST zabbix-6.4.5.tar.gz 43464868 BLAKE2B 39a2bedc2b9fdfc046a984595377a5cf5375db5992ea01775c351ba906996b2f4bc71a8c38a542cb859c9e7fd7711bf21086995c1426ffc2a00fabe0427831f0 SHA512 cab201a68f5c580e102516f7de27a0009258e358abed161a3b3e4ae9d531e8d6a93b8aed1239a0244bff8bcafcbdb6f262e21fa500772dc8fccd20e3345089fd
 EBUILD zabbix-4.0.46.ebuild 9473 BLAKE2B 64dc377510b3c302c2dbff46e91fee4703f5160818b60d4b65c9210b9ded6a70b8e464385f6f57b431b3b2dcb3134faac6f922b847aca576c9ba5d7afa26cbbd SHA512 f8370f98efdf8132604747672756e9bdaf2dd9492d433528ee764e5dc345ef2a48a816867567981489f744ade8175d8d16498d7d814efc374b76143753d78181
 EBUILD zabbix-4.0.47.ebuild 9475 BLAKE2B bb4ae6c9f45ef2ed0aef21ae811f616f5291ffd50beb14c691fa113483123e391024e490b88fafa538adf93aa595e3e9126c92c666dabb4fd1ad4566e16ab556 SHA512 822bc6e3309999df1b68cae6e572563b621352ad4a70f683ab28876ec5384fd56721fad612ce411f6d25c270b7ca228857b7894efd1c49a48131f7bb68b0d3ed
 EBUILD zabbix-5.0.35.ebuild 10190 BLAKE2B ba6e6a4ea61665f700f51f5a150c8790d6a3ca8b9835081f321654deadb63de41ed3c26115903cba8381979b404ad4de30625de16510343f32628445dc09503a SHA512 40e20743f3d312803d2a6a691725f23ddf693c174ca2576a731cf43391aba6badab7df10bdcf3b4fbceef7e6b2c2048c0da1fe55facd9c0a8198ea1807e65675
 EBUILD zabbix-5.0.36.ebuild 10192 BLAKE2B 88498e065c1917b2ce79fb2f7b9283a0c28ada71024582c233edab52596135e567fecc64df6b53f5ddf5bfc68f71f23fed4cbd5a9426786a89e0a786c47bb202 SHA512 68843f8f63dd2c2ca78f5e9a8c46c7056f69f16cbdab34747ed79cfb748b199a9b7f2fa0653dd0ed58c18e73b582076921f190314586e28b418bc67e05cef939
 EBUILD zabbix-6.0.18.ebuild 10283 BLAKE2B f819d2d4519f002b256484eb237dab6fc9edd60d362559dcb0f5a48ecd364877ca80b8750c3bff6b900d55f3bfb5a129c4d019505c5f496388ccd6fd524b81a1 SHA512 e7c0a97439cf0ba026909433914a3c61f3198a2e12c06ba3f023cd831160b56db15b970e3b1c2d817f1f07231ce8f2beb96dd2bb7e46bba975ee90a72b6414f1
 EBUILD zabbix-6.0.19.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
+EBUILD zabbix-6.0.20.ebuild 10285 BLAKE2B 3419dc4892b5110c0347a419c605f0e344c99831def1d1e72db6a0f6397a52e55faae6f00b189029be43abf8582c19ba35ae7170796e084dd2758cb7bc229a35 SHA512 2a3870ed7c291823118f9177cdfb3ed13fd68d0c04bca64b2b724244355c72460a4bfc756df2ed5f504a78643cdd95b2b0a6c51970c0376caaaf29402a590279
 EBUILD zabbix-6.4.3.ebuild 10281 BLAKE2B 1baad42a3ab68ddbfd1f96958bf1f335e64be66c37882058e44e44c8308dfc7262281d0168c47f83cf3cfae3a112f16b2a6ada9831e5e68a46587f1b6137ab43 SHA512 bb19f18d6667b3b41ca8994c5ec648281ab80048bf2ab29f4acd6b9ea01c502e635295bd7e6ec1d0b06462272d8ea993af9ae0200bad4c5908c1a8026fdafa03
 EBUILD zabbix-6.4.4.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
+EBUILD zabbix-6.4.5.ebuild 10283 BLAKE2B 44d4f85febe37026dff5228c58463432ed70a00bb76323f149f0203693c519fe6822b40abd46f26604177a51f8d1591e0fb9a4c86e17416f7c2a486a71c7b5f4 SHA512 3aed0e998df26be546817e18c29d6deb0dfa01d2aad16d66ffeab6a738a39997e70f44ac70c5f82a25c381a6b187b16f2be2cbeae3212deb944025f3f4323f8f
 MISC metadata.xml 1655 BLAKE2B 46ab1f5adaff6069890380b23a6edaf8f0f7380ffc4a320f17df52f2e59867bdcf09633d9c6e242434919d3512d557c2f623d2826b1453424c43dc0b0ee0a262 SHA512 62e5a8853c13dac034360bd1a7b61987b548641b76860f05a8f75181b8d8029e06bc9cbf136d42836e714cf0c193b04a589d214a7864d607bf93dd97066f1a70
diff --git a/net-analyzer/zabbix/zabbix-6.0.20.ebuild b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
new file mode 100644
index 000000000000..e5e5f002a22e
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.20.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.4.5.ebuild b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
new file mode 100644
index 000000000000..2423117090ed
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.4.5.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+#   cd src/go
+#   GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+#   tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+	agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+	?? ( gnutls openssl )
+	proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+	server? ( ^^ ( mysql oracle postgres ) !sqlite )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls:0= )
+	java? ( >=virtual/jdk-1.8:* )
+	ldap? (
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls:=
+		net-nds/openldap:=
+	)
+	libxml2? ( dev-libs/libxml2 )
+	mysql? ( dev-db/mysql-connector-c:= )
+	odbc? ( dev-db/unixODBC )
+	openipmi? ( sys-libs/openipmi )
+	openssl? ( dev-libs/openssl:=[-bindist(-)] )
+	oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+	postgres? ( dev-db/postgresql:* )
+	proxy?  (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	server? (
+		dev-libs/libevent:=
+		sys-libs/zlib
+	)
+	snmp? ( net-analyzer/net-snmp:= )
+	sqlite? ( dev-db/sqlite )
+	ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/zabbix
+	acct-user/zabbix
+	java? ( >=virtual/jre-1.8:* )
+	mysql? ( virtual/mysql )
+	proxy? (
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	selinux? ( sec-policy/selinux-zabbix )
+	server? (
+		app-admin/webapp-config
+		dev-libs/libpcre2:=
+		net-analyzer/fping[suid]
+	)
+	frontend? (
+		app-admin/webapp-config
+		dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		media-libs/gd[png]
+		virtual/httpd-php:*
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		curl? ( net-misc/curl[static-libs] )
+		ldap? (
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+			net-nds/openldap[static-libs]
+		)
+		libxml2? ( dev-libs/libxml2[static-libs] )
+		mysql? ( dev-db/mysql-connector-c[static-libs] )
+		odbc? ( dev-db/unixODBC[static-libs] )
+		postgres? ( dev-db/postgresql:*[static-libs] )
+		sqlite? ( dev-db/sqlite[static-libs] )
+		ssh? ( net-libs/libssh2 )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	agent2? (
+		>=dev-lang/go-1.12
+		app-arch/unzip
+	)
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+	"${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	local econf_args=(
+		--with-libpcre2
+		"$(use_enable agent)"
+		"$(use_enable agent2)"
+		"$(use_enable ipv6)"
+		"$(use_enable java)"
+		"$(use_enable proxy)"
+		"$(use_enable server)"
+		"$(use_enable static)"
+		"$(use_with curl libcurl)"
+		"$(use_with gnutls)"
+		"$(use_with ldap)"
+		"$(use_with libxml2)"
+		"$(use_with mysql)"
+		"$(use_with odbc unixodbc)"
+		"$(use_with openipmi openipmi)"
+		"$(use_with openssl)"
+		"$(use_with oracle)"
+		"$(use_with postgres postgresql)"
+		"$(use_with snmp net-snmp)"
+		"$(use_with sqlite sqlite3)"
+		"$(use_with ssh ssh2)"
+	)
+
+	econf ${econf_args[@]}
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	local dirs=(
+		/etc/zabbix
+		/var/lib/zabbix
+		/var/lib/zabbix/home
+		/var/lib/zabbix/scripts
+		/var/lib/zabbix/alertscripts
+		/var/lib/zabbix/externalscripts
+		/var/log/zabbix
+	)
+
+	for dir in "${dirs[@]}"; do
+		keepdir "${dir}"
+	done
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+		newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+		dosbin src/zabbix_server/zabbix_server
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-server.service
+		newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+	fi
+
+	if use proxy; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+		newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+		dosbin src/zabbix_proxy/zabbix_proxy
+
+		insinto /usr/share/zabbix
+		doins -r "${S}"/database/
+
+		systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+		newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${S}"/conf/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+		newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+
+		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+	fi
+	if use agent2; then
+		insinto /etc/zabbix
+		doins "${S}"/src/go/conf/zabbix_agent2.conf
+		fperms 0640 /etc/zabbix/zabbix_agent2.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+		dosbin src/go/bin/zabbix_agent2
+
+		systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+		newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+	fi
+
+	fowners root:zabbix /etc/zabbix
+	fowners zabbix:zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-1.2.9.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-1.2.9.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.7.32.jar
+		newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+		newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix"
+		elog "if you have not already done so."
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		tmpfiles_process zabbix-server.conf
+
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	if use proxy; then
+		tmpfiles_process zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		tmpfiles_process zabbix-agentd.conf
+	fi
+
+	if use agent2; then
+		tmpfiles_process zabbix-agent2.conf
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+pkg_prerm() {
+	(use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 3de5d0c3c16f..4b0939ca0622 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 0d010e0f79a6..a967161f78f5 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -3,6 +3,6 @@ AUX libssh2-1.11.0-mansyntax_sh.patch 304 BLAKE2B 465b6cf0a67fb9d4db83b0ae1556a2
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
 EBUILD libssh2-1.10.0.ebuild 1345 BLAKE2B 4c2fac289235288aaab718a78cf75113e1e7141e5ca58eb98b22a1f67722ad1f2266f31d8040005da35a3dedac68312898e7d466e7ddbc0f3d804893eec66bd2 SHA512 ffdbb9393595a75b2db0f551989fa2713fe19893798c2ad73efc86be17b9de13210a600830ba7e769048b0cb69294881754e9e5118b8570c6f7349b321cca328
-EBUILD libssh2-1.11.0.ebuild 1483 BLAKE2B 3dfc78f6abdae4d3016df08094a0383bd61f7476e450172f9b060fede21b4923172f0dd73eb1c59ad8ad7911aeb0046e253fac60f848036356879ec7d8cef8eb SHA512 ac56c43309ed72636cc5af3a5f43ae051db27140a56a788f9b266283ad522ac85fa84616dee228fd15f5b0919ec1059a606a5bbe832acd2f51065846514f00f8
-EBUILD libssh2-9999.ebuild 1404 BLAKE2B c8722abf72bdf141067b8bc5b8c9c09d8fcd27b8a62be95d7ec4ab8cc9e51775cec3bd8144fb285dc2ce75b6d2b2e6b208dc9bf467056cfbae6f5834ca81f88e SHA512 189d0b54c101adc2eaa0973992194cdefa3aae8433e7d92b82742f95af4375ea788a8a6ec2858bcb8ce3603791de71537cb1404256d6f0165189891e2acdf260
+EBUILD libssh2-1.11.0-r1.ebuild 1442 BLAKE2B 290f1b4f0123ba47ae072c279a162105674778e589ff11ed0b017e4a0b0f4f8bd487fbf1414a3f2cbabb95efa25835ea79259d28d523cbfaf7aff5ee700bb7da SHA512 1c4e23333615065cca890270fe3e6e689fb7ce32f9fc37c760355be71c5aa9f662897685af9dbf293743ea4fa0e804fe6fcdb1acda206623187920cf25f0ecef
+EBUILD libssh2-9999.ebuild 1363 BLAKE2B 784497be1fffce7873dc5913d4bdf08638c0feff8e0cd6c51141c3a2d8b75d37c7648d4590f73291153f7af1fd47ccebf1f952a2fa27aafee1d55e477948d945 SHA512 cebb0036b408cd3971c6d7307a47a54d617508085cb73f992fa124927d07e41eb136e9f80556bc6529fc8add65ae59200097c66132697e00be83dcdc8c1b35e0
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
index 02fa622e27d5..11816607f618 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0-r1.ebuild
@@ -62,5 +62,4 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 1c3811f85a82..70a9e03a7d0b 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -62,5 +62,4 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 04c4fb74abd8..f74d825a60ca 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 0501a6ad8775..4fe555aece52 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -31,14 +31,18 @@ AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
 DIST openldap-2.4.59.tgz 5886272 BLAKE2B a2a8bed1d2af97fd41d651668152fd4740871bc5a8abf4b50390839228af82ac103346b3500ae0f8dd31b708acabb30435b90cd48dfafe510e648df5150d96b8 SHA512 233459ab446da6e107a7fc4ecd5668d6b08c11a11359ee76449550393e8f586a29b59d7ae09a050a1fca4fcf388ea61438ef60831b3ae802d92c048365ae3968
 DIST openldap-OPENLDAP_REL_ENG_2_5_14.tar.bz2 5024359 BLAKE2B ffdffbd47e76545c2dc2d433d290945ab6eebd910031a60249cd8f6eac24f67841098e61c7e57864428e20a183a46d36dac422bba8cf6f3596f97439875af96b SHA512 abd1e8bda0762500db028f283fe2da9480a419072927295d6f3e1448cae130592511f385a87585843cf88217417c90ef57174ca919cfcf163eb41642a72bb4e3
+DIST openldap-OPENLDAP_REL_ENG_2_5_16.tar.bz2 5022608 BLAKE2B 829e416e3cf92d36df0d6642e44083f9b288ef9c3743a84aef3f03cdf7b08b21ea45231653a2659fe0da285ca47a346d336d02c8e0dda21f039fb9e49630262b SHA512 629b92e275b69a540b200e61165492a4706afdf7b15d21bfe2f1fd4c338ecf397ad0c918e36dcef54d1f0cede2f039a8f73d4735f00e892d64ce9a177d490a07
 DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0ce9eef38601c3e64b7d40e4ca206295bee110097697c919040d2220eea6f0581812e09a2cc3e6afb4a243a5072a8a0a95f24f9fb354b SHA512 1c882a0cd0729b5d0f40b58588d0e36ae3b1cae6d569f0576e940c7c63d03c29ed2c9db87695a87594ba99a927ef4cba491bddba3ce049025fd5883463122ba7
 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c SHA512 bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST openldap-OPENLDAP_REL_ENG_2_6_5.tar.bz2 5040569 BLAKE2B d1835e560a81bc3df2eb44964162306057ad28869a1e41da7ab823460b4a33437cd385ec9448a6df9bc580afd04dff5c4680e0b91a2f16960ad2c5f3812410ba SHA512 d259ca5ac8fbdcf9bb477e24c0feaf05678ab660007164a54463a954f1b26c3f9740855d16155fa249adcb2652223fdcfc682bb4005b46a5f36e2d5cae37f158
+DIST openldap-OPENLDAP_REL_ENG_2_6_6.tar.bz2 5040213 BLAKE2B 2497b6698344674a9e8db5f2f2531541167065bb8ac9f512ecdb9349115140d5e83daef9b489e244eee08445de57599ddcfeeed71d4aab41edc58a3092910925 SHA512 3c235ff7b26f753afeb0176e95ecbf6a353bf76f00935c091323366bf97289f628d4d7b4ae3e2a31fe0797715d6c69e6704967dc79ccbae7add3023e226ad73b
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.59-r2.ebuild 29100 BLAKE2B ca062a8f8bf1b617027a64105b865aaecb27e6aa74893c0a90846521963549f7c9f16475a88666a86017a1187df664818f864948f8218b03a95b4e7efec680a0 SHA512 4983fd0f4fa12f509301dfb6b7fdc4ef34574455e37e0eb1b43cf8d8284e72338944f03d47f0746a298cecb6394e306267aeb67a3c853229efd8748c5db159b3
 EBUILD openldap-2.5.14.ebuild 27672 BLAKE2B 0a98d15609c5e14849decb8242b424459d1a7e800b69cbd72fbf14457e4aad460746229f5b83b74a552f4dda4c2964d43abc38555a8f1be8dfd1f19376ea203c SHA512 d75f2c3c158b27acfdb683ebc29cfccdc6614cae404c32573e0de31856f990cd3e57c092976f89aa9fb20107dd6bdd5aa568f8c36833e29ccba165bc62bd8e01
+EBUILD openldap-2.5.16.ebuild 27594 BLAKE2B 29b638c18ff673f300fe93264201b4a04e758d2164c1b55ba9b44afe559f62f98fab69ea0fce174a63a53380ab52f0544f1d0359c8f35ff59315b5a1345c5562 SHA512 76e43803bb72afc7e0ce7b531d95fb850d42223f52331f5f45c85a43961a65c7d09750675b01d147c390f635da396542edc46ad62dc96f50d946c0e8938d3a48
 EBUILD openldap-2.6.3-r7.ebuild 26517 BLAKE2B 4bfb0209e63f4fb00665a833d67f50a1c647bb91fd9be325a48964738ffad8bcef459e09531c9ab2b5644d1cf90abf78c385a60465a4471985314a16748a8c8a SHA512 42e2f6164fe438a97e3c2161815133318d44aecea4a85387a972dc4c25f370884b97a433a6aa0432ebd2ee23bf44462e070c8f1169af829616c0450725b54d51
 EBUILD openldap-2.6.4-r1.ebuild 27726 BLAKE2B 7dabd9de69abd47c88833c9b507a8efa8c8ab37a1911382e203b6bd96bced3f276ad6cb4a18c366be7b5b09bf40b0d573d3f5a9b749cdb0e2339bf35b0d63b01 SHA512 a66f99bbc517cc3ef6d0fb71191233278fffee92d9fbe8bfcdd44d98a11f838e60265808b0f505ecd4efad6c89dea3d0983d797bd7462a483216b4d0e93cfcca
 EBUILD openldap-2.6.4-r2.ebuild 27871 BLAKE2B 95777bb9911df08317d87ab755aeb4879b712cc4214640343e26afdca291926c2c5294d262fbee7157be5101bf5f883bbe68b3d70f04a51d6d5f46760ceb89ec SHA512 b45c5d96502b6782373ab4324740d9ca8dc118f6e1feafb3343ca516074d768cd848eeec74dd5cb027d035f6a2e41abcdc66b8db1a19e62d0249429c6e148942
 EBUILD openldap-2.6.5.ebuild 27769 BLAKE2B 5a70735ddf3afc88e7bcb41f506813a09d3095f95fbc480897b3148f0d05bc404afa5623a351f97146498e1d6fb0ae9cb1591fa4344f7d4ba44c4f3b2ffa2b4e SHA512 4466243ec8adc8fe9577fc68d3d7d7facf1120bfaade5b9965a4839edd8939f11a2ab72d26e932a2f208de573d4fc387e9c80281b0f3b382cc2273da7de89de6
+EBUILD openldap-2.6.6.ebuild 27769 BLAKE2B 5a70735ddf3afc88e7bcb41f506813a09d3095f95fbc480897b3148f0d05bc404afa5623a351f97146498e1d6fb0ae9cb1591fa4344f7d4ba44c4f3b2ffa2b4e SHA512 4466243ec8adc8fe9577fc68d3d7d7facf1120bfaade5b9965a4839edd8939f11a2ab72d26e932a2f208de573d4fc387e9c80281b0f3b382cc2273da7de89de6
 MISC metadata.xml 1316 BLAKE2B 0635123aab1a5bed9a0da918501fc5e43affe0fbd0f83f8a7e42b0292f4d5ce8231bb9d5c343c67c1011c916e78d475398c1a744b11d6f7e041ac0caed35900e SHA512 818c412cd17d1c49c7f68452fb9e2715f4441a5ff85a4e27dcb7f264c1b4d89cfa46c9d9e506b087376224cd9839e040fe63ea4149323be5c7777b54ef81716d
diff --git a/net-nds/openldap/openldap-2.5.16.ebuild b/net-nds/openldap/openldap-2.5.16.ebuild
new file mode 100644
index 000000000000..b55c20f3ef2f
--- /dev/null
+++ b/net-nds/openldap/openldap-2.5.16.ebuild
@@ -0,0 +1,860 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multilib multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+
+MY_PV="$(ver_rs 1-2 _)"
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.openldap.org/"
+SRC_URI="
+	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
+	mirror://gentoo/${BIS_P}
+"
+S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
+
+LICENSE="OPENLDAP GPL-2"
+# Subslot added for bug #835654
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
+IUSE_OVERLAY="overlays perl autoca"
+IUSE_OPTIONAL="debug gnutls iodbc ipv6 odbc sasl ssl selinux static-libs +syslog test"
+IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+RESTRICT="!test? ( test )"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( cleartext debug sasl )
+	autoca? ( !gnutls )
+	?? ( test minimal )
+	kerberos? ( ?? ( kinit smbkrb5passwd ) )"
+
+SYSTEM_LMDB_VER=0.9.31
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-fs/e2fsprogs
+		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
+		argon2? ( app-crypt/argon2:= )
+		crypt? ( virtual/libcrypt:= )
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			dev-libs/openssl:0=
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl:0=
+			kerberos? ( app-crypt/heimdal )
+		)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
+	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
+	"${FILESDIR}"/${PN}-2.6.1-flags.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		local fail=0
+
+		# This will not cover detection of cn=Config based configuration, but
+		# it's hopefully good enough.
+		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
+			eerror "    OpenLDAP >= 2.6.x has dropped support for Shell backend."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted away from backend shell!"
+			echo
+			fail=1
+		fi
+		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
+			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted to mdb!"
+			echo
+			fail=1
+		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. Check that your data is intact."
+	eerror "11. Set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# The system copy of dev-db/lmdb must match the version that this copy
+	# of OpenLDAP shipped with! See bug #588792.
+	#
+	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
+	# the bundled lmdb's header to find out the version.
+	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' libraries/liblmdb/lmdb.h || die)
+	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
+
+	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
+		eerror "Source lmdb version: ${bundled_lmdb_version}"
+		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
+		die "Ebuild needs to update SYSTEM_LMDB_VER!"
+	fi
+
+	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
+
+	local filename
+	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
+		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
+		mv "${filename}.utf8" "${filename}"
+	done
+
+	default
+
+	sed -i \
+		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
+		-e '/MKDIR.*.(DESTDIR)\/run/d' \
+		-e '/MKDIR.*.(DESTDIR).*.(runstatedir)/d' \
+		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to remove too early stripping"
+	popd &>/dev/null || die
+
+	# Fails with OpenSSL 3, bug #848894
+	# https://bugs.openldap.org/show_bug.cgi?id=10009
+	rm tests/scripts/test076-authid-rewrite || die
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+build_contrib_module() {
+	# <dir> [<target>]
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $1"
+	local target="${2:-all}"
+	emake \
+		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
+		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		"${target}"
+	popd &>/dev/null || die
+}
+
+multilib_src_configure() {
+	# Optional Features
+	myconf+=(
+		--enable-option-checking
+		$(use_enable debug)
+		--enable-dynamic
+		$(use_enable syslog)
+		$(use_enable ipv6)
+		--enable-local
+	)
+
+	# Optional Packages
+	myconf+=(
+		--without-fetch
+	)
+
+	if use experimental ; then
+		# connectionless ldap per bug #342439
+		# connectionless is a unsupported feature according to Howard Chu
+		# see https://bugs.openldap.org/show_bug.cgi?id=9739
+		# (see also bug #892009)
+		append-flags -DLDAP_CONNECTIONLESS
+	fi
+
+	if ! use minimal && multilib_is_native_abi; then
+		# SLAPD (Standalone LDAP Daemon) Options
+		# overlay chaining requires '--enable-ldap' #296567
+		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
+		myconf+=(
+			--enable-ldap=yes
+			--enable-slapd
+			$(use_enable cleartext)
+			$(use_enable crypt)
+			$(multilib_native_use_enable sasl spasswd)
+			--disable-slp
+			$(use_enable tcpd wrappers)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				# ACI build as dynamic module not supported (yet)
+				--enable-aci=yes
+			)
+		fi
+
+		for option in modules rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# static SLAPD backends
+		for backend in mdb; do
+			myconf+=( --enable-${backend}=yes )
+		done
+
+		# module SLAPD backends
+		for backend in asyncmeta dnssrv meta null passwd relay sock; do
+			# missing modules: wiredtiger (not available in portage)
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		use perl && myconf+=( --enable-perl=mod )
+
+		if use odbc ; then
+			myconf+=( --enable-sql=mod )
+			if use iodbc ; then
+				myconf+=( --with-odbc="iodbc" )
+				append-cflags -I"${EPREFIX}"/usr/include/iodbc
+			else
+				myconf+=( --with-odbc="unixodbc" )
+			fi
+		fi
+
+		use overlays && myconf+=( --enable-overlays=mod )
+		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
+		# compile-in the syncprov
+		myconf+=( --enable-syncprov=yes )
+
+		# SLAPD Password Module Options
+		myconf+=(
+			$(use_enable argon2)
+		)
+
+		# Optional Packages
+		myconf+=(
+			$(use_with systemd)
+			$(multilib_native_use_with sasl cyrus-sasl)
+		)
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-mdb
+			--disable-overlays
+			--disable-autoca
+			--disable-syslog
+			--without-systemd
+		)
+	fi
+
+	# Library Generation & Linking Options
+	myconf+=(
+		$(use_enable static-libs static)
+		--enable-shared
+		--enable-versioning
+		--with-pic
+	)
+
+	# some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		if use gnutls ; then
+			myconf+=( --with-tls="gnutls" )
+		else
+			# disable MD2 hash function
+			append-cflags -DOPENSSL_NO_MD2
+			myconf+=( --with-tls="openssl" )
+		fi
+	else
+		myconf+=( --with-tls="no" )
+	fi
+
+	tc-export AR CC CXX
+
+	ECONF_SOURCE="${S}" econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		--localstatedir="${EPREFIX}"/var \
+		--runstatedir="${EPREFIX}"/run \
+		--sharedstatedir="${EPREFIX}"/var/lib \
+		"${myconf[@]}"
+
+	# argument '--runstatedir' seems to have no effect therefore this workaround
+	sed -i \
+		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
+		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
+
+	sed -i \
+		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
+		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
+
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# we have to run it AFTER the main build, not just after the main configure
+	local myconf_ldapcpp=(
+		--with-libldap="${E}/lib"
+		--with-ldap-includes="${S}/include"
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS="${LDFLAGS}"
+	local CPPFLAGS="${CPPFLAGS}"
+
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+
+	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
+	popd &>/dev/null || die "popd contrib/ldapc++"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			build_contrib_module "passwd" "pw-kerberos.la"
+		fi
+
+		if use pbkdf2; then
+			build_contrib_module "passwd/pbkdf2"
+		fi
+
+		if use sha2 ; then
+			build_contrib_module "passwd/sha2"
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		build_contrib_module "passwd" "pw-netscape.la"
+
+		#build_contrib_module "acl" "posixgroup.la" # example code only
+		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
+		build_contrib_module "addpartial"
+		build_contrib_module "allop"
+		build_contrib_module "allowed"
+		build_contrib_module "autogroup"
+		build_contrib_module "cloak"
+		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop"
+		build_contrib_module "dsaschema"
+		build_contrib_module "dupent"
+		build_contrib_module "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod"
+		build_contrib_module "noopsrch"
+		#build_contrib_module "nops" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" RESO:LATER
+		build_contrib_module "trace"
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		$(tc-getCC) -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CPPFLAGS} \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		pwd
+
+		# Increase various test timeouts/delays, bug #894012
+		# We can't just double everything as there's a cumulative effect.
+		export SLEEP0=2 # originally 1
+		export SLEEP1=10 # originally 7
+		export SLEEP2=20 # originally 15
+		export TIMEOUT=16 # originally 8
+
+		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
+		# emake partests => runs ALL of the tests in parallel
+		# wt/WiredTiger is not supported in Gentoo
+		TESTS=( lloadd mdb )
+		#TESTS+=( pldif ) # not done by default, so also exclude here
+		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
+
+		emake -Onone "${TESTS[@]}"
+	fi
+}
+
+multilib_src_install() {
+	emake CC="$(tc-getCC)" \
+		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		einfo "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
+
+		if use systemd; then
+			# The systemd unit uses Type=notify, so it is useless without USE=systemd
+			einfo "Install systemd service"
+			rm -rf "${ED}"/{,usr/}lib/systemd
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
+			systemd_dounit "${T}"/slapd.service
+			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+		fi
+
+		# if built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			libtool --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		if use systemd; then
+			tmpfiles_process slapd.conf
+		fi
+
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+}
diff --git a/net-nds/openldap/openldap-2.6.6.ebuild b/net-nds/openldap/openldap-2.6.6.ebuild
new file mode 100644
index 000000000000..b8aa589bf011
--- /dev/null
+++ b/net-nds/openldap/openldap-2.6.6.ebuild
@@ -0,0 +1,870 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Re cleanups:
+# 2.5.x is an LTS release so we want to keep it for a while.
+
+inherit autotools flag-o-matic multibuild multilib multilib-minimal preserve-libs
+inherit ssl-cert toolchain-funcs systemd tmpfiles
+
+MY_PV="$(ver_rs 1-2 _)"
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.openldap.org/"
+SRC_URI="
+	https://gitlab.com/openldap/${PN}/-/archive/OPENLDAP_REL_ENG_${MY_PV}/${PN}-OPENLDAP_REL_ENG_${MY_PV}.tar.bz2
+	mirror://gentoo/${BIS_P}
+"
+S="${WORKDIR}"/${PN}-OPENLDAP_REL_ENG_${MY_PV}
+
+LICENSE="OPENLDAP GPL-2"
+# Subslot added for bug #835654
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE_DAEMON="argon2 +cleartext crypt experimental minimal samba tcpd"
+IUSE_OVERLAY="overlays perl autoca"
+IUSE_OPTIONAL="debug gnutls iodbc odbc sasl ssl selinux static-libs +syslog test"
+IUSE_CONTRIB="kerberos kinit pbkdf2 sha2 smbkrb5passwd"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="systemd ${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( cleartext sasl )
+	autoca? ( !gnutls )
+	?? ( test minimal )
+	kerberos? ( ?? ( kinit smbkrb5passwd ) )
+"
+
+SYSTEM_LMDB_VER=0.9.31
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!gnutls? (
+			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libevent:=
+		dev-libs/libltdl
+		sys-fs/e2fsprogs
+		>=dev-db/lmdb-${SYSTEM_LMDB_VER}:=
+		argon2? ( app-crypt/argon2:= )
+		crypt? ( virtual/libcrypt:= )
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			dev-libs/openssl:0=
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl:0=
+			kerberos? ( app-crypt/heimdal )
+		)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+		)
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+BDEPEND="
+	!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+	)
+"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+	"${FILESDIR}"/${PN}-2.6.1-system-mdb.patch
+	"${FILESDIR}"/${PN}-2.6.1-cloak.patch
+	"${FILESDIR}"/${PN}-2.6.1-flags.patch
+	"${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${EROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	# TODO: remove this as we dropped bdb support (gone upstream) in 2.6.1?
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		local fail=0
+
+		# This will not cover detection of cn=Config based configuration, but
+		# it's hopefully good enough.
+		if grep -sq '^backend.*shell' "${EROOT}"/etc/openldap/slapd.conf; then
+			eerror "    OpenLDAP >= 2.5.x has dropped support for Shell backend."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted away from backend shell!"
+			echo
+			fail=1
+		fi
+		if has_version "${CATEGORY}/${PN}[berkdb]" || grep -sq '^backend.*(bdb|hdb)' /etc/openldap/slapd.conf; then
+			eerror "	OpenLDAP >= 2.5.x has dropped support for Berkeley DB."
+			eerror "	You will need to migrate per upstream's migration notes"
+			eerror "	at https://www.openldap.org/doc/admin25/appendix-upgrading.html."
+			eerror "	Your existing database will not be accessible until it is"
+			eerror "	converted to mdb!"
+			echo
+			fail=1
+		elif [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. grep -E -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. Check that your data is intact."
+	eerror "11. Set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# The system copy of dev-db/lmdb must match the version that this copy
+	# of OpenLDAP shipped with! See bug #588792.
+	#
+	# Fish out MDB_VERSION_MAJOR/MDB_VERSION_MINOR/MDB_VERSION_PATCH from
+	# the bundled lmdb's header to find out the version.
+	local bundled_lmdb_version=$(sed -En '/^#define MDB_VERSION_(MAJOR|MINOR|PATCH)(\s+)?/{s/[^0-9.]//gp}' \
+		libraries/liblmdb/lmdb.h || die)
+	printf -v bundled_lmdb_version "%s." ${bundled_lmdb_version}
+
+	if [[ ${SYSTEM_LMDB_VER}. != ${bundled_lmdb_version} ]] ; then
+		eerror "Source lmdb version: ${bundled_lmdb_version}"
+		eerror "Ebuild lmdb version: ${SYSTEM_LMDB_VER}"
+		die "Ebuild needs to update SYSTEM_LMDB_VER!"
+	fi
+
+	rm -r libraries/liblmdb || die 'could not removed bundled lmdb directory'
+
+	local filename
+	for filename in doc/drafts/draft-ietf-ldapext-acl-model-xx.txt; do
+		iconv -f iso-8859-1 -t utf-8 "${filename}" > "${filename}.utf8"
+		mv "${filename}.utf8" "${filename}"
+	done
+
+	default
+
+	sed -i \
+		-e "s:\$(localstatedir)/run:${EPREFIX}/run:" \
+		-e '/MKDIR.*.(DESTDIR)\/run/d' \
+		servers/slapd/Makefile.in || die 'adjusting slapd Makefile.in failed'
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to remove too early stripping"
+	popd &>/dev/null || die
+
+	# Fails with OpenSSL 3, bug #848894
+	# https://bugs.openldap.org/show_bug.cgi?id=10009
+	rm tests/scripts/test076-authid-rewrite || die
+
+	eautoreconf
+	multilib_copy_sources
+}
+
+build_contrib_module() {
+	# <dir> [<target>]
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $1"
+	local target="${2:-all}"
+	emake \
+		LDAP_BUILD="${BUILD_DIR}" prefix="${EPREFIX}/usr" \
+		CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+		"${target}"
+	popd &>/dev/null || die
+}
+
+multilib_src_configure() {
+	# Optional Features
+	myconf+=(
+		--enable-option-checking
+		$(use_enable debug)
+		--enable-dynamic
+		$(use_enable syslog)
+		--enable-ipv6
+		--enable-local
+	)
+
+	# Optional Packages
+	myconf+=(
+		--without-fetch
+	)
+
+	if use experimental ; then
+		# connectionless ldap per bug #342439
+		# connectionless is a unsupported feature according to Howard Chu
+		# see https://bugs.openldap.org/show_bug.cgi?id=9739
+		# (see also bug #892009)
+		append-flags -DLDAP_CONNECTIONLESS
+	fi
+
+	if ! use minimal && multilib_is_native_abi; then
+		# SLAPD (Standalone LDAP Daemon) Options
+		# overlay chaining requires '--enable-ldap' #296567
+		# see https://www.openldap.org/doc/admin26/overlays.html#Chaining
+		myconf+=(
+			--enable-ldap=yes
+			--enable-slapd
+			$(use_enable cleartext)
+			$(use_enable crypt)
+			$(multilib_native_use_enable sasl spasswd)
+			--disable-slp
+			$(use_enable tcpd wrappers)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				# ACI build as dynamic module not supported (yet)
+				--enable-aci=yes
+			)
+		fi
+
+		for option in modules rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# static SLAPD backends
+		for backend in mdb; do
+			myconf+=( --enable-${backend}=yes )
+		done
+
+		# module SLAPD backends
+		for backend in asyncmeta dnssrv meta null passwd relay sock; do
+			# missing modules: wiredtiger (not available in portage)
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		use perl && myconf+=( --enable-perl=mod )
+
+		if use odbc ; then
+			myconf+=( --enable-sql=mod )
+			if use iodbc ; then
+				myconf+=( --with-odbc="iodbc" )
+				append-cflags -I"${EPREFIX}"/usr/include/iodbc
+			else
+				myconf+=( --with-odbc="unixodbc" )
+			fi
+		fi
+
+		use overlays && myconf+=( --enable-overlays=mod )
+		use autoca && myconf+=( --enable-autoca=mod ) || myconf+=( --enable-autoca=no )
+		# compile-in the syncprov
+		myconf+=( --enable-syncprov=yes )
+
+		# Build the standalone load balancer (lloadd) - also available as a slapd module; --enable-balancer=mod
+		myconf+=( --enable-balancer=yes )
+
+		# SLAPD Password Module Options
+		myconf+=(
+			$(use_enable argon2)
+		)
+
+		# Optional Packages
+		myconf+=(
+			$(use_with systemd)
+			$(multilib_native_use_with sasl cyrus-sasl)
+		)
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-mdb
+			--disable-overlays
+			--disable-autoca
+			--disable-syslog
+			--without-systemd
+		)
+	fi
+
+	# Library Generation & Linking Options
+	myconf+=(
+		$(use_enable static-libs static)
+		--enable-shared
+		--enable-versioning
+		--with-pic
+	)
+
+	# some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		if use gnutls ; then
+			myconf+=( --with-tls="gnutls" )
+		else
+			# disable MD2 hash function
+			append-cflags -DOPENSSL_NO_MD2
+			myconf+=( --with-tls="openssl" )
+		fi
+	else
+		myconf+=( --with-tls="no" )
+	fi
+
+	tc-export AR CC CXX
+
+	ECONF_SOURCE="${S}" econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		--localstatedir="${EPREFIX}"/var \
+		--runstatedir="${EPREFIX}"/run \
+		--sharedstatedir="${EPREFIX}"/var/lib \
+		"${myconf[@]}"
+
+	# argument '--runstatedir' seems to have no effect therefore this workaround
+	sed -i \
+		-e 's:^runstatedir=.*:runstatedir=${EPREFIX}/run:' \
+		configure contrib/ldapc++/configure contrib/ldaptcl/configure || die 'could not set runstatedir'
+
+	sed -i \
+		-e "s:/var/run/sasl2/mux:${EPREFIX}/run/sasl2/mux:" \
+		doc/guide/admin/security.sdf || die 'could not fix run path in doc'
+
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# we have to run it AFTER the main build, not just after the main configure
+	local myconf_ldapcpp=(
+		--with-libldap="${E}/lib"
+		--with-ldap-includes="${S}/include"
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die "could not create ${BUILD_DIR}/contrib/ldapc++ directory"
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS="${LDFLAGS}"
+	local CPPFLAGS="${CPPFLAGS}"
+
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs -L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+
+	ECONF_SOURCE="${S}"/contrib/ldapc++ econf "${myconf_ldapcpp[@]}"
+	popd &>/dev/null || die "popd contrib/ldapc++"
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="$(tc-getCC)" SHELL="${EPREFIX}"/bin/sh
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="$(tc-getCC)" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			build_contrib_module "passwd" "pw-kerberos.la"
+		fi
+
+		if use pbkdf2; then
+			build_contrib_module "passwd/pbkdf2"
+		fi
+
+		if use sha2 ; then
+			build_contrib_module "passwd/sha2"
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		build_contrib_module "passwd" "pw-netscape.la"
+
+		#build_contrib_module "acl" "posixgroup.la" # example code only
+		#build_contrib_module "acl" "gssacl.la" # example code only, also needs kerberos
+		build_contrib_module "addpartial"
+		build_contrib_module "allop"
+		build_contrib_module "allowed"
+		build_contrib_module "autogroup"
+		build_contrib_module "cloak"
+		# build_contrib_module "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop"
+		build_contrib_module "dsaschema"
+		build_contrib_module "dupent"
+		build_contrib_module "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod"
+		build_contrib_module "noopsrch"
+		#build_contrib_module "nops" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" RESO:LATER
+		build_contrib_module "trace"
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		$(tc-getCC) -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CPPFLAGS} \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		pwd
+
+		# Increase various test timeouts/delays, bug #894012
+		# We can't just double everything as there's a cumulative effect.
+		export SLEEP0=2 # originally 1
+		export SLEEP1=10 # originally 7
+		export SLEEP2=20 # originally 15
+		export TIMEOUT=16 # originally 8
+
+		# emake test => runs only lloadd & mdb, in serial; skips ldif,sql,wt,regression
+		# emake partests => runs ALL of the tests in parallel
+		# wt/WiredTiger is not supported in Gentoo
+		TESTS=( plloadd pmdb )
+		#TESTS+=( pldif ) # not done by default, so also exclude here
+		#use odbc && TESTS+=( psql ) # not done by default, so also exclude here
+
+		emake -Onone "${TESTS[@]}"
+	fi
+}
+
+multilib_src_install() {
+	emake CC="$(tc-getCC)" \
+		DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.6.3-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		einfo "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" \
+			-i "${configfile}" || die
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.6.1 slapd
+
+		if use systemd; then
+			# The systemd unit uses Type=notify, so it is useless without USE=systemd
+			einfo "Install systemd service"
+			rm -rf "${ED}"/{,usr/}lib/systemd
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-2.6.1.service > "${T}"/slapd.service || die
+			systemd_dounit "${T}"/slapd.service
+			systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+			newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+		fi
+
+		# if built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			libtool --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		if use systemd; then
+			tmpfiles_process slapd.conf
+		fi
+
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.4$(get_libname 0)
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4146fe8c6a1f..b5bb51816b4a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 4a182f26a5be..99b93399205e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3152,6 +3152,7 @@ games-rpg/the-longest-journey:hd - Install high definition backgrounds and sprit
 games-rpg/the-longest-journey:hd-fmv - Install upscaled full motion videos
 games-rpg/to-the-moon:bundled-libs - Use bundled libraries
 games-simulation/corsix-th:midi - Adds support for background MIDI music via SDL_mixer
+games-simulation/corsix-th:tools - Build tools for decoding RNC files
 games-simulation/flightgear:dbus - Enable screensaver DBus interaction
 games-simulation/flightgear:gdal - Enable alternative terrain engine based on pagedLOD using sci-libs/gdal
 games-simulation/flightgear:qt5 - Build Qt5 launcher application
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index f9cad42fd515..aa80a5c2962d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 57560f557ad4..5d7f1cf49de3 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce
 EBUILD caffe2-2.0.0-r4.ebuild 5292 BLAKE2B f0560c057af3e24e81e4538f4ef6f35eba6b3e70a435c00be0e08aed40e1991997beea05127e195fcefe019147b10ca74c338e3b5a1b8bd61c631b680805a587 SHA512 4556d43911ca5fd8438d603529cf74bde4ec8ac30b9e7a45debab2252a9a8db53dde09b20d1be08a76f90dc783bd70401b1252427da6556d6c3e7d487b656345
-EBUILD caffe2-2.0.1-r2.ebuild 5341 BLAKE2B dbd68dc9ec032f17ccf06050fe0e181ac38187d93d3e7a697c6c1ae0cc06446fd15643ef05d37fcc99f22c07f9818545b6ec445666ca5bd9002d6c740c6fa07a SHA512 825942421b3c7fec44ea308d112aa92a4b95b70420fdea2aaa5e1bfb76204764060dd62bc29d709b557d7afd22083d8291b55e864397d448f9734892f8d73f8e
+EBUILD caffe2-2.0.1-r3.ebuild 5831 BLAKE2B a268da70eb7885d37e961197c97764f4182c8478a80b220333fe68f0fa3fea6976ce4ccd36c7ddafd862d2edd36ba352e7a05bf6af5d985973af2d869ca9afc6 SHA512 8c3b740da1dbe333f37e5d982d2f2f2347f3332ebbf9172dd95d571c7410bd539e631fc5bc100a7e8217bfd1cd92505cf55f8e809f7f8a4e0a47162e1b98218c
 MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126
diff --git a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
index b8f88ae63e41..29087a44643f 100644
--- a/sci-libs/caffe2/caffe2-2.0.1-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.0.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-single-r1 cmake cuda flag-o-matic
+inherit python-single-r1 cmake cuda flag-o-matic prefix
 
 MYPN=pytorch
 MYP=${MYPN}-${PV}
@@ -97,6 +97,20 @@ src_prepare() {
 	pushd torch/csrc/jit/serialization || die
 	flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die
 	popd
+	# prefixify the hardcoded paths, after all patches are applied
+	hprefixify \
+		aten/CMakeLists.txt \
+		caffe2/CMakeLists.txt \
+		cmake/Metal.cmake \
+		cmake/Modules/*.cmake \
+		cmake/Modules_CUDA_fix/FindCUDNN.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \
+		cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \
+		cmake/public/LoadHIP.cmake \
+		cmake/public/cuda.cmake \
+		cmake/Dependencies.cmake \
+		torch/CMakeLists.txt \
+		CMakeLists.txt
 }
 
 src_configure() {
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c8d39bd87d24..cd2a72c74059 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -5,5 +5,5 @@ DIST gdal-3.7.0.tar.xz 8604724 BLAKE2B 400cc17fc636c637f7c40e93aed8e2db7bfbbe737
 DIST gdalautotest-3.6.4.tar.gz 12614090 BLAKE2B d2c33b56790c1cb030a102ff48bec33c3d187c5be6e13d56da8d6cb8e9393734c2144274cbe08cf82b2a023ffb75df9fd01bcfd9f3d73076c95c4b213823f64e SHA512 2a7704e57f8bc0687c759d047b5a8fb290b2959eb058e02b08edf12e9cca17d6a9121213ef48e8b616c94c8cbe321531612700c6db52cb47fbcc5893c1c1c1c1
 DIST gdalautotest-3.7.0.tar.gz 13785892 BLAKE2B cac18436ad2acb558e27e8ba3f1f2c22aa6c7ba258abe25118acf65fb2cb8a3d5f132ccb8315912a54d07f035b5ff331cf6a66bdf51a54c8275c5203e844eb82 SHA512 81e80c799a8a910a861182480e8306c8583cdffe7cb62f47fbaddf031e1c4d1d3fb341edf0daddbb8c934e5f2d547b380feb2f5a9f22cd50db14e43c2b02737b
 EBUILD gdal-3.6.4.ebuild 6772 BLAKE2B 63e9d689bfbb54948a43756f47acb6aec7030f4fffda1fd5f2ca8d6a8ea9e2aa93ffe7e1c18404ec58e66ba9f94f648f004c7aa4497e1e2cdb9647c0bbd8bd79 SHA512 735ff9adbbc31ee5ac934a832637b35db99e9b64e67110c014a958f485692ae1e2d479bc2642bf35924e38bc3306c086386ae031b783ae03b1938f7586dff750
-EBUILD gdal-3.7.0.ebuild 7536 BLAKE2B a42af154dc1a0a8f816bd7bdb33d5e3b50cd1dfb10947fc6f3cbe48f9613df34a684251264842832b65050ca13a46dd5e78dce495c4adfdddc552ca048eaab28 SHA512 2d38a05d0a2b3a90b2e46ad3d4800c358d8587bc681644686a7b20e05f6958f8dac5176f7e4c932890588d17aa4db11c6e1b8d7e9a76440fa76c5aadc97b20d8
+EBUILD gdal-3.7.0.ebuild 7534 BLAKE2B 4df623ee5633720b2e44e4110410137bcff165b9d4302fbda11baade43a4a2d47faff4c5b332b382c3ee2fa37f3f1ab27ae77f9c398edcc0013ddac5e1ec2af2 SHA512 2971c2c703850337f2086dd305d8ec6b3d2c322b1629edd0f35edb54a1bfdd97bac16f354b7fee8d5cefb94fd0023b5ed334a237e5a390b46e8bcc1e901439b0
 MISC metadata.xml 1348 BLAKE2B 6666f26bc5f48bbfe1971736c6737420fefa7949cd6e1b74c649ae53cb51b756ebba42bb934930af83de254bebc4e4268f60a04ed2fb1aa8835b9abbdb3968b2 SHA512 b5b90368a48679c780dbe89b73ddee9e2c74639bf1a2c9f39dd4a3cdbb005878cd2197271f2ddc23d9611feaf79c0239b32d655d8a29592ad6d87a402970b726
diff --git a/sci-libs/gdal/gdal-3.7.0.ebuild b/sci-libs/gdal/gdal-3.7.0.ebuild
index 678382fc22d1..70f7cabb254a 100644
--- a/sci-libs/gdal/gdal-3.7.0.ebuild
+++ b/sci-libs/gdal/gdal-3.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" test? ( https://download.osgeo.org/${PN}/${PV}/${PN}autotest-${PV}.ta
 
 LICENSE="BSD Info-ZIP MIT"
 SLOT="0/33" # subslot is libgdal.so.<SONAME>
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +curl cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mysql netcdf odbc ogdi opencl oracle pdf png postgres python spatialite sqlite test webp xls zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index e7b66cd957ee..4436dce9d011 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -11,5 +11,5 @@ DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9
 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43
 EBUILD pytorch-1.13.1-r2.ebuild 1512 BLAKE2B a83a2846755b3ad3dc62329f77b04e73be1f5a79a3c3e2311a61c0965c50a17a83deac89c22ce26470be415c0c48a760f1b74c207e6864a16aead25e42896867 SHA512 55a6ed013855c4d20fad0bb213e51b2881d0b7c3e456055800b16658f92460d998294148d041dba642a11be1a60d5d830edf8613cc09cdf9ce6eef7ecc809976
 EBUILD pytorch-2.0.0.ebuild 1549 BLAKE2B f347c1bb89ff80f4cec2f6d5ca27134c3936f02d80a285d2df88c7472e62dcdb025f72d7f88820bbda2422dd0810db2b53017fc91fdedd2cbb5a1880f79d0d74 SHA512 19e390bcb88b81d5eda1f143bcadce730e2c02776dbcad4327f36b0b61beb2932973ee6352bddd27da2fd030a8626fb6687abccff0cb503d159019006264f7d3
-EBUILD pytorch-2.0.1.ebuild 1593 BLAKE2B ca17265a2c32f5775289601cfd14730cb77cb819ae40a52011025886b3796d351e03fd58af413355272b4975fb9fef15ad769a6bb5106876e389a539cb5346fb SHA512 dafdc920d72b559d8cd8a77b5a13002e556fe5a85927c7f8233be2da4eb7618da20abe8f65929877f51bb5cbf14671df4de26abbfa50add82a970ad144c4d5fd
+EBUILD pytorch-2.0.1-r1.ebuild 1640 BLAKE2B f29660c3bf423ba697862d9ccc3bf3ac0f958d4fbc5c4dbeac0860ad5cf8e0c0675def1cd9eb4c0d26a7485baa33481f36a2e2da73d89c00a98cad595fabf8e0 SHA512 21325abae79b7c816822b5605c050d4c05be5b0303ffbbf6497907c5ff6f0c9321d30e9857d008e08697169823e31c297273d5ea31c759fa3f144242d37300ca
 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2
diff --git a/sci-libs/pytorch/pytorch-2.0.1.ebuild b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
index b778dcb357c3..11f7d447a1e1 100644
--- a/sci-libs/pytorch/pytorch-2.0.1.ebuild
+++ b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_EXT=1
-inherit distutils-r1
+inherit distutils-r1 prefix
 
 DESCRIPTION="Tensors and Dynamic neural networks in Python"
 HOMEPAGE="https://pytorch.org/"
@@ -49,6 +49,8 @@ src_prepare() {
 		tools/setup_helpers/env.py \
 		|| die
 	distutils-r1_src_prepare
+
+	hprefixify tools/setup_helpers/env.py
 }
 
 src_compile() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b0a196756a36..c5976c350f35 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 267e8dd2654e..79cbd4c07652 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,7 +1,5 @@
 DIST pv-1.6.20.tar.bz2 115310 BLAKE2B b50623f623231e8e8615f960bad83d10e12d5274c57d23ea843d16fce30b3e690284b2d9b01f82a16b9790e2bf26f80f560e226589a62ca677a2cf90ea007691 SHA512 e445f91b298ed285ddab54a3f8a6b5d5297e2e2eb8ad7b2ee2cbacca4adda9c6ca2bf3c77bf2a93373d3875c5b3b0b345d3945cbd91fc2647c6c25f1661a6752
-DIST pv-1.7.0.tar.bz2 115665 BLAKE2B efdd0434d23fe1ed008224fe0fe5182684010a78650284e920b2cd93134f08e63172df0279b8a4b2c2c4dceb9dbdaa209e402394fb1c4c431d991225f579f718 SHA512 b90ddaa1f950b1b300f1721e5ab8bc2c7a0c46491e439ce33c7b74fd4525e730a99c218a874b3dae2dc3a8a5e0eb5c5add51f7c8be48d0c3d8f135df44779af8
-DIST pv-1.7.18.tar.bz2 133583 BLAKE2B b81a5d9b41e247bed5b390050678afde3611a34030b2dd76d28635d9f580f86e925c08b2a01c60126b5ac971e1dfb20ecf6562b1140bfb57ed052b0416ffc39e SHA512 4f69d1c046cae279a4e93f87b0848dfd34a9a50b8654274e1cd11dc58198e1be216451bc3af2664c336e0d231a7451dc831cc09291eb1d4f0fd0e02abc6eccea
+DIST pv-1.7.24.tar.gz 160435 BLAKE2B a6cff613ac99294d70d1347e78625d838873740d2251802b461a29de28d9c2dda8ebc1fd0a8807fc420c8faf846bc8afc7c6f3e551ff243f02fa5e9ab3caf53e SHA512 46310e2d297bef1a8a7cbf2a23b2e19b21e367902de6cf759fb1a58275e0351d1f6f1ae101a32acaaa579a16c18ed49b116e58f158c87be527533ebacabd7671
 EBUILD pv-1.6.20.ebuild 1456 BLAKE2B 055fc1d118f5f5500e3fb453d94ae40c0db8389425df249cd2cc8d9303db9a113a13d324c1b2f53d993ce455eaaaa695bc542a4c53f5bc2564d314ffbe76721d SHA512 583e35041a54b3123c757acad234afb053d00703e8b8a57efb680fc76d7738485f30d0aed94ad31bbd9d4a4db7356b72a0628ec74fffaa3388af8b7e3abf54a3
-EBUILD pv-1.7.0.ebuild 1597 BLAKE2B 59992824f88bf9301d94434d9e00b715ab2b4f02e9b185873cf6ade7b3e2734a3c57ea4b26c0eb3dc6e3bacb15158d2e79a31ef38f813b28c6a197ae29247165 SHA512 a6af96cc2f820081221ec2ab2923b2c1cd84a3fd9ed29999cfc104501be813ac52c14a361b25ae4c0ba8b1caaa9d9f2ffb39ae426de9ec82e5c6c6036e3ce667
-EBUILD pv-1.7.18.ebuild 1373 BLAKE2B dbac58ccf8b62091436af91b04d30e7fea33f41a9b95df9fc9b349116bc123f4d5d8fcb1fb1da24a7d9db0b15397ef62a7ee6c4fd797963572c0e3f4f2e3ec2e SHA512 a3e76210c0614f46e74dc584d52f2e8fe10911135d6d91eed298daef0a741bc9db33c141d5a7738921dd39ef5b75b1b2d6245be79e516b04e6749bdf2502598e
-MISC metadata.xml 483 BLAKE2B c6240298c7a79c7d5839c593b0139c990477ce67aeb92b585bbb09a07d51bbe9bd75aaeac678ddd81c05cc6f9e36860ad8cfc889204e835019f854477a5bc7bf SHA512 082cac9d7bcff373929e3c0a7af524b65c48cc427755232f981ccd4947466f2f3325a75f691f1bf79e74eebde3e53b4ebd4c904b40affc0d7fbd243f8ab36605
+EBUILD pv-1.7.24.ebuild 1372 BLAKE2B bb70045de27d694c114eb35a22b6ed63bcd03a7cf6476d0486075f752c113d1eb3897165b8fd90ec61a9e2958b02c0411f860b02a3f1d89bed942c403ed3b9ef SHA512 c8c9bb1909b21a4e80e70b26a495692f286daf494fe2ef2c6d528a94ceacdf51fd69c688958f35df09c2d4e6e7efb28fb0099856388565efb870d8880ff9a748
+MISC metadata.xml 428 BLAKE2B ea3ddd8e39479bded00408edd790a1015656e0c8bed1f771e8d5ed309ff4ff4a1a5055b9b376af1aa22f8bdd84a695ed953170cdc0a2da47876588e37416f771 SHA512 fb7ff3b1fa39adb2313e316516ae8754dc9117ab2dcc9ba144d8c7a13f0a1282b9b6d1a64cac8ef80bcd0f8fd10b5afd92aedd57e7304c1486f32ceb1f99de22
diff --git a/sys-apps/pv/metadata.xml b/sys-apps/pv/metadata.xml
index 882536d8820c..2f5983aa7822 100644
--- a/sys-apps/pv/metadata.xml
+++ b/sys-apps/pv/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Sam James</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">pipeviewer</remote-id>
 		<remote-id type="github">a-j-wood/pv</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pv/pv-1.7.0.ebuild b/sys-apps/pv/pv-1.7.0.ebuild
deleted file mode 100644
index d13550cbb754..000000000000
--- a/sys-apps/pv/pv-1.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="de fr pl pt"
-PLOCALE_BACKUP="en"
-inherit flag-o-matic linux-info toolchain-funcs plocale
-
-DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
-HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug nls"
-
-DOCS=( README.md doc/NEWS.md doc/TODO.md )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	stat64 # See https://github.com/a-j-wood/pv/issues/69
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="~SYSVIPC"
-		ERROR_SYSVIPC="You will need to enable CONFIG_SYSVIPC in your kernel to use the --remote option."
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i configure -e 's|CFLAGS="-g -Wall"|:|g' || die
-
-	# These should produce the same end result (working `pv`).
-	sed -i \
-		-e 's:$(LD) $(LDFLAGS) -o:$(AR) rc:' \
-		autoconf/make/modules.mk~ || die
-
-	sed -i -e 's:usleep 200000 || ::g' tests/019-remote-cksum || die
-
-	disable_locale() {
-		local locale=${1}
-		sed -i configure -e "/ALL_LINGUAS=/s:${locale}::g" || die
-	}
-
-	plocale_find_changes src/nls '' '.po'
-	plocale_for_each_disabled_locale disable_locale
-}
-
-src_configure() {
-	tc-export AR
-
-	# Workaround for https://github.com/a-j-wood/pv/issues/69
-	append-lfs-flags
-
-	econf \
-		--enable-lfs \
-		$(use_enable debug debugging) \
-		$(use_enable nls)
-}
diff --git a/sys-apps/pv/pv-1.7.18.ebuild b/sys-apps/pv/pv-1.7.24.ebuild
index e42a3b03fad0..2888d46d4234 100644
--- a/sys-apps/pv/pv-1.7.18.ebuild
+++ b/sys-apps/pv/pv-1.7.24.ebuild
@@ -9,7 +9,7 @@ inherit linux-info toolchain-funcs plocale
 
 DESCRIPTION="Pipe Viewer: a tool for monitoring the progress of data through a pipe"
 HOMEPAGE="https://www.ivarch.com/programs/pv.shtml"
-SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.bz2"
+SRC_URI="https://www.ivarch.com/programs/sources/${P}.tar.gz"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 76c49d4110b4..703eb73260b1 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index ae8d2a5dff2e..f6f32541a0d0 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -100,106 +100,106 @@ DIST firefox-102.13.0esr-vi.xpi 611417 BLAKE2B e67df605c3f3a94f34d82c87df46d25cc
 DIST firefox-102.13.0esr-xh.xpi 427930 BLAKE2B e7c691d36360e7d6353bf0e183cc08b64b0f7758411e37c7b5324511236f4f55957ee2120b6d2a7e11cef779af4927ccb535f2a052d3def6c108b76dc984cd39 SHA512 721c3b68e7af4712230f9be29222c73b9380907778ca7af2e26e0886fee583b4c01508aaada6cbf622b7d72184a18b7cb2f623f7e41917642757d908734f47d4
 DIST firefox-102.13.0esr-zh-CN.xpi 613299 BLAKE2B 315e07eb480c9374e5d9dbd963f72f750757fac9aafd902e47b77fc0d8707c72f509b0aa420a40dfa2edd94f873d965265d12f949338c753df367e154938ac0c SHA512 4c1baaabda6bbf5d06476d49aad5b000410b0af71b81140aae3f6e5d6299427b99b1d1e60075f05b95a430f10cf5e55932a6c071704e61831fb596bd60c900c1
 DIST firefox-102.13.0esr-zh-TW.xpi 614569 BLAKE2B 68fdce9b0ece08978f8d514451a86a562e5d0cd7d9f0d1d99396013ec408eb6996206e8cbae4ebeba9be992da8b15b74076e875a05fa8a01d5bd1fe8471a0ac8 SHA512 70fd7d18b6662a328c8b1503adf27b42c9cd515a07eae325d56325aa459a5af84222779311d9162974b5763469e5c3e28c27833b72ca8155bfedf6d81d4315e4
-DIST firefox-115.0.2-ach.xpi 469325 BLAKE2B a2989debc49362fabba6dc6d7d47cb4fb65aeb898e52e45d7ecb7bd7b5343c94600adad3e614f57c14491cc5c62e3dedf38839b8b06fcdf0dc1f62d220953d4b SHA512 373ad7914d4cf2348faa21f8539bbea2583d8e35bc00c647d8c68bfdaf59f67dc9aa413d62d45c1f4ddc120d92e854cec34721d5e4238f3abeb1fda95970c3bb
-DIST firefox-115.0.2-af.xpi 430126 BLAKE2B 87f2a05edc259b463261be7e6115df4a69facce3b49c766f7b3f55b6f3540ddd4e3c24b880e2f4da054fc5fa004ac7bde1bc6627f9804282e9b28a7e3f0577fa SHA512 2e79fd92f8ef924aae69cfabe86aabaf0cd9aca96e37e651fee5981a22336fed801a490ce0b4cf74e41966a24f88148384eec2b36054b35ec0a5c38b5f055b84
-DIST firefox-115.0.2-an.xpi 514826 BLAKE2B 32441bf332e8e5aa66c6df851084c6dfb28faa5fa1bd45b46ef6fba15882694d689314109482027402fb8fffe9fc3a037a2ee3a185450096dd339e871b230989 SHA512 c462a6e9cd53db577ea705801c4492fd9cf74ce0a218bc13d828591caddc8a9ff1811a0c404bb97ac0a0152abc9e811dd4d7eac285242b7361275c785dec99cf
-DIST firefox-115.0.2-ar.xpi 583866 BLAKE2B 63bedd4422ab32507b140d75cd4a2ffface755e05e517ede985a33e7527bee3b177cd5b9d9b528031ab4b3f1bfd114282f07a4be28f0460c02cd8a2f23a619e1 SHA512 a77b2633b73a1fdf12a5976393138439ee570827b7d46f4621671af65e0ae6fa4cf43d9750c67754df8d8697faeeb2ab50fa68ed73a91f0f6f89b4067a050bed
-DIST firefox-115.0.2-ast.xpi 496707 BLAKE2B f69c446391774c52e5b166602dc7b4fd16ae91a3acbce8161b45016c0152052fcf9e3670953421f0af2932272c9d4cbb0d1d15679a1613a0af4f07950b4c6e2c SHA512 25a593d4acddac84b8c5695e9ca717170edb2a6d767b2e838d796c217ac96bd065f16d49952963d362e8c96af5b03a32b6003fd74f767e0a0435a6ae7b572102
-DIST firefox-115.0.2-az.xpi 501990 BLAKE2B 9ee2a25ae11d0dc2da4e0601a14bddcd8762c3759312261af473161c67f80908e266ed21f35ea2fcb24adf648b592605741856175077a41f8ccdd93ffa4c4a57 SHA512 6afcc1a5c2884b60cc0f92319bd75f881c6b797f1652adab9a66ca5a1df208221eceae5ed925606f166f59885e172697b080cd51db7139e6f89a2d1aada7dcb2
-DIST firefox-115.0.2-be.xpi 686956 BLAKE2B 95a0635ae23590a8026edb45fff7245b240deccfbac1a7e7b0d3cdbc37f45cb62d5ac4c2dbb657fcfaa06e1a5915763b3037bf174605d113396a901c72520dfd SHA512 3ca9fc2fb5ff86f17a44362e36ab8c73bc6c65063c05b80cb869223b9d65d6ba5d1575ed2d547bfcd5ba206733b2af96ca5802aa8f6a339f2e7c38b1c7e7d1c7
-DIST firefox-115.0.2-bg.xpi 600445 BLAKE2B a640ac8eefaff06015cb47c9f7ae92977713d28b9bc73b1525fb680aa175ea4d4ca6ada1427da40cf6b36d71b02cdbcb7d247fcfdb70e786964172dac07da272 SHA512 c246ab14009b239a9ad0116762a582b414efd3dc7468f087af56a697de927404ca8e56a972d1607b2782ff58a3278414754437a0a739cd997045c6d86b9a0bfe
-DIST firefox-115.0.2-bn.xpi 593735 BLAKE2B 67d45b26eb96ead3caaaa6a1ae10f5674abb3b11299e4d8864c0548c62345b1faa535ce3a855db5784d88e9268a024e3e7dd4e10d0f2840e4087af06e5fc6aa8 SHA512 3758151cbb3f56806483195f4cfea74abb472af3b2764168c57ac05d5add559711ed338b76f2ae7f8dab50c0a4c65288912d602b9c389dcdebdf1c2f07969916
-DIST firefox-115.0.2-br.xpi 565393 BLAKE2B b183ed667e283357579e762e138cf6ca002dd3d37bdcba2e307c30e08cbac9af058be29aac758892bdb285ddef46260df65b5ca0de614be2f95a16bc874fc54b SHA512 f29bc850977cb2aff30c6454374877abddaeea687cf67ce35d0b804954face525a25da7c80984cf09e052e4566c908722cd29266a0b8c468668eeefb4cea5f65
-DIST firefox-115.0.2-bs.xpi 474036 BLAKE2B 0ec155ca400736938631c25cb37eebbaf6c4643dcab6e8f01a679f81609c8940f14ac782adc967fa3b57c07d546eb5627ee638453a98a3b60498f3538b764065 SHA512 576f31e6914d718fc4df365f7ed1d8308a4f0ecda979a4a6b8410d96cc77154d2dd135c360ee8b313f2a442bbe7cec6cfc6c862d38eb73464125cf91fad76aa0
-DIST firefox-115.0.2-ca-valencia.xpi 554623 BLAKE2B 409f82c2f25580637b909e71e0ecd6e4535b2c54ee61e53cc2ee00a0e88e9372ba1404a6448c4e9e4fa35cafa416a4702c8392e660a89fd3f7c8e23ed3b703b9 SHA512 2daf6d4a6f581274e9afe7535af2ae0708e2e12d5c25bb03a70471e1a284961465913350e8c7f5877a3717569fd220c308e08500d22ef00f9d3ed0cc2b5c456f
-DIST firefox-115.0.2-ca.xpi 576657 BLAKE2B 92cab038b49a04af05497768681e280674bf1aa30acf46cdcccc4baf9bd3fcf847f62cbac3fa1374a572b4344e10826c5701c67f258ad6f95a9a504adf2bed6a SHA512 09a909f5288ce7042e990cc1126a1ef3f1576c689966bec773190bddca457da0ec4552170ce53ed6fdcb54071480da088b552e1ea0e6ccd422aab86bdb72e384
-DIST firefox-115.0.2-cak.xpi 599844 BLAKE2B fe73402612e13a60d76a925667fa67e382bbef39c2f47238ee2f47148f71c9268a263e38a68fb0bf1042c25d4f8fc3801cb070e742dc0b49ac783f6b9abd5411 SHA512 0060763719f3518313be9d6e3d31389312e20cae45fe4910120f5d1c2d1efd1f5cb19194ee71dbcf830b8c3023750bccde93399cc90a30bddc00224169f09cbd
-DIST firefox-115.0.2-cs.xpi 627667 BLAKE2B 13a5afc9bf3021c11c63f36e287e2476ee5a470e4ece17bf0b5d094e20efe6ab567c222892ca4f0f4676f656d211ef7916bdf5d3af9c8e49b6badc14bbc4857c SHA512 bf19071bb096882cf6656d838f76ea8e2687b6ec8f7a38c04cb4d2c7592c9396540caff9d04c8c7376629163dc1f42469e5526fd2df416abddf3c411044da97f
-DIST firefox-115.0.2-cy.xpi 598167 BLAKE2B 4e89041f9beba76d33e42ba29ac81e93e997d617316dd1bbad2e7f15c5ec0bf05b55f22f56bb49257113ee441f9d46abd1dff144fd1263be3040b0ac69f4a061 SHA512 a60bd9023a36e56f356fc5d795be23a7ef2aaa78bbc6be68e29f70f6eff8551c6c776f68080dbf88d6501bb4cdfad144f9c14456b632d6b7186a7c0fac83c4e2
-DIST firefox-115.0.2-da.xpi 587172 BLAKE2B 72df606c66251326c924e1e374368258dcb6d70276986a9312bee6ceeec2037b7d132a637c5c8ffbb891e8cc0d20bb9644c592baa294d7fb26800bebb98fcbf6 SHA512 c674ac961295b3726677e261dd48bc45975d97cc835d2af5b8ceda6154368629dbb9c4fa4a51bdfa5571e9025aa58881f7c513966227ba32d94f13ad1632a980
-DIST firefox-115.0.2-de.xpi 608957 BLAKE2B 23d0a1cb8eb302c9fded9c3e48187b7846a2c3512506798eb8d3f0ca0e3a74c03a5395d78caa913a5b599479152952c6b8c067abb6fe172f230dd480a5b42653 SHA512 0d4aacea6bd9a3fd2fb0a65f8deb54f7e01f8e038a7b8ebb357de5c7dd711446f0234160d35de98564288cfafd8b608ac4cf9a845723a47170fb647d1e1cdfdc
-DIST firefox-115.0.2-dsb.xpi 620451 BLAKE2B 072c4dab4c8b251afef55ee32c86e732e3782ffa871a7515a64197547aaf9696601c6e74e8582f3782e21ea4b0b9374f119f75563c531d8c30903c48ff9e6db4 SHA512 d49282c9c94aade87c90702d66274f06a55ab5513cdf045ea785a9dab5f2e0569eaf2bb296702620c6ad10a153b23d11e5927b62adae629167784779ad6db58e
-DIST firefox-115.0.2-el.xpi 703017 BLAKE2B e950f5e12e724fabf1131263c7f248dcd80d1e959ceb2458ac25f02b6e7a7666dc0ea46e20b22043ad16320716cd24a45c12f2e51c54c4ee82101a8cf9d0e19a SHA512 a1b608a18d333d7b7a38b7e281007fcd979d8fc61ee2e35a0bc21baa0d341c9f1afe7d712c1ebc3ca7488a68660f747d757a2a5df9927b329af6f36ed9b4ebd5
-DIST firefox-115.0.2-en-CA.xpi 551507 BLAKE2B 19537f42ab2409578a1f3dbea46dbe027fcf136923e554c0242d28ecdb0812732e563451c0db2f461ff33bad1c309c46a6ed1f2e0ee8dc1c6d99f419d7233c80 SHA512 5a568950255cb24f9ed8e97f157108aa6dc939f0f9733f2ee45deabc0d3c2fa57ed42c1302306ac58523889c9eb0d960b47a47e8bc0af0094518395f17390cf0
-DIST firefox-115.0.2-en-GB.xpi 561372 BLAKE2B c9ec9a60cf9f0b8f52e50f5b83a6fced6fd6435fb7cfb822e98bf9914a843495f38191214f3734257732f0876eac7ab74bd8f4664b281dc23965457558d77294 SHA512 9dbc16cfc19e0e40eae29a721261ebbfdfab8861bcf9abf05f1048d73567a2c6608b52cbb95128a876f8784de13cf91441da0af2196445f62c008b0405d9faab
-DIST firefox-115.0.2-eo.xpi 583959 BLAKE2B 76f240466b7bb3940241a84fc0be313abb039dddff30b7311a601486caee68ffd2834cdaceeef9c8c3220af67d0d774fc72a3c57c14d29c6676e0e86f5068487 SHA512 7c0bccf25d24ce3a54b2aea37cfea33139d87daaa5814ee450e9b72e1b0cefa72216aa914d791c7bca6d22446bc84642b6d65faaa24692c7ef18b1d2b4e158f3
-DIST firefox-115.0.2-es-AR.xpi 602639 BLAKE2B 4f0229d3c3f686b461a44857861cac71222e4dfd5704cfa4fa53e447204096386c4e0bfd81d216447880a55174f72b6000ea1c408356a5ab2098614954c1c55c SHA512 0f72ab773cd0fd029babb4b8616a2c1f2bf298acc0a6d684b7c111b3596dfc36963f5e84062034b5b54a24f4418e7807c235d42319d5e285bf2f1065b5280bdf
-DIST firefox-115.0.2-es-CL.xpi 601312 BLAKE2B 1aa8caa081a2c8e466e97e59c89279f8fb998ad588cfb0a494e8846c7a7daf1190436940c2218ff96a52c02285c47878c2aeee828f52c64b893005f3c8189fa4 SHA512 3f7a9b722cf70eb8992ed41f79eb8343670227948010aeb603981acfc077e189502201e9ffe93520134bf4a20087d02c4803589f79bdefc888f0d0e7a272859a
-DIST firefox-115.0.2-es-ES.xpi 595249 BLAKE2B 73db55faeffd60a1c32455ec72c6d8c041638ac29b55d7c3a2e7af295f34a1202037115617f3e23c36f325024029d244c5c5292d322daa9c9da71557040a16e0 SHA512 2e5d37fcbd4e190e9fd8a1661f220a413e67551f78eef161d29ce88ac1cf23e655eead773c12e811194f4b4627590cfe24e0741b3a9946482af479bc4008c271
-DIST firefox-115.0.2-es-MX.xpi 600973 BLAKE2B 4e5a336b614e813e0d7509f01bf8d3fe928ece17d7c67af4316d0bbd4125587c3c5a7f41aae644251267cf789573e99436b2d78bdc885916821e8a8116bd8177 SHA512 b627379565450e69cd5c589b10844d4020d786a5887f77e33d0c49c13a4caa9b1110b2f1970531811663ce63b7a680dcaca0007fe9f2dd03d6bb5152d4cf4519
-DIST firefox-115.0.2-et.xpi 548992 BLAKE2B 0c37cd9113383074c4ce2d3a13fd38fd4f263373fd717669b5b28db36df017263af1546962b58f12113d0205323d941679cfe8963b6e678596ae9ee127652473 SHA512 f7928347a5d1ed4e87807a7bdb5a213cc27110d4e438ff2ef3e61bfb03e4826249a6cb6cfbe6d6d4ce34d72e661ddb15d460d15dc5914ce0a55837ffb368a721
-DIST firefox-115.0.2-eu.xpi 586432 BLAKE2B 046bdcf7fd6d480fd5669e845aea41a90cc42db223c685c608cf6724c817b00359ed2c7fc3b78fdd177c472fdd2c8482e60b98b60ea8e89feea53b111864f7b5 SHA512 23035d8561e8dac308aa4bddae742967ee8d8bdb21ee7ad8b038c28c4cc04f0c2113c28a7a503e744c1335cb8aa761721b0c60717786df07de47ad1b64beaeb6
-DIST firefox-115.0.2-fa.xpi 601519 BLAKE2B bfb1e114636b6e9c89055b10e475c15891e68ca006e40f9c9dc8e4d281b1f8fb8c1321f6ccf89793e9f9b14142f0c9115a17599a625a53a0b58c12f231261c36 SHA512 9dea16dbb2de3a54e598c8a894e3fafae385115b952fe15090cf6964acbc91a583802194b17fd012e219cb360026dd14ce0fdfdf8f1b1235d53d5a41e3d2d919
-DIST firefox-115.0.2-ff.xpi 485924 BLAKE2B 07a350d2a6d10eb5bd241971d184d8bfeb674e441d899324c4a2792eafacd36cf32d96ca0db83f877668d777d9c607b1ddf5a1f3a22bf5237a03455e888d82fd SHA512 3a65e4a9af80c78060e8585dbf17e4c71b17f1bcdf4e80d83be8c8edf4851e11b0591206206fd1d40af303adf6d0611ca58f900a35cbd52e2cba36392baa47ca
-DIST firefox-115.0.2-fi.xpi 586044 BLAKE2B 4825eaf6c606f48ed4c30ec9d3414a638d2ef284aea7381a8db3937d7495f03453e5d4e43c3a8ab62790fc6b446904ca79cee184099e42e2c9a5c826b62a1c5d SHA512 019c0c62d97935363cd1c4491d1f4706746db85acdcefbc62d2c894a817a0b91119a8c205710ceeeccefa626b5315e3d28d035357c73ba99ae39007bf780a67f
-DIST firefox-115.0.2-fr.xpi 615065 BLAKE2B 1b4c52b298f64873968e702f6869dc5afbb152883111c6a41e5c2b7e85522aa39458027bbdaa4d4b1e574e3ae2b76f10190c1ed980b65952b1d2fa50b09549d3 SHA512 cb21fc64c995f81d3bd63530000ea93d7a754afeda0a1186727827cd581979ce1a44d8af6c2675583ef378dd414542d02cd70dd39b9563f1f6d98bfe51bdd4ad
-DIST firefox-115.0.2-fy-NL.xpi 598092 BLAKE2B 25ebfcf9ea937df000f8d6f769090bf2daac98ba6cea58bc521d44a29143236c833fa8f33d61bb1236a9d7b5457726704bc65528eac895ec115d96a51999332c SHA512 3e62903a42e0ef7f1e1d505682d2265b6965c665e91b6bae3f9e0bc41db8578db927b23a71d5d2368de8cdf89acd64a72b775380278b65905f41d078d54c4a86
-DIST firefox-115.0.2-ga-IE.xpi 482378 BLAKE2B a1c441657c2d54888bb0fd7e510c6468dc5ebd22f6d083f80c988e49dbcec2ef0a0c0be9c708852aa0b6080a6914cc6960aec5214a77fbb66eebfd6a7e808371 SHA512 c109a715d26fedf0988bde2bc59d71ad777daa25ff72b52cfb8ce618e5d40ffd8d10bbd21fda392f48db41e7ca7b0ff74cb6aed2141e25418e3bfacc0307fe5f
-DIST firefox-115.0.2-gd.xpi 603644 BLAKE2B 701b6f55ec2c4f057fca46bc8cebb5620450c258fbd90dc8ba410eb50826bea84711d38d329a1630f9e12ad84703e823e3934d37083f8a5d43c56a4d00359c29 SHA512 0cf517f49731ff84155d107f7a4395e831472f2e6e59add23f3bb1015ae407f4aabe20d3b0d2cdaa67681d5787d4a3c9d6e2ee62f64624b69ba1b7bb517cbe2a
-DIST firefox-115.0.2-gl.xpi 598452 BLAKE2B 703ad7847e2d05f91f0c4b7eb3679a3089c2a88bb7227ec92626b72b3e7cde703e929109e987cf8f9148472b8322468e4c38ecd2e88f83a9b1e81166e268ed64 SHA512 f8081ff7351dab63c57cdd01f8c0ac4bc336b938e459fb814e2b2f33d7358346155ed7ec639df2f704b1478c6fe7c549173d749d02ae797b0c8fad199e365989
-DIST firefox-115.0.2-gn.xpi 612070 BLAKE2B 35a832f0d83bf0b3415f5b7b9aa1cec156e2512d3a623d6a4c71015d7d3dc4b5d42f84ae6dda8339d2e0d72739d802675ad5f41666b8102ba88ed26635aba122 SHA512 704db298cb8ac2e4a4be1e7bc97d40af2f6dae2afd5c8d95a9d2664ebe330b3b7afb003d4af68e24cad1886a85c4b9ce4c8e4c98d6bbf44dbd57257c56f4a7c7
-DIST firefox-115.0.2-gu-IN.xpi 541878 BLAKE2B 94b810381d77c70c29b62d2c7c74ca0aa2e196cc18dd5f76a5dcd41cd0641841c7955e339e5fd6bd8ec540f084f34a17c624c6fa5ea118eba1b79a5aa898fe53 SHA512 806320d55b9ddf4d6553e33dafa02f59077e98195730817f610b7141562e6647d8b206464be090e4506e1ce4471c5db1e180bef555db02edd6199b79b4ee522b
-DIST firefox-115.0.2-he.xpi 608008 BLAKE2B 9bf87beab18def740dd36c4f8252de0ce4e98b15511030b7599def08d215e5e97a94835048e687630bfdad4c77090004aa2d4edcb49a0863e57e04a7f1e63256 SHA512 45cace25db06c29ecc71f1d5c36549a19482791e1adb48a47337a9a0fe83440915f0c69276c70c8fd3d76813f87afb9b73d2fc0528d3b7a01376d44cb5421725
-DIST firefox-115.0.2-hi-IN.xpi 571178 BLAKE2B 89075cc02cf73326a00316506de53f4a2373c727021680e844186784d5c3be5bc4fb95f49b355a8e8f1584ca2478480579aaf50c983f682fff31d56958b2c1b7 SHA512 04790eb258b6cff286ab21e49d03ab337c2acdffef867ab1da26027bb88900505a035f760ee10933bcfcb4012c9b5a8683882b2565531eafae327537efa10203
-DIST firefox-115.0.2-hr.xpi 564502 BLAKE2B c8a5285986d56cf25a4b258167c57cb818c256551549d62802adf99e08e7ae25955a2a53278c08f7002d73db147be37adbfa1e16f5e0abfea3f85a1a2e36d18c SHA512 2f6657adb3c2f07f8019038e4b2e0884d7cfdb6dfcd5af564c55ebbecb696d6bedc9eb9b1a0f00b3b7b11803bb6723b6bb4cac18be2ce820121582bf143a1bea
-DIST firefox-115.0.2-hsb.xpi 620455 BLAKE2B 532263be4501e6c81c36e07bc9bcbde160b71608b8258facc90902e9102882ef5cebd4dbf1b9a8e8362469ee7112db3d421e227984dd520ee7bd8b40af9e8f49 SHA512 bd7a9b33a47ccbe18422f4001d7d3bd26de2f4fc7c8d4df5899b052bdf5dba6288f1c2aa2d5588ceb21207cb8f580082ae4621ca0c9126b1ba0847ae5cb3508b
-DIST firefox-115.0.2-hu.xpi 623869 BLAKE2B 2ce5cc06c7c9f468d25d4fecb32326492869e9a13ae4c28bcfb47f4c6f50f367f7683c0b3d022c9887f499ad7bd818356bd7437a7d428604d73669cab5987c26 SHA512 6a514ecbdba45d0eba46b2b15c163d194ed26047f823ecb8926c36ead2fa3ee7a4d67f7b6b7899f8d60142f0df05c3b30180f0e576bf8fbabf0e57f8a8961af8
-DIST firefox-115.0.2-hy-AM.xpi 614932 BLAKE2B 42d59371799f66a3af652c6bf4906720623854031d83fba4b59858a29eb7ebb0205e00296464a11a312029256628efd152f86781161620db1c495f741b1ee735 SHA512 60ce4ab8bba5df45076b49825c36c7ad031e8763ebe444a52ff1e60155a10e2db488c775d41f345a098054bbcdf20f9c10c14eb7f795accff2717c2cf69c0341
-DIST firefox-115.0.2-ia.xpi 585626 BLAKE2B b80a17e165fde31d5717ad727974d0d6e8d5085d80f355f7fef4ed2a39851e78c4dd1c4567c7a14683cc04fca13d9cef40a16c90e8e789eec59fd63c6cd55e92 SHA512 9bc9f1ba0145467af8e576c054d4d14f6e7ec1cd2d0973ec833783c9325e1d9f9766d88dd95149d0b24246372f63ce03720f4b20b18c2927d0cc396839afecee
-DIST firefox-115.0.2-id.xpi 571364 BLAKE2B eb410dfe06827e40b366e1451c383a9c85ec840f1d4a70ee6cbadf0fd892605bd6de29df636c2a0ac7a9fd8a915589cfb299e7f8a6a136a2a71233d22ad975f6 SHA512 5ee61e5132a41f097ed1baa656491472127b532245c0a1d392005545e12d4d19a7b9de7a3659cca008f7c49fff105015e02067597a1c1ded50079017bffbc9a6
-DIST firefox-115.0.2-is.xpi 593531 BLAKE2B ca271d1f7e307d70c311d2a197dbfce2d811ab716944b8e33e8a53c95f072aa75d73c14809f802aa67d079641c36b1666e2c8d124edea795e6d43ebc6f113875 SHA512 e3116f989453acc4290bafda837da1cc7fb3d3ea722a7644a49ea43906ed7c7981fc46928a27a8f0a8fb9eafccdcbbc2dd65500a45535251a80600d8d7d0d46f
-DIST firefox-115.0.2-it.xpi 536403 BLAKE2B f58d3db9ca072d74215af30084595be32afbd62a04942d7bb770f455be862211160b675a6373b97c628f35026072f1872011992d2f5767a26ba87d57da04f196 SHA512 b433fad7dd79f9ef0a7991fc2792275b9e46441d67f4cd3c2f2b5623917de14f586f7fe6d0edcb3572cd4e457fa7c117433f4eca534a6178f74f33397a61a511
-DIST firefox-115.0.2-ja.xpi 648087 BLAKE2B 5b6415626654ca2b94961989bbe0301c55d41157f92c8002b466523275d596c4aaed409da148e06ceb24b121a4447ffc40f70b8b3fcfb4373804bf89d5bdf214 SHA512 54960e93304c79f092d7b5e47f88e47df4786cfd491d7c9ce808e1d6ce62db9a0daa1b473e7a4176c86481e204dda3ec15be2d6c8e32241f9458f283e23bfc00
-DIST firefox-115.0.2-ka.xpi 651358 BLAKE2B 4c5f2a9ad96a0591cebe10fabd07ec1971563f47df5b3a5722f2d21df4a602ac47336ac02fa4908aa1af144b218d2748d159f07a60ab09d9041967f1093fbcf0 SHA512 1eb62092a36f637b1f7392917df9d17249e57a0327ae41267dd9325c3eb5338f8b68eb2884029fbe65e14149a020c5bea111c7c4e3582f113b284727080ba1a8
-DIST firefox-115.0.2-kab.xpi 598573 BLAKE2B e063ada93e0ae33690ca1b24029b9b25629505d4a034c2b4f7f928e39afb54c12dbe6f2041a5f49f01d72e53a196dec5cce4be2fecea54deff128024c887538d SHA512 eb31a2e7249e5d67c0dea8cad1d7c6f7e7d97da350145285f82ef4a238420cdcafbad851a469413d1c70264928b2e5a61720e877d5334e3628c060d4a275a22a
-DIST firefox-115.0.2-kk.xpi 674099 BLAKE2B b71ef3b9e08f6a7fc4cd94bacd510454d24536fd79b476d16e828403592883a44bd56cc11b740175bd325a0cd56aae249da577a23952b78e9a3a20602def3053 SHA512 5ed5d4132ead0bfa8fb83d2beaff819c2cb976ad5eeb94a6e94abd373a192d8545d5123fb3d9aafbf3a12f3e82e9912501c2d0fcf83503bf2bb27c0e1e3f2ceb
-DIST firefox-115.0.2-km.xpi 543687 BLAKE2B c9bf1c03a40f45e1c9de6e6f4c31acc2f3194576cd93cce0704b2a61f10560f75a31c912e78a1ab69a835a4d1bb7bc8e12a6cc4110f3347c1ef31dc82c08d327 SHA512 0f64c1a9b1cd29c4c8c5781f3db5f8a3a532562791a6c0a91aa3b3649721da7493261b0e3498a1480c5cc809490f55bf86939f09f36e0b8bf77c33189250b5b3
-DIST firefox-115.0.2-kn.xpi 508139 BLAKE2B 2eb74980b827b283d7429f9c3f2d4031c25a69baf9083918b18a4b8391dcb28b2e1f80140e7e389e150338d6d0848abfd176d719cca7c635d4775feb6bb1d87b SHA512 d73872fa9c3a009dcb2a53a168cda5d5d19a85c43fdb8016a6bb6c71fec3237d126a04952147b3d8eaabc41d89f93c70fe22264e83492c280915b5e4631b9518
-DIST firefox-115.0.2-ko.xpi 634989 BLAKE2B d11df0bb37c8f44612883b2f52e4b7b39b30d26bf89e419e56217ab522581158668ae40eab00ffbb2c46db979d63e5022e53fe69a4a91773a3043d1e0a5dcecb SHA512 0fb8ad2bebdf174597c7e9a1ccb74b5351c6dcbf9267b17b7d891b80ce13d3d0f1f3e3edfe3f7dcb374e42ff20b8ca00980e42715be61fed7ddf1d9b0840a11c
-DIST firefox-115.0.2-lij.xpi 493481 BLAKE2B 1ff7fc073e057f95b7cce18f55a219396d125429eb5c73002caabd37ea6eb87434df11f3135ee3c23cee0165fbc5e5007ecf8a503e08309592cb2fef32d1d527 SHA512 2b68b75fc91b9f0286e804616f00d97b40e02be14d4ba7f874e27cf47c6d1f7bb47863eb8e776b859cfaa91d339c55b04fac3b1106084076c9a41412b738de40
-DIST firefox-115.0.2-lt.xpi 583774 BLAKE2B c1d7f2a4af6e4c599d7f472c82fa95964e5641fd8c7f6a54c3e2b0fef41406be7d61ab6968f8786a4541768abbeafa38942d42ccb2d7dd5f1cf8ebd4d70ebdec SHA512 4f5272a28efc6fe5657a6b56a6e86291bcd8fbfde65fd165ffd75aa6ae75b07c9c0c2a7dac69d2ece739bf5e00fe1c0b7970c68a92a8a64abb0002fafe627233
-DIST firefox-115.0.2-lv.xpi 481435 BLAKE2B e644e0f10ff3bfb638ae127655bc7f121b445a1cc3cd6f31bd8b5210238ccd1703f68cecb46d49bd5d9cb1471a41091ff5e309cd2a6d2474d7340effddbaf425 SHA512 6a83c38f0d784e248fe6ec38878a4e4e8322e1fd555b174e74aaf36a3cdc6ce5c601e1e80ef184d219bcc1b7e277f72dc3bc915e3526eb4573e7de1971a74a08
-DIST firefox-115.0.2-mk.xpi 496390 BLAKE2B 4f54dc80cdc04f0151ebaa3bea9d16a2de6a9bf26976f87cbdf6d10189e2d1d98c11fb31ec62daf3035021c099c28d2bac6d461d95872603b8825ae8461f9be4 SHA512 ff6675271cc64aa1952064e92561cf5729b7f00e4307602d126a593b2da595b0253bf6fceaf57afa57e6e11901424883d3f681afe297a8f34fbe3a6cce173f23
-DIST firefox-115.0.2-mr.xpi 544675 BLAKE2B 1e92a85f609da23885bd2b6e2ced69e8afc9a6e461e5e4d8a4723395d0d6f38b4a14d7beb92885b96c87c5c51182270efecf07585b58c3bcaabe9c9bc4345ab4 SHA512 f3bdf6bba16405da1c9330297de126e93a2e9606e4eb591b8776e5379324abdba5bc9cb923f286ef34c7b7fba51ab6d2f7033f2094f3fdd1ed9ebb1303125f0f
-DIST firefox-115.0.2-ms.xpi 461878 BLAKE2B c5c45396738529d31c538d7524354ec91d4be846930a0c0979900266602f579541f2bee5c8aa648b3013f3fc2ab3068cd3a892d1864080a900602a0f54d6bc2f SHA512 56047c7854896e9111ce1ac0a461193fb6fe8db2a6cc81cb0d497b45588ab0d67171e9394f1b1564cb4f0265313ffb23e50b575131eaff19a598d6c2cc1b7708
-DIST firefox-115.0.2-my.xpi 529053 BLAKE2B 65dd164728b8fdb3be329d8388405c51b57d8617dbafed078d8574cfb8e0faa8d9a1c0e22757e61a11d5aa62518261c1618e7a2135fa751b8073a398cf735cdd SHA512 053d1f49ef5623426ece6eebccdd87aecf2cbf4b8490d471e6ce37d4debdc9d1678cbfe820784b79952dfdfea6d264ff8a69ef1d4f5a930b088e3698955b224a
-DIST firefox-115.0.2-nb-NO.xpi 582793 BLAKE2B 8c4d139e424054462657889f55a65291d22bd57213b99f928431835d380b5c1f1a8b20d7611f58e0be7bbc3e743c47b46d59289880cf7b2e3cd9c4c9d12f7076 SHA512 8ba35aa456a4ac062a9d08cebc0e31a16934263f7a1cfcd077e192d5ce12cb3c5998eff7877046427fbb957a6af886371d39ac7a1ec2bd7077781578a73290cf
-DIST firefox-115.0.2-ne-NP.xpi 496638 BLAKE2B 2d28a4d74a417de9b355e21c455285b264cf13ac137c8e5235531ea50cc359d8a75bee0be7a4b66804380b8b98a5da3ac6cbf1ad005ebe534414849d0f717584 SHA512 5c76db88eaa89fc146c0a28a12c3f4f615037bff848f65b839bb273f34d0830b8ee740bf1273c5cc8facf8519caae97bda563f5ff3e422269f9212537eb22e67
-DIST firefox-115.0.2-nl.xpi 591933 BLAKE2B c33268fb5eb867999b5275e7cd3ad6f0fae3b534ffeb1c3bb53a0b82cf03d3e1a6aff374a99b46a11034546a920f86f69a313aec78a3715ea9f453bbfa2120d4 SHA512 c1ef253f70a82ab1a49d83da5a78e4e1a1b36444dec5c30f846c12d89b0d6c84ee332d5774eff0ad10cfe104fe92d2bcce6c5ade195210371e3adeac2b0769b4
-DIST firefox-115.0.2-nn-NO.xpi 585564 BLAKE2B ce5d2022f1b9458f0b0b36d67e182a3dc6d77927e83cb315db330abae1a12e3902b49efc4f9d3350b39f93a6cb48c33c471e622a9579faecd126998697461aea SHA512 12dab0e4a5dba09c25b3d57313460a6b210d7b95c4c14c3222c740e5e8a2a692aab4f5ab4c753391c92a720c04b73b840171ed7b5e8e7865f70aea5bcdce227b
-DIST firefox-115.0.2-oc.xpi 606885 BLAKE2B f37b67625d39fd15eca7a558d94fc39266441dd5c5bef40b58dacd50ac4a82d26c982e94f3bddb7dda2e763e047ec956987053967c52638610965d3de1195c2d SHA512 8dfb54e7e2b47120a91d3a30f35ef9fd580bed48a4b74f8a2c0c9a414ebc6af244278f301cc45ca894436684a3712c4a609242b12b646aa7ca34b42f54eb621f
-DIST firefox-115.0.2-pa-IN.xpi 665207 BLAKE2B 90a20eab9d087d30089ab5b101692106ed8468e06f255d9a741db22caa8280f080c49623b84786d605eb049a3bc9bdabb3eeb1b7a39080290d3db907e86165d1 SHA512 57e343fec82fbfc3a4ef1b1ba2c655ede756f7b2b1d45705110c5484a960aa4fd7260d4741eb70abb0de2c6dea6c83dc374836f07786bd38a79901d131ef08a7
-DIST firefox-115.0.2-pl.xpi 617012 BLAKE2B f845086b34edacc47f2cb542f245998b6566a6922696fae9548bb9e8e6c1ae46659ee30c9ed6ad958ea3bb0ea93fc0319ce6047160f6d8dc5bb6405cd18d72e4 SHA512 2447c08f02bd33026768cc738e2310e5ae0464307dcbe581bcf83de734c8fc24fb20c0140072c4b80e8f35dc9ff8a34ad45d5eb41cc2f6619007624a420b3009
-DIST firefox-115.0.2-pt-BR.xpi 596732 BLAKE2B 2e47dcbc7c008a3ecd61e117106c2bf39c3dbbcfd28e6ab2d60a6c619edc7ca5f895969132e391a3a9492a922b7ee50b6b5e63de17e6c51f4ed41ec85cffb87b SHA512 0da0ce733270d1d40c95f4eb90655efe95ff2d22e6ac882391b442fc0aea1654c2b0c683bed1c57ba52ab54539af50de376be77b9df5613ffd6cf93aa44ac313
-DIST firefox-115.0.2-pt-PT.xpi 598863 BLAKE2B 0c5d3ac8bf414457e70d8bdcce6673e778082ca784b8136bb2b4aa1e0007dfcfb4bcd12e399cd5f7d2b07569b56ebc9d7fdd0ff0618fabb4342db816d761f900 SHA512 348f3431f94c99c0f774204da106a0186c041114fcbaa9c865e9b028079e8726f09d5d46d75dbd814df3989cc0f93ec765e31f616549148d1b92f592978ed491
-DIST firefox-115.0.2-rm.xpi 592653 BLAKE2B aeab853de10dc3f47bfd76cc355710e27f0c1a5e63eb506e15d1380d6ffa710aa62c5ffb9fdb195963621d8ebaa68b350c6222039c17fbab40eed773cd8965d1 SHA512 728f33814d9a358012091be24ecc7e60c333ada93722f1c8836423a87957a8a427951c0305ddc850c41ad1263de5de9b5115f4540ba9b1286cd923546983c571
-DIST firefox-115.0.2-ro.xpi 557000 BLAKE2B 09eb80370f7b9f37885cf5d51d6fdf783ba0a524219aa707f85fe1f1f620a4958e49449dbe228eaea5ee8edea7fd118bd930bfea81e07a49757f8f2af7ad6b78 SHA512 adf99f33fa74fe79f68ea05b7f64486e9ce0ee329e36ef3d9558a897642f33e859011ec638ca50e02a54f661bdd3ac10a17812fa3f56bf8a80f662a8d7067933
-DIST firefox-115.0.2-ru.xpi 691641 BLAKE2B a5383c6c6e10ca79fe9cbbb626eb1ae5cdbe1c8a3db6f8e37e17bb5358f78c4169d78cc1a19c753936f3811e0fa237925c48eb6d2a2bc93ca019088e5c3b9dc4 SHA512 c4fbba17427c069f01f02d4604f605f41c5eafb4630777565090c2c6834a1c0191425014bbaff19ad886d90c51cf8f8de6570260bdab5f3f4462606c6c10a975
-DIST firefox-115.0.2-sco.xpi 518348 BLAKE2B 484d4c714f9d150d71de1373d2ded6163639aa86d93d7b19190d324141c29b546a3890ac9078313a64be50e07f43d110bea2fec9cd22c502846b018cd62b46e5 SHA512 ed5ca916f92b8bf09af1ba8dbd0e6164d05cd5f77d6c2b04ad59d75c9a5c9140a82f5aeae8305201788a6e28ea45f08209da4ce42af4f157b3d420d4da203f32
-DIST firefox-115.0.2-si.xpi 593134 BLAKE2B e556c5a7e3f87a1750ea0da86a3bc8f7f9e7f100870c385686726c97b234273499189bedebbf20a2b9acebb48488e8ed9aa6d9218e1b89240692fa2eb30e1fa8 SHA512 d8e7cecf091a5c11638dd6c773001a832100cf388f8d5a7eea83917ac2b7d74b12262ebd4a90a85f978403f3eb3f7c11b7d6ced19a7895c0f4cb4bcce0eee146
-DIST firefox-115.0.2-sk.xpi 625406 BLAKE2B e25723c0556c7625aabab5a6fc8000fcdaa8f6615b4061fdc59a39a8e78403801fe039f63b0efe543f68a78f8b685e366b9d38e305fb5c6b4d61e9e7173c743b SHA512 0073be603a752de4e0065b4337e381d854997c6f3be22867b141fe2840b154793452eae1d68fd4098becf043fe5eb65b61283fc59d8fd433cf794ff69a4fbe2a
-DIST firefox-115.0.2-sl.xpi 596055 BLAKE2B b2b9bec22f431acfc10937d54e09c8055c3d2e68ac9ef3ad5d93a4f5a49ac060790950e9f724d540565244ee9aba9d1165fe563d228ac358a215ded493f4f244 SHA512 974fbf13d0f81892ccea42c0295625b0f9b0964aa397a5a628838699c70c4454e2b4cec748a800fa874f5e043ed72943cc2817c9b46c09500960c8dbccf5521d
-DIST firefox-115.0.2-son.xpi 432506 BLAKE2B d159d2aa59902f13a5544bf77acc00218719da623865fdc1235101afa88ac6c49e80d9eff091db3cd04ff5d30b55a7dee3200270f1194e644cd1b41e5975b10d SHA512 79543f2af6d0202cd3550a007faa68554b1da56a6b21f14e78be756a6eeb18b0634f7d7e575e17e6e96002739c1d59ae16b9885084083a645ac4a6667e3f2dcc
-DIST firefox-115.0.2-sq.xpi 600796 BLAKE2B 9ff833d4ae555165c1c4c15129f72e014f95dcab6b938ce1facf98aa995991c7f702e1e62e8471e396adf537f65d5038ae4c63178a6a40a85404d10318ecba2e SHA512 6436f525fc46108861f65f5985f8529ddc101aa10ec05170b5f8b5755e41e84cd0d66eb52c0cff5798abcdf495b08cfa95da5d260e2299d14925f67c1bea2573
-DIST firefox-115.0.2-sr.xpi 653902 BLAKE2B 93938a0afa9d085515b917ae3aac0ac55be1976ec0a3588360147bbabb2b6e5ddff1f4285f5369c67346c635e1d7428e48673e54ab58bb4682a1065d78b71a13 SHA512 e8de6cc852238f67d13e70f2839aa80ccaa33ed615912a8fc3c14540b3f0ec48c547add3864e253f3c9d9783ed6789f1145b16a2ef99c3b89d315788857ffd0e
-DIST firefox-115.0.2-sv-SE.xpi 593897 BLAKE2B 78d4fd7579d92f38c3075ff2b3b6239501c526760da708399aeb1154a8e08902f1a6c851a7cbd5bcfa93d89e203e1c663bfc559a82b73f7e1075907ebb36983b SHA512 a43b21340bf262a139f3ad01baf75e37392619b596a5119aa9505c90b5619614f89293a8a37a8454f76331295dc99ea0e2f778417d6512288fb036957265f60f
-DIST firefox-115.0.2-ta.xpi 520713 BLAKE2B eb9024c0355df9bc49d33aae1b413a67fef1d9a50d1b3df9315a0edc497753a6f944ae57b97abceba94f966d2498c5ca9f4b1e49978cdf0de3a63910f490b85d SHA512 46d0128e3859978a2e389717bcb4ff77b0399d604e38da931d0a3b9625fd2a4ab88b30acff22cc8cef6c457190cfc26a753265afe747693ff25f81602670e2e9
-DIST firefox-115.0.2-te.xpi 570038 BLAKE2B a29503eb758dd3862dcef8627370be362cf591043fcb39fc5443ea60305fc7ad5eb4cc4fd9048715f7eb0c107179550571c89082057570898fb7565aebca3a9c SHA512 d077e3d423db5180d51393ddca9b56d4585e0952ae0de86d5f645e9c4083885550164357a1fa000fe78a9fe2b4e219321a31694062526044e2a6605ed2b02335
-DIST firefox-115.0.2-th.xpi 667035 BLAKE2B 5255e412daa96efb0c5e1aa3020fd1c36137e3e842bfb0c3c5002119567f9818bf04dd0e775ac5e7ce461d8ac65c84be34d0dccfc52168aa1a6bb44b92e04ae0 SHA512 9f2da5722adfae75f3bf07d3395b2c87bed5ee585c133b285bf834549810f97c734e413dc786e1d71e8c85cd59d31c907f1c2d5a25a358b0fc66e6dcb999b4ba
-DIST firefox-115.0.2-tl.xpi 541134 BLAKE2B 2eb6d6d9ee41ceaead4fb98dbf99be97a4bf959adbb445c0b05aab09a740ce6cd6ed9b72d5c7152ec39929079fd07c2336c6d6a6278019d330c2670647969988 SHA512 e464934793ad5bd72382dcfee6f68a2ab68c457d9f99d0e7aa1c42dd93839a67710492e26effd9018eb4966c66de6bd174f374587396061cc94394e408eacbc2
-DIST firefox-115.0.2-tr.xpi 607281 BLAKE2B e6dae804ca1fd61b3a47b1bb55536feed69987d2e9027448bf54c1a6a664ac24ff87f503628eac26397a44ed8adbaa7344a5a66f0e4b40c844dc5b20c9a2b314 SHA512 1565c75ad9d639658435243effe27ef5b20f417a692eaf5e80584630ea5eec7e7d264880d6b10dcb76bd178e666885afbbec492d30976d3ef23ffbb8cff21c72
-DIST firefox-115.0.2-trs.xpi 501900 BLAKE2B ce39bfd00e6b6ac901029e63829a0eae60c8d163029f7ce04201d3bcc19dc6dd91562ff9a6789250b257af5b0dbf8247f62bf213c10f1525517517b85a27ac70 SHA512 b5fdfa42c87acd0c4678f349b8b27d10eb9ea37574bf322a2a310c98034e99bd00a157f6f72777147574425f32c64bf699639b3291e0b15e9c30c5cea0acea63
-DIST firefox-115.0.2-uk.xpi 684822 BLAKE2B 26d3154fc14aed34ad9b8118910e8286489775ab7ef0a978f025a711cdfdc13e763bbb6305880b9397bd32fe54379649153eb38240fa077fdd0e2204339b310f SHA512 d83008065cd119f77f2700472248ba38028ab9116eb34cf9e25cdb67b0af4ce19029398f56c90cd1621f0a606c278d0ef093448c65cef88ed356100ec9e4d62b
-DIST firefox-115.0.2-ur.xpi 570580 BLAKE2B 60a7a711673e15cf745de0d0ad5cf83aeb6c64f7704e957605d61cebc04aedb87b089516b74e22cde5ae993548aab5f503bd203cf66a29ce47821bb196ffce9e SHA512 31d0ca8e43a6df9396319b86c9bc2aca8896738ecd46ed271ed9216943fbdb29323b4e8d78313e7b6993c81148d434496257695affc2c43cb1aeb2020e632c2f
-DIST firefox-115.0.2-uz.xpi 488309 BLAKE2B 6f183856712caeede2d5497920a4da5c686cb8f350fb6d2bafe2cd721fd37849ea5f5f96e24d677e9daabc9ef681685c25cceba6843aa8eef5f3cfdb3dda1d7a SHA512 c79ef2a7740e8cc022ff5d44b38870e45f4d43bcf74c965060469762802b800a762a390d9642f75ffa747cb70dba51f66ef06a0b6894a5d3136345b9d651a6c3
-DIST firefox-115.0.2-vi.xpi 631053 BLAKE2B 51c993480f0e1e29da0183fbd79f569ded109c99f3f24513e4e7608f3b4a7385028e990040281df2637ec37ac2aa313e06a90a33acc8d939651ef8ba4ee71289 SHA512 750cb780405f8433552bdc0e58d6d43b43be21950ba301de297d110ce8b79d113cc8b355a2d2dceef6b19147a529eb7253867edda152b662347d25d080aecffc
-DIST firefox-115.0.2-xh.xpi 429442 BLAKE2B ab34436e2c2c9dcde04f38f638be7cdcba5939228bed9d24a7caed0d29f25d3efb08ae1a7286b223289e44aa1f4a3bff7196ad0d75eb34d694cdc4fde2aa3583 SHA512 36f165e0841c76b6c181fba1536e69a8d28d554e4e04a3eed05925906870122ae21cb4811bbc3c9e29304884e9a765b08b6dd32000eb861c3db2ea817c96d511
-DIST firefox-115.0.2-zh-CN.xpi 629741 BLAKE2B 7ac24b4ecd0c9d96ec0fe8a4e068845295c43104c50077e0eec7ece976b787042e762d1f2d08045d4888cb4efc77b96457cd448a45312c05812511090e000017 SHA512 6d1cd6f0815694e3f6dfcb10ac7082752f479ac5e5b6ae6f1cadeda79c531dd41114e5ebd2b8ff987a8e136d9311ef77fe78c1992f983a774937f0e65e3d9a2e
-DIST firefox-115.0.2-zh-TW.xpi 631509 BLAKE2B 70e0c60f846c7ec864b956fcca6c209169abdac3e791bc7e60ce9c0c113b8367d49f699afe4938d58fae1c0fff5667bb01c85444ac6078d8fedaa6826e76d617 SHA512 a2aebe7ef10f371a56a52c29cb878274135cec914dc639b29f9433a462cf95e0b88234098ccd2fdd426f2e39ac8ae9c9504e87a55612d0e6e02b52738dbadcff
+DIST firefox-116.0-ach.xpi 440323 BLAKE2B 56d55907cde8e61f0be7c4e880d9548e0f9660f465d33fb61afaa50d1b440bdec76a9a6091885edb58677335941c3755f240c99a0937113003c7ec07a2306695 SHA512 7672d3ab4f5fb6adc14830ac99d3e704b3391e392ce6af3e97375ada2ad675caf5ea1d0b42d311e3fc0a1628ada8c76284d38aeed74c89aee05cbc4c29e3502c
+DIST firefox-116.0-af.xpi 401616 BLAKE2B 9115ce0800aefdb2184556fb92f3a1ee28ab82dc0c77c8b913ca7933253a4ab7f478016ac38e063c20479235a8341fcae4bdd35eac713d0720b4343dd862e59c SHA512 4e8569dac354d5b899cd7e38552d5281045bf2b2dbd7dcd8861d5a48169aef8e0a9b12a251f976006d8833a23d32391adeee27986de6d3eddd101001ea6dbf88
+DIST firefox-116.0-an.xpi 482309 BLAKE2B aeeff77edd86406fbb613696043dfbd080bf1ccb8717ee9d1fe65f338dd26d251a9417b4c5461a9466c905cad888dca03761e123a409f87257a0d6bfea32fa92 SHA512 b79674baccdb978697993c403f1a4ab514e570829962159443a351982e360d62ddb91575dc4eecdda8755623746fc82f916286b8ce3f002be2e78f058e8e1205
+DIST firefox-116.0-ar.xpi 549032 BLAKE2B 97a8756e56dcab186000e47ed0d116ff0467dae59137314974ae3ed32ddefbec2b7f2d464707b34fc6df3b79a28c4fe8996d5a160c9a17097e4c97882c2f8035 SHA512 da07a5236ed41e65175f39ad3ac22ced839dbc97f1fa573745798b92693cc78984a6fd798c78b75b42251df71f8fb3e5f74c7055469f5a8c38d29f6ecf10038b
+DIST firefox-116.0-ast.xpi 476782 BLAKE2B a00b6d28761d907295f41a219a1e08d82fd2e2e04efb708b8c87a76d9cc5dbd637eed557d6d8df6e332b1e7ea030b710ab6463b7423ffdd340e57c0b6ede101e SHA512 2b2ebf06bee28faace4e0e4c17ef1f9181f3f65501ee64354831c70e44da221af4b49ba5f48d4c7c6ba2cd3c4de3b787daded079ecb556e571224240db312cbf
+DIST firefox-116.0-az.xpi 470089 BLAKE2B 6b788d4d9ed92a7dc75817060c93198ec381a01ad8f9e9844990488e58f8a60b35538f170a7627fc252ee419b64accd21fb0ad27ffe52acff4049ae52a679308 SHA512 93a6f57459e67abc09891be7735f864691cae9463e2d7aeca03390488e18663f43c1a7a3c00faf64359bae84728b919eecaab1d547f42baab64fe9ea65fa2eed
+DIST firefox-116.0-be.xpi 647165 BLAKE2B 5c1ee6ab6725b2039577c6b3f0e90ba9371eb057fa351772265b51e30a76c7e0947e19a538ccc246b318232d54fa0fa01941a8f2e51ded78b3af026c7870c8d3 SHA512 9bcf8b91560bc74209802db699e45ab9c1fb6fbb95656fd2ca9120e5e2dee546f8d35556afd51cdb1ecae8cfbb08b881b01b60cd865fc4fb3e5467e9cc047f44
+DIST firefox-116.0-bg.xpi 563684 BLAKE2B deb427524cda4bc765e94501adfb39d8c4303237894bbac2667a0245b411f2aeb42a6df73d44f21de82e11a82b1f5b3d90310ecab5d680e5614ddf5b76ca6bb5 SHA512 bc24d78825fa4a2a7334d9739ff00a03ced53cd95a88d9a1036d43249f8a7eaa08ead02b30b87ad8919a77c5754a1870a6422eef82fdfaef1f5d2b647727589a
+DIST firefox-116.0-bn.xpi 557959 BLAKE2B d0199f998847428dd8b8637db286ec0e7daa2103bffa533a99516392191d7b2f223be99f6672ba0d7afb0b35ed8f03387505cddf9ffdabd7d9e242e802f5e3d3 SHA512 0a85eb78670f5329638726e5f4cc1c383b33df6c39724adc08c55573244817e2678feb163b6a7ed73bd0bf9270ba925492a4b1e3fa3ca7148fc66342af03d64e
+DIST firefox-116.0-br.xpi 533891 BLAKE2B 37d5281b5f90105968d58e759d5d2ad179275d2579e1e9f74c1ab94e75f7b5ad90686f4ae6925685f66d3dc17f36caf748f59ff5c9fa3f59963c8aa85061a881 SHA512 10f42dfe15516d91a4bbae3dd3929f57cd656fd69f19ab7b709ea43aceb3ab49479c8d72499ca3e16aba99dc66ffa8a4d1ad7fae29fe4ee530f0d5892bac5240
+DIST firefox-116.0-bs.xpi 440590 BLAKE2B 0cde4af28b8eff82118dee4eee2d32d94f29d2355dfe813482ead547292303dbc01415ef50af0f397e58aa8d5c46a28c1c3eaf51c224dd4ceca67863a23cc450 SHA512 760c00ec13ebd6e9f148709d60281ad9d26c743249317ce56846b21002c5be5166362f9536682881af5ab32b9588fdab991c8381e0456b11c6347cfcc4a04b33
+DIST firefox-116.0-ca-valencia.xpi 521443 BLAKE2B edabca1c8346dd4f4754203e1b4989e740137f140ebd7675bef0d5972dd62a87b9e6f003c7ea58df99da3aa7cc61836ee40de08b5c7661803c5fbb4bf234ec4e SHA512 e2fc82c11b0838ca0372cec6c43df971867c03f3835ec317bffca6a679d12e38244c2dbe2e0581f97a193d40634fcd14d1764ca7aab0cf2c7e75ab49460f18c9
+DIST firefox-116.0-ca.xpi 544947 BLAKE2B 68a808e69c5732cfc65d0611256b015497c7a976782247140165e2276d47eef1f5b49da6a5e4b427272e15a631988db64cc7dc1324eed987776cef2ca8624ebb SHA512 145ebfb04ef0120a4d1db90992b8800595c0d86d4c32cf267e35737d189bd2dc1e5ed8c0c1dda81c77edc4209fe36d8c06f06dea8763cb124f68ce86d633ab50
+DIST firefox-116.0-cak.xpi 564108 BLAKE2B 18f8c59f6cae941ee7b6ff325cc0da958e2b377e0e7a4a30bfb13e99241949e3f8a07fe2ebd7707ae999cbb60b2e5efe467b57d8d544ec7c34f44e7f3b73e8a1 SHA512 b983e03cc8ea78b74242be1f1515a7fe97d91286f0f5bf9ba91863bebcccdec9fb706a298e6a8260689725f62b25b65d724959609d34436a7561c2af04384d58
+DIST firefox-116.0-cs.xpi 592432 BLAKE2B 624f8e0efafe1020d1f48095e1520ae1ebb83a7162573b65cf4cc1934b045f3ebffb2bca160934c70bc77373a95dc41762cafec97f0dedb53544a9ee9bbe4848 SHA512 bef9d4fc95791369094ddd5abb858cc7289b6f94eea6ddce378b1656e853939bcf5bed8aad1ba13532287c3f8be35078896e68f6cde30fc814f7d6e23dd2acf1
+DIST firefox-116.0-cy.xpi 565915 BLAKE2B 1a038d68ebe4f3b662000892dd5efbfd522360edfe5084174a16c5742785fcf4a4e320faa0800b80e57157869cbcff8174167ff81721686ce5f298ac14300f01 SHA512 b4421d39c5a18ae57be9db3d0a0f68b94128698f854eda4f89d6ab0baede480b49c4ef7c8ffac7cccedd2ce66af51d1cf2549ccf3f635dce43b46c53b505611c
+DIST firefox-116.0-da.xpi 553373 BLAKE2B 51403dbd1304009bc13901d2d76ad4e953b206537c3e5ec405edaf1a3cbd5703cd628e77d3af46881a0c406102c5cd6b394681d195b652ce430e497b4ef89890 SHA512 71b65b7eac4736bf6dc2a2e7668474d45cef0d4603a4a75a621ac987add7fb0c1936655722828054d34a9fd6a12ccd45c6b5406bbce0302e9c62fdfc5f62ff94
+DIST firefox-116.0-de.xpi 574197 BLAKE2B 8f12bfe07d567d8cebe8dbf8ca76cc1f274da26fff15ab4aee797501d605a4cb2a10344cd41ee977118f6b72aa0d30452caf8a89432da0a83c734b9bac12fe4d SHA512 b5acb569b5f23a5380b7ae6a2bf6f1a086b4f022b7f01ff18bcbe90748ffe5c1ced334737d4cf09b9804c01173e63f43082339f89369fa6db9ec1d18b69163e5
+DIST firefox-116.0-dsb.xpi 589675 BLAKE2B 11bb209ca73c286b733416b24823f8139b9046549b3ed7950865ab46a37e20226107d45e6767f7a78362734aceee115ce2737e0691e7795715acca798d579aa9 SHA512 fc003dceda0b1fcea9d9a8dcd9e79724ed91b1dee97403cffaf2e2f2cc19cf7a9af3061bcd2190ea55ffba076ab1caf363c597238894fc75645f817a9b359345
+DIST firefox-116.0-el.xpi 663124 BLAKE2B 113852948b65eda6f5cc25c0a5b053c477fea4998eb0c870b95d48850878f6dbde477cef70b6f2ab774d1fe28e53ca115e1d1e20b7d3b0918219660f6a130366 SHA512 765708bd104ea642e1607941331e50f37896b2bcb9785d4b5338ca5f7dc4cd96c6ad14fb1b1e4ea9a6a4a4ccecde2b04a1a1c95bc08f0a737759a358165575ef
+DIST firefox-116.0-en-CA.xpi 518974 BLAKE2B 5f38b03c4dc7721559eada3bf7745b13b64e8ceaa83941d5ff26fa0d8b58761c2abf6ae85b9a33c3cb18dd02ee6ca3134b68c316e6600073105a832dd8c1bfed SHA512 bfa610a3837c436a262a463dbecc7b0201062d2da1aff71e24f262f88affb9e349760a15af4e46961d5789dd42fb70206a6f6b2436ad23494733ac7e0cf69f69
+DIST firefox-116.0-en-GB.xpi 531550 BLAKE2B 196bdea697fde01080aee8b9ae380c0270c158fc177bf02907bb73fe13c8a9fc65b4c5819adacf238faf5a5d9c467d43ebb52cc2530a7eb90b1f6c096992adc6 SHA512 64af7ed062c3f4b042ef42af63613ac00352c2091206381e6db35de4ef4d4ddb7f823ac41cb12b61d79824cf3a29ae4ccc501e0d0f24dab079872e990a560ae6
+DIST firefox-116.0-eo.xpi 555850 BLAKE2B 11c9f9ffd1977f6533dc664c9b3d1840c9bd9fabb798971e5555e58c0e3ef4218a7f154bf7e93501308e8e54ebd6158bcd3ac0ab3152790b093cda2a5d8ddc6a SHA512 a3e77db74c82d17f3079c01d128f9dc3085b88b51c4166ddfd5394206c9b558bd29ad8aad4c93fb58acf0d32156ce90b83127766709f33b206e5bfaa07d4e87f
+DIST firefox-116.0-es-AR.xpi 569189 BLAKE2B eb703beb58208343de2560d869c3f5db1ddcf9924f68fa70ebff847a19ffb9f591dfce0375fdabd47cec74842bcb2d4f84e649c4c4029bec223ea5ac9653bfdf SHA512 bd59ba74d449f9ffe1fa0b5df93cb39fd27eb60f22a436b1914225babc1eb5af011cb7d53835a1da3af33d9dd190f9d78678a51773b7dfc95d5185657b291489
+DIST firefox-116.0-es-CL.xpi 568868 BLAKE2B 3a9973ce147b7c281ba1e37b4e49e1eebcc0a42df7fa21ac7ec8f529b688eaad39d20333b4774c4322c10c9f643d3a798cfa0d76bfc2aa8060249983bf47b6cd SHA512 c53096731f6b2cfb4fa50c0446e850d8c3cdf2d5574cf7aca2bcb16526cf2f6b5fb87d69e24d759d96e3e5d8edbfb3969d01eee3b23b181cb5f1d33a42b63648
+DIST firefox-116.0-es-ES.xpi 561405 BLAKE2B 61772ac717bac91f87e82013f888a8f941b3fc5afa443a45dd86cb3a9f5bfa8b73ba39ed6d10f0402ed9244b5fcc7453d4fc503f32e337fb735431095b09c321 SHA512 a2ff7c6fe8f8f201720206c96cb2d485b2a5a66806f1dd6193b005dca52cfc6bb9ed194b947369e231597089213ed5b3e54f5dd32ab3f762e8aa60349041679a
+DIST firefox-116.0-es-MX.xpi 564991 BLAKE2B 88266eb4eea91f87daca458c21ae74b7540ded1deb35b7bb7b483d9e8cdc68c255940dccec7295c62d500847043d5ba89ac44098bdec4b2d5e2a37479b59bb04 SHA512 0ca84f06e62b81b13fed79fefeae5425ff30a45f9602396f083a4af1201297e6f76eee29854941d772de72e2240b23e7595754683d97562972855fa6e28b70a8
+DIST firefox-116.0-et.xpi 515646 BLAKE2B 819cfe7ae95bef3ae0b8ba8aecda8966651dd7ea5fb5b98c2c8bb55551c66d3e010ff4ac6a616270965b2102938d66c9afd8dffe26d7312870a17b0abf799da2 SHA512 b7fe6cab23acad6a88182d2196b19d9009f2978f449a9c2174661d6d7955a19318a2299db9986e68a551393aa553359c8d8a826eb8123b0d7c303abc3454c4e9
+DIST firefox-116.0-eu.xpi 551061 BLAKE2B 6fc5c9ea7b0952f05ff38146b2b0df77247efdd86753303492c45f9e8e19561a692261c57336e2311aa95cae345b27000b7665dbee953bf1c27343ba0c55bf42 SHA512 75b69d62fb6a9d170b910136683e0223e6665f163379752a984388b72c57786e7a415e2b28155fdfe3359d16f292e6c127b80e09d25cd039637d2d415476b4bb
+DIST firefox-116.0-fa.xpi 563997 BLAKE2B e6272f3ed62965cdf3870ab806043a758c7a928e4cbc8b1e0797a3c2eacc3935e3c80059b0276d92c7902045b2a500cde00575e30b41db5b79c9174f5bcf6992 SHA512 d5086ab29bb409ff3ad9cb94326fd0277a18297fe1267aac1b4f88827aac3daef9d7adf1d4e7eb7cbad41749b89dc74834bbca98549c9f1419b1a8660a09b093
+DIST firefox-116.0-ff.xpi 456416 BLAKE2B 577e263066e449babe057e66af801588a8ec0d7304db261448a2ace649babf791a1b5ebff73f3dd25f23dd8c73fd525866a796884f47244951efbe46551869fd SHA512 96814943c647ad53c343baa60b849b96458fa3276d4553388f45f8c684259ac4c3f7578546d9afe71cbfb0e320585d88d6acb772b00cf23dfc858e4dc4841144
+DIST firefox-116.0-fi.xpi 552857 BLAKE2B b75fed64129e8f337a4d15eecd24965d5759b4b42f9d71b2677698bd404ceddd1200993b5f58d04012890d8cd70e421600b11179734f98c8eb69e309dbb01ed7 SHA512 d5f0abc088cdd78c3441681ac79b56a9c95a9fc99b327aaeff0488a8287dd498d1fb3463bba2404a0c63d82b72ea686da0b75e92b0a6a65fb7e072d97f410942
+DIST firefox-116.0-fr.xpi 580219 BLAKE2B 285c10388e5f2daeb9a319f8a9e81ec479dc32818e21d4daafd8a1db3100f8f43f13fdb6446ebb7fc10f211480d99ad4f849531f70067499af1f2bc27220357a SHA512 ab8bb23081d9ae9065d7773cbd180e1037fbbd3e4655b9a687f57aa44edb4794d0c540403df5b0c1595a783ae913fdf931c7cfcf1159439620d7a9068acf1d84
+DIST firefox-116.0-fy-NL.xpi 564297 BLAKE2B 018fd4411422beef301cb26974448a47a6478b1caf7d736729d1f91296ad88cc6441da115a972cc7e2764ac4a64cf5f5ad2b5e047abfc67b8458b5adfd3447bd SHA512 79805b9c13711bafd8cd937da32ff5ea522265faab16ac9d9e877d8ce7e74ff99229f0e9e0e2c1223eb831f74b1201d65361f9748a33ef514b90106ae4691ad4
+DIST firefox-116.0-ga-IE.xpi 453552 BLAKE2B 0d0e6771b099974625d5a46872a5da1c9e7ef4b10d97ec687a71db3d9c36b748f386d140ef8d743863fd0303a5a42adaf3cb84f8c077c7621e272052dbee59c2 SHA512 4de236f12ef883cdb6973ddc710a034f6c2f77018f84757a82bb53d9abffcd245f09221ad507df6ae535897a20b5e5f44557d80131f2deb3d18fb6e853307875
+DIST firefox-116.0-gd.xpi 566659 BLAKE2B dc8992d5f368c0dd4a20f2099e82b963fc65f86a39f3fddbdb82e88f7258e822e6110ac12fa2845016b7992c117e883899f219ddc9b8bd6f7d1e8397484ebe40 SHA512 64f82f4901d9206dd5ae1e668e7be7d2c961c222b477dafa584c456383ec26010df6dd84792660ace9c1076d3ba0722f360d4c09def314ba660ad5086ff165f3
+DIST firefox-116.0-gl.xpi 565967 BLAKE2B a8fc484de0324295fd4251fd42e4227e9df74d1ac553083cc2a97ae55d35b8e0f60cb34b0ba26ceedbd421f316917142aa2958e8a4549e1737f872e7c27e4d22 SHA512 1620e1a5acda04f4532e6396188d678cb55220f3825df3c860e293fa914a91f6da304ee51dcb43c35cd40926486674afaaf5d400a682c5e928230b7f1af31589
+DIST firefox-116.0-gn.xpi 578267 BLAKE2B 386d5dedb995c46acb352ea05b3af1b888b78d8e2173648e10cf7710f5e42bb8d1f068be0ce97af1ccd11c197b610fad41a444189624c1fbe1287da6ff6e9ff9 SHA512 a67552989404f3107312b1d21a35dadcdd9e113f0d39ae8ee9af9f2be7c65ab216d39a626057eb62d3b383a1d2f1df69ca860291d73db31c76c406c4e6bf9e21
+DIST firefox-116.0-gu-IN.xpi 506021 BLAKE2B d7f69682252810db5835ae92ae224ac4383283a009ebda66a079ba447bc5bb779e314b0b1335b91c5ecd865d2808adece7a2e5c2df218c605194573865b44511 SHA512 d19d03f2ee8a4c0b436a8059de653cfb72897991dce0ce7d6e460d081c5edb62ca5883ad737e99ca74320ff152abbfe04024f7f2c356834b3e4e587cafb11e13
+DIST firefox-116.0-he.xpi 575333 BLAKE2B 823e6416cdfbdaf2402603ffe5c7516f27254b058575d4f188786436a59f3ca95d513f688958079fdf3742eea6c2d57afc632e9bb4a90c2bd563c1e4ce686c54 SHA512 91a790b58832e387339793fa9a04db5bb16127e808445f71010269998fcdf53d3896c80aff683c43ab7255d18fe84a0ac1f07c2e077302a16d967c83d2f3b792
+DIST firefox-116.0-hi-IN.xpi 538287 BLAKE2B d57447e9567265f8516e2b4f1606e3550d26d8f85007aaff5e8b2ca23d88d65d31b3b861bd68f94abb6283be620766646c214d4bd6ca6fcf0534f5ad2ac72bf0 SHA512 cd7ec011da0be8519de000eb0c53442c2af8c0eeb489e8e56450bc69d9109aa516e17c0d251240a81c4a27e4cc5747ffadb05e0793002b9511499c8ddc9ee1f0
+DIST firefox-116.0-hr.xpi 531474 BLAKE2B 8af41ea8501d1899dfa24800f7666a9b89aefc279ca12f5ac9e027d6c87baa9746af44f7090c971efa443958f0f526d25a003c40ab7f1347e5585bc394402dde SHA512 bcd80c65e36f9090c58e23c4b8d2f2ca536787796f33a2268150524770fd20d3f8b6c4aedc35bcc1bdfd157b457016eba2df66401e5196c7911d6ac9481dfd80
+DIST firefox-116.0-hsb.xpi 585853 BLAKE2B b2dc7bb5d55eb9a4d748bb19816197531cf51832690384d44381b963366aef35a8390acb096b31e9927014f064146ed17379ad892fe7d425b92162e996dcf0ba SHA512 8d88b657fea257a5b13bfd3da8fbfc5f523f36146d720da9fbadcf7049cbc025755e90a98a21d6d7191c269019d15f0fd191f422e07cef689463f4147c771384
+DIST firefox-116.0-hu.xpi 588333 BLAKE2B 1b8befa1169ffebfd0c9519741877632d05ea8295646d7d8f500f76257119ec7ffd1656a5cc764f2d8f8925246ca8355e5ec9260a3917634eab8725f8ad30241 SHA512 abfa9ff75a7dd877d367bc6fa9e1e34ab06d04d4513ba66fe30731598ed81be58733636b6b189f8bb9f6332db862e197bdd842a21fd0e15857ddf2f3736f08ed
+DIST firefox-116.0-hy-AM.xpi 578713 BLAKE2B b72d275f4a5f7f8eba5b9d841c2fa29445d49bd6f3e0152d81d10b684cd2cfdf05589c4e36e88c62ea36e43c1dba0cdce1548d3dafb3d1c20cf06e6c5733db11 SHA512 fe0fa6751ed1bb500f2633d94484cd5a4a286720d32b0317e9bdf9af500db0c0f86ac117ac5ff3d26d6eab0872ba20f5e2fc4cfab738793059454d8341b45ac9
+DIST firefox-116.0-ia.xpi 552437 BLAKE2B 868b651f26dc0e68d16dd7abbca1d353014f6d9cece8a00c3942c3b7578c645832af1fe95d7e26ed545691081364b551b39634bce18d9a17694341310e833122 SHA512 8d0771b03e3af60dc8c7ca26c180cbfc012c83a76df54021a97bc1950ab0838349dc1a072322da5b7a3b6e216e7a215806307d1665dafc015043d86c75dc634c
+DIST firefox-116.0-id.xpi 537282 BLAKE2B dad1caa1051ec2bc3ecd4f3046509093681a9b9e7b1f3b4325c1725749664baa5e3173799fe340fe7297f8e980cd635f2a6d91e378c15b89211e49c17e32b303 SHA512 4461fdac00ec311b8c0c0cbc83f3cd53da01e3998c8eeb88f0c4866d7088ea13b2e3fd7361f5cb0c4f63717d6fdb956861a0e4fdf3aa16cb91716cf0874dbfd2
+DIST firefox-116.0-is.xpi 561600 BLAKE2B 780c4c34fc3cfdf255e900d985d005c177e23144d721b97ffe13d1a453b3e4fc362d8be979aba51ab27fefe2e7c4b75d8d48d96ee086521f61c42a81e11ca299 SHA512 596a1f5bc580a0aa83a8b7cfc15c37d648ea093670432740d2e154bbca2a46f4a24d4357915445ea8a32bdc92099a8e55f3cdb06b39ca2db95808ff7c871ece4
+DIST firefox-116.0-it.xpi 508069 BLAKE2B 5d7f82d664b686300545db7c1a990f577266986f782889f593213c98bfea4ebee4bbb3f9c7981d34a8f48b848c5c88f5ef01da80c23fc98e50c0f55a1c39a126 SHA512 20a33505d1b03470ffb1a5368aa649907097d9d571a6ad604a76449a7d67eebbd153056b650fdc95f4391d1af54b45dc6bd70aa23498faed57653d434d4da730
+DIST firefox-116.0-ja.xpi 629682 BLAKE2B c83bb705a179fef104ae4a9d688a5be8cc07de90ce2f310fd9f2b1ede553bc07d73c1a74a92967d0472938f40e4278fecc43f94857739de159e6430cf3d3bac1 SHA512 60efcaa441ff36fe88d6ee09ba0a6248424a842e1f578f19ac134eeabb0b9202006cdbe5ed538b19a97079870aa8eaf12453923e278c18c39ea7d249b937e362
+DIST firefox-116.0-ka.xpi 610442 BLAKE2B 01ff9baf14dd72250ba76d40d11fb224dbfa08e4e85007a407ddce758c198aed7ce0ca4b0218a58aa5b2f41dcd6210185f2c1fafbd6c88d8f8067ec1d96497b7 SHA512 a6c995151e7b721e8998410e26cb6857513083090e264bc28ac4068a5d194e9d39798b1858c00d2c2d5723a8ca6782f82e23cd1505302d7cdabefc07c4b8107e
+DIST firefox-116.0-kab.xpi 562162 BLAKE2B 52f5c4a1cc916c29203d972736acf6ebbf2c2f60a32fc06974b6b20bbd235649ea58936c28c404a8cc356595486d5c5a28f771798923c517b28ec040e835c21b SHA512 02cbe7f372d5ed84863bbb6c33b37d59c5b5562f61a13bd5a0525cd06ba3d88730b51fed640227100e252e4ba8b7fca5a7bce0dd21700902201227108b176b5d
+DIST firefox-116.0-kk.xpi 640649 BLAKE2B 240c7f750d8115f3a8dbfbb960336777a3b8e66e1f746a1456731217659db28c6663b734d657c9048c217bfe8575869a885702a0657269ee621ce4233ad2df07 SHA512 4d1c1cd2231594fb64b99f0cf9d2940bc42b2270d2ba8ad468bf7cde489c9247f58d7f0c3a7ac928f73a13ef96bf69c7f521bb714d3c8626d35c246f01f504c1
+DIST firefox-116.0-km.xpi 507451 BLAKE2B dd5b0c65b69963a937f1bbcec023aef41f0948d2e8b805b76e14ce57923730de186c7ad690e933c0fe96da3c3a13ad5fb0084eae2cd8ae17c4be07496007fc94 SHA512 e43800b6965f096de9d4227b7ccade4d5db694cbb55c14a174426afe19bbcf470e8f602bab5a011497bc477dd9bff4f48a0fc5495ed90efb1d64adea2d97c55a
+DIST firefox-116.0-kn.xpi 473015 BLAKE2B a067327d200c5cea6fd39cb409e60a6bf99b635ab14feeeda1e6b0f0d01c771fc619f1746c7b820d157bcbe92b0f922603aedc47d6f3fed571754a4ff9a1de51 SHA512 214724290fd86aec85a84f851cf537fbeca884ef340fd39cc5762148b62f08fe45b1f2d14f4075c9d2aa97272672a93739e58aa9a0531d5a2a2f15bb90bc6c15
+DIST firefox-116.0-ko.xpi 601095 BLAKE2B 5e34c51c42756d07c9d819f46e51f9b5fc58819ffb4c94055478605d3a4b7f7a5a63d0fa62a1cddd8672a6b5d8137f2b6aabda856b9d7242a7605aa135d767bd SHA512 e320ecc278876fa8541f5b65f8b323c428a0cf3df12cfb2e0ccde6fa3cb393578379aa92e96f0282f4282acbd3852ff17bb204e3f5076936a744a42d327f631a
+DIST firefox-116.0-lij.xpi 463109 BLAKE2B 1ef02f0b945e1549e526d4af34708e625b5e58b93f05f563bb351138e1c5d5b3d383c05f2c3c3d7cfeed9c85575b27d32fe9122c531652bae29cacc410fecc26 SHA512 314ad54280bc5393d35895a2296917d7a96fab4dc6edc1a4f39fb2296924fd2da2a66051cb41455ac6a696c6eb1ebda37ab1ed73720442e6951ad14d6673ac89
+DIST firefox-116.0-lt.xpi 547793 BLAKE2B 4e40185c7011e33e0f48f21d35fc0d697acc933c7630963cd1fdf3b63f783e950071bb798b974e03eede3bb884c41546d06fdffa1954be5357fbe9211f0ff096 SHA512 b82f8442c5d201ea26d813950cf664327f41cd1202a253511f711b0e190ead889cb72ade0e2b6166915835652fe87e6a4e362fc5b2be5209a6e4789c8527f02c
+DIST firefox-116.0-lv.xpi 450081 BLAKE2B 992a8d72b05a43d8665f19ef0971386e3b492bce8a5e70adeb832fc778d7a0b2d35813b9d71cc237b97ba09bc5c6ccf9e726bc91f1104436b9c5f46e179e576c SHA512 5345b5044fd1b984de1469db548991d71998b89c0458e7138cbdf3d751577d5c931b906556e5b6813f66df66e9c180ba9d48db309e73d542277ab62f4b8ff9e3
+DIST firefox-116.0-mk.xpi 469353 BLAKE2B b56733f697410c496ac3f3cf428bc1b531d17cc345b657909521d90df26aa34c5935eb46c3b1bbac2d9fa88910a0b72c9840b5fffa54e39feddc48c3fc936d61 SHA512 6d34c910d37c3afd0cc3c9b0858324008e3e42e54905de263e3b7809e9d0a4f3f7834f4cd7b0900eb42afe94741d4830c5730c5fc915e4dc025b346b32f7638c
+DIST firefox-116.0-mr.xpi 510121 BLAKE2B e9ce3eac58786218004f9a0a4351dca590bc7df5bbad0caad1682fe1153b9141e828fbf046c67baa7b7dd5ce549afa4bd8aff358952a7a8841258b46b79d7f29 SHA512 a79dfba06fc5e65c205233ba6a148c97aaeacb8d7e3636256f7e6f535951b3476920f2f71c434f7e2a58a0c576dcd216deb541b0751d10c782e44608aa1c992b
+DIST firefox-116.0-ms.xpi 430632 BLAKE2B 009d668a1bb15d98e406c0dcc0f6c2f6f47f891fc86e8dd0cfaa7f22b1081e03a08bf4e77ab72c70c6ec15cf726c2029f611e8a25b076abfdea92d0f0d17b19a SHA512 9bbeb6cc2740ee1bbf4be36c9133adff01654d6e6178d888d937e5565c0a8ec3264e946d3841f33c1b346d1d3e002729f4d050507e0ace6f61b2ad46a444f92c
+DIST firefox-116.0-my.xpi 492892 BLAKE2B eefe28d7ee9d606bc2be14fb636ce9f30122047e579c84f3bb204af6a889f5328a7993168c7447723c37ef562fba46348ea26d1fef0b64b524350c899e4ad9b6 SHA512 b55b032ad2c6d26997167b5a19ad9d600fa5593dc3dc092939b63aa1e7783ccbaa85948fe0681d5ed59be11684c5faaef13c557d349406eb3af61f6073b2549e
+DIST firefox-116.0-nb-NO.xpi 548995 BLAKE2B 0322096227daa482d5a535557dadfb98038514dc84bb9809b28e89d76552850b38fc23cd33af6539046283ea1cb584948b4f9c295877f581e1e158527123f789 SHA512 d42201d05ed7429040c6cf008a2e7af949df041a6271e60853b0a587e7a80afaa63b957f68b6ab35cf181ac1a8ac52c0edeb05afebb9a46cc6188674f7316267
+DIST firefox-116.0-ne-NP.xpi 468336 BLAKE2B d2ef2921e212a6c96711ff6b11e9f7f1f1d4720e51a97629206d0dcb4d4ff9cc861e23c979b180d2f4a58500688246a24ab4878cb376feaebc089de06b2d3ef2 SHA512 24830c061a5e727ad07f15840cd8ec357f07abb07dcfcd25db1befa723e715282425968a60635e1574a5bd12688aa419ae11803206b2473dcef9998da7a021e0
+DIST firefox-116.0-nl.xpi 558557 BLAKE2B 46ff973842d48b618a8ec26fa1657f79a445b65638bce5eb36072ed0f8f51ddad8edecc35ffbc7668ee3c00de1db41201766f1c35fec98b217af42e4dbd87998 SHA512 8699548f889d239c56323c50e86783f568e2e9ea9a182a8a84e5fac1fbee1b0037e6789e094e058626f982fd62cd9c5e8b7ad02097c7a2b3c7203d364f1ac022
+DIST firefox-116.0-nn-NO.xpi 551413 BLAKE2B b945375dfc5f18b994b0a9abde9a385a06313bd2d8c36802cc26b03821a3f6a4e9f771b975ddb7785f3730ce555f756164cabc155595ef5b501823bd7b338c8a SHA512 3712e9e2ac17f6ebfa9cb80baf4092d7f0f9846e728bd2b35fe56b3139e5037ac840761970f30eaa3187971d4b9837108f2c9b01c8a905d707ff6ba2f6f81236
+DIST firefox-116.0-oc.xpi 571598 BLAKE2B c601b9791336faf86c08620e70538cfc8dbe0bf75e477e8bdb9369755868e2da1ff6019cd36898c41f20a5341e98732cafb9070847c1167f1fe0b3b18aaf3c69 SHA512 c63394bbcea50db300212fdef2de98d2c3a4fcde875db43f85308e702829ff706770cf0cf49b0535c81a500adbb375de66e2494ac79351f12ef65b04eaefd1c6
+DIST firefox-116.0-pa-IN.xpi 626851 BLAKE2B c7a585b416801dd964c65b2f1650630754583da0e09d1de2b2e1f3d9e109080e4a69b306e96cc8cbf1081f53da9ee1245a795194b18ddddd74dfa0200d07a816 SHA512 b9baa1e6d5e435d9d952607a8cfec429aa46cec5e3f092393832d7381e1c76a9faf83b6d4ff5a6dcc9e67c54d4126c13c8dd7c7930a700becdd5b724df0a9d3e
+DIST firefox-116.0-pl.xpi 579296 BLAKE2B 5e7053e43ca76ce672fd6b23223e6bda44d71e0d0ce4a2a12d19d4abc61793008e0af43e3af1352eb8cff140a62af05356400d600bfff96bf07db1ae8d56de41 SHA512 7d2599eed582c2e1ecc9a67e661a0151e8b8c8f6028ddd19bb4e934eb121ee77af2ff49e5096c824ccb9f41aa87d9fe61df15019bb38ef1197ba87e5b6848e55
+DIST firefox-116.0-pt-BR.xpi 564563 BLAKE2B 26d3219e8257e88d7800c9bd3dfe8040ca3fce902a4ef63e18ba9fba21f2d4e66fee39a787fee9f240ded64837dbf4fd08b70991ae7e1e297ae5b77817efab9b SHA512 ccf271c13fcd528da1d9afa1245038a066aface786a52fcd2562434619834627f2492e03bfc564e50e73b417c5ee512a74f30f4fa64bd717a33db586473dca83
+DIST firefox-116.0-pt-PT.xpi 568416 BLAKE2B b2c314fd02698ae8d49be3ece86d55d2a83db0a6a02cb034fbde568fb86c313d3320a85416514ad4fa3de766a4320a9a6ec02d99824321b88652d55254dfdd6c SHA512 7a561689538df66bebab2a4508dd2fbb53f5232283e8a617dc4bc48e9f34ecd799252b91b6f86b0db690cdfd04d0b6738064ab484842b4dc01b296c8d29c9e29
+DIST firefox-116.0-rm.xpi 558028 BLAKE2B 82a8b6d8effe0edfca1091ae768a0cd0af721d4c2e11327244060d81276cc9b938cd2f66bf3f779837846879d3dad0feee6f26983c3eee56ce7e65cefc5de68d SHA512 47116719a0cc2970cc4c037b56944e2ded79e4ec54089e19f1857bd627ba0564872a9254b19fd506359f9468daca93a2d09aa721f9ae82c69e6058e5379a6892
+DIST firefox-116.0-ro.xpi 524309 BLAKE2B b49eaec1c070b7056ec33ddd882584ebd744f9d91eb4c5826e85afe7fe7937e3996d3f5f70233a888534235ddc9c1e01b70a270ea980da23361ea7cf6ce43367 SHA512 fecf44f719720d37e95b0a1d9333549cf0b9ef7a40670310e266bcdb5f953c5f4064c2a1a46756d8294728ab530bc9dda55e4b8c3c237eeca3c8c7c422773b1e
+DIST firefox-116.0-ru.xpi 653105 BLAKE2B f4de4add2cc21f5484498e5216c855da858cf08554b86903e8bd532dd9bf005037113cf11617d07fae2aae379fff3ffd8d10f2b139caf7163d7a3353d4c5b50b SHA512 9a8b503152ef160af80a80645f6ea1bf2ba403f973781329db0dea71019276dc9509d3e82af8f69279cd6ddc2bbba4cad991deff6ad631da06a37e502f0f1a82
+DIST firefox-116.0-sco.xpi 489055 BLAKE2B e77146c2916a401d086febcf5d5a757146bb0aa987a0b3446d3c2c71d49568ee125027f03aee8e8c7789fd30b56b8ed566cd11cdba0d94299449996b0916bd97 SHA512 e88621dd5ad6452f98034e6a8828f21f47abd971665d782c0a1b5e6f3179841c166f2b31e39f562ebbc3f627c0399c2541c9222bca8d59af4e70c65da99ae64a
+DIST firefox-116.0-si.xpi 574168 BLAKE2B ee38700ccbdfff8e7ce9aff1669cc28eef67bb7c4c0479573c6a4c6c1e5e1389c0c297eba33f57d5e17e611661cbb4eab3f8aefb3096257a417444ffca277020 SHA512 32be0bb91c6d687926b61928e664bbbbb91d91d198eb2a712f70a874209e8ca3c2c2d05211315b822e6063374f95f9451163ee7d8631c9e559881be4e5a71f93
+DIST firefox-116.0-sk.xpi 590366 BLAKE2B 6b667527f53f44af98160018a81f029749b514138b306da2dc35e1c753675e96bca76fa7ce1ca8586439d7f1bc19ccd7796836bece0fd088938713f11e836f36 SHA512 6d0a0de25ee7f669002a23a167d1b8fe7f791cd3d0eb01ce1335e2be7371fe21d7cbb406b6e9ab82da70c68a577110a9ddb72d1ff2caed33aa8061197566847e
+DIST firefox-116.0-sl.xpi 562029 BLAKE2B 1a9b0dd6826ea5f434e582b6de72ca7e764393a6d9c69f46cb00186f346b7708b25f9d6849497661ba541bf1519b1dba00b415d4e872f2506c1b7d00f130ee18 SHA512 f96b285d1da49a98ac5b101b48d5c6784e8a0091ed34ce038847c8f460612aa2ae92fa56610bb0acd98913848b0461977533ba37582b2a69a9daf1e8523f4fe0
+DIST firefox-116.0-son.xpi 400204 BLAKE2B 2ea9b50609b176aad1b8902cb6838c3437a86ea399052beb65bf939b71cf4fddddd3ca7901f582306b26d3bc7e37ae27d3a70a968c92aa25056d5b22633e7ae7 SHA512 4c9bfe4a09ac9b184b5306ef1f8c5277c0ce38d4ede217a60b04e3539d9d5cc883bdef5ffc5e4c6856153e4f2863300fe37f6e10e13fd14cb50644c477e12001
+DIST firefox-116.0-sq.xpi 563998 BLAKE2B ffdc0e926dd6a81675ef5184f2ddd4b26bf021387a8347b220722468ef07e5593d7828412dfcae1905f43ef83294a4f383822c394ccd72625e7de64204242fc0 SHA512 a4ed0c6b79c4cf845b7bb6df79721ca5b6ed055a3983540bd344260a28309c8f072dbdaff90c753d02b473518949a45b79456fb81ecde4a12792b911c4c39dbb
+DIST firefox-116.0-sr.xpi 613441 BLAKE2B 15aa6b91451315d15a8033707e6e7cff1c4256bf34b31b00bdc15d885b3f8a3d793dfab186c61e90b1c846f9263b2923701f6a32e5d9859a3590a555155200b0 SHA512 deae0b022f9f27a33714a0a1eae465f8a01bb75c912ee0a1eca8ff596b09318a3a506534c6aa56b6859756040f6fabb6a0c37e359fd899f57533f6b8254ec345
+DIST firefox-116.0-sv-SE.xpi 561743 BLAKE2B abade289aefee0e44c057ab05a4045509307aaca303d337568d87564ffbccd7e4730d36337668e3a7b03e76f4b8e247e6d7e2c79de9bb27b51a16cfd08814bf6 SHA512 646779e61e97b6c42196d9bbc1dba015f7d9c4a20d9e47ac7a0cc3bbfc83cead613c0253d4b6f8d726f57b76592e135bec93bc4e4907ea2438f040f0363a9f1c
+DIST firefox-116.0-ta.xpi 488084 BLAKE2B ccf9be9661c3de2deed609cc56fe3650d1a78c96645ca4eae0de0e11b253ba3062c72c55200a9b36139f8783219aeccad9d989aef7821a4b0b55f422c10e17f8 SHA512 2a7fbfb711acec39e045f736a814759ab7cebc79fbff65b8f6bfa50c5fa4d75e41813ba51c781cb1016151475a9523a9ea35e29a8ed9b7b95115688676d581f3
+DIST firefox-116.0-te.xpi 535418 BLAKE2B d247ef6eb294f47fce6da799accc9ec379e7964d1e16ef0c8525e95b27ae243015790ae1a8e9d0abd3a122ec67105a5d25952fb9aafaa1615e3187979b75b2c6 SHA512 c4bd68e5a2710766d8c4090d1f6f96e844009bfd554ee5a7d6fd2d0b8ca42e69d7090b7a57ce6a6ff7c235299191206be00f4442672a1e8566d8316a7876509f
+DIST firefox-116.0-th.xpi 631494 BLAKE2B e94af1a92b3c5f05c7706d263b57dd96fcc84c468acb92e4699763e3939b23f584e4affbceab93a5602747a4e5fc67070d2cf5fc95d0615cc1ff107d5cbcdca9 SHA512 3893e957707b3a62a6984b04a92f47ad4718738f35611f0684e69a85ec3f3a4d7506a2cd925f399fe5ac902d32744b45ae66faf3144f2b8d5f1e67cf40ae99e7
+DIST firefox-116.0-tl.xpi 510943 BLAKE2B e3a8803be244f2f0f967c14e7d6f98f424467561ce4aeabc943013597256e651b09a4efb5b3f3a9041ff77fa45919340e8733a51a885c7be20a7bd733fb7267d SHA512 722d100271429921b4eb878fd6758c406f247900db4c216f289d6713bc5c29782ea4d1a4dfa80c29f37f1813efa0f513e627373626e2cc2e2a8868ae94fb0f0d
+DIST firefox-116.0-tr.xpi 573425 BLAKE2B fd6a2bc198b6c529e29253947df3e41526dad01bf11762681789a82eb4a850efd51681b57554f36911483dbb31a6d5906c1a1fa9b81e16f424b36a16c34f0dc8 SHA512 1fd58a90d0412d01c0db67d134240eda312304d466efeaf43a774a80122fbadd8aacaf4ab74388b9b7c1903b78a4d373881125693f6cd13ed9daeffad8c01492
+DIST firefox-116.0-trs.xpi 481280 BLAKE2B 7dd3c698d32a7dd380b1ecb226b70b7e10a0954fc4778eeb56e3ca6d463787567e31452725e280baff231c10dfa46c577af9e10cd7d482629a55ed7dedc71d90 SHA512 c5508931bc3194dc4f0ab171dcaebc02611399537c6fd3eff3501b07fd34acd0d35f8755a0d111e3bc1ba9c92c76a16e7ba2266eea78ff1aa433a540eae0ba79
+DIST firefox-116.0-uk.xpi 644408 BLAKE2B 584ac4961fb7de3684d353d5dd44218da8f82efad8654e38e9b21306aeda0bc85813966607e8c893776b3776556af5ae749300b4d40883cfa1ccafe607f81ad5 SHA512 272c9725f08758137b554496a837f52548fc26f198446660f0b8b483dd7bf38f3ad2393e95acc4933726102bfcd65bc43b61595b20333a7c1e37fc7c8128d332
+DIST firefox-116.0-ur.xpi 538180 BLAKE2B 2e2524ef3a27adfea3c060deb645fd8e76d3695ffa8fa1731a139772d0b088b80b1e03d04da62546a55ba0d180b538e6609a9725aad1280186764a6c193a80ea SHA512 000d23875ec9afc3600f9cc6dc7357e2cff504ae7e222b860f145f83c38c7ceca63e7d2841fd05600d0ec78451ff41b1062c8be07c2753fd2844bb1f3646cb33
+DIST firefox-116.0-uz.xpi 461091 BLAKE2B 473719f882c93ea0b5150fe3f187c067d7ca20fea64ff2b76315eaa4955caee0b11da5e743406a7034cab56a977f63811a19c2f4a4734b5bef711e09c4a968e3 SHA512 90ee43ea59410b9e884919c8c9c8c099c08e83f6da4521b8bd7b86bb72c9b58956451550c21b2ee903a44b05bab98edcd703ccc6e23b2c2187324349a2067142
+DIST firefox-116.0-vi.xpi 596611 BLAKE2B e282057e43e821ccdcae2c11c4966fc403d45c914b267fb03c7010ae0cdecec683ae98ca79ca21f09c618e93b7769dbd7ff1792d5878598ceb5b8408f68c8e68 SHA512 31f10ba77f79c9425ec88cdd379a6725f3ed3b1b90c69ed83b4b74f42b0631d3e1d66f9abfde88150a3f8317a914e6254f88deb61ddeaae819be2d2b0f1d5d44
+DIST firefox-116.0-xh.xpi 401650 BLAKE2B dce3add055f8e5ca785c05b1b110980668d11e0b4d3cc26569aec77b84441c992e4f8e4e55bb804561aa2e230ae5d6875ed85d9acc45b0ddc3f5423133bd33cd SHA512 e4a466326376e785587faa0497501e1bf0e8cb235027ba0144047eebd2e62defc60990050c7b8bd490dd539439a2485b2ab793c84c4e8dfddcdaf5dd425dd09f
+DIST firefox-116.0-zh-CN.xpi 596066 BLAKE2B 133b239fd1cad0d5e7db5b0f861a9afda6abba16238149d2055f66f07aecc9b23959edc5e43bea0c7f00798bbd3efccbc47c1b74fff263e6490e4f55fc43908e SHA512 427a1e063e986503fae1849cec5124158237526a4a265e616235e77984343e883936ff1569b198a6ec20a5d48cb19b5edf12976ddc3c8a69e598acecd494976a
+DIST firefox-116.0-zh-TW.xpi 598593 BLAKE2B 6633c9ffbfa988f1345c67e3b4cea06bf90714ea6960f12f6beef3c5cd2fb085f0a27a5cf2addab28e645e156bf0f518faaab4be63e3603210b916275f0d1c1d SHA512 c3f901183ab89bb8e01034dc328522163d131dd847be330ea099018bfb32abcbdd748bfd8763079605ee4b3cc0c65b3fd7a39fc853fa3b93b25dcd32d74d7641
 DIST firefox-bin_i686-102.13.0.tar.bz2 80732463 BLAKE2B 2f15e025c9c252e8d2bed2ece017795e52ad0d01e0ffa66c268a29324697dad6d4603507ced87d199fdc865b04e4f578a2e4ad7e50511228b8fceeeb8a3415ae SHA512 eff7c770b8d9c7c9e26588ad383eee1f1b3cf7bf91de7f02a8b687dcc0fff0e34dd4fd5544d94717b55a6ad68dde768ac1114601dc3576af8ea53bd97a91ebf9
-DIST firefox-bin_i686-115.0.2.tar.bz2 84283703 BLAKE2B a96715223e9378bf1ba69ea455f9c5a9d416be7e61ae00db0d7ba4edb02c8968eeff88d4eb66ab1434d80bc4d659acba3946c189b0d0b2aafce86b48bacdd59c SHA512 52c7bbb07e257b10c511c6cb5e6dabeccfc66d81a10e0da26dd125341216f7470efa0cc1e72dde4ad39f94f3ab68909f20823232c88c8a494dda415944cd613c
+DIST firefox-bin_i686-116.0.tar.bz2 79947439 BLAKE2B 9bd6de79477e3cc406989cb52882356c4ef16744fc71d0571156db60b20a9d636ddae5c1480c97d8f245e29ddff335b8425a499f472a9567950a4b94734098e7 SHA512 054f7625f08c99887dbcbb58dbbc52030581777c7bd8f0b585558d6c784c7aece85a73900e398f51d75da5de0255693f6c2233ebc73167fdaa4c28441d5d7881
 DIST firefox-bin_x86_64-102.13.0.tar.bz2 77430471 BLAKE2B 6172d7ed6b2f3cd4f346275984e8603ad497260ea7395dc40487c908646040a293061a92955b087dfae1c63cb2d02efd7c85e7053dc46c55d7382efdab7b3ff1 SHA512 1e39f7eab85cf1981db1ceac7785355ccda73d2f60138e4ad3443dcf081caa553ce044206d945260a0efab051b6d9adae9348e39bafc6f2762a5329cf897e4d0
-DIST firefox-bin_x86_64-115.0.2.tar.bz2 80141576 BLAKE2B cf6a9fde20937311a81448948443858128a86a1fd5413e8a24b70d8ca3c06070bb066e9efe3a1f2ff02f0bd772f52618ba2d8f53b74d76dbdda5a985d3752fea SHA512 38ea15e1574dced96ee54238018c745dff1478f159e917447ded6e558a1df5914f9305e0121976aae95e1094884cf4d6f4e8d32e97180baa7690b16ae42a77b0
+DIST firefox-bin_x86_64-116.0.tar.bz2 76522459 BLAKE2B 1a9043a466f7782b4808e73221b1efe6953042037c2fafc4c21b9f5149d6e8b878e854f3b77d3b1be02a8db0b02a623bd12cb929ddf1a33a44d0e421a8aa0043 SHA512 8ea18e2256cf452b62bc75ff1395091d9bf4a69ea35f0e198a6eb6cebccede16f674741ee6c92bb1f72282ec5ed82675eadd0c30fc1b2e9593dec3e8f29858a5
 EBUILD firefox-bin-102.13.0.ebuild 10818 BLAKE2B 92bbc7f0cc880ab08859d8f7d3da3e7fce327a0974533a19ea366b37d005a83ae5fb88270a98625c216248dc70150874c29b45dfaefd6b5d91fe0bf92fc62aa0 SHA512 4ac6cd0433f0610d59dafd2f84531aace09173f62ec09ad6eabb6b40cb1f42cb93c971f2bd67d4f28def1a1118b2d41bf73776d93ccdb044a1b680f1ce889474
-EBUILD firefox-bin-115.0.2.ebuild 10858 BLAKE2B b18820f9df07f9bdbd2435f15e5e6472bb07e2b068d34b947cc226b0fe880265b455cc5fa15ac210c9d679553c5e8aa7e9254667be6cb95bafc06ae14c505245 SHA512 2ed5ea6723fcce70359930747b2893d6ba0de19134df2da3788e7c7fc43a8cde868e55892d5c7f2361619662958ccdd6cfcac2880b94fe583de41938ab986bdd
+EBUILD firefox-bin-116.0.ebuild 10858 BLAKE2B b18820f9df07f9bdbd2435f15e5e6472bb07e2b068d34b947cc226b0fe880265b455cc5fa15ac210c9d679553c5e8aa7e9254667be6cb95bafc06ae14c505245 SHA512 2ed5ea6723fcce70359930747b2893d6ba0de19134df2da3788e7c7fc43a8cde868e55892d5c7f2361619662958ccdd6cfcac2880b94fe583de41938ab986bdd
 MISC metadata.xml 520 BLAKE2B 4b540dd2d9ac3840061de8a73117f2859db156944826d22c1f74cbc0c35f6d305aa10ff45708eab016df725cfc741c99dec46f0078a29162982431892e86e477 SHA512 0c7183e35a4b0ca2ddd092786ebdeb5b41a431adf918f0c2e541a5ef1c235066586a46a50fa29c25e5a522930824f8662fa2fa7eed8c3895f74d85bef93cecb4
diff --git a/www-client/firefox-bin/firefox-bin-115.0.2.ebuild b/www-client/firefox-bin/firefox-bin-116.0.ebuild
index d134ec543678..d134ec543678 100644
--- a/www-client/firefox-bin/firefox-bin-115.0.2.ebuild
+++ b/www-client/firefox-bin/firefox-bin-116.0.ebuild