gentoo auto-resync : 08:04:2024 - 12:31:06

135 files changed, 2386 insertions, 331 deletions

diff --git a/Manifest b/Manifest
index dc8478150cae..407b9b31a866 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29757 BLAKE2B 90a561ee51ea7501f093a802191907829a07e39d5e85bc46ed9623304bddd020b99c0487b1d55be4ea200068c91ad8796269e9b108e1ffbbf08ea42b06e969ca SHA512 2ccee11038d93d029a0199743931911120e261454e92c3c8ef8b15b65a3386a55bdccccecd2f04a509b8367f8325d42b684f923594a1ce6174ef27bc0f13a704
-TIMESTAMP 2024-04-08T04:40:19Z
+MANIFEST Manifest.files.gz 29743 BLAKE2B 7f20355021bf1d44826742d17779b2d1dc2eccffc1920bf7eca07d860840ff9cab7b2587354721c47ec9d91999a7bded1749db116733b8cd9a8be55f03b67d83 SHA512 74009c2f004119a4bcfeb7b018610d7b8f5d512df3f9267c656b1bf225f6d8fbb15f3e4745371cdfd74d8de59e1bdf7c95775613727f8b702e0524a5d2b976ce
+TIMESTAMP 2024-04-08T10:10:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTdTNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTwqlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDOdA/+Pcdcw0HZooo9UaHLvb54Oz5bJuRFuLeXfsTx9apcExuKJrx/nT+iI5A2
-JkoBmIQatsXv+ctNk6Thktsh9oatMXOC5RxpzyCXbUx66E8O3HZDxrnC/rWMd4UM
-ZXNE98qq7Qoga1Mfs3i2uPL9aLucaqja93xv4Cnoj9PNH3LsNmQwQsgPgadMZ6b/
-vouOozQkLehLSo6aIjDooSyIXLynVCbDsJQcAFu+sBFATY3SKwaf0wZ1MgXjZNW/
-SBpPQA2tfxAh94J92jnc/ZgiJ11ld7E0tU4dJEmYRuzgtjplh9tRBCCp8hZaCtu+
-nKAu5wDhtivghrs38nhJLp/GpajXFf2LEVYtLYcnX7Ixw6OPxVoEccHJZioKBMES
-/dKOLVHQOdk5eNp7gfjrqDxHSTohVRQzi3l9IR5txrrvIYYTJBQb69nJYpY7EzMP
-pJGge/qY/kp+/Pce8ZmsukXtiJRAFThO8wQ+VhApDknYqCCdOtOx80AI+DXVp4uX
-GsvnhBmpgYoLlEiwfczZSLvFXQc3ApW9wK+UogRnQglzeo5Q6927cddLXKi9CgyO
-QQV+bbSnn2Jk1Q5vHZ2T/vgCLUaJ3AqoppesQLIVg61w18jNG/NLskGwCDKqKsWZ
-ijoWdn+JgC8MsIwVDoTFyTlKUmdsYS+1jMCd52yv8boWRP0O4ho=
-=d3p4
+klCPtRAAg7OucnLvua7j5UnEPcQ9Mah2jsY4zS5L6i5amAKcoeSEwkV+xLXN3X5P
+gHT7T6W427GkQ8RhY8LN6CuZTs5gem//lXvfki0JXtlphq+41i0S4jnY2RkZLuxn
+Mh+jnxRfEX8lTns33vSDgC2wUu/ssdG/uPmCRc8du0CYAYOTgAGYCsE5L5vyFSX5
+AOTtcwfVq6qCyw4hP8OrjOijUBRKSFywwDp/q5KfHGQJ0CxMx9LSUhil2zCHblW6
+NrrKCo7jGrqsyXyBWdurMgoYmMd0aR/7rvFXA+0gPlkF4enmR8EzvnQiBSk9tzrw
+7HDsG9qUD6NbNaj4zAh+c2zYydGryqxVUWjplFiGiIqahgInHr7H7axC5jrmjuYU
+cH3L3H9UIA7iq/xGWJ27ltgGjtJNPVq781h1gWTungazgu+oX+N1bwkwMJM7GAri
+R8y8cir+6dY7AFYBTNRhtRWi3aqiw9WH1XdTHOffH8D8KF92xLqUVscCDoQNzeZ0
+IX03VFhvbKMPTawXO5sGS5bxzacXOzXAn914ocXkzRvob5JRdewE7YMJvMxNEwDd
+l+8kqyUmgDO6Dc52WWUq4ozfjV2ousAFW4tFOfhO3E7AoqAF91XkB5qR8EEG7zWQ
+RdY8sIh2S0/EfX/E5f53vtqD+LSBKnMBntDARxpeCVlUcpkBs1I=
+=hmlE
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 00d14e7a9aaa..8530404ae720 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 59fd62f85c0b..30d5e1e2cd73 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javacc/Manifest b/dev-java/javacc/Manifest
index bd2427b32c80..493eee760e0b 100644
--- a/dev-java/javacc/Manifest
+++ b/dev-java/javacc/Manifest
@@ -1,8 +1,10 @@
 AUX javacc-4.0-javadoc.patch 420 BLAKE2B 8f26c37e26f8967cf527a6f7f4b6c5396bffb5cde4cf9aad292217d41e614800cac438b92971e0c942f71ace4f551db30bae873e83ecdcf2ee7940153fca50bf SHA512 e20554696a27137b7f9c086f7d8c4854742fa1e14ad84e2157cecebdc65f2fb6726a0eaaff7bf3f1113a6fade51c5825b86641b61b917a4fcdd96663a8830438
 DIST javacc-4.1.tar.gz 769476 BLAKE2B c2a22fa78ff4dcf1e36221a23ca1e3cd1eecb473a59ea94ce52e298673f6bd18c0ea0cf757dd68885696ebc8cc724d271c69c923a21ffa433d03c1062b1201ee SHA512 911e5e9f062561ade1748dcef3596e0f25c399c4d52dd174773783dadf24a4ceea8d3feab9ab08880370677959051d8557aed815d4c4184f5ecd5789ee8a5754
 DIST javacc-5.0src.tar.gz 810123 BLAKE2B 6833e79a33c7ae8b28902d1c372162a2f9e326629f0d4c1936a8c3638d3aa3f6bd5713aca8398ba5f1ff963fe585eb683fcd3009602ee592ba79692c8ba0f3d6 SHA512 91896a0affac1c4fd00a093a731dfd02bda548d1a4d83e1077ed36a67f4f9deab0ce9f2d0212fd4c08ab00065d3029533adbafbc026a22ca071285093bd3bba6
+DIST javacc-7.0.13.tar.gz 3199783 BLAKE2B 7e3dddbe53a6e417a31bb7386d154c0e9589f17f88e652f5e146a4e344d72cd948d4d8e55fab753bb983e5d31971efc948c1ecdca4e875031bea3f8a38bfc082 SHA512 ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144
 DIST javacc-7.0.4.tar.gz 2842349 BLAKE2B e5a2e24c99e5e3883270cf0e3931d7667e5b5b49a11c1d9b79b98767f74f4addf2dc7d3d620550bc1b5bb0bfbef8bf07af48a40d250d0902d97c8215f6cb8e01 SHA512 b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1
 EBUILD javacc-4.1.ebuild 1478 BLAKE2B 0a6e3b429e290a4371dd7df43e00022849f64fe5ce5a213973a9870da7422a531f6fa64b21859b81fa96a9dd8a9a78ce5a50ab1f897e64a38604c42c185e33a4 SHA512 7e3fc6bdecd437bcb75b07d0d08061bada5482a5c309e21323d9522a0c5e157e4bf7be81bde6dbc8f6aeb99cc778de365076b514cab7a7f2d0ed906301d5b541
 EBUILD javacc-5.0-r5.ebuild 1433 BLAKE2B 275060ccbf5ac28d7ca810d304461ea387dd6e6698cc178804a6b580d12fc9ddeb105f6d6cf385cd0b968b472cecfbdf800d30147c311bf66122df8e49fdfa60 SHA512 920a971a51aedcbbf34885d89657e3032078d5d61bb329db53b16e80a8ea0a8087ba715238b2c0acabfd8b1bd56aeed4d3a2d28e973db44731548ccf51ae3125
+EBUILD javacc-7.0.13.ebuild 1220 BLAKE2B db96859b4b4286354676f713e3e227014337883216b0a259316036751c7574898c84091012b4c0ddacf2898220f24f2153f208f23ca9924c83c7c30f6ba03922 SHA512 827944d3f19341646de4d3d50fd55ef3c9c484f8f50aaa1b5c4c0da11c870f650afa246fef21fdb7511cda2885a9bd12282e6eb75d37d20059fc05aff9076949
 EBUILD javacc-7.0.4.ebuild 1383 BLAKE2B bbc45123fe870bc31b49f067880565a77e7f8035fb9060b218af683027748b07a771ebbfdb98acc256d9b7c70975609d50a7bd6546986c1ffe0fb5ae9615b438 SHA512 c12f855604a816da3844451a210d0f223e02dcba528ddaf21886730f47f41ff8f76b39ee4a365b6038d29e6f309471ab5391e60fa808bd7fc4918dc130a38f70
 MISC metadata.xml 308 BLAKE2B 421dc38149fa3d88a66071836b7b00e6218c44f3111bf9e99b3f35f5e6ae3e550290d03b9f4ac960828484c8993b1ae5fe5ba6b4b73e172ddf905127df96eb25 SHA512 d365ba4454a45f49ceadbb4f1700ca58de8b9e0715f02056cbff899507fe39bd64e5d388245d0458ec5be9a30f134a4bcc2d8e678745f0b79502741ae30aeaa0
diff --git a/dev-java/javacc/javacc-7.0.13.ebuild b/dev-java/javacc/javacc-7.0.13.ebuild
new file mode 100644
index 000000000000..29c7faf60f0d
--- /dev/null
+++ b/dev-java/javacc/javacc-7.0.13.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source test"
+MAVAN_ID="net.java.dev.javacc:javacc:${PV}"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
+HOMEPAGE="https://javacc.github.io/javacc/"
+SRC_URI="https://github.com/javacc/javacc/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="BSD-2"
+SLOT="7.0.13"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (	>=dev-java/ant-1.10.14:0[junit] )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean ! -path "./bootstrap/*"
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar "target/${PN}.jar"
+
+	use doc && java-pkg_dojavadoc target/javadoc
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/*
+
+	echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc-${SLOT} || die
+	doenvd "${T}"/22javacc-${SLOT}
+
+	echo "export VERSION=${PV}" > "${T}"/pre || die
+
+	local launcher
+	for launcher in javacc jjdoc jjtree; do
+		java-pkg_dolauncher ${launcher}-${SLOT} -pre "${T}"/pre --main ${launcher}
+	done
+
+	einstalldocs
+}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index a5caf27717dc..e7104daae8bf 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -24,5 +24,5 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
 EBUILD openjdk-11.0.22_p7.ebuild 8864 BLAKE2B 36030166187064b860ae74f7a11b6ae147e3c43b4251ff4e4e8cdb0136baa0208f2ba825d12f8e9270b0b33dec7a420f51b9f6929561733b685e47a771554fc1 SHA512 7e44978bb48ce996b8603cb5297587c6c3264431bb540b5d7614f4447084464e9bb28460176dd504805d19271b4f4bab3c105c327c21765ebd1dce6968c00c31
 EBUILD openjdk-17.0.10_p7.ebuild 9658 BLAKE2B 70fd9a5134572f07b227403a90ab9223fc7f70ee57b3d2868fbb623566f51af97a32ce09ea38034808d76129bbce3aaf9ac9b9006500c8f7bbe4650f900ed17f SHA512 669f8831f7783640c97ed6d27182fcca6f46cbf5adf88eef37e7d3634dda9e0cfed68355d229b685c43f71fd96e4710a8f0aa5b6d864b361daac37be3e7051a8
 EBUILD openjdk-21.0.2_p13.ebuild 9251 BLAKE2B e7fd409656211864689d2040d738a45a132d5e3150fc8fa180d7957255aaac6cff2a44dfb87bbcf0f519791f39f09bb6788bbe730738c70778d5f22c85e9fa00 SHA512 73ff9f0d4034dee508403f2ffc1924294265465629a6c0d9c33c4e5df776a474c6a7fae19eb0b446e7861cb30fc24929970b718b3da69ecb446bac994bb22950
-EBUILD openjdk-8.402_p06.ebuild 7804 BLAKE2B 032d79c00a20c297a70706bef5bd3905bc1cd00d65914bb2979bbe100a7fa89173197dbc84ac9c354f04ba09d15c71261b992ff5c518197f74a4d919b807bfe1 SHA512 4aec007ff050a974626bd2b9877ac07e35ffd25c10dd322ebfd83f88f2d4689fbc278a0dab75bd8d1c59e2d9cdd1cbd9a13d741d294c4078584f6bdd0f79cdd1
+EBUILD openjdk-8.402_p06-r1.ebuild 7737 BLAKE2B f54978bea72e47f5139c1c739386d8f96a30f65170798405dc2f28e175015b9409eebb0404aacad2993db1299bea68968a019e49c479c9b42968b9e254e4f55f SHA512 bdb7ff068ff1eebb4e484b9774cb2448b42ec411d0c47ce4a852db08dc2f5417c352561db3eb138066117208697e4492cd34711047ad555dccd2eacb87e64ed6
 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
diff --git a/dev-java/openjdk/openjdk-8.402_p06.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
index ce8e246db9d3..902c433e73dd 100644
--- a/dev-java/openjdk/openjdk-8.402_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.402_p06-r1.ebuild
@@ -85,7 +85,6 @@ DEPEND="
 	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
 	)
 "
@@ -132,7 +131,7 @@ pkg_setup() {
 
 	[[ ${MERGE_TYPE} == "binary" ]] && return
 
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
 	JAVA_PKG_WANT_SOURCE="${SLOT}"
 	JAVA_PKG_WANT_TARGET="${SLOT}"
 
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index bff7832f31c0..4a68a5d512e0 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index 336a486c3883..e5d3159f2854 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: java-vm-2.eclass
 # @MAINTAINER:
 # java@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: Java Virtual Machine eclass
 # @DESCRIPTION:
 # This eclass provides functionality which assists with installing
 # virtual machines, and ensures that they are recognized by java-config.
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -28,10 +28,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip"
 IDEPEND="app-eselect/eselect-java"
 
-if [[ ${EAPI} == 6 ]]; then
-	DEPEND+=" ${BDEPEND}"
-fi
-
 export WANT_JAVA_CONFIG=2
 
 
@@ -98,9 +94,6 @@ java-vm-2_pkg_postinst() {
 # @RETURN: 0 if >=app-eselect/eselect-java-0.5 is installed, 1 otherwise.
 has_eselect_java-vm_update() {
 	local has_version_args="-b"
-	if [[ ${EAPI} == 6 ]]; then
-		has_version_args="--host-root"
-	fi
 
 	has_version "${has_version_args}" ">=app-eselect/eselect-java-0.5"
 }
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 63bf666d230c..0de25f2ee15e 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 7fb53a01caa7..8ef56843b6ea 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-4.12.4.tar.xz 16951736 BLAKE2B ddac469b63f8f3a26b90c1ca0ad2f873d067102d5a3827c4b1a0561bf3e58646c042631ef11170cc062219bb54db39023a27d1bbbda839b1bd6fc8514eefb36d SHA512 354c686c160c7996ec7c69b31204786245c2a92615e4799b6248776f10f4393c167e73caf8d2fb949539c978358ffa2151092a515be94ec7eeb8951b773ae6d0
 DIST gtk-4.12.5.tar.xz 17314760 BLAKE2B ce6a88d2c3ecfa2a9773682645ff00a61fd932b9a6de764794ef8abd10c5c75df386801143c32d10fec110029e997a16c4cdcb0ef050905562c6dd9fdc46039d SHA512 813758f4fe23b99b2ea1cf22156b86b22df30024717ae3b30bbe36111f9b1363bbd4da5fe8e5f69268c43794ea165e12c1c5bc52fd64bcbb1f9ccd3121540ac4
 EBUILD gtk-4.12.4.ebuild 5948 BLAKE2B 8b168a7fee8ce5ac017d7d7222692bd7875dd4ae8bee4edfac39177d425469d4785df08c37c4ab90c6d663211774ef078ccff02b0e72c5016bb56f96b3283f26 SHA512 5ff64495c754a1abec97bf9ffddd3b896a9afe9a1b6efa8d96a67cbff584f4c14bb3bef1740c2bc9d3cd3a95789f5f0d53d6084ae0efd8bf9b4b8aeae8f087f7
-EBUILD gtk-4.12.5.ebuild 5948 BLAKE2B 8b168a7fee8ce5ac017d7d7222692bd7875dd4ae8bee4edfac39177d425469d4785df08c37c4ab90c6d663211774ef078ccff02b0e72c5016bb56f96b3283f26 SHA512 5ff64495c754a1abec97bf9ffddd3b896a9afe9a1b6efa8d96a67cbff584f4c14bb3bef1740c2bc9d3cd3a95789f5f0d53d6084ae0efd8bf9b4b8aeae8f087f7
+EBUILD gtk-4.12.5.ebuild 5980 BLAKE2B a55730b59e8d2194b869105fa10b2b5ce5c69feb6a88b60c913af326c18218d2606fb102fc522140b5006098c810b4ceea68f41e5640ad4308644e22a84e70b5 SHA512 dfffd33b9d80cc8a7d813a73ef67759f466ac40348586cdf20c0c6cd61eadcb9c3bdc748011a9e7b8700d280327cbcb2bec3f3a49d9131128836d5433d3c9e62
 MISC metadata.xml 775 BLAKE2B a679a63b050be837319131924b4196dc7fdd2a1dcbca4b099eebc8550db3120dc8afe2b743acd68ce386fda7e4bd3af1eb2eb11d333542e1dbcc8b8a68c6c919 SHA512 15d8dc9c2701575b59d596cc10b1ca18691d10c3a418989eece698650e82a34720bea9d53a4ca4aa83745ce5d254cec5438f1ab10093ab2f765e77d0c9c24433
diff --git a/gui-libs/gtk/gtk-4.12.5.ebuild b/gui-libs/gtk/gtk-4.12.5.ebuild
index 7a3ccf1b78bc..21cbf4b52d50 100644
--- a/gui-libs/gtk/gtk-4.12.5.ebuild
+++ b/gui-libs/gtk/gtk-4.12.5.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
+	vulkan? ( media-libs/shaderc )
 	wayland? (
 		dev-util/wayland-scanner
 	)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 28e1d4aff20b..13af8631e809 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 509fd921a45d..ecd3fbbe8903 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,4 +1,4 @@
-AUX libpgf-7.21.7-remove-off64_t.patch 939 BLAKE2B 3446d82705950af3486fd0378c9330d33224cba2176e48c52fd0e1ba32679df8c8b83f6bf0cffab0a263974c2ae8547f4889e6985fbee495bd2dc7a270969468 SHA512 9d34b3445752e523d9e7971256808bd7062dda07ec5fb7c56f16f2474201c33545529885424cb92206f3b7232e0fb8b8de56809132f79160e70601ef28173d17
+AUX libpgf-7.21.7-remove-off64_t.patch 887 BLAKE2B 88f420fb725d6f33f2f50073bbf21da21f7f587728bde4522bad1a0b695222a7704763f02373b35689737e59c4162be5563f84b477748abe88b53bc199d567fc SHA512 987bea1d48dc11bbaee23e411b8a89c78dd04bc90f3beb263277293cfc20578b3819c6b9d97cb9803ddfdeada19cbc80d3521d2288479e28cb0a8a0497b36a9b
 DIST libpgf-7.21.7.zip 2075722 BLAKE2B 31c5ab5930ef5658ca9b320fa3df94b7d8566467a657df6d255781664a4750d6b5cb7b351c828cad7c60b42f8cb8926c51bb0271d5c51e2484426a15f18b5eb2 SHA512 dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
 EBUILD libpgf-7.21.7-r1.ebuild 1185 BLAKE2B 011c77da3a4a53f4e1e2a80ca71bbf13c6dee90c8eb4979f72da7cd40931bd2d55b92900c203675ed713497b8cbfe0df4ff2abfab70b135c3e31b66846d1c995 SHA512 2d5eee0390a2f2a7fe6abe052e77294c2785e10e1f9c6976fec15ad92cf954eee31086b8d5155cad468c0ec965a081567bda8c211a557a199edeb9fdac90c7be
 EBUILD libpgf-7.21.7-r2.ebuild 1236 BLAKE2B 211b69b6817e149ec792b97350b9fb0c3768c60402538deb2d81221bcff1b6083d72a52874382f5c1adb4f374490eab4f20000c6888d0788d620787b5f1db0d4 SHA512 6bcb5ac4dbc822021b642d06a85632fa3be06497a5182fc4cb58fe3186228f1cf7139f359231d33a84c631c1d1fcb934cd13c01c33f0ce9c7c26795f766211c3
diff --git a/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch b/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
index 9844bd589b94..c0ebd6fe431c 100644
--- a/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
+++ b/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
@@ -1,35 +1,27 @@
 https://bugs.gentoo.org/907091
+https://bugs.gentoo.org/927796
 
-Remove off64_t, add AC_SYS_LARGEFILE to configure.ac instead
+Remove off64_t, lseek64, add AC_SYS_LARGEFILE to configure.ac instead
 
 --- a/include/PGFplatform.h
 +++ b/include/PGFplatform.h
-@@ -341,10 +341,6 @@
- #define __POSIX__ 

- #endif 

- 

--#ifndef off64_t 

--#define off64_t off_t 

--#endif 

--

- #ifndef lseek64 

- #define lseek64 lseek 

- #endif 

-@@ -536,7 +532,7 @@
+@@ -536,8 +536,8 @@
  			return NoError;

  		}

  	#else

 -		off64_t ret;

+-		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {

 +		off_t ret;

- 		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {

++		if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {

  			return errno;

  		} else {

-@@ -554,7 +550,7 @@
+ 			*pos = (UINT64)ret;

+@@ -554,7 +554,7 @@
  			return NoError;

  		}

  	#else

 -		if ((lseek64(hFile, (off64_t)posOff, posMode)) == -1) {

-+		if ((lseek64(hFile, (off_t)posOff, posMode)) == -1) {

++		if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {

  			return errno;

  		} else {

  			return NoError;

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 6fb0eb6435b4..86358b0a7f14 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,7 +9,7 @@ DIST netpbm-11.2.8.tar.xz 3781396 BLAKE2B cb74b79b61a88d739071ab85e0ca96a0e51140
 DIST netpbm-11.5.3.tar.xz 3783400 BLAKE2B 45a0169865922dcdd2cba0d91e347aa753153e7a9496c8469ac40039628dc3bf13adbf67f30e6af929f4bb582c09769eac579f7086ee78fa206b564b736492c9 SHA512 f7e58fa086e6f549bb350ca9592ad5df2cdacd80c8cb0f508ab17b5f85c9358df56306d293e5b88bdcb3d2b350731bd7def0098437fdfea2711921b1caa95b95
 DIST netpbm-11.6.0.tar.xz 3792264 BLAKE2B 482e27df7aca081851b5e87cbd2e54d851c73922553a570223c22b4074178caef2e3018c8c2bab8a301bc35a645ea6ce8ac3bb7eb1001c0ca977f53182e0e19f SHA512 911912b0d6b9817ffdf3b9183c51305bc5418497865cd48cb7fad8bc5212e7092df7b2c0714b05f7459123f6ff10bcd128ffabcf2343c503e430d04aff1a837f
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.8.ebuild 6980 BLAKE2B 07938deedbf23fe5346246a90c07b8f76b68418d8655f318a5d91c2dc08cb81d5fc979c73a24db3fc16f8c05dc6b450139ca38b4f31b539c4ca7d744a47fa88a SHA512 3e8418800eae8e565c1dabcc4248ac0e946124de4b89c722c910c3f199e5557013ad0c4dc5ca9e01eb8f32688a8506d72c175a8edfacbc858e138f29901e5ac9
-EBUILD netpbm-11.5.3.ebuild 6893 BLAKE2B 51e08ff2753647d36c2bf8bafbbc26ab256e94a3bfe83c4c1690f8ab79ef4eae7246b44fa267abba3393b7617f802598e63ca73a0de6158c668bda1440b8d3d7 SHA512 350e2ceb608be231931cfd4044b8b6f7b570e3c212a45cc27a2c91e6991a977ef3bbbb35b5971a793d260ca11dd28365ef1808dd52b0a6bcc3edf331dcf2f14d
-EBUILD netpbm-11.6.0.ebuild 6843 BLAKE2B 9c918a3cdfa2e5555757e1743a864ea81d2b5ba93bfe39aa8aba9c83d35bea65fd48c7f9c6972d7c8f2c8fdae45d151c868e90e42e8eb204ee055454ca893cdf SHA512 732c3fda6c6c7a9d9de4728ca1a8c936e58b7a6bf82f7a1e81ebc1e0667517ab09cc4b973304d4e6c8742e8b72f33459a4c23f458dec270129c16a6cd820f5ef
+EBUILD netpbm-11.2.8.ebuild 7068 BLAKE2B 13319efacfa64a5e9b306efbdafaaf1ca31580d21e17f2e72eaa3f1df6a1cb0aeef4bc6a9fb9b82d115588dab51ee295f8ad8e453a6bede6ef2c6c6d39068115 SHA512 8dc9ce4a4d64b84b2c3a752fe2ba6fafc5d64219be23f1b9703d76ccc9e0ade030539d7c1108779d79f9e17ebaeaf8893f3fae02032234f8639e5bbbb097e334
+EBUILD netpbm-11.5.3.ebuild 6984 BLAKE2B 23d8dc85e12a8a41f0f485b3eb308714185bbaa48c9016f238a3b4341f243114e7c6398361e21083fcdd42327fe83827c5c72b4941a9d802a9800d8e05f15f29 SHA512 8eb6062eeb78bd2edf00eb8d2b6fc3f1515115e1baf43e517184390384caa318a83a30b84d77c9fb2f66e62acfdd12bbe60c9cd254da2962048cb1b3f434dbb7
+EBUILD netpbm-11.6.0.ebuild 6934 BLAKE2B da524853140b4a2c3968904f607968a9db572a30f50e7b33da7a56e0154a9d49c58faf42e4e6988cdeb40e5ba754cd6fc2166d690bae66587e97cca99aa92635 SHA512 86461347264f11c113c216629ab11a3e662ee182d9f821ee4ce8f2a2705ddd9ffae7541107e9ec4d1358cc8496799259797a71418376221a4002010704ae97a7
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.8.ebuild b/media-libs/netpbm/netpbm-11.2.8.ebuild
index f44fa7eb02c1..72ada702ad14 100644
--- a/media-libs/netpbm/netpbm-11.2.8.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.8.ebuild
@@ -160,12 +160,14 @@ src_prepare() {
 			test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random is broken on musl
 	# bug #907295
 	if use elibc_musl; then
-		sed -i \
+		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-i test/Test-Order || die
 	fi
diff --git a/media-libs/netpbm/netpbm-11.5.3.ebuild b/media-libs/netpbm/netpbm-11.5.3.ebuild
index 0a74a2fd9cea..1870cbbec2ed 100644
--- a/media-libs/netpbm/netpbm-11.5.3.ebuild
+++ b/media-libs/netpbm/netpbm-11.5.3.ebuild
@@ -155,12 +155,14 @@ src_prepare() {
 			-i test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random and pnmindex are broken on musl
 	# bug #907295
 	if use elibc_musl; then
 		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-e 's:pnmindex.*::' \
 			-i test/Test-Order || die
diff --git a/media-libs/netpbm/netpbm-11.6.0.ebuild b/media-libs/netpbm/netpbm-11.6.0.ebuild
index ee6f21f27d5a..80e083e89bc2 100644
--- a/media-libs/netpbm/netpbm-11.6.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.0.ebuild
@@ -154,12 +154,14 @@ src_prepare() {
 			-i test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random and pnmindex are broken on musl
 	# bug #907295
 	if use elibc_musl; then
 		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-e 's:pnmindex.*::' \
 			-i test/Test-Order || die
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6beb9b2f9828..733f8ced028f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 5910b6089cee..5d772bb2665a 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -1,5 +1,7 @@
 AUX cdparanoia-missing-sys_types_h.patch 876 BLAKE2B 4624baa06a6d9c4d233104267b35e90431c56405398f985292980dd416809fc8f015e7bd8b3575bb4fd4fe0fa03c1167e0c849a9d30523e1fc1b6e8c31b0993b SHA512 a124c74e7ecfc0238d7e5581063d51fd7aa18df6dae5709fe38662c33f0c9dd0706cbd834681d09f84f2ee2aa0914662740754d181f448b593288382eab68627
+AUX cdparanoia-pkgconfig.patch 2669 BLAKE2B d093fab1a683ff7713dd2fd9e0437d0fb0db467ed2f6f338b963a0aa8f90d405b3c8026720dd8d4243a7e0496870f1c43c22e51caec3c41442681b22e55285f2 SHA512 44e7c98b381867c619b8d16f80f176e281e4870a3bfcb4b1967d8567408240fbec6bb3b60d2f85f41c4497008d56dbc82265bdbba8a108784e37c30dc4cce056
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
 EBUILD cdparanoia-3.10.2-r7.ebuild 1454 BLAKE2B e0707a180db7411bc2f026a3c659895c87639686e8ac3350bb31d67fcfcdf8b55a0877fa6373dd8321b3997894a8a63077ca750c2e5a9e3cb266000b55ce9a52 SHA512 cdd5f6adca1a8799a9850721339fcadfdd04e1d3dc19a58ceab8e4bab40674cfb98f971500687500e4a8fd1648f0f8aa987ab2578f03ddf246077669ad911e8a
+EBUILD cdparanoia-3.10.2-r8.ebuild 1493 BLAKE2B 34d59a105dba8bbcc299113e74663070a5fb7bb48008c1b9080c64b8f9b06bc1e050cf6de531dd739197ac19829ccac0caacab04e8c76712a9d5dc3c0e3459ec SHA512 4495b0f3ff3c6e1680fbca7fe89776921f727142c2897ee4d973e44db94752b59beb3a462568a452611d8c23ad7d62cd5d77814d2ab831681f60786fb21c4a05
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
new file mode 100644
index 000000000000..5b851fbabf37
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools libtool toolchain-funcs multilib-minimal
+
+MY_P="${PN}-III-$(ver_cut 2-3)"
+DESCRIPTION="An advanced CDDA reader with error correction"
+HOMEPAGE="https://www.xiph.org/paranoia"
+SRC_URI="
+	https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
+	https://dev.gentoo.org/~pacho/${PN}/${P}-patches.tar.xz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+IDEPEND="app-eselect/eselect-cdparanoia"
+
+PATCHES=(
+	# Patches from previous patchset + Fedora + Debian
+	"${WORKDIR}"/patches
+	# bug #713740
+	"${FILESDIR}"/${PN}-missing-sys_types_h.patch
+	"${FILESDIR}"/cdparanoia-pkgconfig.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.guess config.guess || die
+	mv configure.sub config.sub || die
+
+	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
+
+	mv configure.{in,ac} || die
+	eautoconf
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export AR CC RANLIB
+	econf
+}
+
+multilib_src_compile() {
+	emake OPT="${CFLAGS} -I${S}/interface"
+	use static-libs && emake lib OPT="${CFLAGS} -I${S}/interface"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/${PN}{,-paranoia} || die
+}
+
+pkg_postinst() {
+	eselect ${PN} update ifunset
+}
+
+pkg_postrm() {
+	eselect ${PN} update ifunset
+}
diff --git a/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch b/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch
new file mode 100644
index 000000000000..422a5caf0374
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-pkgconfig.patch
@@ -0,0 +1,84 @@
+https://src.fedoraproject.org/rpms/cdparanoia/blob/rawhide/f/cdparanoia-10.2-add-pkgconfig.patch
+
+From 5beb3983942ce92ea18a2a0f2e15f84fb25c27d8 Mon Sep 17 00:00:00 2001
+From: xiphmont <xiphmont@0101bb08-14d6-0310-b084-bc0e0c8e3800>
+Date: Fri, 11 Jun 2010 15:42:00 +0000
+Subject: [PATCH] Add pkgconfig file to cdparanoia; closes Trac #1706
+
+git-svn-id: https://svn.xiph.org/trunk/cdparanoia@17289 0101bb08-14d6-0310-b084-bc0e0c8e3800
+diff --git a/Makefile.in b/Makefile.in
+index d03ef85..f8bb5f8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,7 +3,7 @@
+ # DO NOT EDIT BELOW! ##########################################################
+ # (unless, of course, you know what you are doing :) ##########################
+ 
+-VERSION=10.2
++VERSION=@VERSION@
+ VPATH=@srcdir@
+ srcdir=@srcdir@
+ 
+@@ -23,6 +23,7 @@ BINDIR=@bindir@
+ MANDIR=@mandir@
+ INCLUDEDIR=@includedir@
+ LIBDIR=@libdir@
++PKGCONFIGDIR=@libdir@/pkgconfig
+ PWD = $(shell pwd)
+ 
+ OFILES = main.o report.o header.o buffering_write.o cachetest.o
+@@ -85,6 +86,8 @@ install:
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+ 		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(PKGCONFIGDIR)
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia-3.pc $(DESTDIR)$(PKGCONFIGDIR)
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
+@@ -104,6 +107,6 @@ distclean:
+ 	cd interface && $(MAKE) distclean
+ 	cd paranoia && $(MAKE) distclean
+ 	-rm -f cdparanoia *~ config.* *.o *.wav *.aifc *.raw test.file \
+-		Makefile verify_test core gmon.out
++		Makefile verify_test core gmon.out cdparanoia-3.pc
+ 
+ .PHONY: all debug test lib slib install clean distclean
+diff --git a/configure.in b/configure.in
+index 3ad98ca..37d7576 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,9 @@ AC_INIT(interface/interface.c)
+ cp $srcdir/configure.guess $srcdir/config.guess
+ cp $srcdir/configure.sub $srcdir/config.sub
+ 
++VERSION="10.2"
++AC_SUBST(VERSION)
++
+ AC_CANONICAL_HOST
+ 
+ if test -z "$CC"; then
+@@ -67,4 +70,4 @@ AC_SUBST(OPT)
+ AC_SUBST(DEBUG)
+ AC_SUBST(CC)
+ 
+-AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
++AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile cdparanoia-3.pc)
+diff --git a/cdparanoia-3.pc.in b/cdparanoia-3.pc.in
+new file mode 100644
+index 0000000..3a15099
+--- /dev/null
++++ b/cdparanoia-3.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: Cdparanoia III
++Description: Compact Disc Digital Audio (CDDA) Digital Audio Extraction (DAE) library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lcdda_interface -lcdda_paranoia
++Cflags: -I${includedir}
++
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 4501c7c9ba37..4f38c5461906 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,3 +1,4 @@
 DIST grip-4.2.4.tar.gz 1212479 BLAKE2B 58203a4faca90e8662347a5f67b7e026c2235ed53c5dbfe351faf4027608eb9e9c7b106907f2abb0dfffd4d01da33eeb334d2500c7f359314c003dc881e1a863 SHA512 fdc2808b91df617f4d2447114037c31bd5fa0657aa4ea2453e644b155468971c65a364bb0a3c6ed8ff2ba0e44e7117a51bec3081c7defd590f9fbc802a216bf5
+EBUILD grip-4.2.4-r1.ebuild 958 BLAKE2B e978d80bc97520f049da974ee94b8a07f9bce892910348cfb69a7d56f15c47516059668abb5b0871e1a988f3950ed52ed71dc021e7804c926570688ed78800f7 SHA512 9ebdc0abda4d36790e66388b38ba7ed1ea031edd09817971501a617b09f69f08b9ae41086fb54ffca67930db943f46f8828b2d76a2e6e857173ccb5d025f48a0
 EBUILD grip-4.2.4.ebuild 1077 BLAKE2B 407a460fe8ac66a41362076b8f429ee83bc461f8481378e0af6fd887c8e4861cc9c4ef34ef7f038c4b4fde469c82cb25c234cf3a230b5d890254d3eed17bd877 SHA512 a8a8fa0bc6e68acc59266b03259194a94bf8b6e6fa04791105ef2198f14af121293485c6c122a34a91693b97e4238762a93c725f5b169a5b645c509107c63e7d
 MISC metadata.xml 328 BLAKE2B 069257071d00003496464c8990afebb2d35428231b1b787ff65237c6ddf69c40c6f402939696915d781d21c13fd823183e0c2266b26176f9e58ce47324f07bfc SHA512 e6d401ccb1682cf890600714a33d51650901e9c4724b0b08bad99c2c85a17571fb877489e8f4ae33b1db760c5de5f9150ebf4fb6ab50303186402fad624b6d86
diff --git a/media-sound/grip/grip-4.2.4-r1.ebuild b/media-sound/grip/grip-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..4fbf071b1b10
--- /dev/null
+++ b/media-sound/grip/grip-4.2.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	!app-text/grip
+	dev-libs/glib:2
+	media-libs/id3lib
+	>=media-sound/cdparanoia-3.10.2-r8
+	media-sound/lame
+	net-misc/curl
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug #416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dcdparanoia=enabled
+		-Did3lib=enabled
+	)
+
+	meson_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 261ebb9c5936..423dd4c3b733 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9bba7b63f40d..2ed6324c07e5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Apr 2024 04:40:13 +0000
+Mon, 08 Apr 2024 10:10:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 670df8a201e2..6de85c8934ae 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569494 BLAKE2B 475196fd0ff28d6023f45e6c22284bded2028bbe891778e3828fb75c3727438168bcd5ab63fe48683bb5874710c096e12470eee93163ae90c07d1f9d79810710 SHA512 94822c7f83b3b68b28e1885c442c2d9b5794eb5f861b8a0862162601a2c2b03cdc2bb6144d8b4a1d61befedf2ff1952e540c518e34c7f15ff5af14b7dc567fcb
-TIMESTAMP 2024-04-08T04:40:19Z
+TIMESTAMP 2024-04-08T10:10:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTdTNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTwqhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBXYg/+KW+Hb1BtEnRLgxqFVrbglHK05JMsGv77gyGapdYULgIsUxxRliAy0ToT
-ZbFZATuekHnnaVlbNt4Krrq3W34P35Xh7ElSePcW0up6oJm8ZVUNm+ZlO5F5Xwmf
-7gxm7j15LLI3MtjkJGhMe524CTG16f5Vtgk03eI+XuHp5Lo2kDite06f2aAfZ51S
-uS84Rjk3x92C+MFE/qnF58cwAfADwuRFCroHqsRiSBLnMmCVSY0esSsDLW652TYo
-eJaQGHsVSKxlY3UMOLjzACPiNmPra7Sxye7lYhIDWTk5a9V8n1G/ANBY2KhSSZil
-8LO6kpw7vZzYappRa797bq8x+/DkXYD8NX6vR45oAN1do1Zc0p1qkkxxObx8py6w
-IXUxUjp/zL/MNE80L/+R/924/sX0m9WKTUuVPNkSznx8I5bsa4InqNobtcMi/7/l
-C2y/gDpRGUb0oftN6swcVttqSDZeMeod5//UnSfluNnpbL1C7pNnHXkP7LXaTO4h
-97U6F+mp6YWOns0eYRx78qfuLROZbILVKtUuxNh6PHIeVSXw8h7TWni7Y0I9lIN9
-v10Gl3rI//Oz+jN2ho4GJY+ptrv4g5n7+FbFiFwVBu9pqbccOFrb1VioTTGG21P7
-ED+iT8bGYLQ3R/LZoAcArXhbZhAOM8W7S32GamiPm0BSDBjXzAU=
-=8LVB
+klDAwg//aYdEzGPyYXGa7pcUZWGeDoNsYCdTO0BZzqPsk8TehbU8djYjhSk4ALvY
+H/d/syA+Pqemhk+wc9lUeJYT76iQ6oAJa7I0b5WX/FcZrOCG1tXJcu2gHX9lgS+f
+ZUk7GpWzV+LTGtPJuAW/rJ9DIKvC+6DONJtpyijVQpSNvHhnYzvcy6KLyhU7xUIe
+mlEE1xlidbFCk8MwhIpUYgJaFmYAZtnfK8YgtVQG59nGB+nwtH9nNl65HLm6uxsl
+LfS38D+7+VappWHFVNTFpck8aO+zECiDy0MrvxgziR9imFTB/EnpgxgpaMMNpdxi
+oY3WfzJmiA3RdzGHQqsVKx4B5T2k4iEZkgnoHqD7Kx3Ve4qobyR0HGDDfXdD+PT/
+irM7+/ZnXjASzbllO/QjcwyRxffGXkGHC4P5J2LN28h2naIG4V97eQHpU2PQJiao
+3BQ7SYcE33BaFbTQDbahSGLIj+hxuCEkoSH7etI8y7/of7cEHv4X7nm5cOdysjON
+qcF4r3dUbO4s8lmn0XusajzUXWVdw++0L9zIYPmcmqXs0miUbrLCFDThLib3fyjO
+pBEk2cTN+ZSEkONYJY3rQaPc85pK7TEywRsnUgEk0qQJKrANMOdfzXHnTLaYuiAT
+roQx2bKgw3MKyjCXQ43tMrXeJgZogS2GK1R8Vx/AlqOw0Rn+cis=
+=B3OM
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9bba7b63f40d..2ed6324c07e5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Apr 2024 04:40:13 +0000
+Mon, 08 Apr 2024 10:10:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 70b0fff0b798..7aef004366e9 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index f11b84bd121e..8f87bf774399 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/icedtea-bin-3.16.0-r2 b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
index 18ade44089ee..3d558491e164 100644
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
+++ b/metadata/md5-cache/dev-java/icedtea-bin-3.16.0-r2
@@ -15,5 +15,5 @@ REQUIRED_USE=gtk? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=doc? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-doc-3.16.0.tar.xz ) source? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-src-3.16.0.tar.xz ) big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64.tar.xz ) ) ) !big-endian? ( ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-ppc64le.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-ppc64le.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm.tar.xz ) ) arm64? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-arm64.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-arm64.tar.xz ) ) x86? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-core-3.16.0-x86.tar.xz examples? ( https://dev.gentoo.org/~gyakovlev/distfiles/icedtea-bin-examples-3.16.0-x86.tar.xz ) )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5dd7ccbfa21661023e15e48c2b20e206
diff --git a/metadata/md5-cache/dev-java/javacc-7.0.13 b/metadata/md5-cache/dev-java/javacc-7.0.13
new file mode 100644
index 000000000000..5bf625c35400
--- /dev/null
+++ b/metadata/md5-cache/dev-java/javacc-7.0.13
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* test? ( >=dev-java/ant-1.10.14:0[junit] ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
+DESCRIPTION=Java Compiler Compiler - The Java Parser Generator
+EAPI=8
+HOMEPAGE=https://javacc.github.io/javacc/
+INHERIT=java-pkg-2 java-ant-2
+IUSE=doc examples source test
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=7.0.13
+SRC_URI=https://github.com/javacc/javacc/archive/javacc-7.0.13.tar.gz
+_eclasses_=java-ant-2	695635244f02d8e4820279a6511ccc18	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=f05f0ffa9f2e59d604ff5ec96a1d6398
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.22_p7 b/metadata/md5-cache/dev-java/openjdk-11.0.22_p7
index f32921c5932d..23078950974c 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.22_p7
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.22_p7
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=11
 SRC_URI=https://github.com/openjdk/jdk11u/archive/refs/tags/jdk-11.0.22-ga.tar.gz -> openjdk-11.0.22_p7.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.14_p9-riscv.tar.xz ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-11.0.13_p8-x86.tar.xz ) ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.18-riscv.patch.xz )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=b820e49d231d895746cf715f4a035231
diff --git a/metadata/md5-cache/dev-java/openjdk-17.0.10_p7 b/metadata/md5-cache/dev-java/openjdk-17.0.10_p7
index 76eff3248090..9da0047f87e2 100644
--- a/metadata/md5-cache/dev-java/openjdk-17.0.10_p7
+++ b/metadata/md5-cache/dev-java/openjdk-17.0.10_p7
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap )
 SLOT=17
 SRC_URI=https://github.com/openjdk/jdk17u/archive/refs/tags/jdk-17.0.10-ga.tar.gz -> openjdk-17.0.10_p7.tar.gz !system-bootstrap? ( arm64? ( elibc_musl? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz ) ) ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.1_p12-x86.tar.xz ) riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-17.0.3_p7-riscv.tar.xz ) ) riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=fb90597c3568b9b614f0a9a65e378c66
diff --git a/metadata/md5-cache/dev-java/openjdk-21.0.2_p13 b/metadata/md5-cache/dev-java/openjdk-21.0.2_p13
index c80b79b7c8a7..39bfd3f9f6bf 100644
--- a/metadata/md5-cache/dev-java/openjdk-21.0.2_p13
+++ b/metadata/md5-cache/dev-java/openjdk-21.0.2_p13
@@ -12,5 +12,5 @@ RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/harfbuzz:= media
 REQUIRED_USE=javafx? ( alsa !headless-awt ) !system-bootstrap? ( jbootstrap ) !system-bootstrap? ( || ( ppc64 x86 ) )
 SLOT=21
 SRC_URI=https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-21.0.2-ga.tar.gz -> openjdk-21.0.2_p13.tar.gz !system-bootstrap? ( ppc64? ( big-endian? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-21.0.0_p35-x86.tar.xz ) )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5f3343f0724a08d56a6840692319a8f1
diff --git a/metadata/md5-cache/dev-java/openjdk-8.402_p06 b/metadata/md5-cache/dev-java/openjdk-8.402_p06-r1
index c036c388c846..c293e9c39357 100644
--- a/metadata/md5-cache/dev-java/openjdk-8.402_p06
+++ b/metadata/md5-cache/dev-java/openjdk-8.402_p06-r1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig app-arch/unzip
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/icedtea-bin:8 dev-java/openjdk:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib app-arch/zip media-libs/alsa-lib net-print/cups virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst || ( dev-java/openjdk-bin:8 dev-java/openjdk:8 ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 DESCRIPTION=Open source implementation of the Java programming language
 EAPI=7
 HOMEPAGE=https://openjdk.org
@@ -12,5 +12,5 @@ PDEPEND=javafx? ( dev-java/openjfx:8 )
 RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 sys-libs/zlib >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 dev-java/java-config app-eselect/eselect-java
 SLOT=8
 SRC_URI=https://github.com/openjdk/jdk8u/archive/refs/tags/jdk8u402-ga.tar.gz -> openjdk-8.402_p06.tar.gz !system-bootstrap? ( x86? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-bootstrap-8.402_p06-x86.tar.xz ) )
-_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=338de38ae47a803ce2f6abfcfe1470cf
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-utils-2	b346c3901e71ba37137bae0b25b00221	java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=47da583092e55e5c0298a1a9af13923b
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.22_p7 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.22_p7
index ae41a065062f..84585fe3f297 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-11.0.22_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.22_p7
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=arm64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.22_7.tar.gz ) arm? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_arm_linux_hotspot_11.0.22_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.22_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_x64_linux_hotspot_11.0.22_7.tar.gz ) x64-macos? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_x64_mac_hotspot_11.0.22_7.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.22+7//OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.22_7.tar.gz ) )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=1e583b113a313a50a037e0020a0db3b1
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-17.0.10_p7 b/metadata/md5-cache/dev-java/openjdk-bin-17.0.10_p7
index be7f048410aa..a253673fe75b 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-17.0.10_p7
+++ b/metadata/md5-cache/dev-java/openjdk-bin-17.0.10_p7
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=arm64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.10_7.tar.gz ) arm64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.10_7.tar.gz ) arm? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_arm_linux_hotspot_17.0.10_7.tar.gz ) ppc64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.10_7.tar.gz ) amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_x64_linux_hotspot_17.0.10_7.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.10_7.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.10+7//OpenJDK17U-jdk_x64_mac_hotspot_17.0.10_7.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=5212d61de9f7fd515c85476be3a29b54
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-21.0.2_p13 b/metadata/md5-cache/dev-java/openjdk-bin-21.0.2_p13
index 9c2422063f25..0bf75dd1ac36 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-21.0.2_p13
+++ b/metadata/md5-cache/dev-java/openjdk-bin-21.0.2_p13
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs splitdebug
 SLOT=21
 SRC_URI=arm64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13//OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.2_13.tar.gz ) ppc64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13//OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.2_13.tar.gz ) amd64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13//OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13//OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.2_13.tar.gz ) )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=8c4261dd33a1f489307e1860ee0b33b2
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.402_p06 b/metadata/md5-cache/dev-java/openjdk-bin-8.402_p06
index 4cae29d8736c..1591e9de3e9d 100644
--- a/metadata/md5-cache/dev-java/openjdk-bin-8.402_p06
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.402_p06
@@ -13,5 +13,5 @@ RDEPEND=>=sys-apps/baselayout-java-0.1.0-r1 kernel_linux? ( media-libs/fontconfi
 RESTRICT=preserve-libs strip
 SLOT=8
 SRC_URI=arm64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u402b06.tar.gz ) arm? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_arm_linux_hotspot_8u402b06.tar.gz ) ppc64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u402b06.tar.gz ) amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u402b06.tar.gz ) amd64? ( elibc_musl? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u402b06.tar.gz ) ) x64-macos? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jdk_x64_mac_hotspot_8u402b06.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=0493700526e2eb562984f9418f32c69b
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
index 3fc91ec37ae2..1ec32f8d2848 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.20.1_p1
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=11
 SRC_URI=amd64? ( https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.20.1+1/OpenJDK11U-jre_x64_linux_hotspot_11.0.20.1_1.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cb13bf91ecc9e5c8186c9dc1f3e05784
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1 b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
index 1e0d448ee36c..c8d8daad421a 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-17.0.8.1_p1
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=17
 SRC_URI=amd64? ( https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8.1+1/OpenJDK17U-jre_x64_linux_hotspot_17.0.8.1_1.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=cb13bf91ecc9e5c8186c9dc1f3e05784
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-21.0.1_p12 b/metadata/md5-cache/dev-java/openjdk-jre-bin-21.0.1_p12
index ce47e96869d4..ddff3a7ec23c 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-21.0.1_p12
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-21.0.1_p12
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=21
 SRC_URI=amd64? ( https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1+12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=70b7b3cafde933c1e06717b740174be6
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
index 559ba3bde706..5dab6e9522b4 100644
--- a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.382_p05
@@ -13,5 +13,5 @@ RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=s
 RESTRICT=preserve-libs splitdebug
 SLOT=8
 SRC_URI=amd64? ( https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_linux_hotspot_8u382b05.tar.gz )
-_eclasses_=java-vm-2	7e65068a6d9ed9e71f6f4d3cb722e2fa	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_eclasses_=java-vm-2	562cbc1b6ee63dacf0cf6447f00d26b3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=48a365bb3e28eddfa75d535d5b666e9d
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 0a022eec8437..06ee8f3b8bce 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gtk-4.12.5 b/metadata/md5-cache/gui-libs/gtk-4.12.5
index 182aa1e92340..c5e8d7ec184c 100644
--- a/metadata/md5-cache/gui-libs/gtk-4.12.5
+++ b/metadata/md5-cache/gui-libs/gtk-4.12.5
@@ -1,4 +1,4 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pygobject:3[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) dev-python/docutils dev-libs/glib >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) test? ( dev-libs/glib:2 media-fonts/cantarell wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) || ( ( dev-lang/python:3.12 dev-python/pygobject:3[python_targets_python3_12(-)] ) ( dev-lang/python:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ) ) dev-python/docutils dev-libs/glib >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig vulkan? ( media-libs/shaderc ) wayland? ( dev-util/wayland-scanner ) test? ( dev-libs/glib:2 media-fonts/cantarell wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.76.0:2 >=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?] >=x11-libs/pango-1.50.0[introspection?] >=dev-libs/fribidi-1.0.6 >=media-libs/harfbuzz-2.6.0:= >=x11-libs/gdk-pixbuf-2.30:2[introspection?] media-libs/libpng:= media-libs/tiff:= media-libs/libjpeg-turbo:= >=media-libs/libepoxy-1.4[egl,X(+)?] >=media-libs/graphene-1.10.0[introspection?] app-text/iso-codes x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders ) colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.76:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.21.0 >=dev-libs/wayland-protocols-1.31 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-core-2.46.0 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
@@ -16,4 +16,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/gtk/4.12/gtk-4.12.5.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	30dbce54b89e77b86f366548f94419ad	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=41c397d9190e53ead8854df36b7a8740
+_md5_=4e558292eaecc3e35eca45928302aff0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 77ddc81b4199..0e7212fdbb36 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/netpbm-11.2.8 b/metadata/md5-cache/media-libs/netpbm-11.2.8
index d9e0926b089b..de8ac44451ca 100644
--- a/metadata/md5-cache/media-libs/netpbm-11.2.8
+++ b/metadata/md5-cache/media-libs/netpbm-11.2.8
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-
 SLOT=0/stable
 SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.2.8.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4fc2c92a560e7b057076dd8394d74ea9
+_md5_=c4762e0320ec800d6791fe4bbd77f249
diff --git a/metadata/md5-cache/media-libs/netpbm-11.5.3 b/metadata/md5-cache/media-libs/netpbm-11.5.3
index cee8454479b4..b01d45762b8a 100644
--- a/metadata/md5-cache/media-libs/netpbm-11.5.3
+++ b/metadata/md5-cache/media-libs/netpbm-11.5.3
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-
 SLOT=0/advanced
 SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.5.3.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=66688ad050877a4953cc4ec7b2d9d8fb
+_md5_=6d6abd60eebe2dabc9e803f3362d899a
diff --git a/metadata/md5-cache/media-libs/netpbm-11.6.0 b/metadata/md5-cache/media-libs/netpbm-11.6.0
index e8f6c4e0ecde..0a0779b17ddd 100644
--- a/metadata/md5-cache/media-libs/netpbm-11.6.0
+++ b/metadata/md5-cache/media-libs/netpbm-11.6.0
@@ -12,4 +12,4 @@ RDEPEND=dev-lang/perl jbig? ( media-libs/jbigkit:= ) jpeg? ( media-libs/libjpeg-
 SLOT=0/advanced
 SRC_URI=https://dev.gentoo.org/~ceamac/media-libs/netpbm/netpbm-11.6.0.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4edc0aa65f326b17adcacd5faf8e8d3e
+_md5_=4ef91c3cf124b6898573c17d1dcaaf66
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f9d32e1c3c16..65952a227df2 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/cdparanoia-3.10.2-r8 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r8
new file mode 100644
index 000000000000..9d3af8750ff8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r8
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=An advanced CDDA reader with error correction
+EAPI=8
+HOMEPAGE=https://www.xiph.org/paranoia
+IDEPEND=app-eselect/eselect-cdparanoia
+INHERIT=autotools libtool toolchain-funcs 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz https://dev.gentoo.org/~pacho/cdparanoia/cdparanoia-3.10.2-patches.tar.xz
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=57ceecba3da1e5310508dd5036a32245
diff --git a/metadata/md5-cache/media-sound/grip-4.2.4-r1 b/metadata/md5-cache/media-sound/grip-4.2.4-r1
new file mode 100644
index 000000000000..8cf1f7cd9dab
--- /dev/null
+++ b/metadata/md5-cache/media-sound/grip-4.2.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=!app-text/grip dev-libs/glib:2 media-libs/id3lib >=media-sound/cdparanoia-3.10.2-r8 media-sound/lame net-misc/curl x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
+DESCRIPTION=GTK+ based Audio CD Player/Ripper
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/grip/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson xdg
+IUSE=vorbis
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!app-text/grip dev-libs/glib:2 media-libs/id3lib >=media-sound/cdparanoia-3.10.2-r8 media-sound/lame net-misc/curl x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/grip/grip-4.2.4.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=4b2d18219559525e4775e2808b315ac6
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index e28a1fbd4f73..d5e4d5348b5b 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/inadyn-2.12.0-r1 b/metadata/md5-cache/net-dns/inadyn-2.12.0-r1
new file mode 100644
index 000000000000..ed96deea30f5
--- /dev/null
+++ b/metadata/md5-cache/net-dns/inadyn-2.12.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=acct-group/inadyn acct-user/inadyn dev-libs/confuse:= gnutls? ( dev-libs/nettle:= net-libs/gnutls:= ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= )
+DESCRIPTION=Dynamic DNS client with multiple SSL/TLS library support
+EAPI=8
+HOMEPAGE=https://github.com/troglobit/inadyn
+INHERIT=systemd tmpfiles
+IUSE=gnutls mbedtls openssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=acct-group/inadyn acct-user/inadyn dev-libs/confuse:= gnutls? ( dev-libs/nettle:= net-libs/gnutls:= ) mbedtls? ( net-libs/mbedtls:= ) openssl? ( dev-libs/openssl:= ) virtual/tmpfiles
+REQUIRED_USE=?? ( gnutls mbedtls openssl )
+SLOT=0
+SRC_URI=https://github.com/troglobit/inadyn/releases/download/v2.12.0/inadyn-2.12.0.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c955d3f7c5163282219f9da6d12a35a0
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index bd02c0db1992..2ea6169dce2d 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/ksmbd-tools-3.4.4 b/metadata/md5-cache/net-fs/ksmbd-tools-3.4.4
deleted file mode 100644
index 9bb7a204a72b..000000000000
--- a/metadata/md5-cache/net-fs/ksmbd-tools-3.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/libnl:3
-DESCRIPTION=cifsd/ksmbd kernel server userspace utilities
-EAPI=8
-HOMEPAGE=https://github.com/cifsd-team/ksmbd-tools
-INHERIT=autotools linux-info systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 dev-libs/libnl:3
-SLOT=0
-SRC_URI=https://github.com/cifsd-team/ksmbd-tools/archive/3.4.4.tar.gz -> ksmbd-tools-3.4.4.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=8af820ff2e4a71cd113db679e326af6a
diff --git a/metadata/md5-cache/net-fs/ksmbd-tools-3.4.6-r1 b/metadata/md5-cache/net-fs/ksmbd-tools-3.4.6-r1
deleted file mode 100644
index 9f25057ced00..000000000000
--- a/metadata/md5-cache/net-fs/ksmbd-tools-3.4.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/glib:2 dev-libs/libnl:3
-DESCRIPTION=cifsd/ksmbd kernel server userspace utilities
-EAPI=8
-HOMEPAGE=https://github.com/cifsd-team/ksmbd-tools
-INHERIT=autotools linux-info systemd
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 dev-libs/libnl:3
-SLOT=0
-SRC_URI=https://github.com/cifsd-team/ksmbd-tools/archive/3.4.6.tar.gz -> ksmbd-tools-3.4.6.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=3126a360e3c6603409f03f528f175b8c
diff --git a/metadata/md5-cache/net-fs/ksmbd-tools-3.5.2 b/metadata/md5-cache/net-fs/ksmbd-tools-3.5.2
new file mode 100644
index 000000000000..d9f9a630279c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/ksmbd-tools-3.5.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=dev-libs/glib:2 dev-libs/libnl:3
+DESCRIPTION=cifsd/ksmbd kernel server userspace utilities
+EAPI=8
+HOMEPAGE=https://github.com/cifsd-team/ksmbd-tools
+INHERIT=linux-info meson systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 dev-libs/libnl:3
+SLOT=0
+SRC_URI=https://github.com/cifsd-team/ksmbd-tools/releases/download/3.5.2/ksmbd-tools-3.5.2.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	linux-info	7ca3057b277f1e5978947b4cc289ce62	meson	92696988eaddba122c4cedc191f59bcb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	a1229a86bd0db058e474a2d7d9191cca	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=9e8438305c683899cbf34636fee42b2c
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 725eae88893f..9fadc5d746ae 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/czmq-4.2.1 b/metadata/md5-cache/net-libs/czmq-4.2.1
index 1defe35d2cce..3dbd32699646 100644
--- a/metadata/md5-cache/net-libs/czmq-4.2.1
+++ b/metadata/md5-cache/net-libs/czmq-4.2.1
@@ -4,10 +4,11 @@ DEPEND=>=net-libs/zeromq-4:=[drafts?] http-client? ( net-misc/curl ) http-server
 DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=8
 HOMEPAGE=http://czmq.zeromq.org
-IUSE=curl drafts http-client http-server lz4 nss static-libs systemd +uuid
+IUSE=curl drafts http-client http-server lz4 nss static-libs systemd test +uuid
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0
 RDEPEND=>=net-libs/zeromq-4:=[drafts?] http-client? ( net-misc/curl ) http-server? ( net-libs/libmicrohttpd:= ) lz4? ( app-arch/lz4:= ) nss? ( dev-libs/nspr dev-libs/nss ) systemd? ( sys-apps/systemd ) uuid? ( sys-apps/util-linux:0 )
+RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/zeromq/czmq/releases/download/v4.2.1/czmq-4.2.1.tar.gz
-_md5_=bf70bca573bdd5122f3a3c3f7b844f66
+_md5_=3a4c0d7b0c8ce1ef908da5378b97a2fc
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.3-r1 b/metadata/md5-cache/net-libs/zeromq-4.3.3-r1
index f6d5d42dcdfc..8860b92374d8 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.3-r1
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=957e5f507dd46afe6ffa6772ab5693ae
+_md5_=9b999ed34409b4f5afbb4b08840a6d2d
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.4-r1 b/metadata/md5-cache/net-libs/zeromq-4.3.4-r1
index be9246540237..41b9632e3f50 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.4-r1
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.4-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=e2098f8c5d6e50bfc14543ad1fe97aff
+_md5_=8e561b5287b2ec77eb7b672ddb18e7b6
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.4-r2 b/metadata/md5-cache/net-libs/zeromq-4.3.4-r2
index f41d99532cfa..219927ca0c70 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.4-r2
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.4-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b732a4aab6fcc940653962be1c9c1c8d
+_md5_=37f344fe2760119c68c7fa4d180a7863
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.5 b/metadata/md5-cache/net-libs/zeromq-4.3.5
index a23903180924..cb1404c58318 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.5
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.5
@@ -11,4 +11,4 @@ RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) libbsd? ( dev-libs/lib
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz
-_md5_=b4bb5e22f539b221e52335fe58b7ec99
+_md5_=382a5638178195c7d1b7ee6e5e4dfd6e
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.5-r1 b/metadata/md5-cache/net-libs/zeromq-4.3.5-r1
index c28b1391e839..23f5602bfd94 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.5-r1
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=40e29b028ab854abd0cee9fda48ad377
+_md5_=3193b79f186525fe3c07b446851423ea
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 967ab3ba2119..16a3730b1f60 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.25 b/metadata/md5-cache/net-proxy/haproxy-2.4.25
index fa4f67949ea9..0671ae6830ef 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.25
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.25
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.haproxy.org
 INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.4
 SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.25.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=922cd778b1596b88b5ec69e12676d04d
+_md5_=064b4f4141867ff334eec6499111f511
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.26 b/metadata/md5-cache/net-proxy/haproxy-2.4.26
new file mode 100644
index 000000000000..727b134beaf5
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.26
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
+RESTRICT=!test? ( test )
+SLOT=0/2.4
+SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.26.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
+_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=922cd778b1596b88b5ec69e12676d04d
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.16 b/metadata/md5-cache/net-proxy/haproxy-2.6.16
index 99b3ed5c912f..e0119dfc0f14 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.16
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.16
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.haproxy.org
 INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.6
 SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.16.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1f44ed4374e6c5b738d82d899c834d1e
+_md5_=125d57fb0a44d71f071e970af40b9d82
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.17 b/metadata/md5-cache/net-proxy/haproxy-2.6.17
new file mode 100644
index 000000000000..8597b5792add
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.17
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
+RESTRICT=!test? ( test )
+SLOT=0/2.6
+SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.17.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
+_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1f44ed4374e6c5b738d82d899c834d1e
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.8.7 b/metadata/md5-cache/net-proxy/haproxy-2.8.7
index 1236d8e8975e..437ad2083f77 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.8.7
+++ b/metadata/md5-cache/net-proxy/haproxy-2.8.7
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.haproxy.org
 INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.8
 SRC_URI=http://haproxy.1wt.eu/download/2.8/src/haproxy-2.8.7.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1f44ed4374e6c5b738d82d899c834d1e
+_md5_=125d57fb0a44d71f071e970af40b9d82
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.8.9 b/metadata/md5-cache/net-proxy/haproxy-2.8.9
new file mode 100644
index 000000000000..a1349906bb77
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.8.9
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
+RESTRICT=!test? ( test )
+SLOT=0/2.8
+SRC_URI=http://haproxy.1wt.eu/download/2.8/src/haproxy-2.8.9.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
+_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1f44ed4374e6c5b738d82d899c834d1e
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.9.6 b/metadata/md5-cache/net-proxy/haproxy-2.9.6
index caa63a1daf4b..449b65ed71c5 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.9.6
+++ b/metadata/md5-cache/net-proxy/haproxy-2.9.6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=http://www.haproxy.org
 INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
 IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.9
 SRC_URI=http://haproxy.1wt.eu/download/2.9/src/haproxy-2.9.6.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
 _eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=1f44ed4374e6c5b738d82d899c834d1e
+_md5_=125d57fb0a44d71f071e970af40b9d82
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.9.7 b/metadata/md5-cache/net-proxy/haproxy-2.9.7
new file mode 100644
index 000000000000..70333faec8c4
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.9.7
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup test unpack
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+INHERIT=toolchain-funcs lua-single systemd linux-info multiprocessing
+IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd test +threads tools zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) test? ( dev-libs/libpcre2 sys-libs/zlib ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
+RESTRICT=!test? ( test )
+SLOT=0/2.9
+SRC_URI=http://haproxy.1wt.eu/download/2.9/src/haproxy-2.9.7.tar.gz test? ( https://github.com/vtest/VTest/archive/af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz -> VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz )
+_eclasses_=linux-info	7ca3057b277f1e5978947b4cc289ce62	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1f44ed4374e6c5b738d82d899c834d1e
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 1c4628e96879..6590724ad9b3 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/hdf-4.2.15-r1 b/metadata/md5-cache/sci-libs/hdf-4.2.15-r2
index f28e5ca0a81c..9720a9193473 100644
--- a/metadata/md5-cache/sci-libs/hdf-4.2.15-r1
+++ b/metadata/md5-cache/sci-libs/hdf-4.2.15-r2
@@ -2,7 +2,7 @@ BDEPEND=fortran? ( virtual/fortran ) sys-devel/gnuconfig >=app-portage/elt-patch
 DEFINED_PHASES=configure install prepare setup
 DEPEND=net-libs/libtirpc:= sys-libs/zlib virtual/jpeg:0 szip? ( virtual/szip ) test? ( virtual/szip ) fortran? ( virtual/fortran )
 DESCRIPTION=General purpose library and format for storing scientific data
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.hdfgroup.org/hdf4.html
 INHERIT=fortran-2 toolchain-funcs autotools flag-o-matic
 IUSE=examples fortran szip static-libs test
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sci-libs/hdf/hdf-4.2.15-arch-patches-1.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/sci-libs/hdf/hdf-4.2.15-arch-patches-1.tar.bz2
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=4b450cbe1bd0e4ada2b198b762d7e293
+_md5_=5f1e2aa4b129bc04f5178bb680a31f20
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b4d755dc45fa..8440a4abf861 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/pciutils-3.12.0 b/metadata/md5-cache/sys-apps/pciutils-3.12.0
new file mode 100644
index 000000000000..dea245545254
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/pciutils-3.12.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools ) kmod? ( virtual/pkgconfig )
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[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? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+DESCRIPTION=Various utilities dealing with the PCI bus
+EAPI=8
+HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+INHERIT=toolchain-funcs multilib-minimal flag-o-matic
+IUSE=dns +kmod static-libs +udev zlib 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
+LICENSE=GPL-2
+RDEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[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? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwdata
+REQUIRED_USE=static-libs? ( !udev )
+SLOT=0
+SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.12.0.tar.gz
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1dcaf750eaeb6ce3b78b6b142ddec80b
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index ede0de864878..1d56a86a2b8a 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/cronie-1.7.2 b/metadata/md5-cache/sys-process/cronie-1.7.2
new file mode 100644
index 000000000000..01162e464dcd
--- /dev/null
+++ b/metadata/md5-cache/sys-process/cronie-1.7.2
@@ -0,0 +1,15 @@
+BDEPEND=acct-group/crontab virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
+DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
+EAPI=8
+HOMEPAGE=https://github.com/cronie-crond/cronie
+INHERIT=cron flag-o-matic pam systemd
+IUSE=+anacron +inotify pam selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC BSD BSD-2 GPL-2+
+RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/dcron !sys-process/fcron
+SLOT=0
+SRC_URI=https://github.com/cronie-crond/cronie/releases/download/cronie-1.7.2/cronie-1.7.2.tar.gz
+_eclasses_=cron	7a997e295d297e4fa5c9ef0db828ee88	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=3617ce8f76cf9fc59fd05319115569f8
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 2117c10fd68e..a912527dc586 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/jdk-1.8.0-r8 b/metadata/md5-cache/virtual/jdk-1.8.0-r9
index 06ab1375fb04..fabb41194b3e 100644
--- a/metadata/md5-cache/virtual/jdk-1.8.0-r8
+++ b/metadata/md5-cache/virtual/jdk-1.8.0-r9
@@ -3,6 +3,6 @@ DESCRIPTION=Virtual for Java Development Kit (JDK)
 EAPI=7
 IUSE=headless-awt
 KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-RDEPEND=|| ( dev-java/openjdk-bin:8[headless-awt=] dev-java/openjdk:8[headless-awt=] dev-java/icedtea-bin:8[headless-awt=] )
+RDEPEND=|| ( dev-java/openjdk-bin:8[headless-awt=] dev-java/openjdk:8[headless-awt=] )
 SLOT=1.8
-_md5_=1428e44554bb261db7cfa4784553cbc0
+_md5_=9544d7454736dede70d4275f9e58a21a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3b6f786e6b96..293d6534535e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17308 BLAKE2B d6f0e1960300dcb206a4c928e0f5497ce5fdccacc5a0e5c2508a7af6e8f9498d7b9fb9ec3f5d3954053fc79e8414e01e57845b94cb5cd6f55794cf59ea3c0d33 SHA512 5f19269ff35bf881a2c86ab1b5ce45cd93f05493fcf48e1b653586b091edc5c0a54df7ffbf400b137990209ea574d0bf309d777111a8f29a227fc82a5ed91540
-TIMESTAMP 2024-04-08T04:40:19Z
+TIMESTAMP 2024-04-08T10:10:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTdTNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYTwqhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAJNRAAhbZ/MHU3eur/QqWbOs4f/9IQAF4nfWVuA1kdhNp35qt8jzAAD7WUliwC
-LAGd8gKCGQaT3gcwopaESzxTUw5sUoUejQQylZ1ZFiNZUhVjoXekx0lJ4PMGTvhe
-w5LAOd8b+cewbeEnE9yI6CYv1pPXc2xtV2NNLzS4jBdHV4jK0I0pQLeijMnmW3+M
-HgOQB361UjF0TIeE6teHmlXdEnRWBZNEIWQrIs6fzO5PwgdkCJOkeIJdpAUITHRA
-x231F0bHAGxAA8NOYn5BNOEHOGTxa4DTrV55qGhEiVo0/sAQ8L67rCT6Qw36UoOS
-UzGn4iY9y/R3gRTgd0tjTLjboWCZ1b0DuM+Xom1bwLrpZ7FHqPzFxp4ju6CLiNn/
-lhz/W1AkkzPajRlcRaFvVb6h+4zFuXnIYDvTa3ptvahOnSeQmRQrDb+EgP5cPanT
-lNFGJo4zJUC2oC/3OzgOeEPJYVeUiJhejQE6yfOIWO48bgcRxtgRifr2TXPnJaAj
-cCA4vib/auEIytVfNXULrDwIVmlrQt1Eqd/cW2zdfK1btilzBA1SCiEw1m+RNyav
-2mmm9cEcDfSjtyvaSKF8kZjeyoaUABG0jsokb76WoE4ViihSRLTw9XpPa0qE0H2D
-nVdoteTBgAZccMN2OtF8cerZNab3+ZzwFs4Kwh4C5uziVy6v/Tw=
-=nnpc
+klCOOQ/6AvTdCZecaWJsZ1IremewZKDnNDRfI/ETM12WgEi1Qpwu7jBnhRziJgBF
+u4lKEpFj6LDTxdXide5hSqX7v9wLbL1q1dHew4q/98DSAG0umTpaxr9oSUm7+gwX
+cL87ZaboFNjUpvytdtoxYDEZHOLXt9BVyxSyKIFBmVhtTg9zdprkjxse+j667C7V
+TRoel6QNup/uYoLvgnjQL2RX9lx5NGBWghOcAJumRLT+NxRcymEmU9vKW+O/a9b2
+bjKVzEfomFIVeme/Yynb5/AKM58ifulb9oMKhoBoKWolkFf/T52iJF4yAorUnzhj
+TH8at3vS85Nt7SXiXx8Ivpp3dybByUs1j7yrNiJGpOalzWNAcnWKfiOeCwiKdsyo
+wo9EXwCK6O2vTZOG4yuyXTvvzG44wGxiJUXF61+ktKm7qPq+Z/lFCnZMUiR12THV
+Qh3OFPQIwwpfkOx3UfAj2jQYU68LpaW2ZKF9whauZ8A/RMXfb+FilgZpSKa728RI
+2+BVI48rRBiC98+CG+WNohU8wW21y7WhmuKX4L9F6WD6SDXsfkXUo++Fejm2/S7t
+ZUTspkgNRO25op010c0LeoX+4NCH9vVKWP+lhVghBYw29MLGIRFt2y06ul2FItI3
+E5oXN4HWA6wVUSg0i9O41SqfpXV6ajDnWtnQ+P4k6b5DbXNOvYY=
+=Ho0+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9bba7b63f40d..a1cd6a54652e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Apr 2024 04:40:13 +0000
+Mon, 08 Apr 2024 10:10:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 466cacba0ae5..fde626e4aae2 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Apr  8 04:40:13 AM UTC 2024
+Mon Apr  8 10:10:45 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 795702440935..c0b4b64a243b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Apr 2024 04:45:00 +0000
+Mon, 08 Apr 2024 10:15:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ca760e82c777..bc41f8115ca8 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-525fd0a7f81d1ec66fa464aa981d9c0e0d2b2e54 1712549423 2024-04-08T04:10:23+00:00
+d5d70b601cf58a0705db33cd0463b0a28a8f2503 1712569711 2024-04-08T09:48:31+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9de96e949cbf..f2a64de0f303 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1712551201 Mon 08 Apr 2024 04:40:01 AM UTC
+1712571000 Mon 08 Apr 2024 10:10:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9bba7b63f40d..2ed6324c07e5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 08 Apr 2024 04:40:13 +0000
+Mon, 08 Apr 2024 10:10:45 +0000
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c84b60ac40b9..9e9bf1509bcc 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/inadyn/Manifest b/net-dns/inadyn/Manifest
index 05f6c747f2d1..d99a70c78075 100644
--- a/net-dns/inadyn/Manifest
+++ b/net-dns/inadyn/Manifest
@@ -2,5 +2,7 @@ AUX inadyn.confd 158 BLAKE2B 246e1620c4e86ae2181cdee7ae4a14d9139a96476c159a2bd1b
 AUX inadyn.initd 618 BLAKE2B 14dbddb55e21194ddad9fbbd8470a84964f06a30a560375ee2b4916ca3522cf366a5e793eef7edbee272ab117e55ebf20a5ab574c24c8d8561937168cb70bdcb SHA512 fe5d77d54f4f56900e7e54d920530b2023401207ffc43955ebdbf8edf9d8b0a323ec10df7620bc3751c6ee7bf1c25047ef6d7226b3b29d276f70d511665ce45e
 AUX inadyn.tmpfilesd 75 BLAKE2B f09b58e347524f2bb42dbab273a6ca86e2a46bd15082fd54bbf2523a75e97f204a1539c6acde658e2fc4e377cf3801fd5c1a393e7f91ccca847f86aca139c1f1 SHA512 53f3a24f2bd3ed9a236294223199cb9717a009550222d32f704c0b98b6b91c94943440a47ed3dfcd528591cf7e00b29ded02b6245eeb5887282fbffe169e1414
 DIST inadyn-2.12.0.tar.gz 506723 BLAKE2B 35fc5f8f9298cfb5ff7bf4c569fbd0495c2591a1fd630919bae8dabff03a0e41c512d304d2519be688bff3c41427f13b0a66738b785e1d28e0ec4d3901f05488 SHA512 940e49cd2c434f57a56494e1946939f0d773deeb489939c957c0e1eac135177ab3c446e967daa01a56fde5490568761c1492646bae1bb2f63688e0e9121ef8fe
+DIST inadyn-2.12.0.tar.xz 341904 BLAKE2B 2bb1e8f16784c41cb2810c3ed2a52ef12823277082b33a9436a330caad4b4f76034ab3e7f9fefb4dffc0fbf5968f4fb60967f784ce3682f165666c8c0744fcc9 SHA512 309ad6deca4831cbbfb4f4c0b4fcc1ba69fd46a47dc329b20b5e74acdcaf32e7bef435abdc89d2924b576d166095b61bdb7a74cc698a805659c47e7d6a4fe907
+EBUILD inadyn-2.12.0-r1.ebuild 1689 BLAKE2B f97e96f7ef1e68ccb963730798ae1e67ee322b5805f32db2f3d6391b6719cdaf6def1a6be85c7c7f3610d7ec172dd5c4b4e336db222a5063f1b0c4f79e3eeac0 SHA512 96bcdf93fdd1a252a975194fd924340fc0e7955bdf8d946515ce4268a312a66c22852f4c6298d75b43446b4f8fc60ea687549397655ae3ed78a9d809ebf11215
 EBUILD inadyn-2.12.0.ebuild 1582 BLAKE2B f4969dd9e191b0f026a5b1e90a01c84b7f52e5474a29acc4f8454a5d8fe9e25fe4bfe64fd5a9d7f779ece48ba8f64c08c21fc29783cb21b53e0ea2d8e430ebfe SHA512 a2b9a71e60bc58cfd94a1c4fa0c7be8933eebc5ea38e0a96cbf31b00d40f76a7c5924224ec0a9237f3328965b8e2f586c60207c5bb7c76bc6010e4c97543a07c
 MISC metadata.xml 993 BLAKE2B 362846a13e02a33b0219fa4c21f7e4d39886089b16a0eb2d5891abbf3f6c1945f42750126d54b8271caa381770dedf458f18117ece52f7058c494838d5625540 SHA512 7bb3ba6f732c1bde413bd52a50f22c93ca1e5f59cbdee12e106cc33b4175982c55cb587f48a691d603d46ae268ab9bf37fbb816cab514e895c7386c6d5cc4267
diff --git a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild b/net-dns/inadyn/inadyn-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..d95e11c356fd
--- /dev/null
+++ b/net-dns/inadyn/inadyn-2.12.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support"
+HOMEPAGE="https://github.com/troglobit/inadyn"
+SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gnutls mbedtls openssl"
+REQUIRED_USE="?? ( gnutls mbedtls openssl )"
+
+DEPEND="
+	acct-group/inadyn
+	acct-user/inadyn
+	dev-libs/confuse:=
+	gnutls? (
+		dev-libs/nettle:=
+		net-libs/gnutls:=
+	)
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# Tests would need a custom config file in homedir per configure help?
+	local myeconfargs=(
+		--disable-ssl
+		--with-systemd="$(systemd_get_systemunitdir)"
+	)
+
+	if use gnutls || use mbedtls || use openssl; then
+		myeconfargs=( --enable-ssl )
+	fi
+
+	if use mbedtls; then
+		myeconfargs+=( --enable-mbedtls )
+
+		# MbedTLS has no support for pkg-config
+		# TODO: Revisit a while after bug #922123 is fixed
+		myeconfargs+=( MbedTLS_CFLAGS="-I${ESYSROOT}/usr/include/mbedtls" )
+		myeconfargs+=( MbedTLS_LIBS="-lmbedtls" )
+	fi
+
+	use openssl && myeconfargs+=( --enable-openssl )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto	/etc
+	insopts -m 0600 -o inadyn -g inadyn
+	doins examples/inadyn.conf
+
+	newinitd "${FILESDIR}"/inadyn.initd inadyn
+	newconfd "${FILESDIR}"/inadyn.confd inadyn
+
+	newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process inadyn.conf
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 8a41ef50a3b5..fddaf1df3fbf 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/ksmbd-tools/Manifest b/net-fs/ksmbd-tools/Manifest
index 6f625c16e535..2d98382baf5c 100644
--- a/net-fs/ksmbd-tools/Manifest
+++ b/net-fs/ksmbd-tools/Manifest
@@ -2,10 +2,9 @@ AUX confd 163 BLAKE2B ea3a2a65e014d0d96bfb0789cd6756b44eeced76a0d295699d6e615ae0
 AUX initd 552 BLAKE2B 2357df024a9fd9b1334a41a6849fd3fd69f49676c3c4a9cf240a6181cb56c230b59afeadce2b37d84250d2e608e5e8109d8747f91449725ea517879d2e644683 SHA512 ae54b9cafee967fa3a5e313412725b91569c923e10b663bb7032cdc3401209e424d9e333e321ff1a8cb793aa545133e03978d8b5a4c8532836a861421ace7089
 AUX ksmbd.confd 237 BLAKE2B 7d66dc656344516421d5f043071e9a3063d2c4b5128a7a05ad5c11888b06d9f2f43ea54b404901719b8afa03623a65514bed0b3c6c5890b1d17d15eab9942bea SHA512 e314d1a520599dda148ff5aad8d0089950aceec1ec3fec6a34d4e60958e7668414b7234eea2fabdb9d544f67f385fca9dde24dddd265559339f08d949ba019dd
 AUX ksmbd.initd 749 BLAKE2B a1cc96354342d7f89194c9f836ddfe707b2545b1f2a425f8f7ccd28180d407e02a390c98731ef05c76b5ef42ac447d31cbe1d223ab057b6cebfd53e2694ab472 SHA512 5b38dbc8417f57aa9ba08c08cc5796f8316579389e3430efb410b3cc880657c27950cccaabe55f3fb826946d04448625561d165c90e344f1bab4f9084b15889b
-DIST ksmbd-tools-3.4.4.tar.gz 75481 BLAKE2B 84c215b0ccad01956185d42b858eb0de6a3407fc32c59628964ab38a2946fe5123fc73cc06cb04e8864199751f26e509ae5f6ebf6f5e7eb5f1fb8f21a4452a48 SHA512 b7be00e38eb126a0d5b8b3d9dde7c997b4012b29604d899a5f2fe3a77a3c30ac5d4bf00b7fc88d57150fd574af38bd2823c736d272a2cd596d40ccbe14a15320
-DIST ksmbd-tools-3.4.6.tar.gz 86976 BLAKE2B 2f18d41a5ef84d1d5293cab2dc51147649d723117f31b4a0360ff314d98544624c6c0280b11ec2df260514981995bdbac598347063fb6576447c511e88134c4e SHA512 396423a43ccb02fafb721717a36ea1efdc8449414cf9f7737cf44bafd991cde0a5d31689b5f43f96924357df058c1b5fbf90369b9aec2b293ae1a7b68c256d27
+AUX ksmbd.initd-r1 760 BLAKE2B 9492e6ec06b5906cae8f16576e6a72a59510faa9ad606fd4e81b1c369311252c1308d91601b18f4ace8eff0a6128868562ec8de22f27e9dd4a89eefb887dfaca SHA512 64241b5f1a2925af82ee1c6ed46bc2e2953752a5c24b7f82ea5c1d9b2464f20176daccda23312d9ff1e4366871f3836e3091e9e2f725f1c5efc50472b36c425a
 DIST ksmbd-tools-3.4.8.tar.gz 88898 BLAKE2B 4bd4fa77e7d89de4f48427e6867807b27a9be91e4f27079d4a5b231c4925aef73489bced1e4569361105fe7e04671fa8d6f3394154b36072f9d4ec77fded7466 SHA512 f5372ea7fd4b754482374cdeefa011bebe32c37a26acc180c34c61f37cf08125b5b4626128cae413cd517a74af326188f3f9e7cf459308e4305d86e7c6702436
-EBUILD ksmbd-tools-3.4.4.ebuild 1420 BLAKE2B 4ded069126e3ea307c7b81c7952d70f4157b4b851fde4ee2aee8700b16b2c03548d226075fb091dda4452fd291030409e537be05d0d040d5a59d97ffabcf3439 SHA512 8625d4f2457aee52fa4ddbfaf08905fa0c40baa66130197631ff2e355300defcc7250606166def82191cabb9c1ff116875432a0ea08cbaed7d64440e0811f184
-EBUILD ksmbd-tools-3.4.6-r1.ebuild 1816 BLAKE2B c90439f39e06615efa5465100686912a3a1bcacc9db699d4d330cc70bfdf77fe1e676ba6a4a21330f8d2d4f6380bcb61dc312e16ef872aee2d28c623ea88747a SHA512 7a82f6e28a6228c92d52c80f0cf9facb42d27d77fad44320b28b40b0babc07a8b282de451e9d24d9842cbf5d9961c2e6322ea3b382f173340ce0adc0fb0c5d71
+DIST ksmbd-tools-3.5.2.tar.gz 463604 BLAKE2B f54ff13719dd7e7167d065a7aaf5393fc18f67611be0a22fc4914e6d2afd25e751db85c27ff3adde482e1d9c4192161b76dc92f9c066dcc41cae7c820510483c SHA512 20035501e63798f5a23d3d9502ff4a50b04f74a03154bc4bfdfabb37dcf106410cd1355c2612cc46a0e52742f8e213dad4862790661781691e77760c56f40386
 EBUILD ksmbd-tools-3.4.8.ebuild 1858 BLAKE2B d98239b60e460ea95603eada2f1e760a0a5fb8894407eab6754011615c6277e08ad0ddc88e615311cf766f389364d0d2d3d8ed977daae06da8eb5ab4b5eeef24 SHA512 ceb83be663fb00beebaaf35c8511788320111693c0fba3461357a6114a56399eedf64f43133bc5b5f8786b5fe83fc2215eab3118d1f2278605f89d8f2065ed2b
+EBUILD ksmbd-tools-3.5.2.ebuild 1727 BLAKE2B 969e5979d68e245d060b87960526a0ad046b94138785cce1292f02586259fba267df2513df71171931f067c2d41f7df902c2eed1f2d8eafc46dc58ec30102b36 SHA512 7f3cbfa3ab1f4fd2e6940417732a45b629982b3312c7e76a09c412f0eaa2b411b2cc560e199e5938eebeca0ded9eeddd39aefd5a7cd15cfdee18e78787782a4b
 MISC metadata.xml 651 BLAKE2B 7dab0b33504a2f28b7d1a43ec3c6e82b649187374578585b6de5717902d6a4018b05f609022f02e02fa045075c24cad6b4d19f94b26ef57a5154da38dbf86f98 SHA512 35b6ff9c755bc70ae4e40ca97e45bcf021e606c115a9c55858715cd27ae3af47991f6f72d8b58311ba6bd0d345cd533bbe848f44d3c289fdc23b490042bccdf1
diff --git a/net-fs/ksmbd-tools/files/ksmbd.initd-r1 b/net-fs/ksmbd-tools/files/ksmbd.initd-r1
new file mode 100644
index 000000000000..82375f1ad8d3
--- /dev/null
+++ b/net-fs/ksmbd-tools/files/ksmbd.initd-r1
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/ksmbd.conf}"
+KSMBD_OPTS="${KSMBD_OPTS:-}"
+
+depend() {
+	need localmount
+	use net
+}
+
+description="ksmbd userspace daemon"
+
+command="/usr/sbin/ksmbd.mountd"
+command_control="/usr/sbin/ksmbd.control"
+command_args="--config=${KSMBD_CONF} ${KSMBD_OPTS}"
+
+extra_started_commands="reload"
+
+required_files="${KSMBD_CONF}"
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	"${command_control}" --reload
+	eend $?
+}
+
+start_pre() {
+	/sbin/modprobe -q ksmbd || return 0
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	"${command_control}" --shutdown
+	eend $?
+}
+
+stop_post() {
+	/sbin/modprobe -r -q ksmbd || return 0
+}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
deleted file mode 100644
index 727d4cd275f0..000000000000
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
-HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
-SRC_URI="https://github.com/cifsd-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libnl:3
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# we don't want to die() here to be able to build binpkgs
-	kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}"
-	CONFIG_CHECK="~SMB_SERVER"
-	ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work"
-	# use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	# TODO: add kerberos support, explicitly disable for now
-	# tools are expected to recide in /sbin, not /usr/sbin
-	econf --prefix="${EPREFIX}/" --enable-krb5=no
-}
-
-src_install() {
-	default
-
-	local DOCS=( README README.md Documentation/configuration.txt smb.conf.example )
-	einstalldocs
-
-	insinto /etc/ksmbd
-	doins smb.conf.example
-
-	newinitd "${FILESDIR}/initd" ksmbd
-	newconfd "${FILESDIR}/confd" ksmbd
-
-	dosym ksmbd.addshare /sbin/smbshareadd
-	dosym ksmbd.adduser /sbin/smbuseradd
-
-	systemd_dounit ksmbd.service
-}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild
deleted file mode 100644
index 3cc23c1bbc48..000000000000
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
-HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
-SRC_URI="https://github.com/cifsd-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libnl:3
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	# we don't want to die() here to be able to build binpkgs
-	kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}"
-	CONFIG_CHECK="~SMB_SERVER"
-	ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work"
-	# use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eautoreconf
-	default
-}
-
-src_configure() {
-	# TODO: add kerberos support, explicitly disable for now
-	# tools are expected to reside in /sbin, not /usr/sbin
-	econf \
-		--prefix="${EPREFIX:-}" \
-		--enable-krb5=no \
-		--with-rundir="${EPREFIX}/run" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	local DOCS=( README.md ksmbd.conf.example )
-	einstalldocs
-
-	insinto /etc/ksmbd
-	doins ksmbd.conf.example
-
-	newinitd "${FILESDIR}/ksmbd.initd" ksmbd
-	newconfd "${FILESDIR}/ksmbd.confd" ksmbd
-
-	dosym ksmbd.addshare /sbin/smbshareadd
-	dosym ksmbd.adduser /sbin/smbuseradd
-}
-
-pkg_postinst() {
-		local ver
-		for ver in ${REPLACING_VERSIONS}; do
-			if ver_test ${ver} -lt 3.4.6; then
-				ewarn "Upgrade from version <${CATEGORY}/${PN}-3.4.6 detected"
-				ewarn "${PN} config file moved to ${EPREFIX}/etc/ksmbd/ksmbd.conf"
-				ewarn "Please migrate from old ${EPREFIX}/etc/ksmbd/smb.conf"
-			fi
-		done
-		unset ver
-}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild
new file mode 100644
index 000000000000..c8ff8da17db4
--- /dev/null
+++ b/net-fs/ksmbd-tools/ksmbd-tools-3.5.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson systemd
+
+DESCRIPTION="cifsd/ksmbd kernel server userspace utilities"
+HOMEPAGE="https://github.com/cifsd-team/ksmbd-tools"
+SRC_URI="https://github.com/cifsd-team/ksmbd-tools/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/libnl:3
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	# we don't want to die() here to be able to build binpkgs
+	kernel_is -lt 5 15 && eerror "kernel >= 5.15 required for ${PN}"
+	CONFIG_CHECK="~SMB_SERVER"
+	ERROR_SMB_SERVER="CONFIG_SMB_SERVER is not set: ksmbd is not enabled in kernel, ${PN} will not work"
+	# use krb5 && CONFIG_CHECK+=" ~SMB_SERVER_KERBEROS5"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Drundir="${EPREFIX}"/run
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		# TODO: add kerberos support, explicitly disable for now
+		-Dkrb5=disabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	local DOCS=( README.md ksmbd.conf.example )
+	einstalldocs
+
+	insinto /etc/ksmbd
+	doins ksmbd.conf.example
+
+	newinitd "${FILESDIR}/ksmbd.initd-r1" ksmbd
+	newconfd "${FILESDIR}/ksmbd.confd" ksmbd
+
+	dosym ksmbd.addshare /usr/sbin/smbshareadd
+	dosym ksmbd.adduser /usr/sbin/smbuseradd
+}
+
+pkg_postinst() {
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 3.4.6; then
+			ewarn "Upgrade from version <${CATEGORY}/${PN}-3.4.6 detected"
+			ewarn "${PN} config file moved to ${EPREFIX}/etc/ksmbd/ksmbd.conf"
+			ewarn "Please migrate from old ${EPREFIX}/etc/ksmbd/smb.conf"
+		fi
+	done
+	unset ver
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index da02fd241cf3..b39bebc76834 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/czmq/Manifest b/net-libs/czmq/Manifest
index 0d6b6c37fa0b..0f43ed2db89c 100644
--- a/net-libs/czmq/Manifest
+++ b/net-libs/czmq/Manifest
@@ -1,4 +1,4 @@
 AUX version.sh 736 BLAKE2B 6f79aba490d6ac467b0f45ae1b3404692c24e897aece8b40f0ba4d6bcd31d980283c6e8f2307bec19d442d45687fad1ca126e50a6443d3eee2ce75b0d9f5c5a8 SHA512 e7c0c49477a7bc8e01bb84a133bef817a5942e8c13db3cbab05f8fd1a5abcbd821dab4016634363b077c869b93becce4ec1431b3e1d28fa969169cf0b9f6051a
 DIST czmq-4.2.1.tar.gz 1617066 BLAKE2B 5b635ccd7e85f05cd4f81f1ddaef80f7478feccfb916b1a7317f539354d0a4dabb7bf14a9dbee4dae3f6fbfcaf402c51ee9ba9810d952fc837c03c14304d4dab SHA512 776c524ffeba3dbe2534351f91623a6f9db31268aa2e794e29b7eca99c9fd0a726de0f7fba4376a5b3d7321b1033314e86644efaa5a9c7226fc1f06805f7aa9f
-EBUILD czmq-4.2.1.ebuild 1257 BLAKE2B 0ef78af4478cd311819a4682a44917cc70588bb7f429532649953f79ac72da1fc30442f7f80eefc9c6d468e88bc6800e3990ef0e85213514486947e7bf2c2a52 SHA512 98cd08429c9b866787c3b7cfa35a5552842459970339ccf0183b1c0d2350946b1527a4bb7a75351d79b0632d069198051eaa2f33e9a533ab49e6e7e25cc51a05
+EBUILD czmq-4.2.1.ebuild 1529 BLAKE2B 85b635ab66df820e33504aaeb0e987bd9c48c9ad502b0c3c119c36de52253f56c0cde6e66c44c017b67298e92627127be7ee256c4749c0662db8d8356dc39a3a SHA512 90593574250e89fc1b29a12e3cec18f46e78b5aa5916155948a78f029c53755cc5e9fbb639df0bc969cf1e2ba18ab4ebd705f09eb5e3ec1398567dee0f8c9862
 MISC metadata.xml 862 BLAKE2B 9e62a9d8ae31dd3e37ffeaaa623e8a4055c00e54c32eac9bffb6343907b34fb73904a4762aa7e033f4509ea6ea28e2e9c9c0bfe09e010007801900ba2cb8b6b6 SHA512 15d8a817158a90d8519c1bc65b9a88bdcc9cd99ff6eff393c6fdfbbee2a8d0643240ad5c2c8e6d9ede8456a65c01cdb8a389cbf79f34615b1f05b6f53729b4c6
diff --git a/net-libs/czmq/czmq-4.2.1.ebuild b/net-libs/czmq/czmq-4.2.1.ebuild
index 6b42355ba222..0e76450ec3f8 100644
--- a/net-libs/czmq/czmq-4.2.1.ebuild
+++ b/net-libs/czmq/czmq-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -10,7 +10,8 @@ SRC_URI="https://github.com/zeromq/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="0/4"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
-IUSE="curl drafts http-client http-server lz4 nss static-libs systemd +uuid"
+IUSE="curl drafts http-client http-server lz4 nss static-libs systemd test +uuid"
+RESTRICT="!test? ( test )"
 
 BDEPEND="app-text/asciidoc
 	app-text/xmlto
@@ -41,9 +42,13 @@ src_configure() {
 		--with-libsystemd=$(usex systemd)
 		--with-liblz4=$(usex lz4)
 		--with-nss=$(usex nss)
+		$(use_enable test czmq_selftest)
 	)
 
-	econf "${myeconfargs[@]}"
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index f8666a58c2a1..9c4ce378e6b0 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -4,9 +4,9 @@ AUX zeromq-4.3.5-c99.patch 1530 BLAKE2B 6a8855ae86731a4a073f36429d2296172c627721
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
 DIST zeromq-4.3.5.tar.gz 2530237 BLAKE2B 1ece80f4d4f6bba401c9801105cb9adecdde28c619035970a5d8e75ae4617e023c89857ef81179331cbe23b9bb69a0c15904ce9099fa59440829fb5986348d7e SHA512 a71d48aa977ad8941c1609947d8db2679fc7a951e4cd0c3a1127ae026d883c11bd4203cf315de87f95f5031aec459a731aec34e5ce5b667b8d0559b157952541
-EBUILD zeromq-4.3.3-r1.ebuild 1434 BLAKE2B 2ef0bdd7421a2a831b6494b8b4e919f83a4451f2065c448afa780e1740b04b9e3d1fc083af3fcb988f343deb5b55dbb833e2f8e10861b4d19830fc5e987b7d48 SHA512 1e2c77d3150800989e0e32ee8026c7e7523be71f98eb6269e5e2b1963faaa9cb11b50a8f1a6b9ee6df2c0492c3ce3bdbeb7916528dd9af2590bc2df6a5a80bbc
-EBUILD zeromq-4.3.4-r1.ebuild 1459 BLAKE2B 2761055575f039a6b5bc7447d8a871d76b0ab6acfb71b8f35ef78e4fd2430520862a73b42a3d23dc8cdbcafb1592ee146dd72239cb9dd87288ba1b080d23b3e5 SHA512 12f37a75b48cb9ef39ee8a26959e4b73e26c3aa3aa0512f703d162b502772432930adfdb18b1db12bf31d60cfa805cc1b0ac5a963860ea4ac08c943a8e748a15
-EBUILD zeromq-4.3.4-r2.ebuild 1570 BLAKE2B 60404f911400a186426e1be177ce63d7165b452c805992723a41545f0f34b583bc3e14a0e61b361dd817ca1a62c25915e56faaf5b93bdabd9420aa61b91d9bef SHA512 5de24df989adea59a0abc875dfd80a9070428983256c7217b01b202d5e6440f0fe8333874e5f7607f4eb795b860aaac67d9425b8624f62a19d3520cb0caf61d8
-EBUILD zeromq-4.3.5-r1.ebuild 1535 BLAKE2B e040e4a04be2f7ac4a2bec2010dc19482a88d130a85cb18739d141f3924280ed066de0e1150cf5b92e2b7470c1fad9bc596b2ecf6377321b068ad119f04139f9 SHA512 83fa0ecb81fd809ed5ca56678584c15e839236ed5b02ee1384d7d298c8f4a0896214eecb3e1897e6fe4ecd5dc81c7b58249ad0b8eeccbc2c98a30e74ecf69cc4
-EBUILD zeromq-4.3.5.ebuild 1372 BLAKE2B 5b372e3c6a25f3336797e132ac252665239c544ab92719117a377fcda74b660251f8d3987d52f6e490e0e015cec8e5cde73a07bb3d78ed4056a54ec1816faf3a SHA512 3e6504a19190789f1c6ab749c6c3a85cab0ef92ed19c72cea1a81e7b4e1800c11148aba5ad0c5c1be68fa78635139460d69382d2b32485ebdeaa642bd4e74252
+EBUILD zeromq-4.3.3-r1.ebuild 1639 BLAKE2B 6d7578690fe012fb232a5842e701cb9d8b47464e7bfd261f2350edeacef8996293093bc5b5c9e849774015104b953be3c8e72045b101a5ea5196639975f8619a SHA512 cbe9dcbb8ee8946654448162f58112b0fa07a1015802d720227ba7d61a50321380229d10f64126c2bf54bba56ca2cbcd89f6f64a257fc992c1d160ee8c30b98d
+EBUILD zeromq-4.3.4-r1.ebuild 1664 BLAKE2B ee4ae45e5ee4ad0e7e44235a7e43a13b4958724d73f8240be16315f92ef74fc1d7588d73dcfebf897011ad641906ce8dd7384fc7f25f97acdf2f081b40d4cf5a SHA512 677a9d049896b8d3767bf375f3889d5577a043035a4f0c2ac9189730b754969f8a2ff08f7c01b6e1bf40069317c26847834512a998fcfd1032d4585fda298497
+EBUILD zeromq-4.3.4-r2.ebuild 1775 BLAKE2B 4ba8c104f1b6a566bea354a3b1b153b1a9560474fd6ed73bb08a703c2e821bcb3178ef75c5444d93d8d52488fb975d931e7918d42e3b433b16c9d66a4b597b3a SHA512 c8eed2ed755f1ac85cee2e7edd4d9fff9ee72e76f21d69a2e599f9b68bbbc263fc873c805bd4ca9a467a79702717e16a08d4734eef4965cc3ae332a3c60c47b6
+EBUILD zeromq-4.3.5-r1.ebuild 1741 BLAKE2B 9e50ae5b8db525e649d74a80c2c6b908ce1597b995d05221ea7413292a0c630f1931b5e526e0887b52369664cd7b0aae896f0733bbfaf65b883979de95ce690f SHA512 bf5094559814fdc9d913b6f7fc16214abe175a6638e83b77d79e5465af89885e68377fa8eb147e85ec62589a5ade060066618ece5924a53207434c754cf6a167
+EBUILD zeromq-4.3.5.ebuild 1577 BLAKE2B 3038dc9691a0b10cca40c1533c9118586fae37d26f3cc143d08e366af57e7e63b717fc2959c5d41bbcc1bb24e566e9c7bf710930b5d02e095ebdd20500443f02 SHA512 e81772ae472a7c59071d113d2969ed8eb723883243607c103e9294ae355a34c39a08f93d2eb2a29337a6b1817070df15782a2c2f9eaa577428e718dd573d2266
 MISC metadata.xml 1541 BLAKE2B eb0032809d47b0f6e7064c1bcc8acd746480e3d1e222aeb7dd5658b820462376a8982e0d5a46e7dadc22efa8caaaa51c93f7bd66a1d73bba42a43dd959223596 SHA512 f3f8a92816c09499a6111fb375f429091c834be52e21189a7685fe59a40761ebd4d0d9e23889a0fc36d23863b3bcf16c245b00fb3d1ae21c9d8143be90977231
diff --git a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
index f507ff1b89b5..87f3eeabceb6 100644
--- a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -46,7 +46,10 @@ src_configure() {
 		$(use_with sodium libsodium)
 		$(use_with doc docs)
 	)
-	econf "${myeconfargs[@]}"
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index 7fdebcd85665..c18331194b3b 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -46,7 +46,10 @@ src_configure() {
 		$(use_with sodium libsodium)
 		$(use_with doc docs)
 	)
-	econf "${myeconfargs[@]}"
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
index f9a40343c196..e3d18dcd4cb1 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -56,7 +56,10 @@ src_configure() {
 		$(use_with sodium libsodium)
 		$(use_with doc docs)
 	)
-	econf "${myeconfargs[@]}"
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
index e42b438ca368..6108f439cba7 100644
--- a/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,7 +54,11 @@ src_configure() {
 		$(use_with sodium libsodium)
 		$(use_with doc docs)
 	)
-	econf "${myeconfargs[@]}"
+
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/net-libs/zeromq/zeromq-4.3.5.ebuild b/net-libs/zeromq/zeromq-4.3.5.ebuild
index c894ce5dca79..09f7ce445d8f 100644
--- a/net-libs/zeromq/zeromq-4.3.5.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,10 @@ src_configure() {
 		$(use_with sodium libsodium)
 		$(use_with doc docs)
 	)
-	econf "${myeconfargs[@]}"
+	# Force bash for configure until the fixes for bug #923922 land in a release
+	# https://github.com/zeromq/zproject/pull/1336
+	# https://github.com/zeromq/libzmq/pull/4651
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8333cfc074b1..f1096d25b815 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 6134421b85df..b4965344261e 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,24 +3,32 @@ AUX haproxy.initd-r8 1668 BLAKE2B 2d5b6ec27af7cc067eff402d71322fa1776d95437ae515
 DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738 SHA512 cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685 SHA512 d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076 SHA512 bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
+DIST haproxy-2.4.26.tar.gz 3670267 BLAKE2B 073ca954935021fe1986492181137324b8e4a3cdcae0e079e7a817e8dd7ad8b0097a4da57de116ed9c5932565e30962504dc18bf0ce40ac77fb384aa6527e6d2 SHA512 6397e5938fde77915786514def120472791f58e273cffb4562c9a74bda02300413f862e1dfcea33f5ba7b67753c156a326b4a63efadb107f85f6922fc2b89427
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d SHA512 5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc SHA512 81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
+DIST haproxy-2.6.17.tar.gz 4094829 BLAKE2B c1be1ef756883ca8edbad738630bbabae5c108d34c7eee6833029210c06be481dd0eb6261fb27959bb8c0cd5eebab432b6b6c2ca7a6da258f7a5dab8dbc81688 SHA512 b8e9768e768d6de10bec5811998ecbfed27d51d32dcb821ac320d02930530a950f5e2833e804284a1ae46df15bd636145bc147e55ffc7a0ca78008ebdb0d3f81
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0 SHA512 1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2 SHA512 774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
+DIST haproxy-2.8.9.tar.gz 4383096 BLAKE2B 5db0bc2d568989f4c319d0c9f1d7cbf2b0e235fce76ccc2c5688059ffbdcfda0f0d3958c5fc332f01e6fbcf38fb3d9e5e453c44df9baae5bbba16a9db8e0d761 SHA512 087dfe318bd56c3b1e834975277a35f5ebf434fdc4d342a78a24e8bec2f1d5a07d958383581eae6277754cd138e69f465e1d8fe6f1eae2f94f14a9914082bb7f
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
+DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c SHA512 23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b
 EBUILD haproxy-2.4.23.ebuild 6645 BLAKE2B 1da73c647fab05c2681f095f43a803d7dffe7fd22588b4331210f8ffae9f50f531d6cf85f110505d41c3f161064df157ceb7e9c91d9169166a4662e3bb92c637 SHA512 41eae957988f04de4f8f8d84b0e360b97c1b70a6022bafa507f456abc7f64fb85e37a9558645f2f3f6c9c056f547b48315647ce3802b01ae1ad8965672770c76
-EBUILD haproxy-2.4.25.ebuild 6650 BLAKE2B cbdc144d1f10531c0c97495e076f2344f4a3bd420c875a02138334fe6d0874892b7146e97a275c094c6657d14cb4e9201a0792aaefbe1d44b5e3856e5ab56fa6 SHA512 a1aa606e86d97cbb00130f5fab8dd03190ba931dcfa4a27374ee5197732a84fe667f3fb13c56aed237f9f1fd052e96d6eea33d2f12580efbca4ca1cb7e560fd5
+EBUILD haproxy-2.4.25.ebuild 6648 BLAKE2B d2a2d0d72ffbbd8548afa273b4ca62f91023d2ecb1c309ea2063c134989e5615c2c33f8614ce71b307adbd15679a7c3fe57bfe8a688ad7a7f4849e531b84ac3c SHA512 1a53bc6e9f152cb116dbf2a4ab9447d432bf3aaf19401690ebaab955fc54740baa8d0dbe6e5f521f4f398ab58e24aaf3a2ca2165c05e3e735743e7deca04a679
+EBUILD haproxy-2.4.26.ebuild 6650 BLAKE2B cbdc144d1f10531c0c97495e076f2344f4a3bd420c875a02138334fe6d0874892b7146e97a275c094c6657d14cb4e9201a0792aaefbe1d44b5e3856e5ab56fa6 SHA512 a1aa606e86d97cbb00130f5fab8dd03190ba931dcfa4a27374ee5197732a84fe667f3fb13c56aed237f9f1fd052e96d6eea33d2f12580efbca4ca1cb7e560fd5
 EBUILD haproxy-2.4.9999.ebuild 6650 BLAKE2B cbdc144d1f10531c0c97495e076f2344f4a3bd420c875a02138334fe6d0874892b7146e97a275c094c6657d14cb4e9201a0792aaefbe1d44b5e3856e5ab56fa6 SHA512 a1aa606e86d97cbb00130f5fab8dd03190ba931dcfa4a27374ee5197732a84fe667f3fb13c56aed237f9f1fd052e96d6eea33d2f12580efbca4ca1cb7e560fd5
 EBUILD haproxy-2.6.14.ebuild 6638 BLAKE2B 144a53813676977431df4c05560da3aaa2e081d69a2a5093d6a4681c7c3e355db685e4283c7989c51d0b8ea2b74c2c10325a8cb14a324281f821cc4622c42acf SHA512 108b8c9a76c47a36e4ceff0f36f2dafa5eb7d3bdeeebc4646bc02b0bc5e979559d2f28c5a349653c7956b396500ce3db9289beccc4e7f37e08a29b10897a249b
-EBUILD haproxy-2.6.16.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
+EBUILD haproxy-2.6.16.ebuild 6640 BLAKE2B c924afe041aa4e2ca1992f2918eb0fc2e359327e453a6c111cb516a78154e8085bf6aed3b451e0c7aa51da45d8bd8ce118cf64ff4845dddcf595ea112daaad9e SHA512 7a934650f2e291aefe55fd1fb53e6ada566dffcdad6cad2fb3f6804f2107d5eb2948742bb638b7c0085ff9297b10143fd8cd5fb7fc4023ab3106c2a4f5adc00d
+EBUILD haproxy-2.6.17.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-2.6.9999.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-2.7.11.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-2.7.9.ebuild 6638 BLAKE2B 144a53813676977431df4c05560da3aaa2e081d69a2a5093d6a4681c7c3e355db685e4283c7989c51d0b8ea2b74c2c10325a8cb14a324281f821cc4622c42acf SHA512 108b8c9a76c47a36e4ceff0f36f2dafa5eb7d3bdeeebc4646bc02b0bc5e979559d2f28c5a349653c7956b396500ce3db9289beccc4e7f37e08a29b10897a249b
 EBUILD haproxy-2.7.9999.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
-EBUILD haproxy-2.8.7.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
+EBUILD haproxy-2.8.7.ebuild 6640 BLAKE2B c924afe041aa4e2ca1992f2918eb0fc2e359327e453a6c111cb516a78154e8085bf6aed3b451e0c7aa51da45d8bd8ce118cf64ff4845dddcf595ea112daaad9e SHA512 7a934650f2e291aefe55fd1fb53e6ada566dffcdad6cad2fb3f6804f2107d5eb2948742bb638b7c0085ff9297b10143fd8cd5fb7fc4023ab3106c2a4f5adc00d
+EBUILD haproxy-2.8.9.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-2.8.9999.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
-EBUILD haproxy-2.9.6.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
+EBUILD haproxy-2.9.6.ebuild 6640 BLAKE2B c924afe041aa4e2ca1992f2918eb0fc2e359327e453a6c111cb516a78154e8085bf6aed3b451e0c7aa51da45d8bd8ce118cf64ff4845dddcf595ea112daaad9e SHA512 7a934650f2e291aefe55fd1fb53e6ada566dffcdad6cad2fb3f6804f2107d5eb2948742bb638b7c0085ff9297b10143fd8cd5fb7fc4023ab3106c2a4f5adc00d
+EBUILD haproxy-2.9.7.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-2.9.9999.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 EBUILD haproxy-9999.ebuild 6642 BLAKE2B ea559b4178913935cdb1895ffb1da6a6a0049991332a9d547c960cad348f4829369ad158614ce2e58218cd1e61a514a39d70adc93bf5aa579a68c70d702cce42 SHA512 25bee8515a7343c0a9aab2d065c5de80e7356b41862c382ade35abc5d46d4069f0166c27d58b371a381e6b1a125e04eb91312141acf8646053e2d524e02549aa
 MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/haproxy-2.4.25.ebuild b/net-proxy/haproxy/haproxy-2.4.25.ebuild
index 7f97bd0b755f..ec56dcf067f4 100644
--- a/net-proxy/haproxy/haproxy-2.4.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.25.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.4.26.ebuild b/net-proxy/haproxy/haproxy-2.4.26.ebuild
new file mode 100644
index 000000000000..7f97bd0b755f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.26.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	# This is arbitrary; upstream uses master.  Try to update when possible
+	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+	EGIT_BRANCH=master
+else
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre2:=
+		pcre-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	test? (
+		dev-libs/libpcre2
+		sys-libs/zlib
+	)"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		# Switching to PCRE2 by default, bug 838013
+		PCRE=
+		PCRE_JIT=
+	)
+
+	if use elibc_musl; then
+		args+=( TARGET=linux-musl )
+	else
+		args+=( TARGET=linux-glibc )
+	fi
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE2) )
+	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+		SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+						CC="$(tc-getCC)" ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_test() {
+	# https://github.com/vtest/VTest/issues/12
+	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+	dosbin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && {
+			newbin admin/iprange/iprange haproxy_iprange
+			newbin admin/iprange/ip6range haproxy_ip6range
+		}
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.6.16.ebuild b/net-proxy/haproxy/haproxy-2.6.16.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.6.16.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.16.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.6.17.ebuild b/net-proxy/haproxy/haproxy-2.6.17.ebuild
new file mode 100644
index 000000000000..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.17.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	# This is arbitrary; upstream uses master.  Try to update when possible
+	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+	EGIT_BRANCH=master
+else
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre2:=
+		pcre-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	test? (
+		dev-libs/libpcre2
+		sys-libs/zlib
+	)"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		# Switching to PCRE2 by default, bug 838013
+		PCRE=
+		PCRE_JIT=
+	)
+
+	if use elibc_musl; then
+		args+=( TARGET=linux-musl )
+	else
+		args+=( TARGET=linux-glibc )
+	fi
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE2) )
+	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+		SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+						CC="$(tc-getCC)" ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_test() {
+	# https://github.com/vtest/VTest/issues/12
+	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+	dosbin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && {
+			newbin admin/iprange/iprange haproxy_iprange
+			newbin admin/iprange/ip6range haproxy_ip6range
+		}
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.8.7.ebuild b/net-proxy/haproxy/haproxy-2.8.7.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.8.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.7.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.8.9.ebuild b/net-proxy/haproxy/haproxy-2.8.9.ebuild
new file mode 100644
index 000000000000..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.9.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	# This is arbitrary; upstream uses master.  Try to update when possible
+	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+	EGIT_BRANCH=master
+else
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre2:=
+		pcre-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	test? (
+		dev-libs/libpcre2
+		sys-libs/zlib
+	)"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		# Switching to PCRE2 by default, bug 838013
+		PCRE=
+		PCRE_JIT=
+	)
+
+	if use elibc_musl; then
+		args+=( TARGET=linux-musl )
+	else
+		args+=( TARGET=linux-glibc )
+	fi
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE2) )
+	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+		SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+						CC="$(tc-getCC)" ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_test() {
+	# https://github.com/vtest/VTest/issues/12
+	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+	dosbin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && {
+			newbin admin/iprange/iprange haproxy_iprange
+			newbin admin/iprange/ip6range haproxy_ip6range
+		}
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.9.6.ebuild b/net-proxy/haproxy/haproxy-2.9.6.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.9.6.ebuild
+++ b/net-proxy/haproxy/haproxy-2.9.6.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
 	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
 			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} == 9999 ]]; then
 	VTEST_DIR="${WORKDIR}/VTest"
 	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
diff --git a/net-proxy/haproxy/haproxy-2.9.7.ebuild b/net-proxy/haproxy/haproxy-2.9.7.ebuild
new file mode 100644
index 000000000000..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.9.7.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	# This is arbitrary; upstream uses master.  Try to update when possible
+	VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
+	VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz
+			test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} == 9999 ]]; then
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
+	EGIT_BRANCH=master
+else
+	VTEST_DIR="${WORKDIR}/VTest"
+	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd test +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( slz zlib )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre2:=
+		pcre-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	test? (
+		dev-libs/libpcre2
+		sys-libs/zlib
+	)"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		# Switching to PCRE2 by default, bug 838013
+		PCRE=
+		PCRE_JIT=
+	)
+
+	if use elibc_musl; then
+		args+=( TARGET=linux-musl )
+	else
+		args+=( TARGET=linux-glibc )
+	fi
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE2) )
+	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+	args+=( $(haproxy_use prometheus-exporter PROMEX) )
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+		TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+		EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+		SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for extra in ${EXTRAS[@]} ; do
+			if [ "${extra}" = "admin/halog" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+			elif [ "${extra}" = "dev/hpack" ]; then
+				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+					EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+					PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+			else
+				# Those two includes are a workaround for hpack Makefile missing those
+				emake -C ${extra} \
+					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+						CC="$(tc-getCC)" ${args[@]}
+			fi
+		done
+	fi
+}
+
+src_test() {
+	# https://github.com/vtest/VTest/issues/12
+	emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result"
+	ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests"
+	env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \
+		HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
+}
+
+src_install() {
+	dosbin haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit admin/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
+		has admin/iprange "${EXTRAS[@]}" && {
+			newbin admin/iprange/iprange haproxy_iprange
+			newbin admin/iprange/ip6range haproxy_ip6range
+		}
+		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
+		has dev/hpack "${EXTRAS[@]}" && {
+			newbin dev/hpack/gen-rht haproxy_gen-rht
+			newbin dev/hpack/gen-enc haproxy_gen-enc
+			newbin dev/hpack/decode haproxy_decode
+		}
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins admin/syntax-highlight/haproxy.vim
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index bf41754eea7d..a1a81e368c0b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 593e66496a7a..640d8f2e471e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-04-08)
+# Obsolete java-vm, bugs #848804 #830248.
+# Removal on 2024-05-08
+dev-java/icedtea-bin
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2024-04-08)
+# Java libraries without consumers.
+# Removal on 2024-05-08, bugs #853100 #716228.
+dev-java/gin
+dev-java/gwt
+dev-java/validation-api
+
 # Ben Kohler <bkohler@gentoo.org> (2024-04-07)
 # Abandoned upstream long ago in favor of Unifi Protect (running only on an
 # official Unifi appliance.  Likely contains lots of security holes in bundled
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 058aac655eac..4ddf7671d460 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 30b483f6e803..b25800bedf8b 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,6 +1,8 @@
+AUX 0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch 1028 BLAKE2B 6b5a88e903c1201138055fc73f3f850b7d0680de538a712640b75b718fe2b8c78a402b25687de378bcba47341a598598b4a61795cbf943b42c4aade3ec5d38e8 SHA512 8f6e82f7f693589d4ca0e4b4a1d4b4a09b8f58adcda3c314c74835eeba4d471b122c962ba41ecd9f50b3279fafe31b31d83eb577e790441b4f572c10c69f4dca
 AUX hdf-4.2.15-enable-fortran-shared.patch 1271 BLAKE2B bdeb5214a92618b0587472db79d6bef7677cf51ceeb77d9b8593fc374547ee4f63eb7e614c621043670236151731fcdcaac2f3e1fc18b4f577cceca24e38aa37 SHA512 daa6bf33cf5b0f9445c1e96c67907463f2a3813d2d6528a0fd19a57db98253794c3d147e736c3568766e87d01ff41a492ecd18fcef3d85af2adb77315d770be8
 AUX hdf-4.2.15-fix-rpch-location.patch 550 BLAKE2B a88448fa6f454fcac9567b05270f637d144dae5c88d4a88d19a5cc3897f7e20c61e36678dee730ee80bece1c05cd69514f87658e6a691826dce233cdbe9ff49e SHA512 77855e3e7562412fa18e102385264af42605d462690bbe4fbc867268c1cd1837eb012546294b433c4de8e98ddfdeb58c2a5480a7418252563579d6ee26808f88
+AUX hdf4-c99.patch 10535 BLAKE2B e90795c86561c6726fa099b5f55948529bc66cf40640110cbf199f9a8c86206ce6ffc3580446cbd85f123ff26d8c4c725a095b2dae0facbec4562c0e241db046 SHA512 e31eab185e4438e2e91114c7ffe0d3a713f2b736278b417f78c0cc6e6c808417d81e1607072cbcd8f9df7e50ffbeba25ed72e3347de760e6a2ba5d1e99ad90f4
 DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff SHA512 616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9
-EBUILD hdf-4.2.15-r1.ebuild 2151 BLAKE2B 36829259b5fddef733086e3427f98cc575ce1cbe7e08d565f5f450e906f7ae4bfc8c42b18aceaa3019a07c2c563530385df20ac62417c1eabb96efb6679753b6 SHA512 8f16ee75c61ceb0522fa033e836120216936f87b4441a53f4606db6e0577535a320f921cd66edfab58ccba5662b362f6ea7b92eee979d0d9c7f4c3d9c5caeaa3
+EBUILD hdf-4.2.15-r2.ebuild 2470 BLAKE2B 782d1337d4a1d8105a0e4c596c07ebb3008621f9d0108d2744c5b80f4848d222b8f89f848ecc7e067d68f0232004e8c274b57934f7d405d4e1bf8fd331659b95 SHA512 7302ef8dd3df3fb2c9bd2fd6df4a83e75d391aeadcb57a39ba2520e6ac8626c0dbd89918bb9487e1297db79469e503145170e0fad530b084eb5db2971621f48b
 MISC metadata.xml 938 BLAKE2B 6fc9c080eaaf83ab22aab00a6645d5e9936479b65d11645c0e76ed28b0e137e1ef60326ddc638a3187018d11400f35e2e17df747b3621ff26c2394800d522322 SHA512 7a54140b8429dfc6b9b078c642875c70f15fc7b7f78710acd285ae306244e09b818f41ae73571a25c16f39530ef6e53d2e26d94f6fb952ba4d4d49f58038c00f
diff --git a/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
new file mode 100644
index 000000000000..c57481a6cb84
--- /dev/null
+++ b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
@@ -0,0 +1,30 @@
+From 5a93f7ba5bea12bd78616a2168035324054ed7b7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 23:11:43 -0400
+Subject: [PATCH] simply do not build the mfhdf tools ncgen/ncdump
+
+They were removed upstream in:
+https://github.com/HDFGroup/hdf4/commit/57b87b9927f0127d0d04ab7cd6c93e01bf54e3ee
+
+With the note that people who want them can get them from... yup, you
+guessed it, netcdf.
+---
+ mfhdf/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mfhdf/Makefile.am b/mfhdf/Makefile.am
+index d62d3af..0963923 100644
+--- a/mfhdf/Makefile.am
++++ b/mfhdf/Makefile.am
+@@ -17,7 +17,7 @@ FORTRAN_DIR =
+ endif
+ 
+ # src folder in root Makefile, build other folders now
+-SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test ncdump ncgen dumper hdfimport hdiff hrepack nctest
++SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test dumper hdfimport hdiff hrepack nctest
+ 
+ DIST_SUBDIRS = xdr libsrc fortran test ncdump ncgen dumper hdfimport hdiff hrepack nctest examples
+ 
+-- 
+2.43.2
+
diff --git a/sci-libs/hdf/files/hdf4-c99.patch b/sci-libs/hdf/files/hdf4-c99.patch
new file mode 100644
index 000000000000..de5f5d07847d
--- /dev/null
+++ b/sci-libs/hdf/files/hdf4-c99.patch
@@ -0,0 +1,371 @@
+From a3d4d30fe457fc9a85fce5508119dffd3ace54c1 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 21:28:39 -0400
+Subject: [PATCH 01/11] fix tests omitting required header
+
+sys/time.h is not time.h.
+
+Purports to be fixed by https://github.com/HDFGroup/hdf4/commit/276e2c205b767d31f9d0b757f53a36aee1e1f9b2
+which however doesn't directly include time.h, as of the current
+version. In later releases it does.
+---
+ hdf/test/buffer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hdf/test/buffer.c b/hdf/test/buffer.c
+index c7990e7..9f0f06f 100644
+--- a/hdf/test/buffer.c
++++ b/hdf/test/buffer.c
+@@ -50,6 +50,7 @@
+ #ifdef H4_HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
++#include <time.h>
+ #include "tutils.h"
+ #include "hfile.h"
+ 
+-- 
+2.43.2
+
+
+From 02ec8e25e096241e20664acfc6596767f050ec86 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 20:41:06 -0400
+Subject: [PATCH 02/11] fix util omitting required header
+
+sys/wait.h is POSIX, but for some godforsaken reason upstream has
+decided to only include it behind random OS identifier macros. In a
+newer upstream version, they at least migrate over to including it
+whenever the header exists.
+
+https://github.com/HDFGroup/hdf4/commit/67e11955e41471c8892acc3c8930ea538f719a03
+---
+ hdf/util/he_file.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/hdf/util/he_file.c b/hdf/util/he_file.c
+index 8686e2f..d6c5e7f 100644
+--- a/hdf/util/he_file.c
++++ b/hdf/util/he_file.c
+@@ -17,9 +17,7 @@
+ #include "he.h"
+ 
+ /* get the prototype for the wait() func. */
+-#if defined SUN | defined HP9000 | defined IRIX | defined UNIX386
+ #include <sys/wait.h>
+-#endif /* SUN | HP9000 */
+ #ifdef H4_HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+-- 
+2.43.2
+
+
+From 60223f44459e7b43a26bdccf473804f1f0fd710f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 20:46:48 -0400
+Subject: [PATCH 03/11] another POSIX function with a missing header
+
+For this one it is not immediately apparent to me that it's fixed
+upstream at all. Will check later.
+---
+ mfhdf/libsrc/file.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mfhdf/libsrc/file.c b/mfhdf/libsrc/file.c
+index a53301f..df73212 100644
+--- a/mfhdf/libsrc/file.c
++++ b/mfhdf/libsrc/file.c
+@@ -20,6 +20,7 @@
+ #include <assert.h>
+ #endif /* DEBUG */
+ 
++#include <unistd.h>
+ #include    <string.h>
+ #include    <errno.h>
+ #include    "local_nc.h"
+-- 
+2.43.2
+
+
+From 2b4772cf958a1af0fff6117d4f7127607d3f1a50 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 20:48:56 -0400
+Subject: [PATCH 04/11] add brand new definition of function no one bothered to
+ define at all
+
+Added upstream in https://github.com/HDFGroup/hdf4/commit/8a4137d60e2d932703fc6ee91501ad374ccba885
+---
+ mfhdf/test/hdftest.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mfhdf/test/hdftest.h b/mfhdf/test/hdftest.h
+index a211c49..a946e5c 100644
+--- a/mfhdf/test/hdftest.h
++++ b/mfhdf/test/hdftest.h
+@@ -52,6 +52,9 @@
+ 
+ /*************************** Utility Functions ***************************/
+ 
++/* Generates the correct name for the test file */
++intn make_datafilename(char* basename, char* testfile, unsigned int size);
++
+ /* Calls SDcreate, SDwritedata, and SDendaccess */
+ int32 make_SDS(int32 sd_id, char* sds_name, int32 type, int32 rank,
+ 			  int32* dim_sizes, int32 unlim_dim, VOIDP written_data);
+@@ -65,6 +68,9 @@ int32 make_Ext3D_SDS(int32 sd_id, char* sds_name, int32 type, int32 rank,
+ 		     int32* dim_sizes, VOIDP written_data,
+ 		     int32 offset, char* ext_file_name);
+ 
++/* Verifies the unlimited dimension's size and the variable's data. */
++int verify_info_data(int32 sds_id, int32 expected_dimsize, int16 *result);
++
+ /* Calls SDnametoindex and SDselect */
+ int32 get_SDSbyName(int32 sd_id, char* sds_name);
+ 
+-- 
+2.43.2
+
+
+From 1be129c91ec9db6991daebddfe5124cc8180f0ea Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 20:58:13 -0400
+Subject: [PATCH 05/11] fix typoed function definition
+
+https://github.com/HDFGroup/hdf4/commit/490abfc71219657ecfa81cd90413b623f73603fd
+---
+ mfhdf/test/hdftest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mfhdf/test/hdftest.c b/mfhdf/test/hdftest.c
+index da9a36b..04f8641 100644
+--- a/mfhdf/test/hdftest.c
++++ b/mfhdf/test/hdftest.c
+@@ -59,7 +59,7 @@ extern int test_SDSprops();
+ extern int test_coordvar();
+ extern int test_chunk();
+ extern int test_compression();
+-extern int test_dimension();
++extern int test_dimensions();
+ extern int test_attributes();
+ extern int test_datasizes();
+ extern int test_datainfo();
+-- 
+2.43.2
+
+
+From 60fcf1802bd015b01095c6a0463200f09c47f677 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 21:53:59 -0400
+Subject: [PATCH 06/11] make defines actually do anything whatsoever
+
+Rendered obsolete by https://github.com/HDFGroup/hdf4/commit/218c8da49eda25799577ac905209c1e972a77771
+---
+ mfhdf/test/tdatainfo.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/mfhdf/test/tdatainfo.c b/mfhdf/test/tdatainfo.c
+index df2539b..ab36044 100644
+--- a/mfhdf/test/tdatainfo.c
++++ b/mfhdf/test/tdatainfo.c
+@@ -23,6 +23,9 @@
+  * -BMR, Jul 2010
+  ****************************************************************************/
+ 
++#ifndef DATAINFO_TESTER
++#define DATAINFO_TESTER /* to include mfdatainfo.h */
++#endif
+ #include "mfhdf.h"
+ 
+ #ifdef H4_HAVE_SYS_TYPES_H
+@@ -44,10 +47,6 @@
+ #define ssize_t int32
+ #endif
+ 
+-#ifndef DATAINFO_TESTER
+-#define DATAINFO_TESTER /* to include mfdatainfo.h */
+-#endif
+-
+ #ifdef H4_HAVE_LIBSZ
+ #include "szlib.h"
+ #endif
+-- 
+2.43.2
+
+
+From e967cb577fa0ba39cee7d5a128672c61adbb839e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 22:01:14 -0400
+Subject: [PATCH 07/11] Include correct header
+
+https://github.com/HDFGroup/hdf4/commit/3f61fb461d2d19cc1d9da41f29e5cbb2ce0c4365
+---
+ mfhdf/test/tfile.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mfhdf/test/tfile.c b/mfhdf/test/tfile.c
+index a90fc02..b0ea001 100644
+--- a/mfhdf/test/tfile.c
++++ b/mfhdf/test/tfile.c
+@@ -13,6 +13,7 @@
+ 
+ /* $Id: tfile.c 5218 2009-08-29 04:21:49Z bmribler $ */
+ 
++#include "local_nc.h"
+ #include "mfhdf.h"
+ 
+ #ifdef HDF
+-- 
+2.43.2
+
+
+From fda204abcb83516177d6c81a23261e1c641bcdcf Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 22:03:18 -0400
+Subject: [PATCH 08/11] include header needed for unlink()
+
+Upstream in https://github.com/HDFGroup/hdf4/commit/9055b673990b2dc3c9248f720f3e8a03f8d86434
+
+It is unclear why they think it was only needed then...
+---
+ mfhdf/test/tsd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mfhdf/test/tsd.c b/mfhdf/test/tsd.c
+index 397aeba..a6e9b6c 100644
+--- a/mfhdf/test/tsd.c
++++ b/mfhdf/test/tsd.c
+@@ -15,6 +15,8 @@
+  * tsd.c - tests SDstart for file with no write permission
+ ****************************************************************************/
+ 
++#include <unistd.h>
++
+ #include "mfhdf.h"
+ 
+ #ifdef HDF
+-- 
+2.43.2
+
+
+From 572ef6889599b58535bd2285d98ac63c7fdf870d Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 22:49:39 -0400
+Subject: [PATCH 09/11] include the getopt() header
+
+Which isn't getopt.h, though upstream helpfully added one in
+https://github.com/HDFGroup/hdf4/commit/9be7f29942d286873d0b4fa125be11b3f79f6916
+
+They then went a bit further and stopped using getopt at all:
+https://github.com/HDFGroup/hdf4/commit/0b3ad421b3ba8045d078196edd0492067f1ea576
+
+Helpful rationale:
+>  Instead of relying on the system getopt(), HDF4 includes its own
+
+Intriguing.
+
+"Fortunately" this is a patch for an old version of hdf4. All we want to
+do is get the POSIX prototype which we intend to link to.
+---
+ mfhdf/hdiff/hdiff_main.c | 1 +
+ mfhdf/ncdump/ncdump.c    | 1 +
+ mfhdf/ncgen/main.c       | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/mfhdf/hdiff/hdiff_main.c b/mfhdf/hdiff/hdiff_main.c
+index 2fb2342..e2987be 100644
+--- a/mfhdf/hdiff/hdiff_main.c
++++ b/mfhdf/hdiff/hdiff_main.c
+@@ -12,6 +12,7 @@
+  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+ 
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/mfhdf/ncdump/ncdump.c b/mfhdf/ncdump/ncdump.c
+index bdaa120..8697c0a 100644
+--- a/mfhdf/ncdump/ncdump.c
++++ b/mfhdf/ncdump/ncdump.c
+@@ -4,6 +4,7 @@
+  *   $Id$
+  *********************************************************************/
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/mfhdf/ncgen/main.c b/mfhdf/ncgen/main.c
+index 16c0204..7f6e2c0 100644
+--- a/mfhdf/ncgen/main.c
++++ b/mfhdf/ncgen/main.c
+@@ -4,6 +4,7 @@
+  *   $Id$
+  *********************************************************************/
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+-- 
+2.43.2
+
+
+From b569c20be9d3c65ba48bd2a81a5daa9ee8a419bc Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 22:57:19 -0400
+Subject: [PATCH 10/11] Remove never-defined macros that prevented including a
+ crucial header
+
+Also removed upstream:
+https://github.com/HDFGroup/hdf4/commit/3f61fb461d2d19cc1d9da41f29e5cbb2ce0c4365
+---
+ mfhdf/ncgen/close.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/mfhdf/ncgen/close.c b/mfhdf/ncgen/close.c
+index 036d8f0..3dedbd7 100644
+--- a/mfhdf/ncgen/close.c
++++ b/mfhdf/ncgen/close.c
+@@ -6,9 +6,7 @@
+ 
+ #include <stdio.h>
+ #include "ncgen.h"
+-#ifdef EIP
+ #include "genlib.h"
+-#endif
+ 
+ extern void fline(), cline();
+ extern int netcdf_flag;
+-- 
+2.43.2
+
+
+From 9bce6a7a5ea7095f4a51d38bd7e378670c33fb06 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Sun, 7 Apr 2024 23:23:16 -0400
+Subject: [PATCH 11/11] fix blatantly missing type
+
+Upstream applied via:
+https://github.com/HDFGroup/hdf4/commit/38e08e0d12d2ee84917111583a007fdcb5ad1aed
+---
+ mfhdf/hdfimport/gen_sds_floats.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mfhdf/hdfimport/gen_sds_floats.c b/mfhdf/hdfimport/gen_sds_floats.c
+index 81f62c5..d08576f 100644
+--- a/mfhdf/hdfimport/gen_sds_floats.c
++++ b/mfhdf/hdfimport/gen_sds_floats.c
+@@ -23,7 +23,7 @@
+ #define RANK2          2  /* Number of dimensions of the SDS */
+ #define RANK3          3  /* Number of dimensions of the SDS */
+ 
+-main() 
++int main()
+ {
+     /************************* Variable declaration ************************/
+ 
+-- 
+2.43.2
+
diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index c809222acf56..02fc69143873 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 
@@ -34,6 +34,12 @@ PATCHES=(
 	# May need to extend these for more arches in future.
 	# bug #664856
 	"${WORKDIR}"/${PN}-4.2.15-arch-patches/
+
+	# backport fix for Modern C
+	"${FILESDIR}"/hdf4-c99.patch
+
+	# These tools were dropped upstream. Get them from netcdf...
+	"${FILESDIR}"/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
 )
 
 src_prepare() {
@@ -44,6 +50,14 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=strict-aliasing, -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/862720
+	#
+	# Do not trust with LTO either, just because of strict-aliasing.
+	# But also because it does have blatant LTO errors too.
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
 	# GCC 10 workaround
 	# bug #723014
@@ -75,9 +89,4 @@ src_install() {
 	else
 		rm -r share/hdf4_examples || die
 	fi
-
-	mv bin/ncgen{,-hdf} || die
-	mv bin/ncdump{,-hdf} || die
-	mv share/man/man1/ncgen{,-hdf}.1 || die
-	mv share/man/man1/ncdump{,-hdf}.1 || die
 }
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 68a42da6f3c4..4a2a0e5faed9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 74b6422abb07..0733d94e5a7e 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,6 +2,8 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
 DIST pciutils-3.11.1.tar.gz 660457 BLAKE2B 447d0e3fa209d2d27a0310a5824a75b543b539c459caed23e9218f4ff3f9a3c2a99c65dd5ddf92a56c2b880ecfaeff6f3edc458c3e5973a1a4937325740915ac SHA512 6bbb248364831a384a2f521d7300cc53b046ce3765c3f7aca08c9e839174b02687543ee697b8ffc24258bcd39ac625d1ce53d6ca02fdc718eea86a50c95a33de
+DIST pciutils-3.12.0.tar.gz 668358 BLAKE2B 6d57b0654a26e959d2a953a102fd616ba0a0a183ec6d40f65a1274ad33330df9c81b95d4b2274edc240cbcf576ce93a0b61252bae0b6348a29df659b3fc219eb SHA512 b1efd3e24efad4f80e1a942d23d6ea12acec9642714e47d24bff7f7c53ff475b0252c6f75c0053b7ec64635037e72b150b3e313229b36479dc0cbf96902096c5
 EBUILD pciutils-3.10.0.ebuild 4905 BLAKE2B fc998bbc04dd08d1707890bafc62deaa9a282640a7ca946b37e24841b2bf00205d4ee18678786a3616293fa211a1ada48da41bd564e0d6716cd5c7ab2edf2fe0 SHA512 5435ab9fef31732c00f278c4ba19501f99cb13aa2ab84974bef5571798121747c2a9cf68c1d20b4d4a0ea2db4f93b842f7149ac46ab3ed615a5793209c97f297
 EBUILD pciutils-3.11.1.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
+EBUILD pciutils-3.12.0.ebuild 4913 BLAKE2B 301520e077afbd9406e5f330b1a3013d8e89cacaa8f72757da44935db7c9b532cc732e4131366db4b79972df85ecc5df0219c7a46f7e0f39796baa99499421e4 SHA512 8e1d393c8c32b3dde40fd0f80f1a99284cc24c8f4ed1a80c34d7f0fff830947ee7e04328d1ad47bbf9ded42f57bd4d831d846af0d27c23c2821ba10b0d6c4cbe
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.12.0.ebuild b/sys-apps/pciutils/pciutils-3.12.0.ebuild
new file mode 100644
index 000000000000..dd3c7a05627e
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.12.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs multilib-minimal flag-o-matic
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="dns +kmod static-libs +udev zlib"
+REQUIRED_USE="static-libs? ( !udev )"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libpci.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
+DEPEND="
+	kmod? ( sys-apps/kmod )
+	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwdata
+"
+# See bug #847133 re binutils check
+BDEPEND="
+	|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
+	kmod? ( virtual/pkgconfig )
+"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
+
+switch_config() {
+	[[ $# -ne 2 ]] && return 1
+	local opt=$1 val=$2
+
+	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
+	return 0
+}
+
+check_binutils_version() {
+	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
+		# Okay, hopefully it's Binutils' bfd.
+		# bug #847133
+
+		# Convert this:
+		# ```
+		# GNU ld (Gentoo 2.38 p4) 2.38
+		# Copyright (C) 2022 Free Software Foundation, Inc.
+		# This program is free software; you may redistribute it under the terms of
+		# the GNU General Public License version 3 or (at your option) a later version.
+		# This program has absolutely no warranty.
+		# ```
+		#
+		# into...
+		# ```
+		# 2.38
+		# ```
+		local ver=$($(tc-getLD) --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
+
+		if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
+			# Skip if unrecognised format so we don't pass something
+			# odd into ver_cut.
+			return
+		fi
+
+		ver_major=$(ver_cut 1 "${ver}")
+		ver_minor=$(ver_cut 2 "${ver}")
+
+		# We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
+		# because we've had other miscompiles with older Binutils (not just build failures!)
+		# and we don't want people running any unsupported versions of Binutils. An example
+		# of this is where glibc is completely broken with old binutils: bug #802036. It's
+		# just not sustainable to support.
+		if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
+			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
+			eerror "Please follow these steps:"
+			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
+			eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
+			eerror "2. Run: . /etc/profile"
+			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
+			eerror "4. Complete your world upgrade if you were performing one."
+			eerror "5. Perform a depclean (emerge -acv)"
+			eerror "\tYou MUST depclean after every world upgrade in future!"
+			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
+		fi
+	fi
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
+}
+
+src_prepare() {
+	default
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+		mv "${S}.static" "${S}/static" || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# bug #640836, bug #852929
+	# Still broken in 3.10.0, see https://github.com/pciutils/pciutils/pull/144.
+	filter-lto
+
+	# bug #471102
+	append-lfs-flags
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DNS=$(usex dns) \
+		IDSDIR='$(SHAREDIR)/hwdata' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD=$(multilib_native_usex kmod) \
+		HWDB=$(usex udev) \
+		"$@"
+}
+
+multilib_src_compile() {
+	pemake OPT="${CFLAGS}" all
+
+	if use static-libs ; then
+		pemake \
+			-C "${BUILD_DIR}"/static \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+multilib_src_install() {
+	pemake DESTDIR="${D}" install install-lib
+
+	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
+	rm -r "${ED}"/usr/share/hwdata || die
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 98d97b5a612e..093a4933f7e5 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 075b5c75c680..25c363cb1f45 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -7,7 +7,9 @@ AUX cronie-1.7.1-envelope-revert.patch 2169 BLAKE2B 70090c54a070e35b548ec58258d6
 AUX cronie-crontab 476 BLAKE2B 7e2de210328ad714647b9ec50c611573ba166b63f68643aa001f8ca2d2c6e6a5b1300cbd8e1be2ba4374def366698abe6f990673b427e7db4883a9cb74bd06c0 SHA512 0d42a8e749db5c7f057b980678dbfada3dcf1418000168380097032a69a48ab4bc8fa228fb45c65c9c2a1a8d5290da3ca84816963fb7096fd13e293a68fea0c5
 DIST cronie-1.7.0.tar.gz 271404 BLAKE2B 44745f68dba212da60f3013b10737be2390d8c76186dc641fa1930b1c7d103fa2e3127a63fe73571434683137044f7fda8cc31435c59092a14c0091a372ffead SHA512 a8e6688a164540e2cd3741c58813b6684c4c22a04806bcc8ba028a9ff72f986f165715ac3663bd34133af6566bdbd272a3e7be893f139e315aef35b2dbeb622f
 DIST cronie-1.7.1.tar.gz 271985 BLAKE2B 9cbf22fe9c86f265e625563fc5426f39f79ac9c9cfa090ba47957c14391ed3b8ac202b244fed35ea043bed428b4c97a71ad400719a265bd95f5ac28bf3dc9b3a SHA512 4479f6f05ca9da3ecefa0e9b73662f1db58ffff309916de9f92f89c5e7f93f1c5c744f18cb3e1a3df9664d533afe7dad710f97484e72a314c87d84f57a6c56fb
+DIST cronie-1.7.2.tar.gz 272450 BLAKE2B 8e426fd0e279bc6a98a4f31dff867b66c87fe0629aca12b4b85557d0162b58aabf5b9789f0b36af417a92bdffa721e2309e125e9b07bfa21aee53aa1135294c7 SHA512 5b55c677a5b812dbfa70f6ee25e41907e99cc63a4883974c6bb8115ad65155d66665704808c338d2f7be6b0a57028c319f2d1115c69bb5f3efdda1efafd144de
 EBUILD cronie-1.7.0-r2.ebuild 2568 BLAKE2B fa713ec97b38bc019bf3bacf553542944ba237482b942621da644bd1389409cacaec1fbd559acd3be510aa8d0fe42371a3159d0568e6340df17145baf1a71e95 SHA512 d71a57fd6601691b73254b937236b6a71ed51329bcc28d7b4ca8f2c4123e1640b6156e55c86d6919c371cb1259ca985d7fb477f418dfe15fd484c483b0d1167a
 EBUILD cronie-1.7.1-r1.ebuild 2513 BLAKE2B 0ad3ccd160492da03819e5710901ebaf49d25e84d9fd64f2614b4d0ba64aebc9b37aed3fbe83c3f4d994c5d7bdfa539d95c3545392dedaf3e42d26b37649e4ed SHA512 07742ca6cf9a69f91bb35f6118e7b63269d13b225b8f7c34f5b20b3a312465877605489964e1b6118004f52850f5e6b1aaea17022ff2e62fe8f7f09ec9f8e7ec
 EBUILD cronie-1.7.1.ebuild 2466 BLAKE2B abea16c95c4f53b57d08dab4f58ac0069c14af756fb6d46e93473f4abc3dfb9ffc0df2300676f50108b5e26157b293462aaaad694c2b5126ae518cf6826fa4c5 SHA512 eb97d02eae37aec1973f5da88f1507ec7231741a133d73ee86c67b0774193fd04574d81bd51560168ea2ad7112cc8ca839b8f4d20dabd41316b505bd149cb24f
+EBUILD cronie-1.7.2.ebuild 2466 BLAKE2B abea16c95c4f53b57d08dab4f58ac0069c14af756fb6d46e93473f4abc3dfb9ffc0df2300676f50108b5e26157b293462aaaad694c2b5126ae518cf6826fa4c5 SHA512 eb97d02eae37aec1973f5da88f1507ec7231741a133d73ee86c67b0774193fd04574d81bd51560168ea2ad7112cc8ca839b8f4d20dabd41316b505bd149cb24f
 MISC metadata.xml 821 BLAKE2B cb3c9d002c660aea2d9ebff9c48f32ca42e2dfb74b42dbd814b3acdd4afa71a9f6bf28fcd6df44492246b64f52a0537e5c24238bfd813f5b66c274242d4bc63e SHA512 2016c15fc50cb8766a8e701853f56f2823ee730e6cb0df122ba74526d0c0fa6909a3ed945a3a405d2d1c35933c4b80b44a9158ced8d8e68372954a740413dfe5
diff --git a/sys-process/cronie/cronie-1.7.2.ebuild b/sys-process/cronie/cronie-1.7.2.ebuild
new file mode 100644
index 000000000000..623981c18a36
--- /dev/null
+++ b/sys-process/cronie/cronie-1.7.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# cronie supports /etc/crontab
+CRON_SYSTEM_CRONTAB="yes"
+
+inherit cron flag-o-matic pam systemd
+
+DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
+HOMEPAGE="https://github.com/cronie-crond/cronie"
+SRC_URI="https://github.com/cronie-crond/cronie/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+anacron +inotify pam selinux"
+
+DEPEND="
+	pam? ( sys-libs/pam )
+	anacron? (
+		!sys-process/anacron
+		!sys-process/systemd-cron
+		elibc_musl? ( sys-libs/obstack-standalone )
+	)
+	selinux? ( sys-libs/libselinux )
+"
+BDEPEND="acct-group/crontab"
+RDEPEND="
+	${BDEPEND}
+	${DEPEND}
+	sys-apps/debianutils
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		# Required for correct pidfile location, bug #835814
+		--runstatedir="${EPREFIX}/run"
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
+
+	if use anacron && use elibc_musl ; then
+		append-cflags "-lobstack"
+	fi
+
+	SPOOL_DIR="/var/spool/cron/crontabs" \
+	ANACRON_SPOOL_DIR="/var/spool/anacron" \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	docrondir -m 1730 -o root -g crontab
+	fowners root:crontab /usr/bin/crontab
+	fperms 2751 /usr/bin/crontab
+
+	newconfd "${S}"/crond.sysconfig ${PN}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}-crontab" crontab
+	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
+
+	insinto /etc/cron.d
+	doins contrib/{0hourly,dailyjobs}
+
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
+
+	if use pam ; then
+		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
+	fi
+
+	systemd_newunit contrib/cronie.systemd cronie.service
+
+	if use anacron ; then
+		local anacrondir="/var/spool/anacron"
+		keepdir ${anacrondir}
+		fowners root:cron ${anacrondir}
+		fperms 0750 ${anacrondir}
+
+		insinto /etc
+		doins contrib/anacrontab
+
+		insinto /etc/cron.hourly
+		doins contrib/0anacron
+		fperms 0750 /etc/cron.hourly/0anacron
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	cron_pkg_postinst
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
+		ewarn "or ${PN} not working reliably anymore."
+		einfo "(see https://bugs.gentoo.org/557406 for details.)"
+	fi
+}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index b15d16e4cffa..ed3988253266 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index 641685bf76e5..163be4a5e3d6 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,4 +1,4 @@
-EBUILD jdk-1.8.0-r8.ebuild 428 BLAKE2B 02c68311c82d54109349bbfb3b26750e1845c57ee46369d6c6c5d92089037bc2cda52c5fa2099334db44e21be5a7240aca005ffa33ea0a65c0c5250438340188 SHA512 39c5d95d916d9687bd4e417aff257b9fe89b094f183fb94ace0575dd22a6629bda058aad64b5a5a0714f484051ca7c6db7998bdc2cafe9deba39fbe8014f0dae
+EBUILD jdk-1.8.0-r9.ebuild 388 BLAKE2B 7a08fc02180e589629cefb0a7d2e70f78cdc680ad1ae03cbad6a983dea1e4fdd81b07f0cd41c7b70c9de9df7586bd7667ed5ca093ecad537912d41a5246a5eb8 SHA512 9da473b8f3918f9a5be5c17b517b9b510010133b4895357af8b945ad8d198596349fb96b0f5d13a08ead517e2d77f0ef9cd418b8fb3729665cae62aca1a53c1c
 EBUILD jdk-11-r2.ebuild 376 BLAKE2B e505054f44e217624f82b87f997d310cc0b0087bc99a3b09fb9283b3915f1ba04917b595163954093fdea4457ab91a1086dedc532be61ba566b632de19c61398 SHA512 f9e10db3659f5fe25406d91f4a9852ba1b704eaf03e864c465412b9fe8f420cfcec4ea1268ff9e1a05da62fd9e83a96f44a3d068601a5536aa38c921c06eb488
 EBUILD jdk-17.ebuild 376 BLAKE2B c39d0ca4abb7a041dbcb20ba3a612982d43b3c18072c833939a6edfe05343f2d60933957500e770665080d2d90bc71af8b3add54d452cef58c9bdd5cb2792166 SHA512 241e168b16b95ebf7e2f7677762042d20ffe81f8cc395036010de639cedadb2447790b90aeff6c0940611cac3ae799559af3862d02e51e200103bfeb6cad766c
 EBUILD jdk-21.ebuild 368 BLAKE2B 73dd7d754de9c63a74fbcfd1e43ad458a3ae690e95e85124cf74ee8250bac9a89804bcf89b2f733cc9d9566702ae75ff1b67791f1a2c960b71aa1a87ba2d3d8d SHA512 ad01db45121dd45a76364a877a1dc04c5e4dd2a6c3f16cf61e820764eac8b08c36d6ff30dbf1922b6fb86e0dd9000d3ed2027abf3122ce70d05615202a676a3d
diff --git a/virtual/jdk/jdk-1.8.0-r8.ebuild b/virtual/jdk/jdk-1.8.0-r9.ebuild
index ef8c2961a8e1..5fc6997249a2 100644
--- a/virtual/jdk/jdk-1.8.0-r8.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r9.ebuild
@@ -11,5 +11,4 @@ IUSE="headless-awt"
 RDEPEND="|| (
 		dev-java/openjdk-bin:8[headless-awt=]
 		dev-java/openjdk:8[headless-awt=]
-		dev-java/icedtea-bin:8[headless-awt=]
 )"