gentoo auto-resync : 02:11:2022 - 03:08:46

12 files changed, 4 insertions, 814 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7f6759eb04af..5c17171119d6 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index ee05d62d41f3..bf32df655911 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -1,7 +1,6 @@
 AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba4037308ac1e3c83fc49700c1c0d6ee2e3f274dcb76bc13bfaeefdc9cd533a56cef9454ee27eb SHA512 5b55618b870e436b2160e46ede5e1b8031dab368d72bf376a6a9664f1cb528ae37e10eedeb7d438fee8155e3c50139ac240af95a14215aebbfef3133f3b68694
 AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9acb02f9016bfeabd94a043e92d1b1be11e74b838e9cc91d7d7c1144539917c927537e67f92b45003e SHA512 cdfbc735e157306597ff3c37b5aea34d64c66a69bbb9dbfba6c7eb57d6b201c9d2e86969e5be9b8331e75e1de8eaa17ee4d8f72bed9bc058a6198bf5a2d717c6
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
-AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.rc-r3 494 BLAKE2B 5ad7e659403b21d35c24011eca17c108bbbf4874f86ad4f9421f5dd633abcfc747444bdcbe840dca14b7b55f3867ddd376626ec40c71bbb67ded98ef75d544f7 SHA512 792480abee2b641d383fdb63a5478172e63c90f7390d1a1e0ffcb7a1477a15c27c3588c4a810eeca62c3990aebc28da6c0903d451236bc727f806d3635766864
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-1.2.1-build-notests.patch 1512 BLAKE2B 16f1b49802c2883866d5ddc862c49ddca994fc530938b53d6059a0f044aa67692180efd528727b91940357562eb4db4a1abaa0a04404b13b912eb11a6a94b9fc SHA512 5b9cf22809a727c687d4a6796a334fd515d1de3883f2e72b5a44e787dd5e1189cc86e5a50c7f693d45e58ac1c5ee0503571fe4aa15cc31f7fc7d3f409128d21e
@@ -11,10 +10,6 @@ AUX ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch 785 BLAKE2B df61801e9748e20ce7fa8
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
-EBUILD ntpsec-1.2.1-r2.ebuild 4434 BLAKE2B fc33f87243be18fe8ccf1faccc5aa261a162656e8c675fedaa333631ae85c95ca59bf8a06b24c4a3b3e46ab669bc026ae164afdb2a507f3e19b2cef3c7139602 SHA512 d564a533817ad9a54c81db43b8ab1e09dea2f8aa749c930662e2912bb0e058d9fdc835ab22599d403fe34dc85c6a1a25fe0635667ea8a6cf12cd9d5718baa507
-EBUILD ntpsec-1.2.1-r3.ebuild 4683 BLAKE2B 9106135c2355acd4bfefb24c0b68fb6ab1300773fd7cf8aa9dda380b210b61c8f1cc42555c7571b292b2131bc39bf1c0e9b3f6b7a09a0e152fa025bad9aff1c7 SHA512 253294ff11133d62bc54fe5f5bdd3c6b25cecbf02fe84676f99e190d752343cbf5783111d85fc183097d9fcb956385ae0342beb5f0428ea851218a3e8652f360
-EBUILD ntpsec-1.2.1-r4.ebuild 4686 BLAKE2B 94e74b206caf561809b32b1e369f2fe77d133caddfdbd499b36858a5510a62afc43a9dd0ffde54ee98d18da88a70af049d7679fd0e3bd0e40fca682085e1a6ae SHA512 f3e165bf6fc6c4074d3182c22fdae1ce51fd36dfe3e91947f1bbaabcae032bd80b402fd4341a0e38b83c46adc40551678ba5f2b560ef073cd60ddb0fa53b21a9
-EBUILD ntpsec-1.2.1-r5.ebuild 4731 BLAKE2B db85ef6514e13677bb2c405600c002e8c969771c0ae61495a272792ffde4331fb4d5f8abb219489e2e4d3131608f21a0447a900bfa6f48c1cd55c3e16e5b0251 SHA512 eb81825a8d3fbac628729b9f322cc88c0d68715627149fadf31bae01407536b75253467380edda64ce40b9e97b9346f0a5a1f86a7e840d2b5a9afe36f8ae69ca
 EBUILD ntpsec-1.2.1-r6.ebuild 4406 BLAKE2B b0e1cefb7748ea8c115270543915cc7bdde4dc060ec5f36730df635613b0ec84e0c2a26e6a7aecb438e8379a8552bd1729fffab74d1e5cef156b633b507a9018 SHA512 4ec946fad4fcac345be239cecebbd56c1a17c6259cac2d4747e8266f4937cf3f4c2c59d1e9a3b9634ad9f9475c55bcbacc0f6520b04ca73541b926551489fe6c
 EBUILD ntpsec-9999.ebuild 4168 BLAKE2B d92e57770bd9a46330ff6057de0a2706745c48a4bf0c53921065e70cd059266af78c6d48c551391f0535679a7cdca017e8227e6d54aea7e3ee6f20d469521f0d SHA512 2dcd85192a8359975483500e31c501fec3f40fbb9c93ce60503779b51de4256aad3e8a375ef19df3eaaa1ac683af77fafcce62e2fc6053ed58ea03dcdd7baada
-MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf
+MISC metadata.xml 1862 BLAKE2B b77bf43cb790f79b2cdf0a19183a4826794548d2d77a35e83835f979a7ba54d6f06174309b24545bdfc05c560cc47c4be78480070687b87768e02d6b92f6d657 SHA512 ce3d4fa3f8aa07bdcd6a1e55cc42a005b238360276d82ee48b293255a6426e73a70da567a9b4885f6004a0425b2b3b8a2815d4ed020a118bd591f170d2a4b76b
diff --git a/net-misc/ntpsec/files/ntpd.rc-r2 b/net-misc/ntpsec/files/ntpd.rc-r2
deleted file mode 100644
index 82a950ef5dac..000000000000
--- a/net-misc/ntpsec/files/ntpd.rc-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="ntpd - the network time protocol daemon"
-pidfile="/run/ntpd.pid"
-command="/usr/sbin/ntpd"
-command_args="-p ${pidfile} ${NTPD_OPTS}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
-	use net dns logger
-	after ntp-client
-}
-
-start_pre() {
-	if [ ! -f /etc/ntp.conf ] ; then
-	eerror "Please create /etc/ntp.conf"
-		return 1
-	fi
-	return 0
-}
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 69f78f92c02d..7e10e7cbb842 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<longdescription lang="en">
-NTPsec project - a secure, hardened, and improved implementation of Network Time Protocol derived from NTP Classic, Dave Mills’s original.
+	NTPsec project - a secure, hardened, and improved implementation of Network Time Protocol derived from NTP Classic, Dave Mills’s original.
 	</longdescription>
 	<use>
 		<flag name="early">Drop root privileges early</flag>
@@ -31,6 +31,5 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
 		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
 		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
 		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
-		<flag name="tests">Enable tests</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
deleted file mode 100644
index 80e17ecb6cb5..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-	)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libbsd? ( dev-libs/libbsd:0= )
-	dev-libs/openssl:0=
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-"
-DEPEND="${CDEPEND}
-	>=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		#--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
deleted file mode 100644
index 93bcb0332fab..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-libs/libcap
-	libbsd? ( dev-libs/libbsd:0= )
-	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
-	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
-	"${FILESDIR}/${PN}-py3-test-clarify.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--notests
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		#--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile --notests
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_test() {
-	python_compile() {
-		waf-utils_src_compile check
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-python_test() {
-	# Silence QA warning as we're running tests via src_test anyway.
-	:;
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install --notests
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
deleted file mode 100644
index c6da1c0300fc..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.1-r4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-libs/libcap
-	libbsd? ( dev-libs/libbsd:0= )
-	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
-	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
-	"${FILESDIR}/${PN}-py3-test-clarify.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--notests
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		#--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile --notests
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_test() {
-	python_compile() {
-		waf-utils_src_compile check
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-python_test() {
-	# Silence QA warning as we're running tests via src_test anyway.
-	:;
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install --notests
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
deleted file mode 100644
index faba59c221e6..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.1-r5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 flag-o-matic waf-utils systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-DEPEND="${PYTHON_DEPS}
-	dev-libs/openssl:=
-	dev-python/psutil[${PYTHON_USEDEP}]
-	sys-libs/libcap
-	libbsd? ( dev-libs/libbsd:0= )
-	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )"
-RDEPEND="${DEPEND}
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )"
-BDEPEND=">=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
-	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
-	"${FILESDIR}/${PN}-py3-test-clarify.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_prepare() {
-	default
-
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript || die
-	if ! use libbsd ; then
-		eapply "${FILESDIR}/${PN}-no-bsd.patch"
-	fi
-	# remove extra default pool servers
-	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--notests
-		--nopyc
-		--nopyo
-		--enable-pylib ext
-		--refclock="${CLOCKSTRING}"
-		#--build-epoch="$(date +%s)"
-		$(use doc	|| echo "--disable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile --notests
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_test() {
-	python_compile() {
-		waf-utils_src_compile check
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-python_test() {
-	# Silence QA warning as we're running tests via src_test anyway.
-	:;
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install --notests
-		python_fix_shebang "${ED}"
-	}
-	python_foreach_impl run_in_build_dir python_install
-	python_foreach_impl python_optimize
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r3 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 5a8ce3ffc434..000f26bf620d 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,6 +1,3 @@
-AUX ytfzf-2.5.0-cachedir.patch 607 BLAKE2B b97199a2162f83071dd4018a637bafd52c0ab9deb28981e44fe0205e2f2129dc77333467e1686a0f1d61be0bcec8a011dcbc6ef0855101f51526ea346d45871b SHA512 da5ae7bc3ee100aae8e697824b4df34b64dea855ba572172b5513d045a55acb6266cfbe1caa0fff1740d53222998ae050518a691fd50c7a7cecdead9ab3e12d1
-DIST ytfzf-2.5.0.tar.gz 3260280 BLAKE2B 33535afc6be18fe9efeddf666ccdc646db227fcb601a52baeaca91b9316b87b1300fdab50ceca5eb9e21fef5571a87e917f78f71b97e7ec2abbebf5158b4487d SHA512 43e366694687be517a0b3da0d16e423f32046ab5de92368748e87c622f43e34bd1037f01b37fcb05ae8ce87ca536672cf3f5ca2b2608bab07ec9f4abeabb61ec
 DIST ytfzf-2.5.2.tar.gz 3263326 BLAKE2B aa0e6b01ba90217df1e488cfbe74f44baadee0fa5f6e29f45ef79af9a0d9587ef394b345ddf6b8a86282f57f097c6728adccba2e444eda38d1746ae95438900f SHA512 aa87d2f3c50bfed3c49d363b23bdf17c6c5307116648f3042148d828d204cc9f1ce61888a82fade26e46dc46991cb2c8f559f5f9aa671d8bcf425d343fdff389
-EBUILD ytfzf-2.5.0.ebuild 1469 BLAKE2B a9c45e8de3cae522fd547131f6e64ccbbf6f3ff14befbd2c9325a59aa8d6e19321d6c49821ccf8645aaf9316804827ee3990107aefd6af756a1ef8f3d821acd6 SHA512 8887ff344c2a3b335602509c32b94be73f2c41e8d18288880733840b8de0f016ee2bff3315d8d898f8021be3510cb61cc7d17e6fc34fa48d9872ae8f140ebf15
-EBUILD ytfzf-2.5.2.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
+EBUILD ytfzf-2.5.2.ebuild 1419 BLAKE2B 116e90deb0f8c9128b741e53e4449b8a45390e5a39ac05ebdd7c537a1e62afee1d9fb97422da569507af49217c1609fcf51db0d561d51d86821e2f6d6705b39b SHA512 c2a25a86d74ff9c8885c9595116219020a3c27fb393c33a465bad34e74f69aa3257cd031f8e87e40547eda440eef133041c8e1c83e64bf61b7dc0da8828b2fd3
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/files/ytfzf-2.5.0-cachedir.patch b/net-misc/ytfzf/files/ytfzf-2.5.0-cachedir.patch
deleted file mode 100644
index 11023779e690..000000000000
--- a/net-misc/ytfzf/files/ytfzf-2.5.0-cachedir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/pystardust/ytfzf/commit/cfc739211352b0d5249e48419a34ee6e1913aadd
-From: Euro20179 <sandollar2020@gmail.com>
-Date: Tue, 13 Sep 2022 18:50:36 -0700
-Subject: [PATCH] fix: if cache dir is missing, ytfzf complains when trying to
- create instances.json
---- a/ytfzf
-+++ b/ytfzf
-@@ -2278,6 +2278,8 @@ do_an_event_function "on_post_set_vars"
- # files
- : "${hist_file:="$cache_dir/watch_hist"}" "${search_hist_file:="$cache_dir/search_hist"}"
- 
-+[ ! -d "$cache_dir" ] && mkdir -p "$cache_dir"
-+
- # Where do we put the list of healthy instances?
- : "${instances_file:="$cache_dir/instances.json"}"
- 
diff --git a/net-misc/ytfzf/ytfzf-2.5.0.ebuild b/net-misc/ytfzf/ytfzf-2.5.0.ebuild
deleted file mode 100644
index 743a99d9afe1..000000000000
--- a/net-misc/ytfzf/ytfzf-2.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit optfeature
-
-DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
-HOMEPAGE="https://github.com/pystardust/ytfzf/"
-SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X minimal"
-
-RDEPEND="
-	app-misc/jq
-	net-misc/curl[ssl]
-	virtual/awk
-	!minimal? (
-		X? ( media-gfx/ueberzug )
-		app-shells/fzf
-		media-video/mpv[lua]
-		net-misc/yt-dlp
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cachedir.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	local emakeargs=(
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}"/usr
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	emake "${emakeargs[@]}" addons doc install
-	einstalldocs
-
-	rm -r "${ED}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	optfeature "external menu support" x11-misc/dmenu
-	optfeature "desktop notifications" x11-libs/libnotify
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that ${PN} supports many methods to display menus/thumbnails."
-		elog "This ebuild primarily covers defaults and major features, additional"
-		elog "dependencies may be needed for others. Set USE=minimal if want full"
-		elog "control over optional dependencies (e.g. fzf is optional if use dmenu)."
-	fi
-}
diff --git a/net-misc/ytfzf/ytfzf-2.5.2.ebuild b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
index 36a2a31e9d01..05675648180c 100644
--- a/net-misc/ytfzf/ytfzf-2.5.2.ebuild
+++ b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X minimal"
 
 RDEPEND="