gentoo auto-resync : 22:12:2022 - 01:55:45

27 files changed, 302 insertions, 987 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 60de3db4e7fd..522b6c5c5120 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 405be38851d2..2892db6ecb8a 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,16 +1,11 @@
 AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
-AUX chrony-4.2-seccomp-rseq.patch 1111 BLAKE2B 625d93528c11d4fc37a6ec4f7d32c80940ea33976e9b351c519cccfa1de81b3ddef74cad5a85f28c7196ff169cf14f3ff91704c7278444a6abca0e679d9ca0f4 SHA512 bcb9d17345043049c9990a3939d97100a4be6d17ff23851b3a61b929dd9ea4421ad9f5e7e3adb79675dab8a854a9a2a7f9ddbefc8dea294c7d5639c19e6169b1
 AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
-AUX chrony-4.2-test-mawk.patch 1219 BLAKE2B 7cc8d36de7879a500006e6a31d6dde77343616358e6d135efc80181f97fed5e81ada2b5d0ee4ac2d125cf828ac94a0894ffe40ec09ffb5328bf9b8cb71addd24 SHA512 69a9e1bd7c632ecf98992840d2b8aa5bd6e9ac3e7a67485ad9b59286414509001e71c47638059ebfcb952d17e7b6e754d74950dd0ebbdb265c8127e06bb94f34
 AUX chrony-4.3-strict-prototypes-clang16.patch 1771 BLAKE2B 8da00e991a6ca8c62caa9d31f5d12b311eac0fc400048e8423c5ef689a04fe305668a0fa375726f0ae15c905ef82f0024e0254fe524f31b9a0bad620b8a1bcdf SHA512 24b3f18db7f92d581940eddfb6e25a0955e17402dbd48a0413be828c2bc4d56441e91eaeaf44595956f258509acb373f4c277926f1c8ec54139bc15dee82dd92
 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
-DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
-DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
 DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df
 DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7
-EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
 EBUILD chrony-4.3-r2.ebuild 6863 BLAKE2B e178e5adb7433480d05f1ce9446cd27c2f93ed6c822a16ce0814ee2d0fee97e31e49eb29d052747fc88be31f09067f70c9ce7e20f35756f3efc304960eb2dc81 SHA512 d78c1c509404ecd9deb35e6912db2daa272e35b67b46dfd231fdd288ab9432daaa6a17485fb1d3eca6ec9cfd652fecb25189527cca8a7ff9d632395c23d1b128
 EBUILD chrony-9999.ebuild 6733 BLAKE2B cb8d7772b290da4aa82645073b2337a4f0684834e93d258ea5189708ad76d123d9401b6e0dd02a52277854e2a8bb3e26f3a323adb7359b0c2bc7d71c78934ca5 SHA512 8cbfeefb39b8cee35d02192aa09258c30a2204eba9ada5eb7b7e7c9707885bdb49ae550065ab8283a0482626f0826b625363793bf0f758c751cac06fb4f9a738
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.2-r1.ebuild b/net-misc/chrony/chrony-4.2-r1.ebuild
deleted file mode 100644
index 1662b4d302a7..000000000000
--- a/net-misc/chrony/chrony-4.2-r1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
-	inherit verify-sig
-
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
-
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-	fi
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
-# nettle > nss > libtomcrypt in configure
-REQUIRED_USE="
-	sechash? ( || ( nettle nss libtomcrypt ) )
-	nettle? ( !nss )
-	nss? ( !nettle )
-	libtomcrypt? ( !nettle !nss )
-	!sechash? ( !nss )
-	!sechash? ( !nts? ( !nettle ) )
-"
-
-DEPEND="
-	caps? (
-		acct-group/ntp
-		acct-user/ntp
-		sys-libs/libcap
-	)
-	libedit? ( dev-libs/libedit )
-	!libedit? ( sys-libs/readline:= )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss:= )
-	nts? ( net-libs/gnutls:= )
-	pps? ( net-misc/pps-tools )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-BDEPEND="
-	html? ( dev-ruby/asciidoctor )
-	nts? ( virtual/pkgconfig )
-	sechash? (
-		nettle? ( virtual/pkgconfig )
-		nss? ( virtual/pkgconfig )
-	)
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	# Needed for doc generation in 9999
-	REQUIRED_USE+=" html"
-	BDEPEND+=" virtual/w3m"
-else
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
-
-	"${FILESDIR}"/${P}-test-mawk.patch
-	"${FILESDIR}"/${P}-seccomp-rseq.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps ; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp ; then
-		sed -i \
-			-e 's/ -F 2//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	# Update from time to time with output from "date +%s"
-	# on a system that is time-synced.
-	export SOURCE_DATE_EPOCH=1607976314
-
-	# Not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-
-		$(usex caps '' '--disable-linuxcaps')
-		$(usex cmdmon '' '--disable-cmdmon')
-		$(usex debug '--enable-debug' '')
-		$(usex ipv6 '' '--disable-ipv6')
-		$(usex libedit '' '--without-editline')
-		$(usex libtomcrypt '' '--without-tomcrypt')
-		$(usex nettle '' '--without-nettle')
-		$(usex nss '' '--without-nss')
-		$(usex ntp '' '--disable-ntp')
-		$(usex nts '' '--disable-nts')
-		$(usex nts '' '--without-gnutls')
-		$(usex phc '' '--disable-phc')
-		$(usex pps '' '--disable-pps')
-		$(usex refclock '' '--disable-refclock')
-		$(usex rtc '' '--disable-rtc')
-		$(usex samba '--enable-ntp-signd' '')
-		$(usex sechash '' '--disable-sechash')
-
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-
-		${EXTRA_ECONF}
-	)
-
-	# Print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		# Uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html ; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps ; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		# bug #711058
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=0
-	HAD_SECCOMP=0
-	HAD_PRE_NEW_SECCOMP_LEVEL=0
-
-	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
-	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
-	if has_version 'net-misc/chrony[caps]' ; then
-		HAD_CAPS=1
-	fi
-
-	if has_version 'net-misc/chrony[seccomp]' ; then
-		HAD_SECCOMP=1
-	fi
-
-	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
-		# This version introduced a new filter level: -F 2
-		# It's a limited set of seccomp filters designed to be 'bare minimum'
-		HAD_PRE_NEW_SECCOMP_LEVEL=1
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
-			# bug #719876
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-			ewarn "This is necessary for chrony to drop privileges"
-		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
-		fi
-	fi
-
-	# See bug #783915 for general discussion on enabling seccomp filtering
-	# by default.
-	local show_seccomp_enable_msg=0
-
-	# Was seccomp disabled before and now enabled?
-	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	# Are we coming from an old version without the new 'minimal' filter?
-	# (-F 2)
-	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
-		elog "To enable seccomp in a stricter mode, please modify:"
-		elog "- /etc/conf.d/chronyd for OpenRC"
-		elog "- systemctl edit chronyd for systemd"
-		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
-		elog "By default, we now use -F 2 which is a baseline/minimal filter."
-	fi
-}
diff --git a/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch
deleted file mode 100644
index e36a7b33186a..000000000000
--- a/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.tuxfamily.org/chrony/chrony.git/patch/?id=8bb8f15a7d049ed26c69d95087065b381f76ec4d
-
-From: Michael Hudson-Doyle <michael.hudson@canonical.com>
-Date: Wed, 9 Feb 2022 09:06:13 +0100
-Subject: sys_linux: allow rseq in seccomp filter
-
-Libc 2.35 will use rseq syscalls [1][2] by default and thereby
-break chrony in seccomp isolation.
-
-[1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/
-[2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html
-
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-
---- a/sys_linux.c
-+++ b/sys_linux.c
-@@ -497,6 +497,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
-     SCMP_SYS(getrlimit),
-     SCMP_SYS(getuid),
-     SCMP_SYS(getuid32),
-+#ifdef __NR_rseq
-+    SCMP_SYS(rseq),
-+#endif
-     SCMP_SYS(rt_sigaction),
-     SCMP_SYS(rt_sigreturn),
-     SCMP_SYS(rt_sigprocmask),
-cgit v0.10.2
diff --git a/net-misc/chrony/files/chrony-4.2-test-mawk.patch b/net-misc/chrony/files/chrony-4.2-test-mawk.patch
deleted file mode 100644
index 3e9e2eeb422d..000000000000
--- a/net-misc/chrony/files/chrony-4.2-test-mawk.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.tuxfamily.org/chrony/chrony.git/patch/?id=b61cbed6895fcd3eae4c8458a69995870a22a5e0
-
-From: Vincent Blut <vincent.debian@free.fr>
-Date: Wed, 12 Jan 2022 18:08:34 +0100
-Subject: test: ensure awk commands in 008-ntpera return an integer
-
-Some awk interpreters (e.g. mawk) print long integers in exponential
-notation skewing the test result.
-
---- a/test/simulation/008-ntpera
-+++ b/test/simulation/008-ntpera
-@@ -29,7 +29,7 @@ echo "$ntp_start" | grep -q '-' && test_skip
- 
- for time_offset in -1e-1 1e-1; do
- 	for start_offset in 0 "2^32 - $limit"; do
--		export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}")
-+		export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}")
- 		run_test || test_fail
- 		check_chronyd_exit || test_fail
- 		check_source_selection || test_fail
-@@ -38,7 +38,7 @@ for time_offset in -1e-1 1e-1; do
- 	done
- 
- 	for start_offset in -$limit "2^32"; do
--		export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}")
-+		export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}")
- 		run_test || test_fail
- 		check_chronyd_exit || test_fail
- 		check_source_selection || test_fail
-cgit v0.10.2
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index db21d035ae7d..9e62e54cb30b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,5 +7,8 @@ AUX curl-7.86.0-proxy-noproxy-tailmatching.patch 2302 BLAKE2B c4199bc1eb04c8c69f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce SHA512 18e03a3c00f22125e07bddb18becbf5acdca22baeb7b29f45ef189a5c56f95b2d51247813f7a9a90f04eb051739e9aa7d3a1c5be397bae75d763a2b918d1b656
 DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0
+DIST curl-7.87.0.tar.xz 2547932 BLAKE2B b272ec928c5ef1728434630d8910f58834327a30570913df9d47921a2810d002bd88b81371005197db857d3a53386420c1e28b1e463e6241d46c1e50fbce0c13 SHA512 aa125991592667280dce3788aabe81487cf8c55b0afc59d675cc30b76055bb7114f5380b4a0e3b6461a8f81bf9812fa26d493a85f7e01d84263d484a0d699ee7
+DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1375738bce04f4f331d35bafe99d1ca394ecf5943ede7cae040854b6d2b478fd305147eb7330f8d50e5d95c96 SHA512 0bcc12bafc4ae50d80128af2cf4bf1a1ec6018ebb8d5b9c49f52b51c0c25acc77e820858965656549ef43c1f923f4e5fe75b0a3523623154b4cfb9dc8a1d76e4
 EBUILD curl-7.86.0-r3.ebuild 8775 BLAKE2B 22e521fddcf34f1ec259e3bea7daa4a3ac929355511b9798865bbf89e0c98b740d03a9dd7a4f6efacd7cc03f75a14bfc7456eb89f8507934b47bf9f72da579f6 SHA512 94041a785f6b361e8e23f9972c5dc329e5159fc7fca2f2d4c43c1fcc063f06c35ea138d3b556f73ac0a7e6da2bbd1470aba0bbb94ab7be44c4ff627ee69e2127
+EBUILD curl-7.87.0.ebuild 8607 BLAKE2B 4fd6158ba90ab8bd68c3bb36141636f518e2bfa4fad56988d9eb7c7046dad7b2c60babfd152b0d1ec0486e4a7e92464cfd7a54b6c7af4ed914ea8f64c7e44eab SHA512 b78df721b6832f5087b90bbc3b334e23cf6628ee1d5108ea4a3f05f88d9edf53577575c97ee15786a7acec6684c798595b182e1e81d4509ab91f858cd8db8b87
 MISC metadata.xml 2158 BLAKE2B 2b99163e490c531d73aa8c62d428ff4e994537b140e159548d74d52a7c46a2b5e04c992a541298253464f7eaab447d7a680140aadc6b33ecd7d69c35b6aaf6c5 SHA512 a3313197aeedaa7f347e3b6b791d8e5e3bda4292225afcc457ec21cd883347c4cdccaeaa79a7c212e061fdb339be3706815d425d09d8511a4d984f9318164797
diff --git a/net-misc/curl/curl-7.87.0.ebuild b/net-misc/curl/curl-7.87.0.ebuild
new file mode 100644
index 000000000000..f804460a11c1
--- /dev/null
+++ b/net-misc/curl/curl-7.87.0.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
+	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
+IUSE+=" nghttp3 quiche"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+# Only one default ssl provider can be enabled
+REQUIRED_USE="
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			dev-libs/nss-pem
+			app-misc/ca-certificates
+		)
+		rustls? (
+			net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls )
+
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss --with-nss-deprecated )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls || use curl_ssl_rustls; then
+			einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		--without-msh3
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
+}
+
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can disable tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 464519651068..9b10a44d4bb9 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,39 +1,8 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
-DIST geoipupdate-4.8.0.tar.gz 33561 BLAKE2B 0553e52992243e9f4b2f098228810b2fc802ec312f6d41486088cef46170d23e23f936077b624e9587cf5a266629fe2bf6f9c8f025f63c00309f63151d270a1c SHA512 55a5ba2b0b92abfc1e7837206222702aaf98d2bd00494915426e02ead0004f5546f4e2abe99a914bebd41690b1253d7a2b19098c110882c5862a3bbf2092234a
 DIST geoipupdate-4.9.0-deps.tar.xz 2894004 BLAKE2B 2995d4f2f8632d232b156294cca8bd76f40373c948df9ca5b4813bf630923168063eb094de52582af5221950343b998afb50c97bfe9077cf952951b00e5b3349 SHA512 c83c05cd5063199b21b8eb621a80da8679ddac2881da53b6914a7cb1419a1a6ef8cabd62562722d61b7e5d05d93f430a707d4e082e126514bfad27537f4e3ff7
 DIST geoipupdate-4.9.0.tar.gz 36646 BLAKE2B 9eb5e16c39e8c599d3b0fa60804f179d1fb726c44f9f4ed4ed6ff3b853c31c9dece809dcd690e14157f1290c4a9088e696e967f3baeeb7f2762638c70aad6b6a SHA512 29d0639fe636885b1527b4cb795332c103c011d028ada80eb7b07805d91f575554fc0b9fa9a506c644236a2ceab5509f54f0cc1a03a300480350c520484d959c
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
-DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip 14710 BLAKE2B 0e469d2bd8959bb3b743637a7c88f9695342d66827fd4c372b67605082016619799e71b2a174c83bcbc3f72a0d816f123eec9d885146d6dd4f266482888ba7ed SHA512 9b42452b5fed988d4c786beb6fa65b0c277d5da64c0b74eb533647b792a2a8d9c68203409266e3a2402637f0decb28b131210cfaee1d3af792e557a1baa02a1f
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
-DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
-DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.zip 1496749 BLAKE2B 6f665574261f31847b1fafb76bf05483808610124bdf9bb22b976b93ef0d722a8cfd4892f48320ee0e7404b0876f65c37d945ce4466547d692d6fc00f4802c63 SHA512 604c6790250b7d05360cbd341cde88fc5c2a499bae119d51de5b073df0704089abd3b1536c5ef7008db7a5ef6dd8512824e77553ee8216134a2daa6cacb357c2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip 41507 BLAKE2B 1717646144575b87f757c60d60954498f6bbd58d166cfbf650fd16c7a96435f9a4ca93f775c47ac54348bf7416356b5a205f4683139aa59b3093c80a5236a93b SHA512 170b91617f7c7f85f2879c22bef923f2816702fe5774592711d1de1483d5f7359456f94a5a89b9f165d2c18d7ff00ce7b8b5c6d639b8647bdd0a8fa37f9f895a
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
-EBUILD geoipupdate-4.8.0.ebuild 2501 BLAKE2B b44809a76968ebe69cfb356bff4d9ba28a03e2fa232a426c11a01c546029b45ce3e80f28ee228e46e4bd36fd06f876ed36cd9e40c99ff06f71a5b652eb2ecbb0 SHA512 1be347521422bb71ea15db83b270062452087fbd759dd0caa452a7405609f342f912daa12b283b9a9207ba76a8a5b9133680e2333dc28d09be5dbff435b9dd46
 EBUILD geoipupdate-4.9.0.ebuild 1172 BLAKE2B b2f103b2a8ebb3c393941ee89ee1d9a65d9424e95394ccaa7274a8864849ed0f3577cfebf844ed33ec6fd3d6892511a20a2747fd413f4e0ff00d4ff7ebf3b721 SHA512 e35c5e850809341c25db52843ca9bf8531a7caa86d750607f32805ddb5e3c1018ac5d57616d50a0453b5addaa1f701bf8e363a667bfd0d1ef0f75c7e026700b2
 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
deleted file mode 100644
index 0a84de4d7aeb..000000000000
--- a/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGO_PN="github.com/maxmind/${PN}"
-EGO_SUM=(
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/gofrs/flock v0.8.1"
-	"github.com/gofrs/flock v0.8.1/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.7.0"
-	"github.com/stretchr/testify v1.7.0/go.mod"
-	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
-	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-)
-
-inherit go-module
-
-go-module_set_globals
-
-DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://github.com/maxmind/geoipupdate"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ppc64 ~s390 x86"
-
-DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
-
-# Do not let these leak from outside into the package
-export GOBIN= GOPATH= GOCODE=
-
-src_compile() {
-	# requires pandoc but the information is still in the distributed md files
-	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
-	#sed -i -e 's/go build/go build -x/' Makefile || die
-
-	# the horror, the horror ... but it's all automagic
-	export CONFFILE=/etc/GeoIP.conf
-	export DATADIR=/usr/share/GeoIP
-	export VERSION=${PV}
-	default
-}
-
-src_install() {
-	dobin build/geoipupdate
-
-	keepdir /usr/share/GeoIP
-
-	insinto /etc
-	doins build/GeoIP.conf
-
-	einstalldocs
-}
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index c65ea2fcccc8..76241c8dddea 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,14 +1,8 @@
 AUX htpdate.conf 359 BLAKE2B 7bcd2aa3e818ee31796e6f1e3b060cb6c04558fbfcfbdc51cd6b8d787e3cc91ac8870ffd9b95df390bda3c90dd9e186bb6fc2629f56073a97e88fd5dc1141bd6 SHA512 28940548bb15484430cbc63d16eeb03934e6de82cb9729e85450f595712be9caf96e1cb84c55d17dd05f33661c2b657d76bfa8b40a3e0f649a0070aeb8be678b
 AUX htpdate.init-r1 507 BLAKE2B facb31723331fd77ae24ff64753cc12c913e35b7ba97997925bd421164dd25d3820e4c7727e14389cd5372635afdf5cc8e313297679e74b3a65ab65f0c4a12b3 SHA512 d18a91792787fdcb4808da042025d60bbe19335fd8492b33af33d33bc24d250bcc65c8ead7d443e4d37a9ca61428361db7b418a5fb3256b030b02b9a772fe10f
-DIST htpdate-1.2.2.tar.gz 13625 BLAKE2B 11813def81e3cce1194120a21cf99e8ad288b0f604aab201850f03b6ca786d19792b9586c9d805aa1945bbc651e6afc5099b5c7cb6ea354473a4b3bab01397e3 SHA512 00d52b291004ddb3d0282aef78c5fbe5d9397dbf171a6646803ee7ba4bd0514af6089f7e48a92397dd1b0fbae5ba314f5165c9902028438e16d3516b65724de0
-DIST htpdate-1.3.3.tar.gz 16302 BLAKE2B eb19462e1e5d02fe3cda7f4d2c954e2fe4b8dfcc299dc9094466a8652250ce27d37b2cf85716435639580e48295a92ad65521e0420cecac875c9b6e8074d425a SHA512 5d4892ea3626b80e5d529de873f675616dfef156e91d1e574225f91f9496503f55da43aa4f3522cb2b55da7c41dba7d97b3cc557a2704945577ec0243d8bd7f8
 DIST htpdate-1.3.4.tar.gz 16312 BLAKE2B 9ebff6df6de69fa310a6459099cff2bf5ec28ac2bb486a29121b87b93505f6bb31b4debc510dc82b7d7b7cce217d9002ec7606fcf4fa863d7b2cfc78dfc6e8d5 SHA512 634317966f1e5c5d78a889a398e77f89505a5918efa076e2cd1184341f25d963b7f1c135afee7d5489bd8a20b2421d9dfea312e09b5e6bdd389626bfd4d2d960
-DIST htpdate-1.3.5.tar.gz 16661 BLAKE2B 063e5c46b86b6f99a500ff2054110b37157c11bd09b20db06d845b632a0e4d954f2f5cf8fd935f8fd8a69f0e64e0f3db1cb734fa24a77bf2b07855dd3fad9a3c SHA512 db1d237588e44e6eb113d046be2f68b5fac96cc7dc54b4522e1b61ca20a0ea3674265db03796fd6442fab58b82273e6a81ae3914c6d531e03f4fc5f65a3507e3
 DIST htpdate-1.3.6.tar.gz 16683 BLAKE2B ad6e689f64a2cff3e5a832d8ed6bfc85acc7ea99d16e6da5c1ff9052009b46b5ee5dfd113232908df17eb837470c47063be6b5cc91270d6301b78efab8f71ce5 SHA512 41b9ed50e962bb5c207122c4929d919ae4491a2d527f29aafb4a3ef175c3c12e608c77632037d48b5440e48ff051c89caf3e923987ad53329056b83838943439
-EBUILD htpdate-1.2.2.ebuild 1004 BLAKE2B 5a0491ca50a095a94ff339ab6343c7dae1d359609d3d1d0ec23fa58a2bf85875359e9e50f7e7df849cf84fcc10931c6ccaf18cb8341646ee99bedee7e218ac5e SHA512 0d627e3d4aef1a2f3924382af51207802784cc5cb7c36f3e8a97a9336d5ae398652a580d97567d2ee89e4f0bb885bd3d574fa7b0f6fc0c857bc5c45cc8d900b8
-EBUILD htpdate-1.3.3.ebuild 1419 BLAKE2B a7e6c5f37ad0f88439655367bbcf85c950cf39bea3bd01190773eefb3f89b27ae0d1a468fa584afa2b83633252972974b83eba241b3230ace191df593af1ad3f SHA512 997518b4bdebe852fe539813ba0024da6a2196f0cc0683dad8a901cc5d5c370f950d6b37ee3f6d12706b246e74167e243d0a1d07d7c55106cc805758054d18e1
 EBUILD htpdate-1.3.4.ebuild 1414 BLAKE2B c0d0500c858a917c0347d868318134192322827a8f4ec16d73c46e42e678f2aadb491c192cde9c1b59917df36f5af23194efb54776da6b421e65e0baeaf35407 SHA512 e4b1952a585c5b9d78ec0086539685e06a9d62fbd32125777f3e3e1e193db3d663abf1d5510768ea84c8a4afc0ddd742e0a3a340372ffa5e24cac298247498ec
-EBUILD htpdate-1.3.5.ebuild 1421 BLAKE2B f22a09569f62620ce0f96e981f10904bbf5a7228749bfe642bfd4759923cd779cec3aa71b0b9c63126d85378dd53e2070b776e464f4250e674aa1b7f6e258eca SHA512 22dc3f9bcf28ec5f2271247c56898402f389d1140a7f53527bc75df5d46bf035d2cbd5a3c6db92a715e560f9521cea0b02e81b2a61d6ef10525de8ee3c8e1663
 EBUILD htpdate-1.3.6.ebuild 1420 BLAKE2B 26f54699425e974227af733fe6c5601d840878f1f6d66da93ae8b928148502f31cd7e6ce8cdf95a776e70a01f6f7db70f776a8bb77de811f6eb36fd8bbaf3bc4 SHA512 eb564d2713e81d294aea681c332a556040fb0b147d8a6457b6cbd9d05e6e205cc9d1b6f151a28770daeac63c2cedb747c3a3978649d90f108c2a8d2da867e005
 EBUILD htpdate-9999.ebuild 1420 BLAKE2B 26f54699425e974227af733fe6c5601d840878f1f6d66da93ae8b928148502f31cd7e6ce8cdf95a776e70a01f6f7db70f776a8bb77de811f6eb36fd8bbaf3bc4 SHA512 eb564d2713e81d294aea681c332a556040fb0b147d8a6457b6cbd9d05e6e205cc9d1b6f151a28770daeac63c2cedb747c3a3978649d90f108c2a8d2da867e005
 MISC metadata.xml 248 BLAKE2B f5c045d2e881d6a26695acc21e8d807e3c2a728c0ea7b6ad9eabb8b12db116d77317d9aa4c70258f3bcac8417870aec65249dbadd1f708eaa20ef13f012c94de SHA512 6d323edff42767ba94ff43583a291a9d2133fc9a40563b112397f677ae458f729e160c7fbd93e4405575409c0f0e86ff2fac462ec6e14674ba577a9ac0fa326a
diff --git a/net-misc/htpdate/htpdate-1.2.2.ebuild b/net-misc/htpdate/htpdate-1.2.2.ebuild
deleted file mode 100644
index 4869d4ad827a..000000000000
--- a/net-misc/htpdate/htpdate-1.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="http://www.vervest.org/htp/"
-SRC_URI="http://www.vervest.org/htp/archive/c/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=""
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-src_prepare() {
-	default
-
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin htpdate
-	doman htpdate.8
-	dodoc README Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/htpdate/htpdate-1.3.3.ebuild b/net-misc/htpdate/htpdate-1.3.3.ebuild
deleted file mode 100644
index eedff8c28a70..000000000000
--- a/net-misc/htpdate/htpdate-1.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="https://www.vervest.org/htp/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
-else
-	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="+ssl"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-# Test suite tries to connect to the Internet
-RESTRICT="test"
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-PATCHES=(  )
-
-src_prepare() {
-	default
-
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-	# Don't compress man pages by default
-	sed '/gzip/d' -i Makefile || die
-}
-
-src_compile() {
-	emake CFLAGS="-Wall ${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-		$(usex ssl "https" '')
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install
-	dodoc README.md Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/htpdate/htpdate-1.3.5.ebuild b/net-misc/htpdate/htpdate-1.3.5.ebuild
deleted file mode 100644
index 51cf1b0a1728..000000000000
--- a/net-misc/htpdate/htpdate-1.3.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Synchronize local workstation with time offered by remote webservers"
-HOMEPAGE="https://www.vervest.org/htp/"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/twekkel/htpdate"
-else
-	SRC_URI="https://github.com/twekkel/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-# Test suite tries to connect to the Internet
-RESTRICT="test"
-
-DOC_CONTENTS="If you would like to run htpdate as a daemon, set
-appropriate http servers in /etc/conf.d/htpdate!"
-
-src_prepare() {
-	default
-
-	# Use more standard adjtimex() to fix uClibc builds.
-	sed -i 's:ntp_adjtime:adjtimex:g' htpdate.[8c] || die
-	# Don't compress man pages by default
-	sed '/gzip/d' -i Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="-Wall ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		$(usev ssl 'https')
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="/bin/true" bindir='$(prefix)/sbin' install
-	dodoc README.md Changelog
-
-	newconfd "${FILESDIR}"/htpdate.conf htpdate
-	newinitd "${FILESDIR}"/htpdate.init-r1 htpdate
-
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index d7a145f90cbf..1b8e65b8f49c 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -3,10 +3,6 @@ AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e1
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
 AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d24c4fa2b5b72426af5ee5ac57d40cfb2d1bc3ea6c1b253e1daaa341d998d66889bbc94c83d2438 SHA512 5b5aead569c842c2850fb0180b67beb87b4f0301e9e591d957089f5c659a30ef464fadd44a01f9b5476ff999368c3494c7dc7013db473d518721e5fab41cd054
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
-DIST lldpd-1.0.14.tar.gz 1979314 BLAKE2B 9e4dc2126eb07b09e42da07c1ddff9fd02a306404c45632cc80eb791e05cf07c0919a57fca2b91c6302ec01447213ed7f1b5a5bb14482b1f9c3a1fc501a0fdcb SHA512 268d85144fd06c70c9394acdbd92478b0ee3426beed76e48363f71e329681c57ab6bb1d7b313011e1243eeaaeb2b1f35085641bd86d6894c7d998d030d84b548
-DIST lldpd-1.0.15.tar.gz 1980892 BLAKE2B 40702bbe633e7214c73c61e3e811ebe2655480ba3ef0655371c2042798b61fb6066c0051c33fb81e80c17149a1ad94007b2d0562533d24a0d7505dc2fd5caa44 SHA512 c245421cd153be39756e15c379daa70529119a50e0db7fff82a1d7f892f527c6582783aedadf096a4e2ea6352befb7215cecae675bd605d5fcf55820a39a6791
 DIST lldpd-1.0.16.tar.gz 1967182 BLAKE2B 3a359ec6539087ab1ffa5e1f83b90cc375b047b6e404df21067621bac9c9e5bab4b04209e9111d72fc2486046fb1d4b6744c093342c908f9a6475cd0b5a33328 SHA512 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1
-EBUILD lldpd-1.0.14.ebuild 2238 BLAKE2B c25a78e5786a2cc77119e17b09ef5ebd2e2a87b2b77a2e5767637b450cb1335bd368f00aeef02aa65cf32037537dcabcacaece05133a98ea1d9cc985415f691b SHA512 6bde251d2a12c68245f8599c5d3a77ad3bd8d21b767f25de2e4f92cc06e4a3d19487ea90f7703554d373d6d6fbecd7e0ef82ea187c826c7492387e65fd450984
-EBUILD lldpd-1.0.15-r1.ebuild 2244 BLAKE2B b958f0b2b606810739746b78db2294a33542eab45a35b4f86816c3c8e040dee1a62aa93f585639ed0e3632a44ead0bac9045dbe3e2c7723bb0980466aac775c5 SHA512 b622a74680832ccb58af43a02008352bb3079c240d8e4e770b94176d17484d24ee79bb6b4244e3ab990a60cac9d85fef70eefdee871e02e8711a2a1854eea86f
 EBUILD lldpd-1.0.16.ebuild 2330 BLAKE2B 1055f1615104b97cb0b60187cbc0859fd3c2a787dac842c771942f874a6762d2b096a17984114fcf82a3f54d829c3815831df045ee450d9db2611cf0f0a23dc2 SHA512 063236742018f4f22c7d3fcf711a71de882181b315c6c51eb489e37437887962a7c9125179694ee5d689d0dafb7d97c0b8a3be670f96fad3ce6cb4c24fabba20
 MISC metadata.xml 2845 BLAKE2B 30a48fae80109b4f3a2afc8ff90dd103e33ade04d9ecfbe44fc2e43cb0fd9d8f0d54ed098e28fcffedab5f4276b5719c62497d7b39d40fd75f0e12f1e0dcb439 SHA512 e96fbb704401d871d83e9f11144a9259ae5e58bfcdcc98bc08e0199998044588485118f264adafc4927ed69bba2de7fd06dc6bdd2bb3357b90d903168685451a
diff --git a/net-misc/lldpd/lldpd-1.0.14.ebuild b/net-misc/lldpd/lldpd-1.0.14.ebuild
deleted file mode 100644
index 5347eee25f50..000000000000
--- a/net-misc/lldpd/lldpd-1.0.14.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.0"
-KEYWORDS="amd64 x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/lldpd
-	acct-user/lldpd
-	dev-libs/libbsd
-	>=dev-libs/libevent-2.1.11:=
-	sys-libs/readline:0=
-	seccomp? ( sys-libs/libseccomp:= )
-	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
-	xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-"
-BDEPEND="virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot] )
-		!graph? ( app-doc/doxygen )
-	)
-"
-
-REQUIRED_USE="graph? ( doc )"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/lldpd/lldpd-1.0.15-r1.ebuild b/net-misc/lldpd/lldpd-1.0.15-r1.ebuild
deleted file mode 100644
index 67e18d69dfca..000000000000
--- a/net-misc/lldpd/lldpd-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd bash-completion-r1 autotools tmpfiles
-
-DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
-HOMEPAGE="https://lldpd.github.io/"
-SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/4.9.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
-	seccomp sonmp snmp static-libs test readline xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/lldpd
-	acct-user/lldpd
-	dev-libs/libbsd
-	>=dev-libs/libevent-2.1.11:=
-	sys-libs/readline:0=
-	seccomp? ( sys-libs/libseccomp:= )
-	snmp? ( net-analyzer/net-snmp:=[extensible(+)] )
-	xml? ( dev-libs/libxml2:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )
-"
-BDEPEND="virtual/pkgconfig
-	doc? (
-		graph? ( app-doc/doxygen[dot,doc] )
-		!graph? ( app-doc/doxygen )
-	)
-"
-
-REQUIRED_USE="graph? ( doc )"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-embedded-libevent \
-		--with-privsep-user=${PN} \
-		--with-privsep-group=${PN} \
-		--with-privsep-chroot=/run/${PN} \
-		--with-lldpd-ctl-socket=/run/${PN}.socket \
-		--with-lldpd-pid-file=/run/${PN}.pid \
-		$(use_enable cdp) \
-		$(use_enable doc doxygen-man) \
-		$(use_enable doc doxygen-pdf) \
-		$(use_enable doc doxygen-html) \
-		$(use_enable dot1) \
-		$(use_enable dot3) \
-		$(use_enable edp) \
-		$(use_enable fdp) \
-		$(use_enable graph doxygen-dot) \
-		$(use_enable lldpmed) \
-		$(use_enable old-kernel oldies) \
-		$(use_enable sonmp) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		$(use_enable sanitizers) \
-		$(use_with seccomp) \
-		$(use_with snmp) \
-		$(use_with xml)
-}
-
-src_compile() {
-	emake
-	use doc && emake doxygen-doc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
-	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
-	newbashcomp src/client/completion/lldpcli lldpcli
-
-	use doc && dodoc -r doxygen/html
-
-	insinto /etc
-	doins "${FILESDIR}/lldpd.conf"
-	keepdir /etc/${PN}.d
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	newtmpfiles "${FILESDIR}"/tmpfilesd ${PN}.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index 3deafc323731..902e38bd4938 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -1,10 +1,6 @@
 AUX rdnssd.conf 80 BLAKE2B 481e66d63c6743780fa2f887ba990e71050dbc92dfe5d4db7ca7715a8b19abe388f0ca92d3cab4eab4c6f72f5c941d06b9bb4d2f421e73ccd6a0a61fe9dd9df8 SHA512 b9a806b24e0d466efbb633eeab0169c289475a50eb3cc627853a4b28dc97136a42988fbea0d71d8b0afe2dfe955c5b96c300607d6abf7a254beba4cefd486a57
-AUX rdnssd.rc 498 BLAKE2B 816d955e40052a1db7903f9382439264efd88e02cc227471606cf6adddbab2f394e670a46cef1f558b0cd010bebb51187a9163e6564a0a03d089c9a97846ed5e SHA512 802248045080ed1f9fc5936a1edd2f36accdc8189b694b9d44fa30e28a2a72ef763baf08c9eaae5214808f40192d775f9e2e2d20db40fe7a14634c280b80abf4
 AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b86364c501bd1e5eaccaf682f93ef38a4e18de4b2e955a98604bc5854054da5a31ef97cebde602 SHA512 0582ed315756d3e3c17d789252b3c68d1a7dfc6e74e600c0ea186775c976af447923cdc8182be23dd1418323503a91f8f82bc5068148a92bb40f9888a7c5cec2
-AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
-DIST ndisc6-1.0.5.tar.bz2 263243 BLAKE2B 638e47e2bb1671a0bdd53edafd65acc774f068442dd6ade398e8bcae5630353f64b753b04237443aa6a6ea27de36206359e93e308fe5e610a4133ed730d71dd1 SHA512 d2742fee8202da988fd6d2b4b811125a4ab786b645b96b3a1fcfe248a3d9a39706055cf499c6cc742decfa5c3dbcbaac28ae01a50b9ad3ec10906dd468fec47e
 DIST ndisc6-1.0.6.tar.bz2 262008 BLAKE2B b451f8a6f74fe0d30546152e9711055cb2d9fd1433a83f0fdcc57eba4f9eaf41705b03fcfcc14666906f90f3a450c2ef6e3d66faca5019106664dd96dd6d70cf SHA512 e9ce26d139c5cdcaac7a507c247ace5ba1d6bc95a92fbdb693788e463183965390a8228133a8bbbf07ba19eeae64c7a12ce13eb031c1a0c0c47b086d42c527ae
-EBUILD ndisc6-1.0.5.ebuild 749 BLAKE2B 7d7f3647238e0a2a42f584bb5ae1b20f6230b4f8fa3c823b008a0701f12ed527820c741479788fd7c96f6fe193bc81979887428792ae70e77a009617de0b05ce SHA512 64b2890d31f5bbc6bdd7db9ed59a8381df40f74ca29e98009282206442c6dd4b720dc2fb3ea3735dad54c5ff828b3d57ae3b024ab7e2c9e66b70a36b446b999a
 EBUILD ndisc6-1.0.6.ebuild 749 BLAKE2B 554f9c37243f3ae91995bfc34d8e11238fc6f6c8ea35badaa2c6eb476cc651c890d7c93e6b9ea6e52dcfb9f5d648229d75e6380e3bc6e008483d5455596b5508 SHA512 f1fae89736c76455830b67a9d438f403f5159ec866f5b24c07ad2ee95db0c4713d854f41c9bc6d1bcc41af93951251fc629412e3e805a62f46ff0688331bbca0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/ndisc6/files/rdnssd.rc b/net-misc/ndisc6/files/rdnssd.rc
deleted file mode 100644
index 3b8d64cd035d..000000000000
--- a/net-misc/ndisc6/files/rdnssd.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	before net
-	use logger
-}
-
-start() {
-	ebegin "Starting rdnssd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/rdnssd -- ${RDNSSD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping rdnssd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/rdnssd.pid
-	if [ -x /sbin/resolvconf ]; then 
- 		/sbin/resolvconf -f -d rdnssd || true
- 	fi
-	eend $?
-}
diff --git a/net-misc/ndisc6/files/resolvconf b/net-misc/ndisc6/files/resolvconf
deleted file mode 100644
index 335c6c2707df..000000000000
--- a/net-misc/ndisc6/files/resolvconf
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -x /sbin/resolvconf ]; then
-	exec /sbin/resolvconf -a rdnssd </var/run/rdnssd/resolv.conf
-else
-	exec "`dirname "$0"`"/merge-hook
-fi
diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
deleted file mode 100644
index 3e0dcf8b5974..000000000000
--- a/net-misc/ndisc6/ndisc6-1.0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
-HOMEPAGE="https://www.remlab.net/ndisc6/"
-SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos"
-IUSE="debug"
-
-BDEPEND="dev-lang/perl
-	sys-devel/gettext"
-
-src_configure() {
-	econf $(use_enable debug assert)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd
-
-	exeinto /etc/rdnssd
-	newexe "${FILESDIR}"/resolvconf-1 resolvconf
-	dodoc AUTHORS ChangeLog NEWS README
-
-	keepdir /var/lib/run/rdnssd
-}
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 956a0e5a419e..cc6340517863 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,5 +1,3 @@
-DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
 DIST sshpass-1.09.tar.gz 112857 BLAKE2B b19e1b7d057e286a895312c62453b9aa5369efb3c617bb24fc7b6b0e521d4c65fad091c68b93cda17aef8350c243bdc2c22d5d58590f6359715159d9dca57bae SHA512 9b4ba83ca4d34364e7c43e29f98493dc3d595d24dc68c2fe3c244600d92a0f8bc0a6a7f8f43d64c0b4d714eb196516f297d904fa66035a76dae89a3726c0f2ff
-EBUILD sshpass-1.06.ebuild 424 BLAKE2B ce3ebfd26ed91f6f178e7b243b0a7606703d3786888f71b124e95550a2a3fb5c62f7c2a81d16fe3866d8e1ca6f8a95535d7152ea79c315c10973528ae6b9e59a SHA512 cf54fa3510ef8fef7445f32f2d62350131362b046a8b45eb129610978d6c8863edb97a2e177108413f345f7ba780c9a532a1a930934dda6fb4958126efc1c364
 EBUILD sshpass-1.09.ebuild 416 BLAKE2B 7c94d8cab7415a5501d6fd635078844613268a705e68753326416494c4b508298831c34279332930a5ffd6c6db0ac99b44886b70cc0d5d5d88b2692b9841b497 SHA512 8c72ac293b39e6206c24a9a4ff14d3e29729cf9908ae7b483014ed6ec4a1cae10d1fc8081900e1ca2dcca911f50a2bdb78a2c85c93ec9f96859504549e1f23ae
 MISC metadata.xml 245 BLAKE2B 742dd0549c543a09d1713679990f7aed20165c67c2ecca674c272200e3d4f64d7f1b663d4669792dd476eeb7fc8960e87429f702ee1db96563fb816d3ef8ccee SHA512 f88712849405e0e495d0b476eeeb43814f569db2ec6a24b36ef8065f166c2cc977fbc4c64cf3a7fadf145bedbaa25af2ae3a280e6abaa29a7ad4a010c08f19c5
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
deleted file mode 100644
index 959558c9047c..000000000000
--- a/net-misc/sshpass/sshpass-1.06.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
-HOMEPAGE="https://sourceforge.net/projects/sshpass/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="net-misc/openssh"
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index eab50c76d0b2..e5da56a7f42c 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,8 +1,6 @@
 AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
 AUX sstp-client-1.0.17-fix-bashism-configure.ac.patch 1054 BLAKE2B 6c73460707247ec49d639d993b45f9dc6fc96df9cf2c8946bd222a305f4e818016ccfaf3d13985eccd0020bebcf8a22f2fff22964d97aadd8018c5b9b5d234fa SHA512 8aa8417ef1ae6df46fcf7328a979d75983ecf6c279dd972651bd0faec372a3ee952e4c6b3dd3318ea463a2a080a17f60303d637cf2e5c7d8b31069051eef35c7
-DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
 DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d SHA512 eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
-EBUILD sstp-client-1.0.12-r1.ebuild 1325 BLAKE2B 0965f2f89c3905ba02070d0a9fdec51b154e54a37d8c520067ae6f646af38a0ce534437aad6e11a2432ee6d4b5623d53272c4e4521adcd8cd8232cf197d055fe SHA512 e953a85ad8a62922b246bae364095c2894fad0d4355f5bcf14c8c84812d054317ece4c67af445d065f9bc1f288a6f62da66b4a845aad81d602b5c88fc635c2fc
 EBUILD sstp-client-1.0.17.ebuild 1399 BLAKE2B 567713b732fe24367ff18d27fa0a81180e34314833d7892040783da1e499a10129d4917224e42cd3738cbefacd03bb56e6baf630f8a9dd91c80ea9f1dbd80555 SHA512 e71d4fc2992050366596ca05c3be2b902adb27a0d0c5c171c8b3386a3528c3c26f926394acac3295e23345cd6db63a23d0f31319f53c5ec5b3d6d4af9a7bb7fb
 MISC metadata.xml 308 BLAKE2B 3a472844a5dc30193440521d7cba758d6c78b10528e9aee2d76491a526c94bc410376b9db50062de890819b553e5db25c6b596fa6e28432d1095153f3c498573 SHA512 75461a9b457611c5b72de5d80f75969cb63987c6b8e771d3c10b321c00c51fd1bbd06ad6e30c1d9e8a8867320191fd7213ee80cd5adbee35f44226e227a4109c
diff --git a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild
deleted file mode 100644
index 9fb40250d367..000000000000
--- a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
-HOMEPAGE="http://sstp-client.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="static"
-
-DEPEND="
-	dev-libs/libevent:=
-	dev-libs/openssl:0=
-	net-dialup/ppp:=
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/sstpc
-	acct-user/sstpc
-"
-BDEPEND="virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-network-test.patch"
-	"${FILESDIR}/${P}-fix-example.patch"
-)
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	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
-
-	local myeconfargs=(
-		--enable-ppp-plugin
-		--enable-group=sstpc
-		--enable-user=sstpc
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
-		--with-runtime-dir="/run/sstpc"
-		$(use_enable static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index 19e6c9f68904..afddecf2882f 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -1,7 +1,4 @@
-AUX udpcast-20200328-gentoo.patch 338 BLAKE2B bc10afd3494d0b57b382cccf2d046c3dc1085830bf9821b0bec4b4eb521fc06c53ebd86189a74e292ebee44aa70701cd28530679a4ea799c49ea2c86bb9ba491 SHA512 28022d99fb5b257f9fd59336d2b7d4d5029b5a8a8c9aa92ed848f94d8cb15908c6325a70e93dbde3f4138ffae262ef9a1522c18f3370095e3c896e797f7c1fb4
 AUX udpcast-20211207-musl.patch 1018 BLAKE2B e8adbf4ee6317e514d05003be17c45a2eabd7fe547462b1a09aa0cf9e6a691bc2933e5bb5745a45218471aabdc89ac6046ecfcfd672ca9e93fe858a1416fc09f SHA512 4ef72c0a4484d6782b0b42c689950c20de04746ea5cdd2f3527fe42c1599c906393d22da00ad84a9aa4bac0c4ed643a2c9075116ef96a60f1f7b57b003641b66
-DIST udpcast-20200328.tar.gz 169252 BLAKE2B df760dea814fabf951a65dc191a88355dec864d9c0f1be99ea60c742862d0b9944e51a45dd462ffce5c4b56a8d94f719796e3c725b42edae8cb9a19b1d3bc147 SHA512 b1ce4f0cade5db6bc69d3a154c354565675f44e97f9e3d90152f9594fd4f17fff2891eb1cb8d73c59e0d24eeb85e485e96b7a64fa9f1b6d2f005c4cece377bc7
 DIST udpcast-20211207.tar.gz 171148 BLAKE2B 96a7b1a30e19a2b83ce2ab7d8491ad430838f1305b83b728e6b43343404440b5a7fa9ee0afd0c00f8203937803a691065af31d7dc51633f26d019955e9ac8ed0 SHA512 89010c781d99a60e335213e88867c9114b51f3d75bd4ebfa38bcd1382e5925be4f316faf8c24ea55b087edb2115e18b5fd3cceac70a65371f91227528d218e89
-EBUILD udpcast-20200328.ebuild 549 BLAKE2B 23845dfb07fdc0e5f3abf93f376f5d1587991b7d2ade0b7e02a054009f301e71eda260ed2065b0a6129cf8a9e4df4e9c1825014be13d03a9c5d80a7c37ae75e4 SHA512 1a63b729e0979921656aeebb03a0c7f25847868aa83dacf944e3bb4b42e364f0d942adb27d4de720361f768249e3b057367725becb5ed7737786222451acb871
 EBUILD udpcast-20211207.ebuild 536 BLAKE2B 6b7e36769c67ba06d826f1624cb746de21eef8311bd67971ba60ecda54a696cd5091eed4a8c405f94791987e46b7e5bd73699ccf3d90c6a63ce3fb8a42729a7b SHA512 5f44008050f6e329f8803357849a6ce9be98243bb6862fa7077ebc7f173b4cf837bd5f20c6477416771ebf2e4ebfd0ca23d7ebabcb8dde069bd09d499eb91d14
 MISC metadata.xml 693 BLAKE2B d5fe9bbc4fd2deb6aa08eb6326e888f4cbb9e3e15491909d435f10b1dee78898d6c41a3906c750fb2f97a3bf92b407971af009425f664541697e1d82c6f5d92d SHA512 b4e5471bb9d81ee5d52ce35ce77e18c92cdcc5cec6cf32fdcb6537c3af4b361e8f11dae8446901c7669ba0489d5fe7cae57a3809c6d0314d1001f1f9b94f7429
diff --git a/net-misc/udpcast/files/udpcast-20200328-gentoo.patch b/net-misc/udpcast/files/udpcast-20200328-gentoo.patch
deleted file mode 100644
index 529c31f7f7c8..000000000000
--- a/net-misc/udpcast/files/udpcast-20200328-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,8 +30,7 @@
- 
- # For additional warnings & checks, add -Wstrict-prototypes -Wshadow to the
- # following:
--CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -DUSE_SYSLOG -DUSE_ASSEMBLER -O6
--LDFLAGS +=-s
-+CFLAGS +=-Wall -DBB_FEATURE_UDPCAST_FEC -DUSE_SYSLOG
- LIBS +=@LIBS@
- 
- BUSYBOX=../udp-busybox/busybox
diff --git a/net-misc/udpcast/udpcast-20200328.ebuild b/net-misc/udpcast/udpcast-20200328.ebuild
deleted file mode 100644
index 2a300d7a0be6..000000000000
--- a/net-misc/udpcast/udpcast-20200328.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="Multicast file transfer tool"
-HOMEPAGE="https://www.udpcast.linux.lu/"
-SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hardened"
-
-BDEPEND="
-	dev-lang/perl
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-20200328-gentoo.patch
-)
-
-src_configure() {
-	use hardened || append-cppflags -DUSE_ASSEMBLER
-
-	default
-}
-
-src_install() {
-	default
-	dodoc *.txt
-}