gentoo auto-resync : 26:03:2025 - 00:31:47

9 files changed, 338 insertions, 23 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5266eff01a38..8f6443004f21 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 4713451d0a12..662f3008089d 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,10 @@
 DIST ed-1.20.2.tar.lz 69182 BLAKE2B 5a9d36dba98488e3cacb3e4c0b9d70003345ca94dbf9a3ebd3181b93567b9ef94df0e72614e99e2c6dde4929933d9333c6dba90fafcea6962e2c1abccb0525af SHA512 5efad386399035329892d8349500544f76e1b18406e164aae35af872c15a0935d412dd4a6996bd15b960d0e899857cc7d8657805f441b1b9f2ae3d73c73dcf4f
 DIST ed-1.20.2.tar.lz.sig 72 BLAKE2B f62d5fc9d909cd1f665ed2b4793407d1d91981bad6b4da0383b84936d03d2ee78c37dca1f0c09fbb84cbbfd8211980ea489b897ff14834773185fce0339c7fe3 SHA512 dc895c0634d73c5ddaaffc78c8dd86df88c477607a7d5f1828229009e2a72091cbb24286dbad295019a30651cc6e98d07a1181b0ae38b94d66cb28532876098e
+DIST ed-1.21.1.tar.lz 70017 BLAKE2B 36c83d2552b4d9a9a51f52e740f04439d18de661565de5a2e1c0b734ac31762e48c5a9247957a58b5657de6eb10e48ace6a087263b732c3d943c5a2f149f3eef SHA512 14b7b220cebb74f2381dfe9bfdc750a693d4372340c20cc14cc70d67ad6f2b3f37e46a957516d0c5c18154fb6373670b2dba6487c334d0bb79f34b4e7a993b9d
+DIST ed-1.21.1.tar.lz.sig 72 BLAKE2B bb63ae37998bf499c2741564aeb04a9f0c191f15d13cae28eb2dea99cc8dc384ea877ff2f6212176978dd192db71992600b098154141df2014667d88a31dc6f0 SHA512 204e24811b258c9afd024c50993c23a82bcda8abc57b90008545cf22d6a64593eec5257754df210940cee94e32a03947e9330688d60e26fb6dd487228351ff80
 DIST ed-1.21.tar.lz 69718 BLAKE2B 60d5b962f58e5214202071887d80b523e53100c5a93cb1b06dd3192fa5a4b0059a537b87906738384380f28091ee0e1833908a260536e82ab436441411c383d3 SHA512 ac65287dff9f85c22194c98d658a147eac65e1f192d1564cd940ef9b5317be46a48aaefa16f37ab45513568d28503f4da15bed7adfacf0dfa5c28492adceaac3
 DIST ed-1.21.tar.lz.sig 72 BLAKE2B 265a4fba89d36faaa0fb92dc5dcebd8ec4b6ff6faead1e795193eae36960ea80232395764bdfe797bb7c9b1e951bfa3c802c34dfd169f971a67a117d8f949265 SHA512 032ee6bfc84302562ceb8904ff86e5767691e38f6405b6a49653e91fb8955a6f99a565782b1d42209983ae311a4b192a89493345e6ad546803141ca07888b093
 EBUILD ed-1.20.2.ebuild 1332 BLAKE2B c7d9a3b17c1e1ee819bb5d68a8fe0e2acd511f23135c44c1b1961eb56d00b1d1fe35f1ed21e45c654b731cd45b6b53058c00c5bd2277f2534338c6ae78742f5c SHA512 5263de1db9863322c5fbfc86ad471b63ae07f440b44ad1b9ccefe064a4b96a9ee5a169968698699194196c103159e05c807b010539cc032c988aac38f4e9ff11
+EBUILD ed-1.21.1.ebuild 1269 BLAKE2B 732354c350a25755d507eae3efb08a1bc6699b10d96d0b88e7a52131f1df62ee89a0f41f0a2e260248a5a8dc1683a53992143706abb3de173231aa9740fa5601 SHA512 2e98b74b25eb456a9a3767f28729d8d736b9b7f9f97227e4a51a86970ea13519c6c4a93c4b6985fe03b1c0037f04e0b7ad242ac06a82ea9ded4629f06ec8e5cd
 EBUILD ed-1.21.ebuild 1261 BLAKE2B 61ee2c51b0ef0ee22cd9350bd317b806806f8f461e98ff66eb3d24a9115c34e931de7a06e5f9552a121a6f3dbd7d15789c4e3b25c78859324980843e51e3cd97 SHA512 e3e7868d0db712d32fd12be6d3dbbe2cd22a32ee72ea0be8737fa1253e5b331f4315fb96d4a63fe87be8a53b13688e582d13d205f0f96c3d31fc4d3f23539337
 MISC metadata.xml 337 BLAKE2B 40506db26223e7d375b03972929e04e5684f0ee5d722248819d28d424daf9f2f4effd07a7491cdba9d77185712593fe8fd182c058bff2ff0ba4341aff383dc7d SHA512 5709e973094bd7fda825a3a223c04f8ce04ba9e2f609466c7cf56da4f62d4155562669bbfd808acd2f7db17434ca5871cdc50962a6bfdae3c4edeca1bb4736df
diff --git a/sys-apps/ed/ed-1.21.1.ebuild b/sys-apps/ed/ed-1.21.1.ebuild
new file mode 100644
index 000000000000..da8a31ecdc78
--- /dev/null
+++ b/sys-apps/ed/ed-1.21.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/antoniodiazdiaz.asc
+inherit edo toolchain-funcs unpacker verify-sig
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Your basic line editor"
+HOMEPAGE="https://www.gnu.org/software/ed/"
+SRC_URI="
+	mirror://gnu/ed/${MY_P}.tar.lz
+	https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz
+	verify-sig? (
+		mirror://gnu/ed/${MY_P}.tar.lz.sig
+		https://download.savannah.gnu.org/releases/ed/${MY_P}.tar.lz.sig
+	)
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+BDEPEND="
+	sys-apps/texinfo
+	$(unpacker_src_uri_depends)
+	verify-sig? ( sec-keys/openpgp-keys-antoniodiazdiaz )
+"
+
+src_unpack() {
+	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.lz{,.sig}
+	unpacker "${DISTDIR}"/${MY_P}.tar.lz
+}
+
+src_configure() {
+	edo ./configure \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		--bindir="${EPREFIX}/bin" \
+		--prefix="${EPREFIX}/usr"
+}
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index af0274e46642..8e1f7067b4c6 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,8 +8,10 @@ AUX iproute2-6.9.0-mtu.patch 1135 BLAKE2B 503eb3ece9ef5b5a7918a0e26f7b1d57ed6889
 DIST iproute2-6.11.0.tar.xz 923736 BLAKE2B 1a360d7cb9a70f5cde184abe934f2d08e9c0d2196c4ec10015636af3984abe2738d9dd8d6c7a69569fc7449e9933829f4eccd593ab8c041ce7b6385adaed63cc SHA512 06bedd7ae573fe5cf9c72af698987ba03e53dc6fce5f41813bf5bb155b683490e5c75cc835ce5ba4509e491eb6138e96da162204c28ea1b3d80887107997a3b3
 DIST iproute2-6.12.0.tar.xz 925392 BLAKE2B 95aee769662e21c8c6223d09ee0ec365fcdeb7a10d01e89e33aa3039a6dfac11401cbdca4bf436544fc05ed709ad90871ac91eaf17dc553d7ca157b98577a7b7 SHA512 dbd6afb8162a6086e4be9045b8dc53aa563bd4b7abaf43ee13cd7d493730ff0b90e6985f68c6f42d64f4af6a692d0589e0cefd2f24045ec1c10418cfb73940b2
 DIST iproute2-6.13.0.tar.xz 927416 BLAKE2B bbebc44d1a7e35c410869a2a5884df09698ea3950acd126e5736a938718d40e57d539ff88ecd7827cbdf2f9481c3d728fff3948a61c2ba3e1483c5b7a7616577 SHA512 2e392a8ddc3d7662c3a72bba1c845587df85b7afc6efabf7df0ec2830bb1d4b16cac5bfb7a43dc3ac73adf0ea3fe3670824674d4f32209c6d1aa638a7cb7cd6c
+DIST iproute2-6.14.0.tar.xz 929092 BLAKE2B 18bd180c608b657694f4713bf915d45006c97a7206a3260ac52149d4c976422e1949ada425d4989c5a7e327e3d8eb45ea990de25f3645bb1308ac2531bf834d2 SHA512 e79049bdca0e0381f0a93a40e4d597ce59fb509dabc6e8b04a510ff9953f091c67577d6faa62967bd197bf62ab6e56d928558270a1390621431acb237b77fa46
 EBUILD iproute2-6.11.0-r2.ebuild 6106 BLAKE2B 87d1a285c669f862cc0bce9326ae482cf78fc5a25f36e111d3b98e434f9841f57acc5a9f2b442a99f5f60383055bd9a81683d7b634a57f941594764305bf95cc SHA512 3035309c205b9991973a47d53e9cc853770276a5c58af90148808a4d3c6f99573b41515342544f668ebb8d0e88912e6c1fa91d2a2d4c5ffa8cdcd371ab6b432e
 EBUILD iproute2-6.12.0.ebuild 6102 BLAKE2B d9438c9d727671e130f4e3f203ff4dd02fbc15aa795edeb23e30e33a4290de0ee15063521e8f996d93367d22ff484cd1138c2339608922d1ed672d5104618f01 SHA512 a3ac2e3572f6c26bd1493ff16f6d9d11e96dda39be9508f04ca10b95d191e421eac4ad7432e6ca6858a9383249abaed84dcf0b89df4c598b0654e00818a7a52a
 EBUILD iproute2-6.13.0.ebuild 5993 BLAKE2B 8318985875a4cd2310a03615f1fcb2d9f6a9c5c17f6c4ecf5d37fc8106134eeefeca76f1cc5060a20ca58b678d6f2d49de10f4818f066562f19106460be2ac5e SHA512 87a10cea39cb25c8ee021e6fa716e13fd5b78d022ddc279d6490487416de13602c7a5e20ec13debce95acb18a1c4e7e163ef8528cd4236a11d2f90d8da3903e4
+EBUILD iproute2-6.14.0.ebuild 6000 BLAKE2B e7df45f3855e6146c2dd90e6d5e2360796a9e9bae3137dd7b56a2bcb41e1ea10eb40c586feb6649e796cb890ce4dda369d498904bddd7afd5a11254765b9f55d SHA512 78607ee3cd1e95b1e781830457b20383369d66d8caa58b672c4ca48aef44ce7326fecff6d660ad124642239f4c60cf229452c2bb46d83443714cef344f05f097
 EBUILD iproute2-9999.ebuild 6000 BLAKE2B e7df45f3855e6146c2dd90e6d5e2360796a9e9bae3137dd7b56a2bcb41e1ea10eb40c586feb6649e796cb890ce4dda369d498904bddd7afd5a11254765b9f55d SHA512 78607ee3cd1e95b1e781830457b20383369d66d8caa58b672c4ca48aef44ce7326fecff6d660ad124642239f4c60cf229452c2bb46d83443714cef344f05f097
 MISC metadata.xml 887 BLAKE2B 28f816c12d798665f2e32e22ffd69dfda03e251bc6447a34e3ddbf0d5d00046c561b7f8282f73ed8609b3d9397da9bc2b1bf54d23bc82d5395af141e2448a3e3 SHA512 e5cafc242c2e4fe64df7456b3e001285933a680b674400ef53b2fc5f966f0c8551fc2ad7d07798d56eed365331ae01536d7b6d41fa5a710c1c2257900ce45d3e
diff --git a/sys-apps/iproute2/iproute2-6.14.0.ebuild b/sys-apps/iproute2/iproute2-6.14.0.ebuild
new file mode 100644
index 000000000000..dcaf60620faf
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-6.14.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables minimal nfs selinux"
+# Needs root
+RESTRICT="test"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( >=dev-libs/libbpf-0.6:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	nfs? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	app-alternatives/lex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.10.0-musl-2.patch # bug #926341
+	"${FILESDIR}"/${PN}-6.9.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-6.8.0-configure-nomagic-nolibbsd.patch # bug #643722 & #911727
+	"${FILESDIR}"/${PN}-6.8.0-disable-libbsd-fallback.patch # bug #911727
+)
+
+src_prepare() {
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed -i "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed -i 's@echo -n@printf@' configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly. Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null || die
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
+	popd >/dev/null || die
+
+	# build system does not pass CFLAGS to LDFLAGS, as is recommended by GCC upstream
+	# https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html#index-flto
+	# https://bugs.gentoo.org/929233
+	append-ldflags ${CFLAGS}
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+	edo ./configure --libbpf_force $(usex bpf on off) "${EXTRA_ECONF[@]}"
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
+
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers, bug #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, bug #144265, bug #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die # bug #330115
+	mv "${ED}"/{s,}bin/ss || die # bug #547264
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	# Collides with net-analyzer/ifstat
+	# https://bugs.gentoo.org/868321
+	mv "${ED}"/sbin/ifstat{,-iproute2} || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug #47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index e353370f1cbb..a492e633bf7c 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -7,6 +7,7 @@ AUX 0.88-protos-ipv6.patch 2127 BLAKE2B fbef8e74c8ea24246db9d09e26c4b3e4af50ce8f
 AUX 0.88-protos-no-ipv6.patch 671 BLAKE2B d0c052a53833d9034b92d6ace244aad487c30c17fec5778b9df474aed9de194e92061f496216c50667da41b9dbbf88c8ef439ebbdb0be3c4001fba16425ef3f5 SHA512 56557365c1951e437b6a6b0b8c80d865adc16e2d1fb464a85b367af2d43fbce99e64a6e5a6c8fd4aa0cff53025db6c1ed25458f96316b3c51189d20c5688c0ed
 AUX 0.88-protos-rblspp.patch 214 BLAKE2B aaa6b2ff1e2acd5caf753b4621bd0d662fb17ccd264bc780823961829395e53157efbbf91cb953043f6a0d8f370cffcc6b970dac0225dade03ddc324c218e3ba SHA512 f207ff2e03a0d2088b4a00ff224cc4678fbb2bee7289d6d9cc1b8034cdbc7013f3e94a336694ddf6ec599bc86c799caeb1e194f2e44598add909b9ffe37436f1
 AUX 0.88-protos.patch 12339 BLAKE2B 6998ab4d53f709df7d0c6052f7e17318c956ee19cdb40f3e293272e6103600b7de55d70b22d9d027983a997f0ad1de6d7472e6911aaf83af2d471f3fa70fc64c SHA512 af68c2307a1246d1854662a8ee2bcb60d40ff78b8619f62399739d252588152a896ca3955951908b635a5e04ffc17021c06a9b58eea95101afc8104f13f33fea
+AUX 0.88-protype-alloc.patch 770 BLAKE2B aebf859ea3ad68f341b129176c49d17ed3d6c8061d0cf75cdb85e00867832253d4fb8427e5adee684a02e3f6dcd593e20f39bdb365a84e21924bf95e0482d0d1 SHA512 9b33de75044fc3d9e9cdff1a3ca764609a47d8852c6dc8ee1e644d5c5ba7461825f3358493a9f736852682e9d964aa766d8597f7526e718aeeb475d3ac77c397
 AUX 0.88-rblsmtpd-ignore-on-RELAYCLIENT.patch 392 BLAKE2B 14f87e385d673b79bfdab44f86cdbf6163aaa11771d1a28b0b6dd669712a60f4825a9f499f4376a39a947e3fc00d47a837ca65d70c763529817e3e7792bea38e SHA512 6d9229011dca513bd2524da52bea06fb6b18fc38ecb99c9885f04d8ebb1221d5df59398363d34d322592f68979eec3f7cd1c095cc88dfd31ee81a19105624fc4
 AUX 0.88-tcprules.patch 483 BLAKE2B 851f22f3064237c94c6e1939a2c3d46fb3e937afc8a7f139b0ff4e99894a16c33f96bcb87fc3a012249f145e74e1e4f6d067e6c63335271a7a8ab326742606ce SHA512 94f83a23de742695c77ea05cf88ef0a1215d6bade587951104b70693a1217c0a2e2e1dc519e4b1c5abad03324fb3d42cc13adb6f15c9455869d5ed6417db4f8a
 AUX 0.88-uint-headers.patch 3100 BLAKE2B b3ae425066a313b58cbd95a977b3dd08134b469f2b3393d2713a3b500af96b5556f9e1d458d39446aeb0dae2734b9553b184453d7f5ac780c796d5300437d5dc SHA512 515ab4a81a420697b955578986f544bec082ca42a4384d7795f26e197d6948ded810862d500536ce431e2e7e8dccc8874ffc38c0f1fdea193e9c9e843535f5f6
@@ -16,5 +17,5 @@ DIST ucspi-tcp-0.88-ipv6.diff20.bz2 22088 BLAKE2B faa6cf37b828241fe8b0365aadc912
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r19.ebuild 2194 BLAKE2B 3d878212e12c4226325d25a4d033e1480ca2692043cfd32d2ca3437ed60f03942cd6d2417ed5af82f8c645890198b5946a7855f8f0388e8c6ac316b17b1d6416 SHA512 724c725aeb9f2fecba4aabb2a84f01140f296201fabf26d6377d0cb9b3d4fea915192eead4ead49223e32e7ddf10da720ea726fcc3d828c6d725c14d5a68ac72
-MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
+EBUILD ucspi-tcp-0.88-r20.ebuild 2175 BLAKE2B 1a44e51b16511e0a681d791a1cc548e96cad0203aecec08386b0ff99952b563a17617fa92d2407619b7d3647bc7d15038fc614ccc11278ee2b4b5e76bbbf5688 SHA512 5e650151c6fc8f7690721f6f2772160dd1ed6c950eb0d08c33a2dcad47028275a4a8e3dc540a71e891812e986c0c58281e5793859489b3b76d6f966dde93bebd
+MISC metadata.xml 822 BLAKE2B 23cdfc787d98ae70333bd9d170d344e34328d9db1262bafe045080e34dafd86438a5a02a0c8c1373d77e23fefdefe2cad69726da936ca712803269089f0487b2 SHA512 ea87f1c866d0fa18031b2a5a9d05afbe579ad893035cf9a86f47ee7876422f103c6cd78c1b4595de642c82478a8d3996ea2ad8dae4594d52987f389d43c5af3d
diff --git a/sys-apps/ucspi-tcp/files/0.88-protype-alloc.patch b/sys-apps/ucspi-tcp/files/0.88-protype-alloc.patch
new file mode 100644
index 000000000000..5463f437939f
--- /dev/null
+++ b/sys-apps/ucspi-tcp/files/0.88-protype-alloc.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/919874
+fix -Wincompatible-pointer-types
+ error: passing argument 1 of 'alloc_free' from incompatible pointer type [-Wincompatible-pointer-types]
+   66 |   alloc_free(e);
+      |              ^
+      |              |
+      |              char **
+
+diff --git a/alloc.c b/alloc.c
+index b7a3e67..4e258f4 100644
+--- a/alloc.c
++++ b/alloc.c
+@@ -21,7 +21,7 @@ unsigned int n;
+ }
+ 
+ void alloc_free(x)
+-char *x;
++void *x;
+ {
+   if (x >= space)
+     if (x < space + SPACE)
+diff --git a/alloc.h b/alloc.h
+index 24ef27e..680848e 100644
+--- a/alloc.h
++++ b/alloc.h
+@@ -4,7 +4,7 @@
+ #include <stdlib.h>
+ 
+ extern /*@null@*//*@out@*/char *alloc(unsigned int);
+-extern void alloc_free(char *);
++extern void alloc_free(void *);
+ extern int alloc_re();
+ 
+ #endif
diff --git a/sys-apps/ucspi-tcp/metadata.xml b/sys-apps/ucspi-tcp/metadata.xml
index 8bccd58f26a9..4c135243ad1e 100644
--- a/sys-apps/ucspi-tcp/metadata.xml
+++ b/sys-apps/ucspi-tcp/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>zhixu.liu@gmail.com</email>
+		<name>Z. Liu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		ucspi-tcp is a replacement for inetd. It consists of tcpserver and
 		tcpclient. tcpserver can listen on sockets and start programs in an
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild
index f48e7d24362f..5c08c3637970 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit qmail toolchain-funcs
 
@@ -21,30 +21,37 @@ IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
 RDEPEND="
-	!app-doc/ucspi-tcp-man
 	selinux? ( sec-policy/selinux-ucspitcp )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-protos.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${PV}-protos.patch
-	if use ipv6; then
-		eapply "${WORKDIR}"/${P}-ipv6.diff20
-		eapply "${FILESDIR}"/${PV}-protos-ipv6.patch
-		eapply "${FILESDIR}"/${PV}-tcprules.patch #135571
-		eapply "${FILESDIR}"/${PV}-bigendian.patch #18892
-		eapply "${FILESDIR}"/${PV}-implicit-int-ipv6.patch
+	if use ipv6 ; then
+		PATCHES+=(
+			"${WORKDIR}"/${P}-ipv6.diff20
+			"${FILESDIR}"/${PV}-protos-ipv6.patch
+			"${FILESDIR}"/${PV}-tcprules.patch #135571
+			"${FILESDIR}"/${PV}-bigendian.patch #18892
+			"${FILESDIR}"/${PV}-implicit-int-ipv6.patch
+		)
 	else
-		eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch
+		PATCHES+=( "${FILESDIR}"/${PV}-protos-no-ipv6.patch )
 	fi
-	eapply "${DISTDIR}"/ucspi-rss.diff
-	eapply "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
-	eapply "${DISTDIR}"/${P}-rblspp.patch
-	eapply "${FILESDIR}"/${PV}-protos-rblspp.patch
-	eapply "${FILESDIR}"/${PV}-large-responses.patch
-	eapply "${FILESDIR}"/${PV}-uint-headers.patch
-	eapply "${FILESDIR}"/${PV}-ar-ranlib.patch
-	eapply "${FILESDIR}"/${PV}-implicit-int.patch
+	PATCHES+=(
+		"${DISTDIR}"/ucspi-rss.diff
+		"${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
+		"${DISTDIR}"/${P}-rblspp.patch
+		"${FILESDIR}"/${PV}-protos-rblspp.patch
+		"${FILESDIR}"/${PV}-large-responses.patch
+		"${FILESDIR}"/${PV}-uint-headers.patch
+		"${FILESDIR}"/${PV}-ar-ranlib.patch
+		"${FILESDIR}"/${PV}-implicit-int.patch
+		"${FILESDIR}"/${PV}-protype-alloc.patch
+	)
 
-	eapply_user
+	default
 }
 
 src_configure() {