gentoo auto-resync : 15:04:2024 - 12:04:02

author: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-04-15 12:04:03 +0100
commit: 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree: e514d1b9999d088064bee1e34a3a3c500d6d7a07 /net-misc
parent: d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)
51 files changed, 420 insertions, 3521 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 120c74f3cc9a..c8e4d5bc490c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
deleted file mode 100644
index edad9f8c668b..000000000000
--- a/net-misc/dahdi-tools/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a
-AUX dahdi-autoconf.init-3.1.0-r4 6709 BLAKE2B 53dd72c1390b8be78117df9fb8829ba8c9e0c53800bde17f3dcd9384750bbbc9e883888b53a453da3f222843e09f56a095bcc9a27c0c44a3a232faf2da3a0dc8 SHA512 9ec20697a7b6a3a6a9bbd03687477a9a0b59365996e5018f04bd4798623f83dd69d3bd34f48c104a00a621aa8d12f9254ddc1effc0743ec67b30e6a405e2dacf
-AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d
-AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac
-AUX dahdi-tools-3.1.0-cplusplusexternc.patch 695 BLAKE2B 8b3cbe872786017759d11bf5d23e6eb41de29003e047ab7244188e0603df6ea669b870216e15cdf4c77a41f7b4f5d10169853aaf839b6dc4d491c0a23121924b SHA512 eecfdb73558b8f4ea8b5ffb55ced8f863960cb1ee92196995ca69e30df4a55f07f59a0b429cfad40271b71b585130438b11861d3459fab87f02ced7032f57ded
-AUX dahdi-tools-3.1.0-execinfo.patch 1194 BLAKE2B da5ebde771ff1cc7099681854d5bc313f66eafadec00399f0d249decc4d1d28844b579d08b76641285df301f21aba8ba9fa1569573001370ed94ca9ffc2c5eb9 SHA512 638c7cf9f6a378bcf0aa5d184a59aac40a8bdaf206180cf3f9d30464d88545aa3d5205f652cf3ed793014d5a3cf5a6d358e623936add6137b65b29cf48136389
-AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7ccec7c99f9b9ada6207b6f8590d5da732a27cb77570ffb53fd43f312cded7e6783322436f18eaba44a8ee5fdb03447a895a77ac SHA512 0841ff6a8f1e551a088c36bfdc44bad185e884b055dc6b8655db489b4957398834c4a25eabaf32269eeecd3aef6d7b891dd87a89af9b15e3d92786ce0151656c
-AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
-AUX dahdi-tools-3.2.0-lto.patch 2264 BLAKE2B 1db7cbfc5d7c2ad2c98fb71a054bcb60d7a16a3da2aa5a2a7cb28792c768fa1d724c40f360d1aefe394eec359b4ae48550f2e2c17a520c140a644d96a7ecef8b SHA512 662337c6e770a4b37926bbaa00ef00e7def6ebd3f53e968af1783c65b52309f2dd7c59eef97a799f6aa4b805514e42fd38316db6d0e6a4f556630047ebd2c145
-AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
-DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-DIST dahdi-tools-3.2.0.tar.gz 729392 BLAKE2B 77667a16fd18fa5b6ffd67d9bd267c4ea5e6ff3841938de64704b7e6f1818b23feff196701c62ceb0a56c677614b4c2a4d4d1f4f533020559e8b3b3c12785bf5 SHA512 29df9a768c6db872bd51926dac11178400a03e2e1d0771ae163433ce300af71691f5c7a60f8756c0e6cef8a43f1331944cb4e44393f04a0ff8dee19bc9e7cf16
-EBUILD dahdi-tools-3.1.0-r2.ebuild 2152 BLAKE2B 2c84f625ba1d41d43a69841c8d4dcbe898e1f5c54c54b0a554b3e382c0861fa97b4d027fb63b1b4e4ae2fa7b32dd81389554af2cab3cedfad0c68c2288748537 SHA512 b4e76d483b67390b1a889d868118093d2d5db443d80ded95c0a3424b478a16da934b3911fa451ae7fca380f3a76fad6b821f2ca9ba91f87b27869f15d14b486c
-EBUILD dahdi-tools-3.1.0-r4.ebuild 2193 BLAKE2B 35da5b37f60762dd1205f03b17b3c8da70b1564fb4d3fa8e93e63db5134c67a279751177dcee790b6c7ca6bce9d4bae883ac64a1cf69e894e172ef10dfbf27de SHA512 8b231fd5c0bc78b6521843dae2ee87b8ba8c573703f6a245c7a219c7920cf60e86988236c34e0395346d68521b4a6d2c9408efab8f9587a3e4595588560948d5
-EBUILD dahdi-tools-3.2.0.ebuild 2090 BLAKE2B a55354d6a2d8604b846ed7b5da90e9dadcdacdc4988283fb19e6095e32ad6408a21364e72375ebdf610542e8989a728ddf4ee82b24a25078c1c542b8adc5323b SHA512 623d0aad88bd46d17d3b8fd75a94d409939257a10ca342f11e90e7bfb75de1b22679fe8ca813433776124f3123251ce489dc39e5658ee01bfb0a138c6f3779dc
-MISC metadata.xml 563 BLAKE2B e5c2a3e3a279ec33e7367437eb6cb3b4a7e9779356dfd8a3631b9c8fe276ccb8de43695419f22e52f5c60a4a9ca6b5603c8192df06ce328dd49bc6f48f91180c SHA512 3e0b8472b24d4c913ed306187eeb84acc9293959f25416257e3079ac9c3e4234560ba750233110f6c57612f7ad6d3a3a18254209625f3c13396770f0a14f1f9e
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
deleted file mode 100644
index 49903c27e61a..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="ppp"
-PATCHES=(
-	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-)
-
-DEPEND="dev-libs/newt
-	net-misc/dahdi
-	sys-kernel/linux-headers
-	virtual/libusb:0
-	ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
-	dev-lang/perl:=
-	dev-perl/CGI"
-BDEPEND="dev-lang/perl
-	sys-apps/file"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
-	sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
-	sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
-	local bashcompdir="$(get_bashcompdir)"
-	local bashcmd bashcmdtarget
-
-	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
-	emake DESTDIR="${ED}" install-config
-
-	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
-	# install init scripts
-	newinitd "${FILESDIR}"/dahdi.init2 dahdi
-	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
-	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
-	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
-		die "Error parsing dahdi bash completion file for commands")
-
-	rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
-	# Delete *if* the libtool file exists, bug #778380
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
deleted file mode 100644
index 4ccf762c64d7..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ppp"
-PATCHES=(
-	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-fno-common.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-)
-
-DEPEND="dev-libs/newt
-	net-misc/dahdi
-	sys-kernel/linux-headers
-	virtual/libusb:0
-	ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
-	dev-lang/perl:=
-	dev-perl/CGI"
-BDEPEND="dev-lang/perl
-	sys-apps/file"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
-	sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
-	sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
-	local bashcompdir="$(get_bashcompdir)"
-	local bashcmd bashcmdtarget
-
-	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
-	emake DESTDIR="${ED}" install-config
-
-	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
-	# install init scripts
-	newinitd "${FILESDIR}"/dahdi.init2 dahdi
-	newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf
-	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
-	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
-		die "Error parsing dahdi bash completion file for commands")
-
-	rm "${ED}"/usr/$(get_libdir)/libtonezone.a || die "Unable to remove static libs from install."
-	# Delete *if* the libtool file exists, bug #778380
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild
deleted file mode 100644
index 773d22263bd4..000000000000
--- a/net-misc/dahdi-tools/dahdi-tools-3.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 perl-functions udev
-
-DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ppp"
-PATCHES=(
-	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-execinfo.patch"
-	"${FILESDIR}/dahdi-tools-3.1.0-cplusplusexternc.patch"
-	"${FILESDIR}/dahdi-tools-3.2.0-lto.patch"
-)
-
-DEPEND="dev-libs/newt
-	net-misc/dahdi
-	sys-kernel/linux-headers
-	virtual/libusb:1
-	ppp? ( net-dialup/ppp:= )"
-RDEPEND="${DEPEND}
-	dev-lang/perl:=
-	dev-perl/CGI"
-BDEPEND="dev-lang/perl
-	sys-apps/file"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
-	sed -re 's/ -Werror($|[[:space:]])//' -i xpp/oct612x/Makefile.in || die "sed to eliminate -Werror failed."
-	sed -re '/[[:space:]]*-Werror[[:space:]]*\\$/ d' -i xpp/xtalk/Makefile || die "sed to eliminate -Werror failed."
-}
-
-src_install() {
-	local bashcompdir="$(get_bashcompdir)"
-	local bashcmd bashcmdtarget
-
-	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir="$(get_udevdir)/rules.d" install
-	emake DESTDIR="${ED}" install-config
-
-	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
-
-	# install init scripts
-	newinitd "${FILESDIR}"/dahdi.init2 dahdi
-	newinitd "${FILESDIR}"/dahdi-autoconf.init-3.1.0-r4 dahdi-autoconf
-	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
-
-	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
-		die "Error parsing dahdi bash completion file for commands")
-
-	# Delete *if* the libtool file exists, bug #778380
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2 b/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
deleted file mode 100644
index a46545231911..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.conf2
+++ /dev/null
@@ -1,40 +0,0 @@
-# Global settings
-# Set this to your country code.
-DAHDI_ZONE=za
-DAHDI_ECHOCAN=oslec # mg2,jpah,kb1,sec,sec2 (there may be more, we recommend oslec)
-
-# Settings for analog
-#Analog signal types, one of:
-# ks - KewlStart (recommended, default)
-# ls - LoopStart
-# gs - GroundStart
-
-# Signalling to be used on FXO ports
-DAHDI_FXO_SIGNALLING=ks
-
-# Signalling to be used on FXS ports
-DAHDI_FXS_SIGNALLING=ks
-
-# Whether or not to echocan:
-DAHDI_FXO_ECHOCAN=yes
-DAHDI_FXS_ECHOCAN=yes
-
-# These settings will be used for BRI cards.
-# Known options: B8ZS,AMI,HDB3
-DAHDI_BRI_CODING=AMI
-
-# Known options: ESF,D4,CCS,CRC4
-DAHDI_BRI_FRAMING=CCS
-
-# Our experience is that it's not required (still defaults to yes)
-DAHDI_BRI_NT_ECHOCAN=yes
-DAHDI_BRI_TE_ECHOCAN=yes
-
-# These settings are for PRI cards.  Note that only E1 currently supported.
-DAHDI_E1_CPE_ECHOCAN=yes
-DAHDI_E1_NET_ECHOCAN=yes
-
-# PRI will default to CPE mode (remote end provides signalling).
-# If you really want to provide signalling set the appropriate spans
-# here (eg, set span 1 to NET mode).
-#PRI_SPAN_1_NET=yes
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4 b/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
deleted file mode 100644
index 73ab07b8904f..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init-3.1.0-r4
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Ultimate Linux Solutions CC
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before dahdi
-}
-
-dahdi_load_modules() {
-	local hwlist loc status mod mod_vname pciid desc
-
-	hwlist=$(/usr/sbin/dahdi_hardware)
-
-	if [ -z "${hwlist}" ]; then
-		einfo "No digium hardware found."
-		ebegin "Loading module dahdi_dummy"
-		/sbin/modprobe dahdi_dummy
-		eend $?
-		return
-	fi
-
-	echo "${hwlist}" | while read loc mod pciid desc; do
-		status="${mod:${#mod}-1:1}"
-		mod="${mod%[+-]}"
-		mod_vname="mod_${mod}"
-
-		einfo "Found $desc at $loc (module: $mod)"
-
-		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
-			ebegin "Loading module $mod"
-			/sbin/modprobe $mod
-			eend
-
-			[ $? -eq 0 ] && eval "$mod_vname=loaded"
-		fi
-	done
-}
-
-dahdi_module_unload() {
-	local mod=$1 s
-	[ -d /sys/module/${mod} ] || return 0
-
-	for s in $(find /sys/module/${mod}/holders -type l); do
-		dahdi_module_unload $(basename $s)
-	done
-
-	ebegin "Removing dahdi module: $mod"
-	/sbin/rmmod $mod
-	eend $?
-}
-
-dahdi_gen_fxo_config() {
-	local port=$1
-
-	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_fxs_config() {
-	local port=$1
-
-	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_bri_te_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_bri_nt_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_e1_cpe_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_e1_net_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_t1_cpe_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
-	bchans="${basechan}-$(( basechan + 22 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 23 ))"
-	[ "${DAHDI_T1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_t1_net_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_T1_FRAMING-ESF},${DAHDI_T1_CODING-B8ZS}"
-	bchans="${basechan}-$(( basechan + 22 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 23 ))"
-	[ "${DAHDI_T1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_conf_span() {
-	local span=$1
-	local type=$2
-	local desc=$3
-	local port=$4
-	local basechan=$5
-	local vname="PRI_SPAN_${span}_NET"
-	local cfunc="dahdi_gen_"
-
-	# Analog we need to deal with on a port-by-port basis.
-	[ "${type}" = "analog" ] && return 0
-
-	echo ""
-	echo "# ${desc}"
-
-	case "${type}" in
-		digital-TE)
-			cfunc="${cfunc}bri_te"
-		;;
-		digital-NT)
-			cfunc="${cfunc}bri_nt"
-		;;
-		digital-[TE]1)
-			cfunc="${cfunc}$(echo "${type##*-}" | tr 'TE' 'te')"
-			# Use CPE by default.  Unfortunately there is no easy
-			# way to detect CPE vs NET as far as I know and specifying
-			# in a config that you want NET mode seems the sanest way.
-			if yesno "${vname}"; then
-				cfunc="${cfunc}_net"
-			else
-				cfunc="${cfunc}_cpe"
-			fi
-		;;
-		*)
-			echo "# Don't know how to configure this (type=${type})."
-			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
-			return 1
-		;;
-	esac
-
-	"${cfunc}_config" "${span}" "${port}" "${basechan}"
-}
-
-dahdi_gen_config() {
-	local type manufacturer devicetype basechan aport atype
-	local span=
-	local tfile="$(mktemp)"
-	local sfile="$(mktemp)"
-	local plocation=""
-	local isdnport=0
-
-	/usr/sbin/dahdi_scan > "${sfile}" 
-	exec 3<"${sfile}"
-	exec 4>"${tfile}"
-
-	echo "# Automatically dahdi-autoconf generated file ($(date))." >&4
-	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >&4
-
-	while read LINE <&3; do
-		case "$LINE" in
-			\[*\])
-				if [ -n "${span}" ]; then
-					ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
-					dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
-					eend $?
-				fi
-				span="${LINE%?}"
-				span="${span#?}"
-			;;
-			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-			;;
-			location=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-				if [ "${location}" = "${plocation}" ]; then
-					isdnport=$(( isdnport + 1 ))
-				else
-					plocation="${location}"
-					isdnport=1
-				fi
-			;;
-			port=*)
-				# For analog cards only.
-				aport="${LINE#*=}"; aport="${aport%,*}"
-				atype="${LINE#*,}"
-				if [ "${aport}" -eq "${basechan}" ]; then
-					echo "" >&4
-					echo "# ${manufacturer} ${devicetype} (${name})" >&4
-				fi
-				case "${atype}" in
-					FXO)
-						dahdi_gen_fxo_config $aport >&4
-					;;
-					FXS)
-						dahdi_gen_fxs_config $aport >&4
-					;;
-				esac
-			;;
-		esac
-	done
-	
-	if [ -n "${span}" ]; then
-		ebegin "Configuring ${manufacturer} ${devicetype} (${name})"
-		dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >&4
-		eend $?
-	fi
-
-	echo "" >&4
-	echo "loadzone = ${DAHDI_ZONE}" >&4
-	echo "defaultzone = ${DAHDI_ZONE}" >&4
-	echo "## END OF AUTOCONFIGURED FILE ##" >&4
-
-	exec 3<&-
-	exec 4<&-
-
-	rm -f "${sfile}"
-	[ -r /etc/dahdi/system.conf ] && mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
-	mv "${tfile}" /etc/dahdi/system.conf
-}
-
-start() {
-	dahdi_load_modules
-
-	if [ ! -r /dev/dahdi/ctl ]; then
-		eerror "No DAHDI compatible cards detected."
-		return 1
-	fi
-
-	ebegin "Generating DAHDI Configuration"
-	dahdi_gen_config
-	eend $?
-}
-
-stop() {
-	dahdi_module_unload dahdi
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-autoconf.init2 b/net-misc/dahdi-tools/files/dahdi-autoconf.init2
deleted file mode 100644
index 9e3de84bac26..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-autoconf.init2
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Ultimate Linux Solutions CC
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	before dahdi
-}
-
-dahdi_load_modules() {
-	local hwlist loc status mod mod_vname pciid desc
-
-	hwlist=$(/usr/sbin/dahdi_hardware)
-
-	if [ -z "${hwlist}" ]; then
-		einfo "No digium hardware found."
-		ebegin "Loading module dahdi_dummy"
-		/sbin/modprobe dahdi_dummy
-		eend $?
-		return
-	fi
-
-	echo "${hwlist}" | while read loc mod pciid desc; do
-		status="${mod:${#mod}-1:1}"
-		mod="${mod%[+-]}"
-		mod_vname="mod_${mod}"
-
-		einfo "Found $desc at $loc (module: $mod)"
-
-		if [ "${status}" = "-" -a "${!mod_vname-notloaded}" = "notloaded" ]; then
-			ebegin "Loading module $mod"
-			/sbin/modprobe $mod
-			eend
-
-			[ $? -eq 0 ] && eval "$mod_vname=loaded"
-		fi
-	done
-}
-
-dahdi_module_unload() {
-	local mod=$1 s
-	[ -d /sys/module/${mod} ] || return 0
-
-	for s in $(find /sys/module/${mod}/holders -type l); do
-		dahdi_module_unload $(basename $s)
-	done
-
-	ebegin "Removing dahdi module: $mod"
-	/sbin/rmmod $mod
-	eend $?
-}
-
-dahdi_gen_fxo_config() {
-	local port=$1
-
-	echo "fxs${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXO_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_fxs_config() {
-	local port=$1
-
-	echo "fxo${DAHDI_FXO_SIGNALLING-ks}=${port}"
-	[ "${DAHDI_FXS_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${port}"
-}
-
-dahdi_gen_bri_te_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_TE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_bri_nt_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_BRI_FRAMING-CSS},${DAHDI_BRI_CODING-AMI}"
-	echo "bchan=${basechan}-$(( basechan + 1 ))"
-	echo "hardhdlc=$(( basechan + 2 ))"
-	[ "${DAHDI_BRI_NT_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${basechan}-$(( basechan + 1 ))"
-}
-
-dahdi_gen_e1_cpe_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},${port},0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_CPE_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_gen_e1_net_config() {
-	span=$1
-	port=$2
-	basechan=$3
-
-	echo "span=${span},0,0,${DAHDI_E1_FRAMING-CCS},${DAHDI_E1_CODING-HDB3,CRC4}"
-	bchans="${basechan}-$(( basechan + 14 )),$(( basechan + 16 ))-$(( basechan + 30 ))"
-	echo "bchan=${bchans}"
-	echo "dchan=$(( basechan + 15 ))"
-	[ "${DAHDI_E1_NET_ECHOCAN-yes}" = yes ] && echo "echocanceller=${DAHDI_ECHOCAN-mg2},${bchans}"
-}
-
-dahdi_conf_span() {
-	local span=$1
-	local type=$2
-	local desc=$3
-	local port=$4
-	local basechan=$5
-	local vname=""
-
-	# Analog we need to deal with on a port-by-port basis.
-	[ "${type}" = "analog" ] && return 0
-
-	echo -e "\n# ${desc}"
-	case "${type}" in
-		digital-TE)
-			dahdi_gen_bri_te_config "${span}" "${port}" "${basechan}"
-		;;
-		digital-NT)
-			dahdi_gen_bri_nt_config "${span}" "${port}" "${basechan}"
-		;;
-		digital-E1)
-			# Use CPE by default.  Unfortunately there is no easy
-			# way to detect CPE vs NET as far as I know and specifying
-			# in a config that you want NET mode seems the sanest way.
-			vname="PRI_SPAN_${span}_NET"
-			if [[ "${!vname}" = [Yy][Ee][Ss] ]]; then
-				dahdi_gen_e1_net_config "${span}" "${port}" "${basechan}"
-			else
-				dahdi_gen_e1_cpe_config "${span}" "${port}" "${basechan}"
-			fi
-		;;
-		*)
-			echo "# Don't know how to configure this (type=${type})."
-			echo "# Please file a bug on bugs.gentoo.org and add jaco@uls.co.za as CC."
-		;;
-	esac
-}
-
-dahdi_gen_config() {
-	local type manufacturer devicetype basechan aport atype
-	local span=
-	local tfile="$(mktemp)"
-	local sfile="$(mktemp)"
-	local plocation=""
-	local isdnport=0
-
-	/usr/sbin/dahdi_scan > "${sfile}" 
-	exec 3<"${sfile}"
-
-	echo "# Automatically dahdi-autoconf generated file ($(date))." >> "${tfile}"
-	echo "# This file WILL get regenerated whenever you restart dahdi-autoconf." >> "${tfile}"
-
-	while read LINE <&3; do
-		case "$LINE" in
-			[[]*[]])
-				[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
-				span="${LINE%?}"
-				span="${span#?}"
-			;;
-			type=*|manufacturer=*|devicetype=*|basechan=*|name=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-			;;
-			location=*)
-				eval "${LINE%%=*}='${LINE#*=}'"
-				if [ "${location}" == "${plocation}" ]; then
-					(( ++isdnport ))
-				else
-					plocation="${location}"
-					isdnport=1
-				fi
-			;;
-			port=*)
-				# For analog cards only.
-				aport="${LINE#*=}"; aport="${aport%,*}"
-				atype="${LINE#*,}"
-				[ "${aport}" -eq "${basechan}" ] && echo -e "\n# ${manufacturer} ${devicetype} (${name})" >> "${tfile}"
-				case "${atype}" in
-					FXO)
-						dahdi_gen_fxo_config $aport >> "${tfile}"
-					;;
-					FXS)
-						dahdi_gen_fxs_config $aport >> "${tfile}"
-					;;
-				esac
-			;;
-		esac
-	done
-	
-	[ -n "${span}" ] && dahdi_conf_span "${span}" "${type}" "${manufacturer} ${devicetype} (${name})" "${isdnport}" "${basechan}" >> "${tfile}"
-
-	echo -e "\nloadzone = ${DAHDI_ZONE}\ndefaultzone = ${DAHDI_ZONE}\n## END OF AUTOCONFIGURED FILE ##" >> "${tfile}"
-
-	exec 3<&-
-
-	rm -f "${sfile}"
-	mv /etc/dahdi/system.conf /etc/dahdi/system.conf.bck
-	mv "${tfile}" /etc/dahdi/system.conf
-}
-
-start() {
-	dahdi_load_modules
-
-	if [ ! -r /dev/dahdi/ctl ]; then
-		eerror "No DAHDI compatible cards detected."
-		return 1
-	fi
-
-	ebegin "Generating DAHDI Configuration"
-	dahdi_gen_config
-	eend $?
-}
-
-stop() {
-	dahdi_module_unload dahdi
-}
diff --git a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch b/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
deleted file mode 100644
index 3df8f166a56c..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-nondigium-blacklist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-tools-2.8.0.ORIG/blacklist.sample dahdi-tools-2.8.0/blacklist.sample
---- dahdi-tools-2.8.0/blacklist.sample.ORIG	2009-04-02 10:34:32.000000000 +0200
-+++ dahdi-tools-2.8.0/blacklist.sample	2010-05-24 20:46:05.000000000 +0200
-@@ -14,6 +14,8 @@
- blacklist wcb4xxp
- blacklist wcaxx
- blacklist wcte43x
-+blacklist wcopenpci
-+blacklist zaphfc
- 
- # Some mISDN drivers may try to attach to cards supported by DAHDI. If you
- # have a card which is *not* supported by DAHDI but supported by one of the
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch
deleted file mode 100644
index 37d1402c404f..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h
-index 33ff50d..3d03f98 100644
---- a/xpp/hexfile.h
-+++ b/xpp/hexfile.h
-@@ -70,7 +70,9 @@ struct hexdata {
- };
- 
- 
--__BEGIN_DECLS
-+#ifdef __cpluplus
-+extern "C" {
-+#endif
- 
- typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...)
- #ifdef	__GNUC__
-@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth
- void dump_binary(struct hexdata *hexdata, const char *outfile);
- void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output);
- int bsd_checksum(struct hexdata *hexdata);
--__END_DECLS
-+
-+#ifdef __cpluplus
-+}
-+#endif
- 
- #endif
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch
deleted file mode 100644
index b222a85d8cb9..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac	2020-03-28 22:28:35.614340050 +0200
-+++ b/configure.ac	2020-03-28 22:28:55.084181570 +0200
-@@ -161,6 +161,7 @@
- # Checks for header files.
- AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
-+AC_CHECK_HEADERS([execinfo.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
---- a/xpp/xtalk/debug.c	2020-03-28 22:41:43.507810560 +0200
-+++ b/xpp/xtalk/debug.c	2020-03-28 22:41:10.538087608 +0200
-@@ -27,8 +27,10 @@
- #include <stdarg.h>
- #include <syslog.h>
--#include <execinfo.h>
- #include <xtalk/debug.h>
- #include <autoconfig.h>
-+#ifdef HAVE_EXECINFO_H
-+#include <execinfo.h>
-+#endif
- 
- int	verbose = LOG_INFO;
- int	debug_mask;
-@@ -61,6 +63,7 @@
- /* from glibc info(1) */
- void print_backtrace(FILE *fp)
- {
-+#ifdef HAVE_EXECINFO_H
- 	void	*array[10];
- 	size_t	size;
- 	char	**strings;
-@@ -71,4 +74,7 @@
- 	for (i = 0; i < size; i++)
- 		fprintf(fp, "%s\n", strings[i]);
- 	free(strings);
-+#else
-+	fprintf(fp, "backtrace information only available if execinfo.h is available.\n");
-+#endif
- }
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch
deleted file mode 100644
index 3ca5bd2aa09b..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c
-index fdb34f1..8fb3687 100644
---- a/xpp/mpptalk.c
-+++ b/xpp/mpptalk.c
-@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) {
- 		MEMBER(MPP, TWS_PORT_GET_REPLY);
- 		MEMBER(MPP, TWS_PWR_GET);
- 		MEMBER(MPP, TWS_PWR_GET_REPLY);
--} PACKED members;
-+} PACKED;
- 
- /*
-  * Statuses
-diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c
-index 49e47d5..251a502 100644
---- a/xpp/xtalk/xtalk_raw.c
-+++ b/xpp/xtalk/xtalk_raw.c
-@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK,
- 
- union XTALK_PDATA(XTALK) {
- 	MEMBER(XTALK, ACK);
--} PACKED members;
-+} PACKED;
- 
- const struct xtalk_protocol	xtalk_raw_proto = {
- 	.name	= "XTALK-RAW",
-diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c
-index 18a5cad..ffa79d2 100644
---- a/xpp/xtalk/xtalk_sync.c
-+++ b/xpp/xtalk/xtalk_sync.c
-@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) {
- 	MEMBER(XTALK, ACK);
- 	MEMBER(XTALK, PROTO_GET);
- 	MEMBER(XTALK, PROTO_GET_REPLY);
--} PACKED members;
-+} PACKED;
- 
- const struct xtalk_protocol	xtalk_sync_proto = {
- 	.name	= "XTALK-SYNC",
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
deleted file mode 100644
index 9575966435e7..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- dahdi-tools-3.1.0/Makefile.am.o	2020-01-09 12:23:37.943059915 +0200
-+++ dahdi-tools-3.1.0/Makefile.am	2020-01-09 12:23:58.863036654 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS	= -I m4
- 
- LEGACY_MAKE	= \
--	 $(MAKE) -f $(srcdir)/Makefile.legacy \
-+	 +$(MAKE) -f $(srcdir)/Makefile.legacy \
- 		top_srcdir=$(top_srcdir) \
- 		srcdir=$(srcdir)
- 
-@@ -131,7 +131,6 @@
- 	install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf
- 	install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf
- 	install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf
--	$(LEGACY_MAKE) config
- 
- dahdiconfdir	= @sysconfdir@/dahdi
- dahdiconf_DATA	= \
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch
deleted file mode 100644
index 75f6c1a93eee..000000000000
--- a/net-misc/dahdi-tools/files/dahdi-tools-3.2.0-lto.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From bc45d96413902e0ded093908bc3a02410d799e24 Mon Sep 17 00:00:00 2001
-From: Jaco Kroon <jaco@uls.co.za>
-Date: Thu, 11 May 2023 17:28:02 +0200
-Subject: [PATCH] Fix compilation with LTO.
-
----
- xpp/echo_loader.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xpp/echo_loader.c b/xpp/echo_loader.c
-index 827f6ef..adfb1f4 100644
---- a/xpp/echo_loader.c
-+++ b/xpp/echo_loader.c
-@@ -409,7 +409,7 @@ UINT32 Oct6100UserGetTime(tPOCT6100_GET_TIME f_pTime)
- 	struct timeval tv;
- 	unsigned long long total_usecs;
- 	unsigned int mask = ~0;
--	
-+
- 	gettimeofday(&tv, 0);
- 	total_usecs = (((unsigned long long)(tv.tv_sec)) * 1000000) +
- 				  (((unsigned long long)(tv.tv_usec)));
-@@ -564,7 +564,7 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams)
- 	return cOCT6100_ERR_OK;
- }
- 
--inline int get_ver(struct astribank *astribank)
-+static inline int get_ver(struct astribank *astribank)
- {
- 	return spi_send(astribank, 0, 0, 1, 1);
- }
-@@ -647,7 +647,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- 	/* General parameters */
- 	OpenChip.fEnableChannelRecording 		= TRUE;
- 
--	/* Chip ID.*/	
-+	/* Chip ID.*/
- 	OpenChip.ulUserChipId 				= 1;
- 
- 	/* Set the max number of accesses to 1024 to speed things up */
-@@ -775,7 +775,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- 		ChannelOpen.VqeConfig.fRinDcOffsetRemoval	= TRUE;
- 		ChannelOpen.VqeConfig.fSinDcOffsetRemoval	= TRUE;
- 
--		ChannelOpen.VqeConfig.ulComfortNoiseMode	= cOCT6100_COMFORT_NOISE_NORMAL;	
-+		ChannelOpen.VqeConfig.ulComfortNoiseMode	= cOCT6100_COMFORT_NOISE_NORMAL;
- 		/*        cOCT6100_COMFORT_NOISE_NORMAL
- 			  cOCT6100_COMFORT_NOISE_EXTENDED,
- 			  cOCT6100_COMFORT_NOISE_OFF,
-@@ -824,7 +824,7 @@ UINT32 init_octasic(char *filename, struct astribank *astribank, struct span_spe
- 		ChannelOpen.VqeConfig.fRinDcOffsetRemoval	= TRUE;
- 		ChannelOpen.VqeConfig.fSinDcOffsetRemoval	= TRUE;
- 
--		ChannelOpen.VqeConfig.ulComfortNoiseMode	= cOCT6100_COMFORT_NOISE_NORMAL;	
-+		ChannelOpen.VqeConfig.ulComfortNoiseMode	= cOCT6100_COMFORT_NOISE_NORMAL;
- 		/*        cOCT6100_COMFORT_NOISE_NORMAL
- 			  cOCT6100_COMFORT_NOISE_EXTENDED,
- 			  cOCT6100_COMFORT_NOISE_OFF,
--- 
-2.39.3
-
diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2
deleted file mode 100644
index d3abf3c4e61e..000000000000
--- a/net-misc/dahdi-tools/files/dahdi.init2
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -f /etc/dahdi/system.conf ]; then
-		eerror "/etc/dahdi/system.conf not found. Nothing to do."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting DAHDI"
-	/usr/sbin/dahdi_cfg
-	eend $?
-
-	if [ $? -eq 0 -a -r /etc/fxotune.conf ]; then
-		ebegin "Loading DAHDI fxotune.conf"
-		/usr/sbin/fxotune -s
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping DAHDI"
-	/usr/sbin/dahdi_cfg -s
-	eend 
-}
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
deleted file mode 100644
index 41312228e19d..000000000000
--- a/net-misc/dahdi-tools/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jaco@uls.co.za</email>
-    <name>Jaco Kroon</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="ppp">Enables PPP/DAHDIRAS support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">asterisk/dahdi-tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
deleted file mode 100644
index a348c7feccb7..000000000000
--- a/net-misc/dahdi/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
-DIST dahdi-fw-a4a-a0017.tar.gz 181429 BLAKE2B fb1285eb7d06c8bca5c91b421c408c7f494c05e4ccb89eb0703457059efef78f248a471e0d5ca03fdca97882531eb3b7e0c52e3231b7ef7a90b58c33882772db SHA512 e42cb83e05edb359949acd888a743c665d228cd3b9424fc8f3b60676d6799f4455e65cc269d1e2ac0e3bb5613607dad4fb37c433067832fb68b15bfddf6f4a2a
-DIST dahdi-fw-a4b-d001e.tar.gz 239591 BLAKE2B f09c2ee17c9d14b95d5bc90de84cdb57a49c33d44e21c66b8ea29908d9ac58b979a0d0eb3cae80efc5e96de19226a850b2ca36aa2b462af66e02043bc8c3def1 SHA512 ab72cf6d469e44f3a8b9dda5e7acae9ae435b6f12b1491079155b8df4c9cf83aed48ccbda4acb4a9943dd6228846f5b82998a0bf575d454ac3b81b72c585d58c
-DIST dahdi-fw-a8a-1d0017.tar.gz 181958 BLAKE2B f7955ba62a94a1edd0c859e71c4f820ab789e098e2fd2c48e3fb453fee6ca5b056fe4144f83bd926f61e8f48fa223b84ce6912bf4a384ee9068fbe63538c1047 SHA512 2f80d24170f0efdebc318f238abb04664dfa97e3ca47a330b5a5e1d695c8ba5c535ad1302bf338667912b46cd5b4bbb76ab5bdbe6e736edd4f0e9239d818d05d
-DIST dahdi-fw-a8b-1f001e.tar.gz 236508 BLAKE2B 830cc01cc14eca0367e92e5d6dc10b019e42072da5a69b18095c52633d7dcddade920fd2cf2c43f101effc2319c43a803f433faad244e096fc9854d3d652da7a SHA512 68041e5cb53d8ff6beb9f667abca5a5a1c752357c224f5c7cfcb81732bd417671cf6dc03b5c5bafd6a0864f6c5451165c0f26908b0f40ed3408961f448f2a9a4
-DIST dahdi-fw-hx8-2.06.tar.gz 29252 BLAKE2B f3c635108032ff06b51a140f2f665a6a41638eb027d88c33822da9d47fe907eecfaab937ce6199f0d9eeeafbd36919366e039b0bc1a1be605c339055a8b6843b SHA512 d113d2bd10d5a851087e04fadb3427ec07634960d47e2292320f0d195c65075fb24ab173e0985c257eaf8e46f595f29af034fb380382cdbff7bfbc7381dff4ae
-DIST dahdi-fw-oct6114-032-1.05.01.tar.gz 165866 BLAKE2B 527d49f66924e91b6689cf905f365804be02707476d425e563db763bb158431f0e8bccc8ed38cbe3f4ec91747e53769ab5526cb3949218fc3b8041839796fcbc SHA512 ec47a7aac6a6abc73fe0c7ec3b31eebc868c516aeb1bb584f145f36c28abec21afa12dcec554bceb914c058c83255e32fb8d967ef4d8a5d0161b6053af464a24
-DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 BLAKE2B 9b21e9a5a9bf85ac18db67b14a457676d32958e1a2316fbf33fb802c1393ef2759a3637a80eafb77e2c496002c76f49705ac9eb2d427b8e079503a31bf930893 SHA512 6dcc6a3413c6c0561b08c4949a746cbebc58b8a068481f568007fdc663cfc6ef90417fbd81398055a781367e7db57f0a694745cddcd3c697a4f857be15981549
-DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 BLAKE2B 8621538d16e028eb2de64fa61c7475874525a302af5603f07a8a948a3c2cc1bd776feeeaf51c4d0c2edc4577156addc27905ecb06c9db6f43400258905cad6bf SHA512 17e83aa57ea8e9d3353027184adb48f664b177a528006d67112a53127fcb19c1011d4f44c2980ab77d27b3bf7f7a74d44f15aaf115e05fa3df8e16d3c30fc267
-DIST dahdi-fw-oct6114-256-1.05.01.tar.gz 171685 BLAKE2B 2f831da3043c6c73a4a38085d1c2b685acae94d92deba776e47a4d292f1ae65e5686ec3e8c73f0672ea8f390404717662f106b084083af4a8635447cd2f539fe SHA512 e447fe8d24963892339d895450cf7a04da3bdcf1de22630dea68119dbd9da84878478adf8ce0e5ef859e6d677c2a051aa6272de4e0692f5ce0e8b5d0fba4096b
-DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 BLAKE2B b16a2c77dc0222851af25a11e64e40f2648ec870444373ad2310b8b5157b2a2d5a4a4bf2850551758080e87f43371ff55a11f5f381bd08b060f5062f0faa7587 SHA512 88a986d22ead41a3dabc320e13f7a3e6e6ab9e2752aca2cc940ad9c1ec570d4f01e82c46d0ec1b6dc1a87a1df7e94cfb8aa638b44b4fe2254af8962f1fdbac86
-DIST dahdi-fw-te133-7a001e.tar.gz 242987 BLAKE2B f6e5fedc742061b0ee26b33c20cb16a7a5efd68de827963dbb5fe3ddeed5bb491643e20818d39c8d0876ab3971c339ce43f03e97af3aff2286b70e020d2e05a4 SHA512 acd273bcf9b8e009b986e2c9f068121fad8b9cf8f500b79fd5456225ec4ef81d22f32960246a1e9b49ca7f47efb2f7d346c8727fe3b7b80c700d2dc609784acc
-DIST dahdi-fw-te134-780017.tar.gz 185478 BLAKE2B c301362e7433f9c3c9991ae50c0536ad4315fe966dced38fd2be7a9c3b01ce4829d4ecb8ef9756f4ad05b507bb4b6739a861264eb6975512ce8aa5b89b1ca14c SHA512 b6f93ff060512b15bb8462805d8f8a435e56a83be362770d2c3b39b876d2171c5e1e6c1bc42c893eaa382ccd2f19534536612618c4ef4ff8c25976cf3719d4fb
-DIST dahdi-fw-te435-13001e.tar.gz 238504 BLAKE2B c348a1e0d187ac4008254c78680dcd2b2ccce3f1af92bced190936c8ace88973e7d6854ed6de0480869ccd687d398958193ad90a648c8fe90464c3d1b5ddf974 SHA512 1cd5c191db62f87f87c9f6913bcbc3ed9f3d77a51578cd0bc5fdb9d17e128bcaf66d04c5a9e6417e9d7543fc8f18b6f635f0e8c1cb1bc19b11bc8ddffaa6be08
-DIST dahdi-fw-te436-10017.tar.gz 210601 BLAKE2B 8aceaa093b457a374db89599779315458a91af3d6f58e74a35ee08d3c91a556b64f78244a9e3e05d9bc8b200be2b3be83d159eb85681f3afb20329f16b2f2445 SHA512 56e8a26a737ac45e137324b635e5f489fe05a5939324af038f881b64ddabf486eb3830ff0ada1561ffedb3d6bc8338b11f4dccbc9b2ca9e00cd2bcc85abf83c0
-DIST dahdi-fw-te820-1.76.tar.gz 54303 BLAKE2B 16a70f103f890275595c1c066d05992b43dd21170fc16669de064e92615e5b049cf5cdf49f9c9d03d9e795172eafad83cd3b0636fb1491df5612358757a2e9d5 SHA512 3189df3dd680353d5520773ac8ea7fe638ea05e3c656379c1a245bd3ab8a6ae0c8a1c22c2068be9c758996e5993b0d19376b159b4e868ebc3d817dcce3b9aec7
-DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd62a60398e29848d53a24d7cb3263922fc43dbdf0f9b66ba8324e9d7f37047803fd474e90102d4af876169f5597e545b98d529 SHA512 3ee8c56a7075d13a6457a5249fcffc04b2da59da94a622cb66810babf46260235492810c867479fccf343e84424c9bcc12c2d05389a52c0a56c62b138f23aeb3
-DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
-DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
-DIST dahdi-linux-3.2.0.tar.gz 1617958 BLAKE2B 1a35ba69719e7cebf7cf471f901a3280e1558b8e8e4f615fcc974a08a83f62e71ee653b47f3a09e85e96a0447e4516996ef254497746492fe50eebef5515e217 SHA512 cb4b06d5a83aae7ce54049137d989fa6275367debc77a1df64cc36ba1bda08a058ea92f01bb873bcd83c3c7d58ff4c5da42c67bbbe8a02b8f4f0e12348c4a072
-DIST gentoo-dahdi-patches-3.1.0-r4.tar.bz2 8631 BLAKE2B 683cfac178bb2d15053396d45ed6c4b0511952165b3bf4907f8f95737d1b36eab2d7cd7c288924602539779d4251d9ef5d7c369c8c600fa27862c173f4aa1506 SHA512 7b4bca16bd0cb9ee9f1d44fedb1077436cd951c3c92693c5b8187e0d2292dc236db89cb2304f80cc287c83ffbf4bd1c8a413c4d508b0493a6be1e3051f2af157
-DIST gentoo-dahdi-patches-3.2.0.tar.bz2 6947 BLAKE2B 8e4d2245d966a14c6eec7045c74788decc52c5dec562e7d09670766f169e6890a7fae2bf245ab198276780210564e891fe5d16b6e0d44ff5be876f218c23f2fb SHA512 c47a092d17abb0070cebfae540363a01bb8a9927e05524c3d50e76d69249115b3caf83d436469153b7a519e6c6952baab14d6bf898a440373f90d02359fbb4ae
-DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
-DIST gentoo-dahdi-sources-3.1.0-r4.tar.bz2 87720 BLAKE2B 676a8332b0d68155dc2b24a49f01abd21521c9aeecdc930b2fbf1fcbcda568b8162d9d34a5876b0dcd5510abc72e933a112598863df745a44b54a9bc928c6cb8 SHA512 d7f77dcb636e1346bbe18ed780a3df3cab064d12e50f01528a102f9fbadb11661218b8e00e73792003cb7d8440fab58011900244d7555e33a4c26c8164f61762
-DIST gentoo-dahdi-sources-3.2.0.tar.bz2 87595 BLAKE2B 18a2f007581ac653e0a1a50c77b36b0b2065e1dfd5c32ffe754cbb66b7aaf6df52dc4f856f8a9e0440f6ecf193c56e7506db24ab2b0ede43d9a1185ef84e0036 SHA512 4f13597914427f2e6cea08c6dce9e9bedf5d35a62c8d5dc545e8fb1268ffeb5dece84a27c2a50a8d55a7b8eda1d4fe2bfe18465b0492b45a3684170c5a600072
-DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
-EBUILD dahdi-3.1.0-r3.ebuild 4805 BLAKE2B d6e722b3d9649293889ac3fd9374aa247a1b35b28a6d7fdc526568ed24ff42af392555b75550a82d9089af77d270abcb51edea4c6d7fdbab29e2ea92a80279a1 SHA512 3ccd4e65fead21091cb18bcf5bb9871160c55f7009afcdc3b5a1b2a7cc3cff03c79ee3f0895c8adc3a4312400151945490ecbf74d9acba726fd144f09e82f0b0
-EBUILD dahdi-3.1.0-r4.ebuild 5495 BLAKE2B c71798600838bc2bee130b40ffc689dfda07b4ccd60a78f205c567a5288779aaf0dce693843773c71c20b64e28e4f6923e1a9123d924a5c591bf20c7a2f4dccd SHA512 9d903c0749d278e7c5f78503cf04b8fde0b32328f065e669b3cc0dce7001c269aed4fa3e7c333c78b37655176000623e1a3dd3f0f3978fa8b757be193fc9f6a2
-EBUILD dahdi-3.2.0.ebuild 5489 BLAKE2B fae584e0bd0b4ace3dd7880dee46c76a7ef9b65700ec496e9b866a96e34d3d7ea475f7e89e8d64cc7b598920f44f0228e287e4f08d60274d6b88b25828f3529c SHA512 c6ff05cfcac9d560ea961e802026ffb651b956520a1d53f34c0806b960f417eccaf622b68303c82399f18e8340e5e670a04749b6515ace575190efa92567d420
-MISC metadata.xml 659 BLAKE2B 62b88bd3740d28c0ace35c1f760a30b0e6264bdb2686dfc48a50aa77d66f1fcabfa21700ea299b42dc9b7289e2c65c16c79f653e8cb7b7519f97382106b823f1 SHA512 74d3e854ba88cb41915b073cefd505f3cf635d4fe6b320a731480985f54829488274e9f0ea0542372d8f7b6ae773aa7ba3d88f7a313c026f26ccb78bfa758de5
diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
deleted file mode 100644
index 5dc1b0089be5..000000000000
--- a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod linux-info toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO=3.1.0-r3
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/dahdi-patchset" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_pretend() {
-	use oslec && CONFIG_CHECK+=" ECHO"
-	check_extra_config
-}
-
-src_unpack() {
-	unpack ${A}
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		[[ "${file}" = dahdi-fw* ]] || continue
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
-			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
-		die "Error moving firmware files into the right folders."
-
-	for drv in ${JNET_DRIVERS}; do
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.c from jnet to DAHDI."
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.h from jnet to DAHDI."
-	done
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
-			die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
-			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	if use oslec; then
-		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
-			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" install
-
-	# Remove the blank "version" files (these files are all empty, and root owned).
-	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
-	# If the kernel sources have a System.map, and there a suitable depmod
-	# available (seemingly when we're not cross-compiling), then the kernel
-	# sources depmod kicks in.  Remove the files caused by that.
-	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild b/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
deleted file mode 100644
index 05ae21da55a6..000000000000
--- a/net-misc/dahdi/dahdi-3.1.0-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO_PATCHVERSION=3.1.0-r4
-GENTOO_SOURCEVERSION=3.1.0-r4
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_setup() {
-	use oslec && CONFIG_CHECK+=" ECHO"
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	local file drv
-
-	unpack ${A}
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		[[ "${file}" = dahdi-fw* ]] || continue
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
-			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
-		die "Error moving firmware files into the right folders."
-
-	for drv in ${JNET_DRIVERS}; do
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.c from jnet to DAHDI."
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.h from jnet to DAHDI."
-	done
-
-	# Find the stuff from gentoo-sources (ie, modules that has been removed by
-	# upstream and we're re-adding).
-	DAHDI_GENTOO_MODULES=""
-	for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
-		[[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
-		[[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
-		mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
-	done
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
-			die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
-			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	if use oslec; then
-		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
-			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
-		LDFLAGS="$(raw-ldflags)" install
-
-	# Remove the blank "version" files (these files are all empty, and root owned).
-	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
-	# If the kernel sources have a System.map, and there a suitable depmod
-	# available (seemingly when we're not cross-compiling), then the kernel
-	# sources depmod kicks in.  Remove the files caused by that.
-	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/dahdi-3.2.0.ebuild b/net-misc/dahdi/dahdi-3.2.0.ebuild
deleted file mode 100644
index 8b59341edcee..000000000000
--- a/net-misc/dahdi/dahdi-3.2.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-MY_P="${P/dahdi/dahdi-linux}"
-JNET=1.0.14
-GENTOO_PATCHVERSION=3.2.0
-GENTOO_SOURCEVERSION=3.2.0
-S="${WORKDIR}/${MY_P}"
-
-JNET_DRIVERS="cwain qozap ztgsm"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
-HOMEPAGE="https://www.asterisk.org"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}.tar.bz2
-	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}.tar.bz2
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
-	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="flash oslec"
-
-PATCHES=( "${WORKDIR}/gentoo-dahdi-patches-${GENTOO_PATCHVERSION}" )
-
-CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
-
-pkg_setup() {
-	use oslec && CONFIG_CHECK+=" ECHO"
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	local file drv
-
-	unpack ${A}
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		[[ "${file}" = dahdi-fw* ]] || continue
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
-			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
-		die "Error moving firmware files into the right folders."
-
-	for drv in ${JNET_DRIVERS}; do
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.c from jnet to DAHDI."
-		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
-			die "Error linking ${drv}.h from jnet to DAHDI."
-	done
-
-	# Find the stuff from gentoo-sources (ie, modules that has been removed by
-	# upstream and we're re-adding).
-	DAHDI_GENTOO_MODULES=""
-	for file in "${WORKDIR}/gentoo-dahdi-sources-${GENTOO_SOURCEVERSION}"/*; do
-		[[ -d "${file}" ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}")/"
-		[[ -f "${file}" && "${file}" = *.c ]] && DAHDI_GENTOO_MODULES+=" $(basename "${file}" .c).o"
-		mv -n "${file}" "${MY_P}/drivers/dahdi/" || die "Move of ${file} into dahdi-drivers failed."
-	done
-}
-
-src_prepare() {
-	if use flash; then
-		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
-			die "Failed to define FXSFLASH"
-		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
-			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
-	fi
-	if use oslec; then
-		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
-			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
-	fi
-	default
-}
-
-src_compile() {
-	unset ARCH
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
-		LDFLAGS="$(raw-ldflags)" all
-}
-
-src_install() {
-	einfo "Installing kernel module"
-	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
-		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")${DAHDI_GENTOO_MODULES}" \
-		LDFLAGS="$(raw-ldflags)" install
-
-	# Remove the blank "version" files (these files are all empty, and root owned).
-	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
-
-	# If the kernel sources have a System.map, and there a suitable depmod
-	# available (seemingly when we're not cross-compiling), then the kernel
-	# sources depmod kicks in.  Remove the files caused by that.
-	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
-}
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
deleted file mode 100644
index 2bd89c9cbc5a..000000000000
--- a/net-misc/dahdi/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jaco@uls.co.za</email>
-    <name>Jaco Kroon</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <use>
-    <flag name="flash">Support (short) flash on FXS</flag>
-    <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">asterisk/dahdi-linux</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 858ea7b683e0..4702b3f705a6 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,4 +1,6 @@
 AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df
 DIST dropbox-cli-2023.py.xz 14308 BLAKE2B e0e1f28c911e5744f26bc3854e1283884f7daa57c247f0a13cd5f571124edca1f11e61ea487bccae294b34c4ce30884758662f95d0438efd1e0e3e64ead6a819 SHA512 c11928de24c6ab10c142eedfa244a903795b37bb75e7e805dbf28fe5b18f524db210eb432bf43eb3c99d67b0caca51c85bbe533b3d7d877cfdc7595925483294
+DIST dropbox-cli-2024.01.22.py.xz 14316 BLAKE2B c2bc33a6d1f74103a3685340747c8d9c974f75e0deec4cd97690333b7697730aa61beef1b315f1375a29d02c6bdf2609464b8ff41cffe7b7ec6efd5978762207 SHA512 272ad65476c8ebd55154feb848e1027b891c91252ca3fa3f50c7db84a7c71697843ae999716a671f697b891721b5c536927c2e63fd2c2afd298a37770aebf123
 EBUILD dropbox-cli-2023.ebuild 720 BLAKE2B 0bf4ea7ee884d532472d75482080eec1a781025baff4e9309df11ecdf3ae574a3fb06be601b9be0aefcf4f71beb13bcd8f385523ee84dde0cd0fbb0783400cb4 SHA512 313c545d7ba1de072b44296a0a474616705a965834b55ec9143b4d0c5c55f8d70ce8736af64d3202e203398c7217a3291bec36f2d4b6e1a19504aa4838d405c8
+EBUILD dropbox-cli-2024.01.22.ebuild 906 BLAKE2B 0f127e124d14672c964df5fb958805e30a12ceddfe8e1fdb32fab71ad0f7e906965ff7a80e3a287f3839b2ad0cdf5202a8a64bf29d21266b05173e5efc11aceb SHA512 671cf34ee46bcd3542a025c0f98574ddeeba752f4b38473d2cab067c3c27d755b0a1c0e41f81896661ec3be8c674d284a9b326e573316ae41c7fa71c0bbcb077
 MISC metadata.xml 311 BLAKE2B ff3b8e2e3f7b28ac858933b5cb5dda2eb2c56621c5fa07d0adc571066d598ecc97cdf114425d3c3cb5f4d49df8ce88a79b16f4f17ee462cc98ffeb9b9dba4d62 SHA512 774123d6db311ce59f6aeeb930364d3341156a0236b2606e10dac09ddb8604cb2e323c308213a39446bc8abeeaf61617162bff808cda282f441a6a8df671de4f
diff --git a/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild
new file mode 100644
index 000000000000..d2c3eb6fe937
--- /dev/null
+++ b/net-misc/dropbox-cli/dropbox-cli-2024.01.22.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit python-r1 bash-completion-r1
+
+DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
+HOMEPAGE="https://www.dropbox.com/"
+# https://linux.dropbox.com/packages/dropbox.py
+# https://www.dropbox.com/download?dl=packages/dropbox.py
+# https://raw.githubusercontent.com/dropbox/nautilus-dropbox/master/dropbox.in
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
+S=${WORKDIR}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="net-misc/dropbox
+	${PYTHON_DEPS}
+	gpg? ( app-crypt/gpgme[python] )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+
+src_install() {
+	newbin ${P}.py ${PN}
+	python_replicate_script "${D}"/usr/bin/${PN}
+	newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN}
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
deleted file mode 100644
index a830fb294359..000000000000
--- a/net-misc/econnman/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST econnman-1.1_p20160305.tar.xz 240428 BLAKE2B 6417b30fd110416f6339b4dfad9edaff2888e9fb9562451ffb13661664c1e51d45f513a192f7850f8030caab13ebd914a138ff6cd596ed09c7210940c98ce748 SHA512 c50155a286e8a8d20deb4d5bf30ce91cc97e7323bc6dd209a16c767c3a1d6f30aab0d3b60c3a14df091d086fc10c2584d7bf56c59c95af684af3d2af7eff726c
-EBUILD econnman-1.1_p20160305-r1.ebuild 773 BLAKE2B a7c7689788df5b06d9c50515a739f85485cffebc0437e456183be977f93e12a4e6640fbbafcc1d8fbd380b2bebf8199a753b450f941e1a6d6f11c3b93ddfc8e5 SHA512 f1eb3ecce757de9c3fdf8f2adbe5fb593ecff3daacc6b9e565153b9eef14289d1bc3e850381f21bfdd018d4fc3215c272791e512d48df9bfd5163a5bb39a910a
-MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild b/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild
deleted file mode 100644
index 8b5bc55fe2dc..000000000000
--- a/net-misc/econnman/econnman-1.1_p20160305-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="ConnMan User Interface written with EFL & python"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/"
-SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.tar.xz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-libs/efl[X,connman]
-	$(python_gen_cond_dep '
-		dev-python/python-efl[${PYTHON_USEDEP}]
-	')"
-
-src_prepare() {
-	default
-	python_fix_shebang econnman-bin.in
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/var/ || die
-}
diff --git a/net-misc/econnman/metadata.xml b/net-misc/econnman/metadata.xml
deleted file mode 100644
index a1fbf3c0c993..000000000000
--- a/net-misc/econnman/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest
index 8fed179b1689..7201b9c09e8b 100644
--- a/net-misc/netdate/Manifest
+++ b/net-misc/netdate/Manifest
@@ -1,3 +1,4 @@
 DIST netdate-1.2.tar.bz2 7516 BLAKE2B b044f8294716a5660cab8c77cc9bfccf0f606a89f8b4d73d93a760f69bcdb4e48aaad7b6c0fbf7a22468e1f3aa1f026647159270456a989d9df65c3af458e3db SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918
 EBUILD netdate-1.2-r1.ebuild 474 BLAKE2B cb6ec0cfad3a10868c929cd314ea58c05b48cde86e49065b6b4ce7fc5bb819cdc0ec3a988e9ef7f9d6977728068e79fd4d2ef43d1ff8cf0488548a76b7a46aab SHA512 7514876da1d319339958e067ebea9e9f5aedb4bdbb811d90f0d201ff07b07109a1b9037b3b02eee4538b395bc9173bb2918e69aa4c40570f9d5d94c9b536f77b
+EBUILD netdate-1.2-r2.ebuild 549 BLAKE2B 1acb10a1a6e6e01858ea7db9b06b00059ba6b658ba09e6e46d2127568b5881862956f1b32d1fdc6b24cba278df095f787d8f4f00542de977c5539a093be78ae5 SHA512 8e77f5f1cb38abfb32e197609ad472cb4dc86804dfd312c6109cdc3dcaccd0b36b0c7bceba3c12fe1b089921e24f5fe7da0f5371214972140f4ee95ed859fc45
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/netdate/netdate-1.2-r2.ebuild b/net-misc/netdate/netdate-1.2-r2.ebuild
new file mode 100644
index 000000000000..832dd2e23b62
--- /dev/null
+++ b/net-misc/netdate/netdate-1.2-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility to set date and time by ARPA Internet RFC 868"
+HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
+SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
+
+DOCS=( README )
+
+src_compile(){
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.8"
+	einstalldocs
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 6b24019843ea..584b77496041 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,13 +2,6 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.42.6.tar.xz 6749088 BLAKE2B 9d583c163908ee4fe145cdbdaa657cbc682d9f6270efc7d7525acd86912a0da50f2ccf14810fdfe2998c6ce701dcabc2b5b39fa58ff9d3fe4f5630205b15f4c8 SHA512 606a996043d8fbc7972329b94bc9854557950f665790381611eddfc632850b31584a4ba2d773fa9d12127db4c37ea2076c657521b78cedb012144df6f41d3748
-DIST NetworkManager-1.44.0.tar.xz 6868528 BLAKE2B f916620e74c0d5b8581b8c1eeb8f58c1cbac2d6c18bc72a25679cf5d36975df6c37b130f97e8d2078d9ab7aeeb4371ed6f9e830c5e6dce19feb41f26277be734 SHA512 7ebece465dfd108d66adb1c941ab22bdca8bb0ce7869baa421e4aef65e89a23bf63f3713e809e1e7b6c5226813ad9d56d8af339c711507a33aa6728afd334405
-DIST NetworkManager-1.44.2.tar.xz 6863972 BLAKE2B 2bb5ac06018d45d55623d742fba49c3b485116091992ad56a4680ce00946c96bd0c1b3b5d34f2c36c6347ff51182e00158351c0c6989cdc7db4a49b52564a1b7 SHA512 2f3721ebdfa14470c8bb22362c4f598a277c6cea77a34101a6cc9ef32b44382bd408d55e4c58561c324864bfb814b6efb563fbbd593a16c191524cde8ee758f5
 DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407
-DIST networkmanager-ppp-2.5.0.patch 45845 BLAKE2B afcf1410f89db950a7e7c2c0af3aaed174a43fae127c8a139431093a3ae9802542c40cf69faabd1d057563438b48f0a0b0d4c7fc188c13e9320d127e0034f181 SHA512 34fe7780ac1780efa156429166344548058a9079ad61238a33d89a57e52ab79765ebfaf39bd9c246d0b74549ca7156e9df1a472920485cbe23ed81de4f8cf243
-EBUILD networkmanager-1.42.6-r2.ebuild 11947 BLAKE2B 20ffa1a873ebd171c47d2fa5feeb65647656c5239c716b4969a82722674dae3fcdeef3ecf1bb30cbf5ea85d0412b3677df5bd40ad83994c4c42c9c359c664e54 SHA512 19f0896a05be639186da85f5d46d07d02a467d3d5c559a5b3ecab41acaa073ffcd70359b76af1cd95d31ba4c0b881e0460b5b5f4c2cf60613d0f7586e2b9cdfe
-EBUILD networkmanager-1.44.0-r1.ebuild 11693 BLAKE2B e87be9fbf57bdd519339c6bd4750c508731cf88e5baa251b257c2e9c142a212676b08cf752cecdd5a75397b7ad6972421c2cf54bb903e478de4668ab9093b690 SHA512 5f8619be794991ae8ba31c26f8505d477ddd9833c55eac75ebd22e76702641ebfc2a15d5e313d61b467fb3e5957d7b5dfd22ee101fb7f66bf50b8685885d8517
-EBUILD networkmanager-1.44.2.ebuild 11693 BLAKE2B e87be9fbf57bdd519339c6bd4750c508731cf88e5baa251b257c2e9c142a212676b08cf752cecdd5a75397b7ad6972421c2cf54bb903e478de4668ab9093b690 SHA512 5f8619be794991ae8ba31c26f8505d477ddd9833c55eac75ebd22e76702641ebfc2a15d5e313d61b467fb3e5957d7b5dfd22ee101fb7f66bf50b8685885d8517
 EBUILD networkmanager-1.46.0-r1.ebuild 11867 BLAKE2B dbd3f555e674c097b05f2be625c14142a6e42d1f5ac48372fc7dd7374811aef280eba65d22cd0a974a6468c650081d4f9ee280d82ae9a06bcc7777d81a410f87 SHA512 ae2d6cebef5a44df0e262c230e94cbcb55b44c4933e660982d4387cd607add408f8d9068aa306e8d27982de4275066eb20ae5cd0a26b68484dfeb5ee280643da
 MISC metadata.xml 2360 BLAKE2B 0d95733c3909e35ef555ad32c44e706d48347e6b8a5f7f915831edf7a43376e973fa32c7704325818704b59082fbbb2e4610e075848f09ac7c818d8fdbb94830 SHA512 c4478c41989eca2b777bb59767ce7660d70b261f61bc42673bc61e7e4db528c45f921c384de5454e7f901f4cfdb3cf1303e183397671606ed43c1fdaa59762c7
diff --git a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild b/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild
deleted file mode 100644
index 021f002ede42..000000000000
--- a/net-misc/networkmanager/networkmanager-1.42.6-r2.ebuild
+++ /dev/null
@@ -1,395 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-# bug #904840
-# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1607
-SRC_URI+=" https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.patch -> ${PN}-ppp-2.5.0.patch"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? (
-		dev-libs/nspr[${MULTILIB_USEDEP}]
-		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
-	)
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5:= )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-	"${DISTDIR}"/${PN}-ppp-2.5.0.patch
-)
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	# Workaround for LLD 17 (bug #915819)
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild
deleted file mode 100644
index b5c1e8ab294b..000000000000
--- a/net-misc/networkmanager/networkmanager-1.44.0-r1.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? (
-		dev-libs/nspr[${MULTILIB_USEDEP}]
-		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
-	)
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5:= )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	# Workaround for LLD 17 (bug #915819)
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-		-Dconfig_migrate_ifcfg_rh_default=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/networkmanager/networkmanager-1.44.2.ebuild b/net-misc/networkmanager/networkmanager-1.44.2.ebuild
deleted file mode 100644
index b5c1e8ab294b..000000000000
--- a/net-misc/networkmanager/networkmanager-1.44.2.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org linux-info meson-multilib flag-o-matic python-any-r1 readme.gentoo-r1 systemd udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? (
-		dev-libs/nspr[${MULTILIB_USEDEP}]
-		>=dev-libs/nss-3.11[${MULTILIB_USEDEP}]
-	)
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6(+)] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5:= )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	# Workaround for LLD 17 (bug #915819)
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-		-Dconfig_migrate_ifcfg_rh_default=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/openr2/Manifest b/net-misc/openr2/Manifest
deleted file mode 100644
index 7d7491fb6524..000000000000
--- a/net-misc/openr2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openr2-1.3.0-fix-build-system.patch 855 BLAKE2B 0712ab876e8941f63756531597a861e433e2e3a8f457fcf62c83e3d5f32d1f0f809c2fb34ce362533d7a4e1d434132c0df81ddb656e3223f7dab1381001215b4 SHA512 6f71b83d1ec8a07a32a019784954148adde44b2fdfc982ec9d02deeae66fc307448f6577d715276de4cdde42f771d647d625d3111a6189cf60ae8f6c5c6c2d2e
-DIST openr2-1.3.0.tar.gz 650048 BLAKE2B bff444c839d5f62fc889c1720cb9c17c38c5bd4b0dc3b3884c8fd00226aa6354281cf37c7a748fca4e16e633a94ac055c8f7b5e4bf69d97732846fdbc618ca47 SHA512 2cee4534eeebb91a2cf0f74c9fcd2a16db3966db01a4bae7e3406416546fdc1c5e20bb9172375f55e5dcc30cfcc2c8f7182ef7476253b4fcce9421f74b8d125e
-EBUILD openr2-1.3.0.ebuild 643 BLAKE2B 4d0a464275893bc1dbfef82c36637c6f08c15520a1aececf0948163201cf808d2fe32a17e0c26c7bb6f7e8a3aa747aad82a4c30672bb1440527f1d8f3013c2b8 SHA512 accff8b8e325bb58c3c2da3f16ef0249fd970382b4839a530f1f6913ace63116b8f796327f8b6a85a33227baf10cae37548338a24e708c75a0d6b7464dc59b36
-MISC metadata.xml 244 BLAKE2B a71e3730eb16c6db4cca37ad5a584be5b6ec19e1e73049bdfe6f03c718a20dab895e7d7f07d3b9fc3841ab12f73a5f28dd71895a1d66c36ee76e7bacb11b5fff SHA512 e31f07e523e88b04dbc7654ac6da27395cc1d4456f56f192d08b96271ce5ef2578b300b3b79e212431536b9f0b757bce515567a924014f428e3e822356ec1eab
diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
deleted file mode 100644
index 59918934d563..000000000000
--- a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -25,11 +25,6 @@
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE
- 
--# let's default to compile with debugging information
--# most users will not even care about it
--CFLAGS='-ggdb3 -O0'
--CXXFLAGS='-ggdb3 -O0'
--
- AC_PROG_CC
- AC_PROG_LIBTOOL
- AC_LANG([C])
-diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,10 +1,10 @@
--AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes 
-+AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes
- if WANT_OR2_TRACE_STACKS
- AM_CFLAGS += -DOR2_TRACE_STACKS
- endif
- 
- if HAVE_SVNVERSION
--AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\"
-+AM_CFLAGS += -DREVISION=\"0\"
- endif
- 
- lib_LTLIBRARIES = libopenr2.la
diff --git a/net-misc/openr2/metadata.xml b/net-misc/openr2/metadata.xml
deleted file mode 100644
index b61afa2b03b1..000000000000
--- a/net-misc/openr2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">openr2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/openr2/openr2-1.3.0.ebuild b/net-misc/openr2/openr2-1.3.0.ebuild
deleted file mode 100644
index 2f15c2e0e766..000000000000
--- a/net-misc/openr2/openr2-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="An open implementation of the MFC/R2 telephony signaling protocol"
-HOMEPAGE="https://libopenr2.org/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="net-misc/dahdi"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 184b4d3a542b..552df14fe858 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -12,8 +12,6 @@ DIST openssh-9.6p1.tar.gz 1857862 BLAKE2B dd7f6747fe89f7b386be4faaf7fc43398a9bf4
 DIST openssh-9.6p1.tar.gz.asc 833 BLAKE2B 9363d02f85457aa90069020827306a2f49d8406e32f5ee1d231844648dd2ffa02fa9b7325b8677a11e46a0ba0d9ffc86d9c989435d691a02f5354a956c49f9f9 SHA512 aec5a5bd6ce480a8e5b5879dc55f8186aec90fe61f085aa92ad7d07f324574aa781be09c83b7443a32848d091fd44fb12c1842d49cee77afc351e550ffcc096d
 DIST openssh-9.7p1.tar.gz 1848766 BLAKE2B 520859fcbdf678808fc8515b64585ab9a90a8055fa869df6fbba3083cb7f73ddb81ed9ea981e131520736a8aed838f85ae68ca63406a410df61039913c5cb48b SHA512 0cafc17d22851605a4a5495a1d82c2b3fbbe6643760aad226dbf2a25b5f49d4375c3172833706ea3cb6c05d5d02a40feb9a7e790eae5c4570dd344a43e94ca55
 DIST openssh-9.7p1.tar.gz.asc 833 BLAKE2B a95e952be48bd55a07d0a95a49dc06c326816c67b8b5d40bd3f64c28aa43122253817b8a088e7a3b8a190375ea39f9fc3400b22d035561f9643c1d32b5caef27 SHA512 e028978e4266de9ad513626b13d70249e4166923fc15f38751178e2b3522ff6ebb9a7ca7dc32d1bb42d42fb92adf9903dba1b734bec083010ed7323aadad8baf
-EBUILD openssh-9.6_p1-r1.ebuild 14012 BLAKE2B 879504585f4ad5de7e93d54535ebd7a3f82a7b1d7cee1661386f0883d32dc0aa56304b5f2c587f6c21569312736d8408ce91eda7e5c55a0f845197f4cf048e25 SHA512 67a580e5c3888a7253216238147fb51bea2b5bffca75bfa69188b5f6d35ae2bbc18afcc621adfae724e08e992488446268e4e0a07b3c34efa33453f3befb2967
-EBUILD openssh-9.6_p1-r2.ebuild 14105 BLAKE2B 0dc5ac19fd1edbf1114ce98c576245302fb74b97b2f45a501b14c2dd206d4db9a453195ee50d2d9e8edb91766f6ed3c92965c828b9cd8f60f7a42f519f9cf319 SHA512 794e8ca280500f61e7df99e0a1273cfbfe25b0736b0bcb8f4aa4b5486bb915bece9bc6831559755ef8af9af88ff66ad17201ec7f51db22dda99413642235a142
 EBUILD openssh-9.6_p1-r3.ebuild 13890 BLAKE2B ada79c2c62392ad259d3ddc7e5d92d67aeaba8b4e9be6063cdc33c29459f3225014012a19dc4513fc5d507377826da430bd8069155fb0e83c625b43f953bd40e SHA512 56ecdd20399d725e0dfc8bcdedace31751f3d01019316b8b39a9f2922cd02cabae47f65e0524cc4c57bd452e18e18636ba9ddfde9d379bb28258e75ef9b44645
 EBUILD openssh-9.7_p1-r2.ebuild 14066 BLAKE2B ada1b60519d235b78468cd5a0ab142e2bc4c897faa14b222025ce376dc4c7e5d6ebff8ac54ee2e8b8628b0a5ea6b5894908b1ae45aac7de11e40d780f009373b SHA512 76da8edc2524f830ffb5abc5a50fc8806f3907e3e197055b472e3c6f27bb3d7166c636616b3863b978a750d393d444559f6c6f690326ca809e6042cf753860f9
 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca
diff --git a/net-misc/openssh/openssh-9.6_p1-r1.ebuild b/net-misc/openssh/openssh-9.6_p1-r1.ebuild
deleted file mode 100644
index 9e122cab62d8..000000000000
--- a/net-misc/openssh/openssh-9.6_p1-r1.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="
-	mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="
-	${RDEPEND}
-	!net-misc/openssh-contrib
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-# Weird dep construct for newer gcc-config for bug #872416
-BDEPEND="
-	dev-build/autoconf
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
-		>=sys-devel/clang-toolchain-symlinks-16-r1:*
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch"
-	"${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch"
-	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
-)
-
-pkg_pretend() {
-	local i enabled_eol_flags disabled_eol_flags
-	for i in hpn sctp X509; do
-		if has_version "net-misc/openssh[${i}]"; then
-			enabled_eol_flags+="${i},"
-			disabled_eol_flags+="-${i},"
-		fi
-	done
-
-	if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then
-		# Skip for binary packages entirely because of environment saving, bug #907892
-		[[ ${MERGE_TYPE} == binary ]] && return
-
-		ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore."
-		ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality,"
-		ewarn "since these USE flags required third-party patches that often trigger bugs"
-		ewarn "and are of questionable provenance."
-		ewarn
-		ewarn "If you must continue relying on this functionality, switch to"
-		ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your"
-		ewarn "world file first: 'emerge --deselect net-misc/openssh'"
-		ewarn
-		ewarn "In order to prevent loss of SSH remote login access, we will abort the build."
-		ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib"
-		ewarn "variant, when re-emerging you will have to set"
-		ewarn
-		ewarn "  OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
-
-		die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	[[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-
-		# --with-hardening adds the following in addition to flags we
-		# already set in our toolchain:
-		# * -ftrapv (which is broken with GCC anyway),
-		# * -ftrivial-auto-var-init=zero (which is nice, but not the end of
-		#    the world to not have)
-		# * -fzero-call-used-regs=used (history of miscompilations with
-		#    Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086,
-		#    gcc PR104820, gcc PR104817, gcc PR110934)).
-		#
-		# Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK,
-		# so we cannot just disable -fzero-call-used-regs=used.
-		#
-		# Therefore, just pass --without-hardening, given it doesn't negate
-		# our already hardened toolchain defaults, and avoids adding flags
-		# which are known-broken in both Clang and GCC and haven't been
-		# proven reliable.
-		--without-hardening
-
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with security-key security-key-builtin)
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230)
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
-	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
-	tc-is-clang && myconf+=( --without-hardening )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
-	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
-	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
-	# Send locale environment variables (bug #367017)
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM (bug #658540)
-	SendEnv COLORTERM
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
-	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
-	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
-	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
-	# Allow client to pass locale environment variables (bug #367017)
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM (bug #658540)
-	AcceptEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
-		UsePAM yes
-		# This interferes with PAM.
-		PasswordAuthentication no
-		# PAM can do its own handling of MOTD.
-		PrintMotd no
-		PrintLastLog no
-		EOF
-	fi
-
-	if use livecd ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
-		# Allow root login with password on livecds.
-		PermitRootLogin Yes
-		EOF
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
-	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
-			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
-			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
-			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
-			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
-			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
-			ewarn "set 'Restart=no' in your sshd unit file."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-}
diff --git a/net-misc/openssh/openssh-9.6_p1-r2.ebuild b/net-misc/openssh/openssh-9.6_p1-r2.ebuild
deleted file mode 100644
index dbbcd778f79e..000000000000
--- a/net-misc/openssh/openssh-9.6_p1-r2.ebuild
+++ /dev/null
@@ -1,397 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssh.org.asc
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="
-	mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="
-	${RDEPEND}
-	!net-misc/openssh-contrib
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-# Weird dep construct for newer gcc-config for bug #872416
-BDEPEND="
-	dev-build/autoconf
-	virtual/pkgconfig
-	|| (
-		>=sys-devel/gcc-config-2.6
-		>=sys-devel/clang-toolchain-symlinks-14-r1:14
-		>=sys-devel/clang-toolchain-symlinks-15-r1:15
-		>=sys-devel/clang-toolchain-symlinks-16-r1:*
-	)
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch"
-	"${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch"
-	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
-	"${FILESDIR}/${PN}-9.4_p1-Allow-MAP_NORESERVE-in-sandbox-seccomp-filter-maps.patch"
-)
-
-pkg_pretend() {
-	local i enabled_eol_flags disabled_eol_flags
-	for i in hpn sctp X509; do
-		if has_version "net-misc/openssh[${i}]"; then
-			enabled_eol_flags+="${i},"
-			disabled_eol_flags+="-${i},"
-		fi
-	done
-
-	if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then
-		# Skip for binary packages entirely because of environment saving, bug #907892
-		[[ ${MERGE_TYPE} == binary ]] && return
-
-		ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore."
-		ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality,"
-		ewarn "since these USE flags required third-party patches that often trigger bugs"
-		ewarn "and are of questionable provenance."
-		ewarn
-		ewarn "If you must continue relying on this functionality, switch to"
-		ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your"
-		ewarn "world file first: 'emerge --deselect net-misc/openssh'"
-		ewarn
-		ewarn "In order to prevent loss of SSH remote login access, we will abort the build."
-		ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib"
-		ewarn "variant, when re-emerging you will have to set"
-		ewarn
-		ewarn "  OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
-
-		die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	[[ -d ${WORKDIR}/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	default
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-
-		# --with-hardening adds the following in addition to flags we
-		# already set in our toolchain:
-		# * -ftrapv (which is broken with GCC anyway),
-		# * -ftrivial-auto-var-init=zero (which is nice, but not the end of
-		#    the world to not have)
-		# * -fzero-call-used-regs=used (history of miscompilations with
-		#    Clang (bug #872548), ICEs on m68k (bug #920350, gcc PR113086,
-		#    gcc PR104820, gcc PR104817, gcc PR110934)).
-		#
-		# Furthermore, OSSH_CHECK_CFLAG_COMPILE does not use AC_CACHE_CHECK,
-		# so we cannot just disable -fzero-call-used-regs=used.
-		#
-		# Therefore, just pass --without-hardening, given it doesn't negate
-		# our already hardened toolchain defaults, and avoids adding flags
-		# which are known-broken in both Clang and GCC and haven't been
-		# proven reliable.
-		--without-hardening
-
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with security-key security-key-builtin)
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE (bug #753230)
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
-	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
-	tc-is-clang && myconf+=( --without-hardening )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
-	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
-	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
-	# Send locale environment variables (bug #367017)
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM (bug #658540)
-	SendEnv COLORTERM
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
-	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
-	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
-	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-	EOF
-
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
-	# Allow client to pass locale environment variables (bug #367017)
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM (bug #658540)
-	AcceptEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
-		UsePAM yes
-		# This interferes with PAM.
-		PasswordAuthentication no
-		# PAM can do its own handling of MOTD.
-		PrintMotd no
-		PrintLastLog no
-		EOF
-	fi
-
-	if use livecd ; then
-		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
-		# Allow root login with password on livecds.
-		PermitRootLogin Yes
-		EOF
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.socket
-	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
-	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
-			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
-			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
-			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
-			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
-			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
-			ewarn "set 'Restart=no' in your sshd unit file."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-}
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index 210287fe6939..a52fa8d8bb0a 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,3 +1,3 @@
 DIST socket-burst-dampener-1.3.1.tar.gz 6248 BLAKE2B 1aa80e64d72eb76c46b7212f3cccc35d13de35390702e71f8f9599bd1d502591f33da0ba139d47870c68e74102fed03d83d1636d21cb07a2f33ab8798465fcc7 SHA512 18b9ea1e7879c5ccea8ae531ab349516ec018bac3f07b6b491a7595bae490c8de96b2cf637f94603dd552374e09c5927abcaf605dc363137d7ff6cd0244eab6d
-EBUILD socket-burst-dampener-1.3.1-r1.ebuild 602 BLAKE2B 43be51efb98751f08c235d346abcc830f6def532464310fdec43f383b6485e56baeadcf0d8b1c2c95d2c0eb04dcc2dfb4b988f2f5a67ba41a73b02d10a74f798 SHA512 e18ae70f2fb6841fd5622a31187bc66c7fd9c93656de48bcedadd806d2eb9436446c3d6c651ba9da57e1d94f9077b10f0a4fb87cde8180dc4c957762ec6a4f6a
+EBUILD socket-burst-dampener-1.3.1-r1.ebuild 603 BLAKE2B 744706b3062b4da854362e013b65c6a92f58f01eea148228af06e357ea13d952bc6930cbf4d7544be69897db246307a83336261db95d8d04880649ae70aebb24 SHA512 00fe7a3685f566a65ac525c3aced6022822089a9f81ff2fad98ff07e291384a06370863cc9ce135f0f97195642fd0b8a4a10d57568893d128d91881bb8d995e0
 MISC metadata.xml 396 BLAKE2B 4ec6460fc6f45a7d7edaf860ca5547a69c7b9bacb0380dc6f8f5d5ef0fe88503ef78a3580b9328690e632e4b65078c2d11404f7a07b7105909a1999d747445b3 SHA512 1958a98220f9e3ba8e8df7b644d685ba42d88ef4584f5996f30ba29abb7452f03337110e6826f650cfa014ad4637287ea85f19021595debb4216cb04b05922d2
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
index 784e8b2cbbec..66b660705e66 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYPI_NO_NORMALIZE=1
 inherit distutils-r1 pypi
 
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 455f0ac13c1e..2c090bb148e2 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,8 +1,11 @@
+AUX streamlink-6.7.2-validator.patch 2637 BLAKE2B 91b6c0f12b584c0908f0d4092d87cb50feefbdc3ff563d7585c5713547ffbb54614b7970435664d3a0cae7c1b7ae69edaa7bd15ff19a4169c9bc5ff02f0edfe5 SHA512 fe9d12e5d7bbdee7f778ac344494ec0fca6489509a92627b6305b425d1f594337a8b495c61c87f90356a9aaf97996b6b9b2b804f1b08f1ca3358ad2dec1cdea8
 DIST streamlink-6.5.1.tar.gz 717297 BLAKE2B 7f24a9ac2e62ff08d2126e4aceda75cbd46d78de08784336dd3b4d7608cd7885a5dca28bd9dda9f8c217b9cc428f8f50f09d0c45e470e0d3534ecd3effb2a95f SHA512 b31b34a2ef510d47d396b12b770c042bed24ff61835db6a654722803ae94e8371aa547f30bf20d7cf34d737ed9bd59bcea1bb1810e926cfc7ae3fa72f38881d8
 DIST streamlink-6.6.2.tar.gz 737076 BLAKE2B f1603c292cbb1135534d34b89bad3d859194a9d9b602aafc05e38d901071b77a92fc054387081a4579a4504642d33454427ee239def80a8ec0b50f901dab05ab SHA512 727fbd6bbf03a55a468b625984abe3d7f1792aaab11b2a55d5b0526454cc1959d7bfb3579526eb9e7493a44277302e6f40556f3ad99509751f950d49605b60db
 DIST streamlink-6.7.2.tar.gz 741037 BLAKE2B b6ecea883a8b09e524a28ebdee083bb5f1e563605ef16fb3adebba03194ad3f1d8f9dc902cfe80372dc53c5778f1ddc9695680b5cd4a87277b646fc15fffd7e2 SHA512 251e0b03c39dae980367e8a5b6ffcb1c279b0874eeaeff31d9d4486917b759ef27ba2bd5bba0bc74691237e429981f3748002e0ef49befe8c7be69160856ecfe
+DIST streamlink-6.7.3.tar.gz 742832 BLAKE2B 5f03a036c3f2170d25e43618f36d7b937e8063f15a965f45d8cc6033b49899b15c19af23aa2a845f8aec74341932721b792dad6bff70400f0dea24a19f1415ed SHA512 0955faab177bcdd0f66500f837124bf0f426829cb5c847fa18bb85aa3fcd7c27a750bab13f3e247b5187e9561713330b582b10729d82984d98081856e976ae65
 EBUILD streamlink-6.5.1.ebuild 2195 BLAKE2B 402b5052819b75766701fca53fcef174031ecabf1546cef2ae582183601321af449089df87fceac39f799cf1ec1005ceb5d8681268b33d3b9d4bf5e36a5868c9 SHA512 0a3c651ec9ea507e721fd819a7cb4fede850cc7a6fe001002cf5087e554515deb6816d0c7da8f673ab95795d22a5d0f6a3a11c615ea29fa5bef8fce0a1c5026d
 EBUILD streamlink-6.6.2.ebuild 2196 BLAKE2B 8ef3951cba5995da90a9964a29f231a62939d9a154375757d48eb2227fedcc0b5f07ebcc3215ba281d9485a4c902ef0d9a7e648cfccd7b929b2ab667d758de97 SHA512 8a6282c96ed33721631aa2fcaee5caf424881090b5c2406a44bd4ec355d92e41ec93fb3f9daf4124e3f67e024e435fa48f03a65a534485fa5bc406dfb3c3bc39
-EBUILD streamlink-6.7.2.ebuild 3538 BLAKE2B 25640c8c168c175ed71a88ccb76edf58d60901ad265ac483e2600a0d7c69ee5bdb2b5f791a6d4545be5717a43db7e18bbdb9d24ff1bad75ff9687d099a125460 SHA512 c2a52cd668d9dbdb4aef0230f244044e135e852095b9ead7bda578b3f9ddb905506733daa4035c30c0b8585e7c22dadb7609486e537f7ec29feecfdfb2163226
-EBUILD streamlink-9999.ebuild 3538 BLAKE2B 25640c8c168c175ed71a88ccb76edf58d60901ad265ac483e2600a0d7c69ee5bdb2b5f791a6d4545be5717a43db7e18bbdb9d24ff1bad75ff9687d099a125460 SHA512 c2a52cd668d9dbdb4aef0230f244044e135e852095b9ead7bda578b3f9ddb905506733daa4035c30c0b8585e7c22dadb7609486e537f7ec29feecfdfb2163226
+EBUILD streamlink-6.7.2-r1.ebuild 3587 BLAKE2B c15e6c3b815d8fe77a3c98a80e814cbb15dd23cb0aefd0b65022a373b8228ce9675c7caf2edf02e1b584ad417ca0939524f9b0d8f9d8dd08edcbfbe139e87feb SHA512 6a1860f4f05afafaed455cf89784071de9920ea0fb80e8316599b303cb69c820a454ff1a2857fa8126ded5735b646985029533be3d3ad9264039ab3925be758c
+EBUILD streamlink-6.7.3.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
+EBUILD streamlink-9999.ebuild 3512 BLAKE2B 5b466bef6616009eeb15735d85b32d32d967a1b8ff17e6e04e2ee8d96f072fb72bdae3f5c554619ff2de438826c87b2af46bbdb7eb55ab74142b75f6b480d6e1 SHA512 8ad3b8d227b37aec93ca0f76b305a0e43afefae55ff3c2c1a963ced7d4e532c5199769005ef5361d2ec8e72946dc98e17e14fae6313be78423e15f4f7e18a55e
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/files/streamlink-6.7.2-validator.patch b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
new file mode 100644
index 000000000000..8dc69d62616a
--- /dev/null
+++ b/net-misc/streamlink/files/streamlink-6.7.2-validator.patch
@@ -0,0 +1,61 @@
+https://github.com/streamlink/streamlink/pull/5932
+https://github.com/streamlink/streamlink/commit/0466622dc0bd13db972f6a00d2e2bda31ad50229
+
+Quoting the PR:
+"""
+Since Python 3.11.9 / 3.12.3 / 3.13.0a6, urllib.parse.parse_qsl() now raises a TypeError
+if the input is not a str, is truthy and can't be passed to memoryview(), like integers for example,
+hence the test failure which previously just checked an invalid input to that validation schema.
+"""
+
+From 51c13ddd45f83384cf7800a881127ad74dec3bb8 Mon Sep 17 00:00:00 2001
+From: bastimeyer <mail@bastimeyer.de>
+Date: Tue, 9 Apr 2024 21:36:03 +0200
+Subject: [PATCH] plugin.api.validate: check parse_qsd() input type
+
+---
+ src/streamlink/plugin/api/validate/_validators.py |  6 +++++-
+ tests/test_api_validate.py                        | 11 +++++++++--
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/streamlink/plugin/api/validate/_validators.py b/src/streamlink/plugin/api/validate/_validators.py
+index 69135b74919..e99d305733f 100644
+--- a/src/streamlink/plugin/api/validate/_validators.py
++++ b/src/streamlink/plugin/api/validate/_validators.py
+@@ -651,4 +651,8 @@ def validator_parse_qsd(*args, **kwargs) -> TransformSchema:
+     :raise ValidationError: On parsing error
+     """
+ 
+-    return TransformSchema(_parse_qsd, *args, **kwargs, exception=ValidationError, schema=None)
++    def parser(*_args, **_kwargs):
++        validate(AnySchema(str, bytes), _args[0])
++        return _parse_qsd(*_args, **_kwargs, exception=ValidationError, schema=None)
++
++    return TransformSchema(parser, *args, **kwargs)
+diff --git a/tests/test_api_validate.py b/tests/test_api_validate.py
+index ceff9bc1dde..c328116d27b 100644
+--- a/tests/test_api_validate.py
++++ b/tests/test_api_validate.py
+@@ -1343,13 +1343,20 @@ def test_success(self):
+             validate.parse_qsd(),
+             "foo=bar&foo=baz&qux=quux",
+         ) == {"foo": "baz", "qux": "quux"}
++        assert validate.validate(
++            validate.parse_qsd(),
++            b"foo=bar&foo=baz&qux=quux",
++        ) == {b"foo": b"baz", b"qux": b"quux"}
+ 
+     def test_failure(self):
+         with pytest.raises(ValidationError) as cm:
+             validate.validate(validate.parse_qsd(), 123)
+         assert_validationerror(cm.value, """
+-            ValidationError:
+-              Unable to parse query string: 'int' object has no attribute 'decode' (123)
++            ValidationError(AnySchema):
++              ValidationError(type):
++                Type of 123 should be str, but is int
++              ValidationError(type):
++                Type of 123 should be bytes, but is int
+         """)
+ 
+ 
diff --git a/net-misc/streamlink/streamlink-6.7.2.ebuild b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
index 77cb4490795c..2f0f40037611 100644
--- a/net-misc/streamlink/streamlink-6.7.2.ebuild
+++ b/net-misc/streamlink/streamlink-6.7.2-r1.ebuild
@@ -73,6 +73,10 @@ if [[ ${PV} == 9999* ]]; then
 	"
 fi
 
+PATCHES=(
+	"${FILESDIR}"/${P}-validator.patch
+)
+
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/net-misc/streamlink/streamlink-6.7.3.ebuild b/net-misc/streamlink/streamlink-6.7.3.ebuild
new file mode 100644
index 000000000000..b224e1c5387a
--- /dev/null
+++ b/net-misc/streamlink/streamlink-6.7.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
+# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
+# See https://github.com/streamlink/streamlink/pull/5895 re exceptiongroup dep
+RDEPEND="
+	media-video/ffmpeg
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		|| (
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		)
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
+		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+if [[ ${PV} == 9999* ]]; then
+	RDEPEND+="
+		$(python_gen_cond_dep '
+			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		')
+	"
+fi
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip tests requiring <dev-python/pytest-8.0.0
+	# https://github.com/streamlink/streamlink/pull/5901
+	EPYTEST_DESELECT+=(
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception
+		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_error
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_detach
+		tests/webbrowser/cdp/test_client.py::TestNavigate::test_error
+		tests/webbrowser/cdp/test_connection.py::TestCreateConnection::test_failure
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_invalid_json
+		tests/webbrowser/cdp/test_connection.py::TestReaderError::test_unknown_session_id
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Default timeout, response not in time]'
+		'tests/webbrowser/cdp/test_connection.py::TestSend::test_timeout[Custom timeout, response not in time]'
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_bad_command
+		tests/webbrowser/cdp/test_connection.py::TestSend::test_result_exception
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_error
+		tests/webbrowser/cdp/test_connection.py::TestHandleCmdResponse::test_response_no_result
+	)
+
+	epytest
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 77cb4490795c..b224e1c5387a 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -76,7 +76,7 @@ fi
 distutils_enable_tests pytest
 
 python_test() {
-	# Skip tests requiring <dev-python/pytest-8.0.0 which is currently masked
+	# Skip tests requiring <dev-python/pytest-8.0.0
 	# https://github.com/streamlink/streamlink/pull/5901
 	EPYTEST_DESELECT+=(
 		tests/webbrowser/cdp/test_client.py::TestEvaluate::test_exception
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index d51a01d3c0d7..e492823a5481 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,7 @@
 DIST wget-1.21.4.tar.gz 5059591 BLAKE2B ced6fb9a20343d41e4d8e0c8f171c60535847504fa4c32abc81d104a1594dc7b7c97b5b301836e31dacc7a0f2155c0a2e70e42ff60dc3fa471deb1dad33ba736 SHA512 7a1539045174f6b97ab6980811c2ac1799edc20db72987b5ba9b1710cffb19669a7736813d15c8da3aa2d4a384246ff946b77ecb0baeb6fd3e12ae591f1bf6a3
 DIST wget-1.21.4.tar.gz.sig 854 BLAKE2B 162c4f358e781bbfb0fa73910191c29dd411f48c9b2c8e8fe00a12741153e624955393d769aa7311b03115d04b6b946a84b636f643d7cdc8c8cd81387b9cf143 SHA512 72603493c2d799dca08700175a2010d8736fd6d3cb9bea3987db8814e9f133ab0fbd1477892115f7fbbd1a7d4d416ec370bdbff6dbe8f00d1eea84f0c4f8d84b
+DIST wget-1.24.5.tar.gz 5182521 BLAKE2B d33274d599f91384c2a7db0b145ec6b315cf87cbbd02026d686a79220e3f15ca9ad0f9d8b507895f6c8486b7ac2ae5fa5c9ea010e883b6eec68d3aba038b02de SHA512 572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d
+DIST wget-1.24.5.tar.gz.sig 854 BLAKE2B 67c084cb8dcbe6184c58203afe11c7426be1f190a6073a68aa658f8480f7046786eb70e47fed4c45b86ea1fda0812a401f530dafd9be816d33d46d54b90223d2 SHA512 f819dc43a466682ace38e8537698e3c7c3919203f77373bdaea1b63ead40c4d3663590209dfeb6187d98edd00e30848a3abd5735795fb47878924f1d9b2ee10d
 EBUILD wget-1.21.4.ebuild 3171 BLAKE2B 3bd335a9f22114d225645bd158d57f8452554dca84bd716827e26066cefda1ba8a3b846630cbaff77bc7f33a1c5651a436da693d582f984680c5583e7d135ad8 SHA512 87ac0d94dec8cd39a2357b87986a28623b49107026584b22f655c31485e13dcf71a8600a283bf8661eb9dad44e6de554cdd58e520e35370d11d71a812db9121b
-MISC metadata.xml 803 BLAKE2B 9bdb761fa36afd7a03f4631ed314230776de4af2c3e153a3631ee8f9e801233e44abe68ba5ec874bcfaef53d2cb1100a671768169d58d6e2c96387be5210abc9 SHA512 4ddbdc883a155f4eddeb5cd6e031b4824f1f50586ceaedd1b72a8d2ce9d3dffe440a0554e4a9a07f1295f79a5958bcb533ae324919c64daf77caff577318dfc1
+EBUILD wget-1.24.5.ebuild 3327 BLAKE2B f373e71a737b147143fc0c21f2cd358416e86aee8d2120ea7bdb4f13c2dcdf668a3e99181ebf7c7158400fe0d0d6b9a756c7e3478ad7f848388ea3a7fe2f23c0 SHA512 512744a4c3fc7d227416fd7f4cf82c8d5c6752f6200856b68b07a076420c805ef0d7dbf210312da3ebe532e68489f47acf722f5f3e70e7620de668e1ca6fbd97
+MISC metadata.xml 925 BLAKE2B 6a009c4883a765ab687cb5a77339e20bf314e2edc6eb7ca4a2e95296bc2457de9523877df6bc4cd57bd32fdeee182dd356123d49626cb0b321939d37f15c3ace SHA512 cb256297bf62ead8c3841a9186813b0b7230a4078150fc644eb09e94bc7e5588003369a0e03a8530ed5dff893bbac06b2d6d6feec8a20fd9871e4661400e030a
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 07aa81b0e850..bc5cb81f4837 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="cookie-check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag>
+		<flag name="libproxy">Support for automatic proxy configuration management through <pkg>net-libs/libproxy</pkg>.</flag>
 		<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
 		<flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
 		<flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
diff --git a/net-misc/wget/wget-1.24.5.ebuild b/net-misc/wget/wget-1.24.5.ebuild
new file mode 100644
index 000000000000..81f8f939140c
--- /dev/null
+++ b/net-misc/wget/wget-1.24.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc
+inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.gz.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="cookie-check debug gnutls idn ipv6 libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+RESTRICT="!test? ( test )"
+
+# * Force a newer libidn2 to avoid libunistring deps. #bug #612498
+# * Metalink can use gpgme automagically (so let's always depend on it)
+# for signed metalink resources.
+LIB_DEPEND="
+	cookie-check? ( net-libs/libpsl )
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	libproxy? ( net-libs/libproxy )
+	metalink? (
+		app-crypt/gpgme
+		media-libs/libmetalink
+	)
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:=[static-libs(+)] )
+		!gnutls? ( dev-libs/openssl:=[static-libs(+)] )
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	dev-lang/perl
+	sys-apps/texinfo
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		>=dev-perl/HTTP-Daemon-6.60.0
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-wget-20240415 )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README )
+
+# gnulib FPs
+QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. # bug #612498
+	local myeconfargs=(
+		ac_cv_libunistring=no
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with cookie-check libpsl)
+		$(use_enable idn iri)
+		$(use_enable libproxy)
+		$(use_with metalink)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index 98472152b943..539e66e14c66 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,4 +1,6 @@
 AUX ytmdl-2023.11.26-data_files.patch 208 BLAKE2B 51cb77162812f798ce73d3d71d7a1ad113c047b3ed1e75747d09017b400353dc1fd7bd13ab180ad2e33f4d5c52c65330ff841240677b89da45c85e57a4328993 SHA512 66e6b4177c64232878c5ff04d09a931e0d3a51d0f797f5e2186d3c2870f606c6ac54a367abf90fb3805018f01f6ddb79065aa3a543171f1d1cbcc06e813f910c
 DIST ytmdl-2023.11.26.gh.tar.gz 1120208 BLAKE2B 145f8e24305f4978f1ed0655e5511c6b17b94ea23301309c31bbafaec60b2184216ef0866aed478eda95763ab4ec0cd43eac176acf849871e58c3505b09ea231 SHA512 df8ed294f0092d4078fba8b64abcd2524e0d8331a42dfee6e1869e3a418cf2d54f95d7c300d83e4392295ea4116ec989d418b0292b0895ef474bf93338a980e7
+DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760
 EBUILD ytmdl-2023.11.26-r1.ebuild 1645 BLAKE2B 32762cca3ee9918b8f206f10353242c41b22ab82ad6226c1e7f2038c2bf6773578c008dd5ecc26b48677f706354ff64ce073da8173e481d7592136625595f34b SHA512 b2b3b90c78bf4b6b07e38e1e625dd6e67ece37e64bc8e9bda10fc797651f2bf88a6b06841b1e0dd817185d0262bf41e88d93a1704c199904bab416c5ea25df1b
+EBUILD ytmdl-2024.04.14.ebuild 1645 BLAKE2B 96462c1dfeabb5978dbbed84031339acfaabb4c3b523eb4f85ebf3f65200701018cf59ca3809f011af84574a5312e26ef35097cfe1ab66013b9545d801cf080a SHA512 e42eed2725161b02bd80d254ae13998e0bf91508e5152c9d5d2ae20a9def96a81146e8fc16eae9c617e77d200fc38a7140369ca3823f225de069be5bf6a12ff6
 MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
new file mode 100644
index 000000000000..605d4eb28f65
--- /dev/null
+++ b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1 edo
+
+DESCRIPTION="Simple app to get songs from youtube in mp3 format"
+HOMEPAGE="https://ytmdl.deepjyoti30.dev/
+	https://github.com/deepjyoti30/ytmdl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git"
+else
+	SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
+	dev-python/itunespy[${PYTHON_USEDEP}]
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/pyDes[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/rich[${PYTHON_USEDEP}]
+	dev-python/simber[${PYTHON_USEDEP}]
+	dev-python/spotipy[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/youtube-search-python[${PYTHON_USEDEP}]
+	dev-python/ytmusicapi[${PYTHON_USEDEP}]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	net-misc/downloader-cli[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" )
+
+python_compile() {
+	distutils-r1_python_compile
+
+	edo "${EPYTHON}" ./utils/completion.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp "${PN}.bash" "${PN}"
+}
author	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-04-15 12:04:03 +0100
commit	7fa8a1e3f149eea4c844c47cfe26136ed7614c58 (patch)
tree	e514d1b9999d088064bee1e34a3a3c500d6d7a07 /net-misc
parent	d993571e2ee444d08f4e9e90d493ee37338657e3 (diff)