Adding metadata

20 files changed, 691 insertions, 325 deletions

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 2ffbd2c8402b..d3773a407978 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -4,3 +4,5 @@ DIST dhcpcd-10.2.4.tar.xz 276444 BLAKE2B cdc5c345c58f24852ecf7e6655446f9385c860d
 DIST dhcpcd-10.3.0.tar.xz 279100 BLAKE2B 657d20b5b92769615035b5d8792c77280a2ef34a96f64f4c5a70d3ee51a24b9dec48f2a4f59b75d3e5505685eece0a4f163518fd1f027b09945287a30b075f8a SHA512 311113fe525d783caaa77ef962d5b81d74c9cd35e77d19070a9f4b8eff1f7da1a0abc21a55b4a54cf98e3bd4c2de5bea837e319640c797410380a82656cd0435
 DIST dhcpcd-10.3.1.tar.xz 279320 BLAKE2B 5abed98813c129add43d91e83974e05bb1a8be3ef8586e72110f33e3592f2e3f09ed42936fdfcbae4681cf0da397f2bfb900b8d41847bb66ebd7cfd17ec8b454 SHA512 89516cde49b1c37ff4e8574a04654b4196f00ec1e93d5d730e759e4d335e05d2747285db7aab6eda555561ef73348705667660c37b0f9a84889754b8074e0ed7
 DIST dhcpcd-10.3.1.tar.xz.asc 488 BLAKE2B 5b00f138ec33efa39de87891308ddda7e18594cd4f01bec6627815c9e92acb45ccf896b7a438c825cbef020c479ade638749a8c6a5e2a7aee0079d2954fb8e0b SHA512 21131c5cf29802ab958ae0d08346099b0e409a70a3d2ecb952f17fa64801de6c0a58d16627414232b308213e8f4172286779d08fe2319e0c7ae54feb506019f6
+DIST dhcpcd-10.3.2.tar.xz 279368 BLAKE2B 55a88fe29bbe1a99f8d521ab6b35765afd912a9fcf8f3bcca26a9afef418b179ed73dbbcb440f5625813890ed74b28fc11ae7d62aba94680d7c5c1c07f46fbc8 SHA512 5944fa141bd40c8aabb2c3c46748d736f69f6fd0a773386508cbff868d8f69d88305a0fd97dff4da21c5662918016b36d8327498e5b0509804dbec80603f6d6d
+DIST dhcpcd-10.3.2.tar.xz.asc 488 BLAKE2B 20ad844a553c0d795591db349d44c1fb7b48c368366a1290e9f3312b07d8e1963b59e11163e92f2c2fe036dad7796e14d46ecb0d50722f588ee72a62327c3c5a SHA512 ab9bb23a3a2fa4042a37655ef38aa875c834a9731640d8d7be360296a8e88fedbbc0a1b4598fe9ee302c05e6d7a04f76de5801dba8e37b5dc1cf538bc8fd986d
diff --git a/net-misc/dhcpcd/dhcpcd-10.3.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.3.2.ebuild
new file mode 100644
index 000000000000..84fe8c2b0bf8
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-10.3.2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd optfeature toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/roymarples.asc
+	inherit verify-sig
+
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="
+		https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz
+		verify-sig? ( https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz.asc )
+	"
+	S="${WORKDIR}/${MY_P}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-roymarples )"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
+
+LICENSE="BSD-2 BSD ISC MIT"
+SLOT="0"
+IUSE="debug +embedded ipv6 privsep +udev"
+
+DEPEND="
+	app-crypt/libmd
+	udev? ( virtual/udev )
+"
+RDEPEND="
+	${DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# These don't exist on Linux/glibc (bug #900264)
+	memset_explicit
+	memset_s
+	setproctitle
+	strtoi
+	consttime_memequal
+	SHA256_Init
+	hmac
+	timingsafe_bcmp
+	# These may exist on some glibc versions, but the checks fail due to
+	# -Werror / undefined reference no matter what. bug #924825
+	arc4random
+	arc4random_uniform
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.6-fix-lib-check.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable debug)
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(use_enable privsep)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+		$(usex privsep '--privsepuser=dhcpcd' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	optfeature "lookup-hostname hook" net-dns/bind
+}
diff --git a/net-misc/frr/files/logrotate-v1 b/net-misc/frr/files/logrotate-v1
deleted file mode 100644
index 367346c32736..000000000000
--- a/net-misc/frr/files/logrotate-v1
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/frr/*.log {
-  su frr frr
-  notifempty
-  missingok
-  delaycompress
-  postrotate
-    [ -r /run/frr/watchfrr.pid ] && kill -USR1 $(cat /var/run/frr/*.pid)
-  endscript
-}
diff --git a/net-misc/frr/files/logrotate-v2 b/net-misc/frr/files/logrotate-v2
new file mode 100644
index 000000000000..0c8bfee819d1
--- /dev/null
+++ b/net-misc/frr/files/logrotate-v2
@@ -0,0 +1,13 @@
+/var/log/frr/*.log {
+  su frr frr
+  notifempty
+  missingok
+  delaycompress
+  postrotate
+    for f in /run/frr/*.pid; do
+		[ -r "$f" ] || continue
+		[ "$(basename "$f" .pid)" = watchfrr ] && continue
+		kill -USR1 $(cat "$f")
+	done
+  endscript
+}
diff --git a/net-misc/frr/frr-10.1.4-r1.ebuild b/net-misc/frr/frr-10.1.4-r2.ebuild
index f43afa84c033..a23d1b885e7d 100644
--- a/net-misc/frr/frr-10.1.4-r1.ebuild
+++ b/net-misc/frr/frr-10.1.4-r2.ebuild
@@ -133,7 +133,7 @@ src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.1.5.ebuild b/net-misc/frr/frr-10.1.5-r1.ebuild
index f43afa84c033..a23d1b885e7d 100644
--- a/net-misc/frr/frr-10.1.5.ebuild
+++ b/net-misc/frr/frr-10.1.5-r1.ebuild
@@ -133,7 +133,7 @@ src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.4.4.ebuild b/net-misc/frr/frr-10.2.5-r2.ebuild
index b066d0005c6d..0ca50342b17b 100644
--- a/net-misc/frr/frr-10.4.4.ebuild
+++ b/net-misc/frr/frr-10.2.5-r2.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.3.3-r1.ebuild b/net-misc/frr/frr-10.3.3-r2.ebuild
index 0d81c3cf7a01..9c5f8665306b 100644
--- a/net-misc/frr/frr-10.3.3-r1.ebuild
+++ b/net-misc/frr/frr-10.3.3-r2.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.3.4.ebuild b/net-misc/frr/frr-10.3.4-r1.ebuild
index 0d81c3cf7a01..9c5f8665306b 100644
--- a/net-misc/frr/frr-10.3.4.ebuild
+++ b/net-misc/frr/frr-10.3.4-r1.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.5.3-r1.ebuild b/net-misc/frr/frr-10.4.3-r2.ebuild
index b066d0005c6d..0ca50342b17b 100644
--- a/net-misc/frr/frr-10.5.3-r1.ebuild
+++ b/net-misc/frr/frr-10.4.3-r2.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.4.3-r1.ebuild b/net-misc/frr/frr-10.4.4-r1.ebuild
index b066d0005c6d..0ca50342b17b 100644
--- a/net-misc/frr/frr-10.4.3-r1.ebuild
+++ b/net-misc/frr/frr-10.4.4-r1.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.2.5-r1.ebuild b/net-misc/frr/frr-10.5.3-r2.ebuild
index b066d0005c6d..0ca50342b17b 100644
--- a/net-misc/frr/frr-10.2.5-r1.ebuild
+++ b/net-misc/frr/frr-10.5.3-r2.ebuild
@@ -135,7 +135,7 @@ my_src_install() {
 
 	# Install logrotate configuration
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
+	newins "${FILESDIR}/logrotate-v2" frr
 
 	# Install PAM configuration file
 	use pam && newpamd "${FILESDIR}"/frr.pam frr
diff --git a/net-misc/frr/frr-10.5.4-r1.ebuild b/net-misc/frr/frr-10.5.4-r1.ebuild
new file mode 100644
index 000000000000..0ca50342b17b
--- /dev/null
+++ b/net-misc/frr/frr-10.5.4-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..14} )
+inherit out-of-source autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	dev-libs/protobuf-c:0=
+	>=net-libs/libyang-2.1.128
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc
+	dev-libs/elfutils
+	doc? ( dev-python/sphinx )
+	grpc? ( sys-apps/which )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+		dev-util/cunit
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+	"${FILESDIR}"/${PN}-tests-abs_srcdir.patch
+	"${FILESDIR}"/${PN}-tests-grpc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo # No functional impact.
+	mallinfo2
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		ac_cv_prog_VALGRIND_CHECK=no
+		LEX=flex
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+my_src_compile() {
+	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23
+
+	use doc && emake html
+}
+
+my_src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23 check
+}
+
+my_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	# Create logs directory with the correct permissions
+	diropts -ofrr -gfrr -m0775
+	keepdir /var/log/frr /etc/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins "${S}"/tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate-v2" frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v4 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
+}
diff --git a/net-misc/frr/frr-10.5.4.ebuild b/net-misc/frr/frr-10.5.4.ebuild
deleted file mode 100644
index b066d0005c6d..000000000000
--- a/net-misc/frr/frr-10.5.4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit out-of-source autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2+"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	dev-libs/protobuf-c:0=
-	>=net-libs/libyang-2.1.128
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	sys-devel/flex
-	app-alternatives/yacc
-	dev-libs/elfutils
-	doc? ( dev-python/sphinx )
-	grpc? ( sys-apps/which )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-		dev-util/cunit
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
-	"${FILESDIR}"/${PN}-tests-abs_srcdir.patch
-	"${FILESDIR}"/${PN}-tests-grpc.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	mallinfo # No functional impact.
-	mallinfo2
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		ac_cv_prog_VALGRIND_CHECK=no
-		LEX=flex
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-my_src_compile() {
-	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23
-
-	use doc && emake html
-}
-
-my_src_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23 check
-}
-
-my_src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	# Create logs directory with the correct permissions
-	diropts -ofrr -gfrr -m0775
-	keepdir /var/log/frr /etc/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins "${S}"/tools/etc/frr/{vtysh.conf,frr.conf,daemons}
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
-	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v4 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	# Files from frr seems to be newer.
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
-}
diff --git a/net-misc/frr/frr-10.6.1-r1.ebuild b/net-misc/frr/frr-10.6.1-r1.ebuild
new file mode 100644
index 000000000000..0ca50342b17b
--- /dev/null
+++ b/net-misc/frr/frr-10.6.1-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..14} )
+inherit out-of-source autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2+"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	dev-libs/protobuf-c:0=
+	>=net-libs/libyang-2.1.128
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	grpc? ( net-libs/grpc:= )
+	nhrp? ( net-dns/c-ares:0= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+	sys-devel/flex
+	app-alternatives/yacc
+	dev-libs/elfutils
+	doc? ( dev-python/sphinx )
+	grpc? ( sys-apps/which )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+		dev-util/cunit
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+	"${FILESDIR}"/${PN}-tests-abs_srcdir.patch
+	"${FILESDIR}"/${PN}-tests-grpc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo # No functional impact.
+	mallinfo2
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		ac_cv_prog_VALGRIND_CHECK=no
+		LEX=flex
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+my_src_compile() {
+	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23
+
+	use doc && emake html
+}
+
+my_src_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23 check
+}
+
+my_src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	# Create logs directory with the correct permissions
+	diropts -ofrr -gfrr -m0775
+	keepdir /var/log/frr /etc/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins "${S}"/tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate-v2" frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v4 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
+}
diff --git a/net-misc/frr/frr-10.6.1.ebuild b/net-misc/frr/frr-10.6.1.ebuild
deleted file mode 100644
index b066d0005c6d..000000000000
--- a/net-misc/frr/frr-10.6.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2020-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..14} )
-inherit out-of-source autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2+"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	dev-libs/protobuf-c:0=
-	>=net-libs/libyang-2.1.128
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	sys-devel/flex
-	app-alternatives/yacc
-	dev-libs/elfutils
-	doc? ( dev-python/sphinx )
-	grpc? ( sys-apps/which )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-		dev-util/cunit
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
-	"${FILESDIR}"/${PN}-tests-abs_srcdir.patch
-	"${FILESDIR}"/${PN}-tests-grpc.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	mallinfo # No functional impact.
-	mallinfo2
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-my_src_configure() {
-	local myconf=(
-		ac_cv_prog_VALGRIND_CHECK=no
-		LEX=flex
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-my_src_compile() {
-	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23
-
-	use doc && emake html
-}
-
-my_src_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	emake GRPC_CFLAGS=-std=gnu++23 GRPC_CXXFLAGS=-std=gnu++23 check
-}
-
-my_src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	# Create logs directory with the correct permissions
-	diropts -ofrr -gfrr -m0775
-	keepdir /var/log/frr /etc/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins "${S}"/tools/etc/frr/{vtysh.conf,frr.conf,daemons}
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
-	fperms 640 /etc/frr/{vtysh.conf,frr.conf,daemons}
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotate-v1" frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v4 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	# Files from frr seems to be newer.
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
-	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
-}
diff --git a/net-misc/inetutils/Manifest b/net-misc/inetutils/Manifest
index 42f13885854d..837065533630 100644
--- a/net-misc/inetutils/Manifest
+++ b/net-misc/inetutils/Manifest
@@ -1,2 +1,4 @@
 DIST inetutils-2.7.tar.gz 3157952 BLAKE2B 0d651cf458dd7c42955be17f82c8f022e7048c694daa94f14fbc15969d628d1e017a05235353a03de8a69dd3f349eb1e4adf89e7dffc82f782858506738f9a42 SHA512 8f36bea126108e8f48f2c436c9ff11684f3bd51c4e48090f0ab8626b8c5878b6dc8c64b84cd7a6220913f68c8602b37c8ac632fe9ef530bf5018c6e51ee1a90b
 DIST inetutils-2.7.tar.gz.sig 1223 BLAKE2B 905e53a09d87a734e482dee87ccbdc145f0ae862dfbb5c5fec7d92d87045ad7f2fe555c6e67203443909a652249ed3e0f5dd1da845ad582265e7ff3a82937cbd SHA512 50896de44056f419b743f90bbd462372151da5c6516ea72a552329449d67b0423d15664256a3100f0511353b398745a1261b1fbd6e771f5192eb39026981b425
+DIST inetutils-2.8.tar.gz 2985957 BLAKE2B 354ea34874c230c471a060faf88241aa069129a361886cc68db04a205dd5dff88ff5ecacec9fe504eb0266dbdccbf4a5324df2172258e3fecf1add647928b92d SHA512 00b33c9d712cf670f16dbefc963fed880088ff67f506df54fd02fdfc0f8c05d379faba5d602c8772c4dc4fd72e1fa8733777d5840784aa86e092eeb5d0f905f7
+DIST inetutils-2.8.tar.gz.sig 1223 BLAKE2B 4f7707c976019790b114d954529f0a37a7ee76b37757e0699398604e74e3417be7eb54cd81f71c03c1f062175016afda8e7af67b70a31140fb7101911532327f SHA512 a86f9513cca247f3ee10b20630b5a791f975ad4fe41a014e887d44c85847a9d203d58507740fcc50897486f93ce4323cfcc18ed4e20aa5fee41ea12ec5ecc44e
diff --git a/net-misc/inetutils/inetutils-2.8.ebuild b/net-misc/inetutils/inetutils-2.8.ebuild
new file mode 100644
index 000000000000..f184bca56a11
--- /dev/null
+++ b/net-misc/inetutils/inetutils-2.8.ebuild
@@ -0,0 +1,178 @@
+# Copyright 2021-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit branding pam systemd verify-sig
+
+DESCRIPTION="Collection of common network programs"
+HOMEPAGE="https://www.gnu.org/software/inetutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SERVERS="ftpd inetd rexecd rlogind rshd syslogd talkd telnetd tftpd uucpd"
+CLIENTS="ftp dnsdomainname hostname ping ping6 rcp rexec rlogin rsh logger telnet tftp whois ifconfig traceroute"
+PROGRAMS="${SERVERS} ${CLIENTS}"
+IUSE="idn kerberos pam tcpd ${PROGRAMS}"
+
+DEPEND="
+	sys-libs/readline:0=
+	ftpd? ( virtual/libcrypt:0= )
+	idn? ( net-dns/libidn2:= )
+	kerberos? ( virtual/krb5 )
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	uucpd? ( virtual/libcrypt:0= )
+"
+RDEPEND="${DEPEND}
+	ftpd? ( net-ftp/ftpbase[pam?] )
+	ftp? ( !net-ftp/ftp )
+	dnsdomainname? ( !sys-apps/net-tools )
+	hostname? ( !sys-apps/coreutils[hostname(-)] !sys-apps/net-tools[hostname(+)] )
+	inetd? ( !sys-apps/netkit-base )
+	ping? ( !net-misc/iputils )
+	ping6? ( !net-misc/iputils[ipv6(+)] )
+	rcp? ( !net-misc/netkit-rsh )
+	rexec? ( !net-misc/netkit-rsh )
+	rexecd? ( !net-misc/netkit-rsh )
+	rlogin? ( !net-misc/netkit-rsh )
+	rlogind? ( !net-misc/netkit-rsh )
+	rsh? ( !net-misc/netkit-rsh )
+	rshd? ( !net-misc/netkit-rsh )
+	logger? ( !sys-apps/util-linux[logger(+)] )
+	syslogd? ( !app-admin/sysklogd )
+	talkd? ( !net-misc/netkit-talk )
+	telnet? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
+	telnetd? ( !net-misc/telnet-bsd !net-misc/netkit-telnetd )
+	tftp? ( !net-ftp/tftp-hpa[client(+)] )
+	tftpd? ( !net-ftp/tftp-hpa[server(+)] )
+	whois? ( !net-misc/whois )
+	ifconfig? ( !sys-apps/net-tools )
+	traceroute? ( !net-analyzer/traceroute )
+"
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-inetutils )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/inetutils.asc"
+
+QA_CONFIG_IMPL_DECL_SKIP=( MIN static_assert alignof unreachable )
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		--disable-clients
+		--disable-servers
+		$(use_with idn)
+		--without-krb4
+		$(use_with kerberos krb5)
+		--without-shishi
+		$(use_with pam)
+		$(use_with tcpd wrap)
+	)
+
+	local prog
+	for prog in ${PROGRAMS}; do
+		myconf+=( $(use_enable "${prog}") )
+	done
+
+	econf "${myconf[@]}"
+}
+
+iu_pamd() {
+	if use "$1"; then
+		pamd_mimic system-remote-login "$2" auth account password session
+	fi
+}
+
+create_init() {
+	use "$1" || return
+
+	newinitd - "$1" <<-EOF
+	#!${EPREFIX}/sbin/openrc-run
+	command="${EPREFIX}/usr/libexec/$1"
+	command_args="$2"
+	pidfile="${EPREFIX}/var/run/$1.pid"
+	EOF
+
+	systemd_newunit - "$1.service" <<-EOF
+	[Service]
+	ExecStart="${EPREFIX}/usr/libexec/$1"${2:+ }$2
+	PIDFile=${EPREFIX}/var/run/$1.pid
+	Type=forking
+
+	[Install]
+	WantedBy=multi-user.target
+	EOF
+}
+
+create_socket_stream() {
+	use "$1" || return
+
+	systemd_newunit - "$1.socket" <<-EOF
+	[Socket]
+	ListenStream=$2
+	Accept=yes
+
+	[Install]
+	WantedBy=sockets.target
+	EOF
+
+	systemd_newunit - "$1@.service" <<-EOF
+	[Unit]
+	CollectMode=inactive-or-failed
+
+	[Service]
+	ExecStart="${EPREFIX}/usr/libexec/$1"
+	StandardInput=socket
+	StandardError=journal
+	EOF
+}
+
+create_socket_datagram() {
+	use "$1" || return
+
+	systemd_newunit - "$1.socket" <<-EOF
+	[Socket]
+	ListenDatagram=$2
+
+	[Install]
+	WantedBy=sockets.target
+	EOF
+
+	systemd_newunit - "$1.service" <<-EOF
+	[Service]
+	ExecStart="${EPREFIX}/usr/libexec/$1"
+	StandardInput=socket
+	StandardError=journal
+	EOF
+}
+
+src_install() {
+	default
+	iu_pamd rexecd rexec
+	iu_pamd rlogind rlogin
+	iu_pamd rshd rsh
+	if use kerberos; then
+		iu_pamd rlogind krlogin
+		iu_pamd rshd krsh
+	fi
+
+	create_init ftpd --daemon
+	create_init inetd
+	create_init rlogind --daemon
+	create_init syslogd
+
+	create_socket_stream ftpd 21
+	create_socket_stream rexecd 512
+	create_socket_stream rlogind 513
+	create_socket_stream rshd 514
+	create_socket_stream telnetd 23
+	create_socket_stream uucpd 540
+
+	create_socket_datagram talkd 518
+}
diff --git a/net-misc/wlvncc/Manifest b/net-misc/wlvncc/Manifest
index d39a884ae805..e610149adfa0 100644
--- a/net-misc/wlvncc/Manifest
+++ b/net-misc/wlvncc/Manifest
@@ -1,3 +1,3 @@
-DIST wlvncc-20250307.gh.tar.gz 171350 BLAKE2B 3fd745d3df3902386a77ea186f9d6285c73509d71a3fbbe3d90bc4e04fb65f8a7552b418380d8de840c919d052dc89c94c2754a89d33be05c2f7d302f98258a1 SHA512 b55d34a0c416ef5019ed10b7f15494d55b001a5eb73c2382f2e5d98c58735512db67e9ad299855980df331faf84905480bd13da3f1b6c48a0f4ff7898e5b03a7
 DIST wlvncc-20250626.gh.tar.gz 171524 BLAKE2B 9968419dbbada0263fdaacb9617b9fba2740c42a93a069933f604a0d7885c6ac4cf203b7969a7855518dd245b56894191547f2a9ffd10a37090a8162f87d53f5 SHA512 b7c7d2fbd95f549360f7f37795de0b82d77199d23e29b3d6d0537c8818638a448618f7eab7c6192dce643c40ce5d13db064ea060bbac88bb1328f48c5773eafa
 DIST wlvncc-20250725.gh.tar.gz 173048 BLAKE2B fb3b9aac2bb9f71238c90acd5e7af7b966d5101b67d073b2750bcd4db247a154c305741c6928861b0e9570abc4288460785f924e001daab6fbd4fa273ec65d5e SHA512 d1e2c55bb5017d9bd00f5134f06ec049205eb2b97cacec550dedf34b2abd28a05a24666d764c35232fe6a6b5e8483730f54ea9e1ce9002edd8a57ce99a593fd5
+DIST wlvncc-20260429.gh.tar.gz 173208 BLAKE2B 6da99d3678e574cc17f447257ba20bc2c242fcb5750eea6d01205736e90495b9d1ab370ea7e2fba3b217d66a438eff65e6f70bd999ee4014af6a75f523564baf SHA512 9250e5537b0f52c3b90f8c033da7c49ff820bea4b6cf21953ca967fbf1113cb6bb87c8b80cd5b6083ec39bf747a65d0f50430746de55e2fbae838da54c40a670
diff --git a/net-misc/wlvncc/wlvncc-20250307.ebuild b/net-misc/wlvncc/wlvncc-20260429.ebuild
index bf9314334576..99b083ece92f 100644
--- a/net-misc/wlvncc/wlvncc-20250307.ebuild
+++ b/net-misc/wlvncc/wlvncc-20260429.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-COMMIT="bec7a54fbb835824ac6f8cefbf50181189a5c510"
+COMMIT="cc0abf87c37920540f2439a556e6a480c28f8f46"
 
 inherit meson