12 files changed, 87 insertions, 610 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b59309ff8ad8..3021b6d9b8cd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index ba22e17a0071..d9ef3b7c227f 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -7,14 +7,8 @@ AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0d
 AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863
 AUX ntpsec-1.2.3-pep517-no-egg.patch 1147 BLAKE2B 653e9cce60feece6d906b06263e9b44e93f07ca41430e6d2021f105bdfbcf2e7405c02974419d124c7ea6b64110b5ad2aec48c5d044f5011aaad339647a13405 SHA512 bbdfa0441d5a353872fd6fdaed8acea3133440766a2dc96178d3367cc24360b94d5473c9d0ad97bffa9e1c9044ba9af78fc1732ea52a98d218452fe91cbca98f
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-DIST ntpsec-1.2.2a.tar.gz 2710790 BLAKE2B b069433598697ab1e8110dbd005316a295d14c1e180fe0af2d19494bdff941d01234f0b4e9f38a150e27e450e1bd1f4dcf4535f9ff51c253670d11c5cb67382d SHA512 7a2cc04bde49800a745c74933e565a4764a22be484faffc5ea933231b74507af737a691cd0bb3aa024e81c083be0718c8d7b30dd152b0b0d386ae72fda426db9
-DIST ntpsec-1.2.2a.tar.gz.asc 833 BLAKE2B ce21b020d2a8590b731fdd4c171041fadbd699d60b9e10b2dc548675eed2efc04b9d5ae75fa8f77cc9c8e55db0f609d1eee5c5f2f7c7d804e1b087eb9ea95e1d SHA512 c1b0c1c6b534b11ef172d5ab68ada47bbd9e3f0298400c684e8745447221db16e4f4de436f06b0f6ab374e437b0506853a3a3da2bbe17c148cdf7de62c769f28
 DIST ntpsec-1.2.3.tar.gz 2725081 BLAKE2B d39a4d08790949afb28b843739a410624a8d862bfc25afd4e6c7dc55be43e41f3c89823406c60fb911496e7a3db51d6fa83c8bcda9b9686708c36154c2fe9686 SHA512 6baecf32f499fc12c2ef0b44360072b61ab9e8b52ec7ead64ff43a27b5a57431db939d4ce1fad92d38def981f6256a1d8ede0c0cdc5abb50d861be729255eee2
 DIST ntpsec-1.2.3.tar.gz.asc 833 BLAKE2B f0d6a0b163a7f9214da6d6eb1982f87387a7087efb740ec146f55362381aa101a5a8e40c27f121ca6607c0a5c429b1e06ecaf9a9ab5392d836535430cf6575fa SHA512 17280e3092e7e9de0ddae0723637a261d3a740d916ce0f016c44c6010672cfe2fc39b45f86257cfa5bd29f1f11895f8bd583c76765c6484489027cbc82dbe6b2
-DIST waf-2.0.27 105950 BLAKE2B b01cc3539f6d9c8aadd9ef95b4821f9b5314e92b4bc7b930ff193e0382de1b23f0b92da88bfe0273df146437c24779f5f5443895dc0743e8acae58e03c7cb406 SHA512 22c21dfcbf5ed25c25040ab04f62326f271b2b18ff96ca7598dadf68230d21d70cef1c9d7ef56721edbd9c737a56576fd4a9ffac1b00cb93d5c013b8f3a9d97e
-EBUILD ntpsec-1.2.2a-r1.ebuild 4928 BLAKE2B f5e8aa1a841100449d8c675dbd2f74c9bfca092b7b8c579a4c5bef2ee8ec37807405def4eac67c0ce2e7f90f8489683c4aee02dad24db5bd694af71e2cc5ffa7 SHA512 34cf40bfeb55bbc710ba380b84261f7dbe4ed7382c955c63c93a245bb9bbf0f2cb730165bf6d6669478d0bff70ad9aca0dccb01a5480fbdb6029c2f37a097e96
-EBUILD ntpsec-1.2.2a.ebuild 4400 BLAKE2B a8329fecac0ecaa5643dbcccbb77c6c3c3b944677f1c5bfb350e21a2d734b8f20862cc3b0fdc1c3135e8de4f75d11bcad523cb27b4f062af1839ba592738b387 SHA512 46b98f059d76924fda38340b6803935ec97ad9aa3dcd68d95f4913d7f733581e1253e322ee8357735ef6d9942482eeecbc3cc259e3511c94ff0ecbfbb87c2a93
 EBUILD ntpsec-1.2.3-r1.ebuild 4758 BLAKE2B 30ad626b112802998108d7870b81b122c33c36629db453d787462b48b48e47f4e248e785c29f88a23e9d4a0b33a83b13f48f6075663b4574af453e2d032d2afb SHA512 1bea39d8c4755ff76a6c953e7a628bf86c30824ca3675af269ffe8d4406e9e4cb590c237da77f2d072eeff046078905b04c2f21e9342f5eecc36ac4e88c4627d
-EBUILD ntpsec-1.2.3.ebuild 4352 BLAKE2B ca2448d2a39601ec53efe061435581f896f844d3e87f76e29c29875e413b46e9d56469cc3e52d55982fef9d61f2faf43618887e525c421266b89dac5a6164202 SHA512 9584fad1dbd5a1755f52ece791ed0590c974427c6de3552fbc67d1bb515f25b5df9792ef4ebfba3a95f7dc61d44f1611337163abf80fffbd909e87c0d9817f4f
 EBUILD ntpsec-9999.ebuild 4761 BLAKE2B b85b41993e44b2f5ca562db0c2b87ee637ec1fcac99f5d8f1311b660612a4486e6a66f374451750890e0bd3ffa85d4104a94b423d4c61f2b9c428b5b4678f8c9 SHA512 b9def6c11cc8a55138a269e3764fd15251e2a25086012bae1457d1e3ea6e48b4f7e7bb9a3c325bb9ad95e589d07f08af259a7051d0375934dee9c53ac1fe27c4
 MISC metadata.xml 2612 BLAKE2B 4333e99791da57969b1745266fc6a24056da02f6bdfe11cb0d279a7eb259f82f0812e87bd828cd912cb643cd3e67ada44727e6f0237183d293f01532f250c2ae SHA512 cdb45516847d9afcc1e18511c1820d2426d2678cc8b9dd0e5574d10085205f197d5f38cba8f6050979241274fbb9de5a49d3348e096a76c9271f133a6da48cb8
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
deleted file mode 100644
index 00428f679c48..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517="flit"
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc
-	inherit verify-sig
-	SRC_URI="
-		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
-		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
-		https://waf.io/waf-2.0.27
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE="${NTPSEC_REFCLOCK[@]} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear test" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
-RESTRICT="!test? ( test )"
-
-# 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 )
-	oncore? ( net-misc/pps-tools )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${DEPEND}
-	!net-misc/ntp
-	!net-misc/openntpd
-	acct-group/ntp
-	acct-user/ntp
-	ntpviz? (
-		media-fonts/liberation-fonts
-		sci-visualization/gnuplot
-	)
-"
-BDEPEND+="
-	>=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-alternatives/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
-	"${FILESDIR}/${PN}-1.2.3-pep517-no-egg.patch"
-)
-
-WAF_BINARY="${S}/waf"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		# Needed for downloaded waf which is unsigned
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}" || die
-	chmod -v ugo+x "${WAF_BINARY}" || die
-	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
-}
-
-src_configure() {
-	filter-lto
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use ${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	myconf=(
-		--notests
-		--nopyc
-		--nopyo
-		--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_setup
-	cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-
-	ln -svf pylib build/main/ntp || die
-	cd build/main || die
-	distutils-r1_src_compile
-}
-
-src_test() {
-	cd build/main || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die
-}
-
-src_install() {
-	# 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 logrotate 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
-
-	ln -svf pylib build/main/ntp || die
-	distutils-r1_src_install
-	waf-utils_src_install --notests
-	python_fix_shebang "${ED}"
-	python_optimize
-}
-
-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.2a.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
deleted file mode 100644
index 52c1058a3b2e..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..11} )
-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
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc
-	inherit verify-sig
-	SRC_URI="
-		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
-		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
-	"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-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? (
-		media-fonts/liberation-fonts
-		sci-visualization/gnuplot
-	)
-"
-BDEPEND+="
-	>=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-alternatives/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.2-logrotate.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() {
-	filter-lto
-
-	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|,$||'`"
-
-	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")
-	)
-
-	distutils-r1_src_configure
-}
-
-python_configure() {
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-python_compile() {
-	waf-utils_src_compile --notests
-}
-
-python_test() {
-	waf-utils_src_compile check
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# 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 logrotate 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
-}
-
-python_install() {
-	waf-utils_src_install --notests
-	python_fix_shebang "${ED}"
-	python_optimize
-}
-
-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.3.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild
deleted file mode 100644
index 2fd6e5cad45b..000000000000
--- a/net-misc/ntpsec/ntpsec-1.2.3.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} )
-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
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ntpsec.asc
-	inherit verify-sig
-	SRC_URI="
-		https://ftp.ntpsec.org/pub/releases/${P}.tar.gz
-		verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc )
-	"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea modem local
-)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early 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? (
-		media-fonts/liberation-fonts
-		sci-visualization/gnuplot
-	)
-"
-BDEPEND+="
-	>=app-text/asciidoc-8.6.8
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-alternatives/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.2-logrotate.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() {
-	filter-lto
-
-	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|,$||'`"
-
-	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 samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	distutils-r1_src_configure
-}
-
-python_configure() {
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-python_compile() {
-	waf-utils_src_compile --notests
-}
-
-python_test() {
-	waf-utils_src_compile check
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# 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 logrotate 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
-}
-
-python_install() {
-	waf-utils_src_install --notests
-	python_fix_shebang "${ED}"
-	python_optimize
-}
-
-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/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index b55c18e637df..023b65ef327e 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,5 +1,3 @@
-DIST s3cmd-2.3.0.tar.gz 136754 BLAKE2B 61feff68d008536d4d31009f4ad18da37ccd0cdab9bfdf151b7112ac66f43bde78f042bc2ad36998fe070428a10a9ba99db5d6d39e9eb74e829a855eb11d1697 SHA512 3507fb8b597617a384508149cb30bdfa8bc8a7b3705782fbf9a943c4be413dc5b7cfb3572b632e8bebbb644ab31f418428ccca996c0d2ba840ad88df1f5a406a
 DIST s3cmd-2.4.0.tar.gz 144976 BLAKE2B d854281a029b9865dc40d6bebd0994840a201ad573dfc628916daec00a6b38022f3f3c80aa745870c0b594443da747b1967d24976701e4d97167cfc087ae6dd8 SHA512 78a7fb193ef94759e6b59c8bccc2e736f4195f7de781f6a5d11a5685a3cf93ca9ef946bdefbfe0b0dafd0ea0612c8944283c3177f280d14edfca6553e62e0b49
-EBUILD s3cmd-2.3.0.ebuild 694 BLAKE2B c4318b5d47f61f246e2e7b22f8150ce2edb2ffae96d1bccfb662207ffd182ad3a8d6c5444e748173149b6502f6f9f0297900d1ba30a84f64fbe0fb8e8df0b5a1 SHA512 60c62ea16ee0d6e1e9a96e872ba427411778bea7af3aad11ea5bad38100acffa716e3cac21c49b77294b95b44b8dc8468aa854935c97d2dee388c58ebc374cf2
 EBUILD s3cmd-2.4.0.ebuild 726 BLAKE2B 094af03a01b57d80bba51976ad90d027c5a493434dcb493f5cfef8b85bb710d0bb3f960e850d525b8586a0098b80d4c451cef5f44b6022f7054ba6e28cd83626 SHA512 f0526a4f915d9bbf3c27361e7c57d698804890cec317d87f8aa86015075e69cd1b5596f03ad62c22952363f196629d0b9a1645c02383391a4e63e7d226294237
 MISC metadata.xml 795 BLAKE2B f1d85ae68ca459fbf61bc0cfb20da9e3d5380f33f8ebbac3335ed7432e50a44612238331ceb725c6e6ec116a19a6cf6d41bfc4895f9a892e698dc2ccad185d51 SHA512 01531459d573097f668c7c584732f17bdff1dde9d49b2e9c424134e346f0b430957a64bfb4075ef41b08ca1f86d5b6a6b5285de81f9f1f9d3d52bb081ded06eb
diff --git a/net-misc/s3cmd/s3cmd-2.3.0.ebuild b/net-misc/s3cmd/s3cmd-2.3.0.ebuild
deleted file mode 100644
index ff21393aaefb..000000000000
--- a/net-misc/s3cmd/s3cmd-2.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Command line client for Amazon S3"
-HOMEPAGE="https://s3tools.org/s3cmd"
-SRC_URI="https://downloads.sourceforge.net/s3tools/${P/_/-}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~loong x86 ~amd64-linux ~x64-macos"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	"
-
-src_install() {
-	distutils-r1_src_install
-	rm -r "${ED}/usr/share/doc/packages" || die
-}
diff --git a/net-misc/s4cmd/Manifest b/net-misc/s4cmd/Manifest
index c1d2d60d77a6..c05a85188525 100644
--- a/net-misc/s4cmd/Manifest
+++ b/net-misc/s4cmd/Manifest
@@ -1,5 +1,5 @@
 DIST s4cmd-2.1.0-botocore-fix.patch 2449 BLAKE2B 5158ded38f8e3417c090d274063a4eaa4f25cd5005c4bb8793cc639d3d87875f31d87464a8dbb44b5c1690570865cb01a0681f2e92edc46fa549828b91f30a0a SHA512 ea889d069a86a1d1f7f5cf5b1f19a9d0b35527c3db5eecf9202cca742ad4442655169d8688fc4b290a1362a0a794ba8ac44abf697ea7830acf8e48b6c7998ef6
 DIST s4cmd-2.1.0-py3-iter.patch 768 BLAKE2B 3e6bf42d40b87048521e1e3672bbb5c75a2d923696c85cfe9cd7140a388b483d830002354562ccc6017a8c8225799c0cb9ead2e136a37fec7ed0722e6ee99c39 SHA512 8070a987bf48c5832a80f39213125b4209141d1c35e612b26dce307fa621772741401f1da355b2a56e7869a3c76f4b91301d4aeae56f3810ce9a6ce6f9fd917b
 DIST s4cmd-2.1.0.tar.gz 39312 BLAKE2B 9d2d533273543153f2bad69362933315f65c5e70bd45c102e42b1b733989815239ae4d027ac08d658f03263bd9dd75f1f6db802b5f38ed3256da5e7c9f48558c SHA512 05e930e2789ce8ab280dcdb2f08e4162930d946d2ed2e4f1c754c8b875375774779b73729151bd23d9bf3736bc48f7626fe53df66aff71dd11b32e90e9355470
-EBUILD s4cmd-2.1.0-r2.ebuild 923 BLAKE2B ae672ab7ff2562ed909913d285a0d959ebfae18ca9e5f32f48c8e9f978f149d8be2fd35ddd4f5cfaea4c2b2290f76c50bc9e9ee9b0b01855e2a7036db60b096d SHA512 7cdeedb1a31a1f11c44b1ba276ea97ab3e33956caacffebce734f733029268a48efd4baaa59b1dad4aa626c5f874f0dbbfdebbd6456f52b04f5a6132b209a668
+EBUILD s4cmd-2.1.0-r3.ebuild 940 BLAKE2B ef2616d5a24fd27ee691542b63383ccd98c44d49db6a000841d15f6ca1874aa1bcddc2ecd874e8df1127eecd26bcb0aba72820dc4087bc206a97c2f96b4258e7 SHA512 031ce633141c2e8a526e48d9ce0473c2f8772127044d7c7cf8034903789ebbeab2047226cf02f3bdf3080e77296b13cebac2da4f687b4d7e5850c1f07b812bb1
 MISC metadata.xml 296 BLAKE2B b7e22e8989c86a3d8e159cf01ea82c6324d41f2660f29e8a225a9f4e23f513c5da4fee2fa9ec400a8c7eabb9548f31b5230dda2ee8dc2d66fab6f70016ae943a SHA512 5f6c8d053c4d0f26606e26e06a93ee931d8c25888b5d799ea9f5f259ba371576d05a3428cf40f4d3da2b35c1654903370b9cab30c68f6692cc5c911ea99a7d2c
diff --git a/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild b/net-misc/s4cmd/s4cmd-2.1.0-r3.ebuild
index d80445061cdb..1d71df41895d 100644
--- a/net-misc/s4cmd/s4cmd-2.1.0-r2.ebuild
+++ b/net-misc/s4cmd/s4cmd-2.1.0-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 bash-completion-r1
@@ -15,20 +16,21 @@ SRC_URI="
 	https://github.com/bloomreach/s4cmd/pull/162.patch -> ${P}-py3-iter.patch
 	https://github.com/bloomreach/s4cmd/pull/310.patch -> ${P}-botocore-fix.patch
 "
-PATCHES=(
-	"${DISTDIR}/${P}-botocore-fix.patch"
-	"${DISTDIR}/${P}-py3-iter.patch"
-)
+S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
+	dev-python/boto3[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]"
+"
 
-S="${WORKDIR}/${P/_/-}"
+PATCHES=(
+	"${DISTDIR}/${P}-botocore-fix.patch"
+	"${DISTDIR}/${P}-py3-iter.patch"
+)
 
 src_install() {
 	distutils-r1_src_install
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 86f69d17e286..674dbdd1b248 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,6 @@
 DIST yt-dlp-2025.02.19.tar.gz 5842393 BLAKE2B e35716ceb51739668ed1b9f263d643ef33de3fd4ed38d21cc02971f3f454484814b57f370730a91ea8e2c21995027b8f2e13caf6a41bbdfd0798f8856416d124 SHA512 91179c08f6d3eafc8b796671f513b7908a53632b2c926293bbe887cbb3843c6dc80c80de90a7f892b98e6dd5b77daeea10f02e5a2ee078855ce78227e4c9be4a
+DIST yt-dlp-2025.03.21.tar.gz 5903140 BLAKE2B b7108973f27d9755155f47a0c5646a8d150a8c7c3a007dd21b3b5892349ebc0a6661e89678b3f62f7594e8574b7758283a2de3edfb2a5232cb477128e01e077f SHA512 782e35170c4f581bd5e26589dd42cc022d37365bfcec13340456badd0213dc7ea59530e716731181306082fe3494f9238a5c396ad9655ea7a26dbb19162e7b52
 EBUILD yt-dlp-2025.02.19.ebuild 2420 BLAKE2B aa87bfbc02c62dffcc5fbc5711e59c9a49f9ad9869b1f82ba7eb61ed1f569c6668bc263cdbf5e83eb5f2327a91e1b0ec75bac3251f7d21591ddb1123e574dbe2 SHA512 8129eb5a482a97ac44ab5ce796fcaee1a297fc433016a34fcb6a5ef2a65b2a45aa6b4e81bc8d824df380375b2928ad4d8873bf4404d7f400ca7e036cc6532123
-EBUILD yt-dlp-9999.ebuild 2440 BLAKE2B 54ec3a69363bad6385e63fbf29994d9b0885762e1a08f15c3326298cf06724164a082e4f346b56c7b5fe31498c7c472613318af4dc59b2667d3c32325b2a2959 SHA512 ec6ddabd3970f6e474df85c5e3057021ba3d919f0f7cdaf0d43a668554538a967a6fc3ae67596e87cf888a9d39392a1b7671709904cec053c5c2167556ed2cc2
+EBUILD yt-dlp-2025.03.21.ebuild 2386 BLAKE2B 38fb61861b043396dd76896a8327de49453263be948dfe299c5d2edddb9153c2ac936cdedc74cf457b6e12bad9fee3e9d03c04aaccab31a733407bdc55f9b692 SHA512 1686d50efe620ad13dd37db9ca3ee76b674a30325a41872eb2a787e6fa8304c67fa435a266a6f7e8f546dbb1963abd1de945f8d7affdf1a8e49332bd5760dc74
+EBUILD yt-dlp-9999.ebuild 2406 BLAKE2B 124090ca299901d902fbfedb2f85a9a909878539bb7bbecbceae45b9f32b748733af66ee1cadfb550cb198f633f7c738b5d9cff60fd08f16a2d9b952045aa30e SHA512 523a86be871c8665dcb9c387b25cd3976c62376ffe8b1ecfea0c68034b03ed4ddd08980fa9647ce94f820e76cc63b04d335ff477627f4e5bb497181cc8adbfce
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2025.03.21.ebuild b/net-misc/yt-dlp/yt-dlp-2025.03.21.ebuild
new file mode 100644
index 000000000000..a57a8f5167a7
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2025.03.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
+inherit bash-completion-r1 distutils-r1 optfeature wrapper
+
+DESCRIPTION="youtube-dl fork with additional features and fixes"
+HOMEPAGE="https://github.com/yt-dlp/yt-dlp/"
+SRC_URI="
+	https://github.com/yt-dlp/yt-dlp/releases/download/${PV}/${PN}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${PN}
+
+LICENSE="Unlicense"
+SLOT="0"
+# note that yt-dlp bumps are typically done straight-to-stable (unless there
+# was major/breaking changes) given website changes breaks it on a whim
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails with FEATURES=network-sandbox
+		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
+		# fails with FEATURES=distcc, bug #915614
+		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+		# websockets tests break easily depending on dev-python/websockets
+		# version and, as far as I know, most users do not use/need it --
+		# thus being neither in RDEPEND nor optfeature (bug #940630,#950030)
+		test/test_websockets.py
+	)
+
+	epytest -m 'not download'
+}
+
+python_install_all() {
+	dodoc README.md Changelog.md supportedsites.md
+	doman yt-dlp.1
+
+	dobashcomp completions/bash/yt-dlp
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completions/fish/yt-dlp.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins completions/zsh/_yt-dlp
+
+	rm -r "${ED}"/usr/share/doc/yt_dlp || die
+
+	make_wrapper youtube-dl "yt-dlp --compat-options youtube-dl"
+}
+
+pkg_postinst() {
+	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
+	has_version media-video/atomicparsley || # allow fallback but don't advertise
+		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
+	optfeature "decrypting cookies from Chromium-based browsers" dev-python/secretstorage
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
+		elog 'as "youtube-dl". This is strictly for compatibility and it is'
+		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
+	fi
+}
diff --git a/net-misc/yt-dlp/yt-dlp-9999.ebuild b/net-misc/yt-dlp/yt-dlp-9999.ebuild
index 5e48f1d170d0..c0523c906e61 100644
--- a/net-misc/yt-dlp/yt-dlp-9999.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-9999.ebuild
@@ -17,7 +17,6 @@ IUSE="man"
 
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]
 "
 BDEPEND="
 	man? ( virtual/pandoc )