16 files changed, 142 insertions, 488 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 73ea8af6c1c4..27203dd5eec3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1c7390e44099..2d9eb9ffb8c6 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -7,12 +7,10 @@ DIST dhcpcd-10.0.10.tar.xz 272732 BLAKE2B 2ecf52009f3fd4442863e1927a8d9e777ee6f3
 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6 SHA512 403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004
 DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4
 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04
-DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
 EBUILD dhcpcd-10.0.10.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.0.6-r2.ebuild 4908 BLAKE2B bc0e0e9861b2be679817a74bd7ff749038dd04f8653d7ca13732602c3184ff9728b1b6efcfb411972e77e425f444cc01b084dc95cc4310e82da32667151e1d36 SHA512 480c9c9c4d74bd0ff52e3efb339d73abb2ba2b2fc8373e6f6f2aa2075d628d6e230b0d707f5bbaf6581b86759bc561c708bf962f1e6a6cfe07f53cf267e5269a
 EBUILD dhcpcd-10.0.6-r3.ebuild 5147 BLAKE2B 9fefbb6c238edf8124d7a015954f6e3aab60870fe91664c705d2df6ee5a8e9694b542cee7fece90927ebbdb50ff249d5cbc6c928eac9938475b36fbc07280ea7 SHA512 8a3b7fb39663b07481239d2de7d4b8d6449e38b7f8024c280c97cdbbf1da59a031c1d23ee24fbc9af37565efe67eb8c3bf56e64568f761e26ddada8a76bcf388
 EBUILD dhcpcd-10.0.8.ebuild 5055 BLAKE2B 84dd290736fd5df2b1eee34233f906938928d2346e84e83893153db86a6bb66827913ff1e48eac5f47ff4d122a3c32e3782a977e7129c3e751d4466cb34d6ce3 SHA512 2905b9d6f5a8c12a801423972da34f6a0edf568ab48814b8d4cdfea9bc1e660d67444cd52162efc8cccabd3962d6be915c7bfb0dd69a4d1c501166d6f77a068c
 EBUILD dhcpcd-10.1.0.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
-EBUILD dhcpcd-9.5.1.ebuild 4604 BLAKE2B e929fa97123c42d25fbdfe2318a8b8ed5f2b04f667c473c09533edca2d40f2c950dc308dd09f5d21bd6f4c1b2041d9acfb57fa137ef7cdc2ddcfb832d2ecdd45 SHA512 c4a53cc1f2d58031218b128d30721a5723f7f564ad8b99eea8a2de2874ce92d74102fe24bf6847e520567a42674c3e35e402ba967e152b3dbba2d768bae33a96
 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild
deleted file mode 100644
index 45846936105a..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.5.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${P}.tar.xz"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ https://roy.marples.name/projects/dhcpcd/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-DEPEND="udev? ( virtual/udev )"
-RDEPEND="
-	${DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 57714a5d5631..c8d3a88794e6 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,6 @@
-DIST gallery-dl-1.27.4.gh.tar.gz 707554 BLAKE2B 09868291bf01db3db9bf4521a39a2443c6fe82cbd68f5840ff0d14a911bee56a649d89fcec3d2e705b0cabc54c18a0f04eee2fc8bb40e3b99803ea393e5d35f8 SHA512 7e22abbe77929ee4ef420f586b018796c00b8dc18b7ea709fe85bc51ac9fc467ba8763fcec4ab2afe108fd0fbb9002980970e037e1af2408e9c6504db1891220
 DIST gallery-dl-1.27.5.gh.tar.gz 722422 BLAKE2B cd15c00549e9ed9605b39b76b271932ce3beae24b58e60c6fdd549f50d15cd949b14c19634067a24db2056c773be4e4811e9872a811cf6043a9e1edcdfec37dd SHA512 fb5895f4845582bc04bb3fe354bbd4f7611d5fde3caba723139e9bf5bd49796c82a2e6eed1ceca8e19d65136caf187eb6a64f9e93d4c64b89aa46e639e384852
 DIST gallery-dl-1.27.6.gh.tar.gz 730206 BLAKE2B 4b47cb50599d401e3b3edf726afbe175e82b1617397cdd9c0ce389f1e43b16ece6d94dc44a015e515bb3e397f52b11f863e56b12fccb3bedc8e5d9e39fd90bcc SHA512 a72c30e0c7e64fb7eb8fd2b5a8de0c0b1570b5c2fc13adaddeb0a1ce9e721b299132b2e7ebbf932155b8880283c1b3e2783e037151557a167a8664ef01cce0f8
 DIST gallery-dl-1.27.7.gh.tar.gz 738516 BLAKE2B af29a40de14c392101c50698ae2199f64b458c8e5ab997982625773f21b069d5b3133c1a7897a743255962c5494e0536f36f4c4067872a06761a5a3a333e44ca SHA512 384c5a5c7dfac01ad48dbbe12750e5bec5814620bebd1d49866a9a3b6d64f7aac60e4173f737ed2678c6d57e372b6957cb747d28444981a4ddb7721bd4f9cff9
-EBUILD gallery-dl-1.27.4.ebuild 1137 BLAKE2B 6bddf5d2f20b3d3d9b480e3e7fee9a1d16790ce228a9080a30cbe0849ad027965eb86c0fe629f60099d84dbd65ac6c59ddd79ed43ff9ee234b4d8099b8b4c124 SHA512 85b53fc950769856e4d17aa0a359004e10e3353c9c627669db03e9fb71beec64d499fc76a844d65c6ab079bdd1c57486448fe6ba1c5c44eb39b374893c6e5f13
 EBUILD gallery-dl-1.27.5.ebuild 1137 BLAKE2B f572a713f9a7b56f6c167b8a9ead10cd4a702e3e5f2ba106bf2d2f238b5583b6ac3a59cdae6be7777d5e99a6155e392f20efe0ce99e17ee27b0076c7ec782a78 SHA512 b6b65910d0a220cbf1df9f92ec2ad4162dc2c70ec399cf1e7d1982faba7a0f81e7d22ef479dc8d468c32d4320b17555254fb0eb778bf455f0d9dc72128e08e3d
 EBUILD gallery-dl-1.27.6.ebuild 1144 BLAKE2B 8ae03c0e61632d87295dfff8aa25382716fd107415260bf3142a6ec0c5c9601cd219c03696e0e97bb9d0efe4e26dccad3be782473122f68f6fa9186332cb66d3 SHA512 f5761a87af190e6e5e259ea4c4fdb3eae2762c09632016842e5a5a10147510b6960f34255cc3c5aa175b6fecaf2e74bc89ceb7c6beb853c05696457f0a8a7668
 EBUILD gallery-dl-1.27.7.ebuild 1167 BLAKE2B 9dd3c132317169d2e1d91c097399cbc6b70497472d7bba764133e43e81c5f89853779dde55e9dee71dfaa699ab1c79b72c91c27c9134b90cd7b16b8e1942cdd4 SHA512 70f0ed192f07d6cc9ac4bf58bdfeeae52ec16c5b3b7eb53ff435331bad41ccb3d2a968df714ef8ab1558bc78154245b1533063bfdd3a37f97e71c6d6444c9f58
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.4.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.4.ebuild
deleted file mode 100644
index ef7b5f886bef..000000000000
--- a/net-misc/gallery-dl/gallery-dl-1.27.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="sqlite,ssl,xml(+)"
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download image galleries and collections from several image hosting sites"
-HOMEPAGE="https://github.com/mikf/gallery-dl/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
-else
-	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Tests against real servers, some tests always fail and some are subject to change.
-	rm test/test_results.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	emake PYTHON="${EPYTHON}" data/completion/{,_}gallery-dl man
-}
-
-pkg_postinst() {
-	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
-	optfeature "video downloads" net-misc/yt-dlp
-}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 8b6d6444f89b..fe25d61636c9 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -11,7 +11,6 @@ DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12ded
 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
 DIST rsync-3.3.0.tar.gz 1153969 BLAKE2B 75a3cc50452086aebd16f42d7a309c173cbc1ea156227afb10d2106d0b9043e973676995b8199d22840775ae3df8db97d1c0de5f3aa58afa130c5b1348c3f825 SHA512 df5c53bc2f2b0e7e30f475903e5e4296dc2fbcf08e9ea6c3c61462d0e52b067c27e82deeb4be79102c86e9aa55a825182e126f22df44dabf5b7328acb2a01d10
 DIST rsync-3.3.0.tar.gz.asc 195 BLAKE2B bd077217bd44d406ac49a55b0c0d38c2accd4867b9fbf78a13fe906f52e1773d5a69aa3116a0c245abdeb1af54705d6ffc75aaba8b276ba9229bbb3340d7c3e8 SHA512 611d26374e0ff98ffb11b6ad6555f08773b9f09e1fbf232abc73c5d472b0defd28fd559bd42707774204d055b93be289f19f4db94bbdfe0b0935918fd922cced
-EBUILD rsync-3.2.7-r3.ebuild 5457 BLAKE2B ba5696acafe5a41e8d04990e5f6527ed78588d03d99322c1e5e5e56a2d85e22e673eead9286cb98f3a258090bb76f3e7a9d02bf890a70b676bf8029a33818eb5 SHA512 dbb09184b70ef6bff69e9b7f090708df3c86aa75af7bfe8cae5e9c734c048d59fb694f0da8306e36e4166cecf2e467bdcd9f897c2735353b557d0ecd06869429
 EBUILD rsync-3.2.7-r4.ebuild 5576 BLAKE2B 3e67c9f3786956aa97bd39010738bc9b0c17b5116abee6c802a3038a125199259c2faa5fecdb79b89e532e6a7367ba0838d7d6b19c2dabe1e3d4fb46e00b8aae SHA512 7ef46478145f92bcf7c6c6f29cf421f5507dd4990a37027faa1d7b7e1c91ed8059a0a5de76d117b6598f7c8b0e264c9a6371fa90de1fcffd765d6102b4c3bbdd
 EBUILD rsync-3.2.7-r5.ebuild 5576 BLAKE2B 5a8e3a2fb7c47ab5c1fb90d763cbad907b6640461e6ceba95873f396328582fd072e759bac9f7e237e0d33d121aed906be360c120ec7d927623f180633793e7c SHA512 b061f5535543cb940083326ce4aad8792f101cd3e1826094c887bea5aedadf2ee325cad8b1682c8efc4390b845524c7c8624a61492ed8ffeefdbb57d29ee0a64
 EBUILD rsync-3.3.0-r1.ebuild 5427 BLAKE2B bbaf1038a87ee063aaaa14762becd410806d866e2cac54fd9e180964df55e57434da42d9efa1cbb030ae08ab6e2eff55a7003c54c474ed2e73dae890dd12d3de SHA512 71bc541ba9f4bdcbb0a16802e21db860adc30c913f78ea2eebad380694ef08a67bde23cdddaa5406c6a8342da717509e9f1f9acff081309c1eef793fc51ada86
diff --git a/net-misc/rsync/rsync-3.2.7-r3.ebuild b/net-misc/rsync/rsync-3.2.7-r3.ebuild
deleted file mode 100644
index e3cbcc56a940..000000000000
--- a/net-misc/rsync/rsync-3.2.7-r3.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Uncomment when introducing a patch which touches configure
-#RSYNC_NEEDS_AUTOCONF=1
-PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic prefix python-single-r1 systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
-	inherit autotools git-r3
-
-	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/waynedavison.asc
-	inherit verify-sig
-
-	if [[ -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		inherit autotools
-	fi
-
-	if [[ ${PV} == *_pre* ]] ; then
-		SRC_DIR="src-previews"
-	else
-		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	fi
-
-	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
-		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
-	S="${WORKDIR}"/${P/_/}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
-REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
-REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/popt-1.5
-	acl? ( virtual/acl )
-	examples? (
-		${PYTHON_DEPS}
-		dev-lang/perl
-	)
-	lz4? ( app-arch/lz4:= )
-	rrsync? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/bracex[${PYTHON_USEDEP}]
-		')
-	)
-	ssl? ( dev-libs/openssl:= )
-	system-zlib? ( sys-libs/zlib )
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	xxhash? ( >=dev-libs/xxhash-0.8 )
-	zstd? ( >=app-arch/zstd-1.4:= )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	examples? ( ${PYTHON_DEPS} )
-	rrsync? ( ${PYTHON_DEPS} )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	BDEPEND+=" ${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-		')"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flist-memcmp-ub.patch
-	"${FILESDIR}"/${P}-fortify-source-3.patch
-)
-
-pkg_setup() {
-	# - USE=examples needs Python itself at runtime, but nothing else
-	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 || -n ${RSYNC_NEEDS_AUTOCONF} ]] ; then
-		eaclocal -I m4
-		eautoconf -o configure.sh
-		eautoheader && touch config.h.in
-	fi
-
-	if use examples || use rrsync; then
-		python_fix_shebang support/
-	fi
-
-	if [[ -f rrsync.1 ]]; then
-		# If the pre-build rrsync.1 man page exists, then link to it
-		# from support/rrsync.1 to avoid rsync's build system attempting
-		# re-creating the man page (bug #883049).
-		ln -s ../rrsync.1 support/rrsync.1 || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		--enable-ipv6
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable lz4)
-		$(use_with rrsync)
-		$(use_enable ssl openssl)
-		$(use_with !system-zlib included-zlib)
-		$(use_enable xattr xattr-support)
-		$(use_enable xxhash)
-		$(use_enable zstd)
-	)
-
-	# https://github.com/WayneD/rsync/pull/428
-	if is-flagq -fsanitize=undefined ; then
-		sed -E -i \
-			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
-			byteorder.h || die
-		append-flags -DCAREFUL_ALIGNMENT
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS.md README.md TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		# The 'rrsync' script is installed conditionally via the 'rrysnc'
-		# USE flag, and not via the 'examples' USE flag.
-		rm support/rrsync* || die
-
-		exeinto /usr/share/rsync
-		doexe support/*
-
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_newunit packaging/systemd/rsync.service rsyncd.service
-}
-
-pkg_postinst() {
-	if grep -Eqis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-
-	if use system-zlib ; then
-		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
-		ewarn "using the --compress option."
-		ewarn
-		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
-		ewarn "and the --compress option, add --new-compress (-zz)."
-		ewarn
-		ewarn "For syncing the portage tree, add:"
-		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
-	fi
-}
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index d561f78eb6ac..744139421e55 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -4,5 +4,5 @@ AUX taylor-uucp-1.07-modernc.patch 3030 BLAKE2B 84d1076dd1cc613ad3fc7a885353258e
 AUX taylor-uucp-1.07-remove-extern.patch 1852 BLAKE2B ab69378916f3fcde12da9d866ab03b369687f98b1f4363b1551d2806a9c1752078f1b061b5ea067287a8df18a1105eb7efcbc9b797a478130b2582acb0adf277 SHA512 8624fa2507345b162060dae91655ae9a36ac4102cfd43542a1cf735d91cf99a5a1cdefe862ee444634449acc585b69d111d9ffdb5cd9ea492fff11f05be0acda
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
 EBUILD taylor-uucp-1.07-r6.ebuild 1345 BLAKE2B bb91c8302be87a407d10a312126959038f1816bf7ff4db7e6148315ce574e80992e4be6f09ee130b2788f7d2274cff89ddfcd46b442a1af2b6be8aa2f2a328df SHA512 e471214a5a7d6f4eff3061d7abfa7450ec7963b231d1cdeea37a8b6b695ba6d9e1ae7090a129b7908f5ed7a2781177b6305c8d3b79a86feb1b536b4aa1e8d2a1
-EBUILD taylor-uucp-1.07-r7.ebuild 1383 BLAKE2B e944e8b81c81eefcf157372c0c68a00cb5f48a6fcba98ac9614c534750275e97267f538c65bc4e71ad49468af21630972415f9e175dd7916d4cb41fc23748931 SHA512 a4f9f94584cb1eb1f0acc230fc9c49b536c472a52f599299eaacd03575e224d17686f933b248d5b6fb778bd3964275971be5aac98f14941906f623cd1ad05134
+EBUILD taylor-uucp-1.07-r7.ebuild 1380 BLAKE2B 50288770619dd21bd778ae13cb6cc5041d48250444ea397a6f52c8072c304db54be6cda3cfc113d3cd757b0bf9000c968cef13b2730cbe2105f59814b82cc7e7 SHA512 51aa80a3481d7940cda4f42ec418641dc6f963ea1ef970bbc3f3147010eadc66bf32c995826cb575cc4afb433634107dfd660bc7862c55e3fb8cb071f179e551
 MISC metadata.xml 320 BLAKE2B fe826c34c590adcce97070a32a7d409d7c026967e85baf904b3b6644634d4849e083007479813bdc1549eab389a034ef1a6bfa3d350f3e23a03f7108addb0972 SHA512 52d157cfeef5b6132c44f1e750586bd36296a6fa766bc3e30387863cbfee7645e17a8ce70c9a064d38048d6f7a3b3f17516bd21b94d00968c89db8239ed95a08
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
index 0a13b69be1fa..2980765e9479 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/uucp-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index f7e05446d64c..7fa28c0daa56 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -4,9 +4,11 @@ DIST xmrig-6.21.1.tar.gz 2416545 BLAKE2B 72ecdfc8c999aee91aef4f540211c5d5a6f1992
 DIST xmrig-6.21.3.tar.gz 2426720 BLAKE2B 11563169e51402313399109860e04dd13dfc9911504db571968d6a97112990ebb68a3019da836a4ac19a589c94ab4b5f2ebcbadce59452c278ea923e8abf475a SHA512 91e92f61e385b75715b0b00fcb772bf997f3db19ef47f43c4bda3662aec6276273551ac915a7a6eeef253deb8da5b0ec0b45e02f0b84211ab8f0f5a37f34c87e
 DIST xmrig-6.22.0.tar.gz 2428500 BLAKE2B 3f675f909a5875c85a22eed8a89022d4895a1a6e7ec258ec87c624c5150487376b065bef4f50c0bafb062e07003ad3910c34634ec2266c458d7284014181daf3 SHA512 12eac61ea8b33a2932a0fdbd7a4ccbbf4f046578ecfd67adad4e7729f9de740060d11025d7ab6f17d7e19586ee59f041e761e3bb42c6fd766ea7029c15d97b42
 DIST xmrig-6.22.1.tar.gz 2434991 BLAKE2B 69ca78c3f0c8adefb8b33a58e4e55739810fd3ce61ea636d8e1d29fe92f786eafa6368b77f3e5d9123964dc72be78b2df2a468ea9c56a649faf66a16c05c8b77 SHA512 4ebeaea8d4439f0f682a46c25a86ebc0e6129eb6a89d1c8036c05973e61b385c62200dc7ed702f4f6f52d2ad546953d0d941447ba1e3db54fec1adaecba20ea6
+DIST xmrig-6.22.2.tar.gz 2435360 BLAKE2B c9b81ee93a008639709751b3924461d29216f8daa4beb3db96d983812efa5083926624aaea14d20692c3a3740a1ca178383b8b7cce0c1ad78a16f0299f891561 SHA512 4e25364737456711b09d5ed68e0d26b74cc2f4f4408ff5d02e0063bf67d6f38db5fe9af5d099dc4fd4b3f668baf2023cb816c049d38588ba1b54a8a2c0393269
 EBUILD xmrig-6.21.1.ebuild 1551 BLAKE2B e590f209544572f41c8ef3f9984791cedcf33d73626d47411eecaff54d3320111140de17da4790ab9a6a506ef7e58eb317d917840f6967b0b332870f5e4f37f8 SHA512 1046e575d34e47489533335121be7780f85a3fbd36669fb4d93e8344f24ae62f6fc82656c4927a537744942c384d2047cb28b134b925d735221845f151e0794c
 EBUILD xmrig-6.21.3.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 EBUILD xmrig-6.22.0.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 EBUILD xmrig-6.22.1.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
+EBUILD xmrig-6.22.2.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 MISC metadata.xml 719 BLAKE2B c8e2f6946503bafb5899f2b2ff022fb5e123cacd82ebd6ba2d983b5e8c94cc0ad35bc057a1b0147e0ce85701223abbe22464f8087c27453607cff278bc4fa860 SHA512 1611d29f42483a1aa4f1a3c438fd51a53473fdb0611bd428f068a9ae38e8a93c7cb278ecb834e4ae17957fdb2873461e7364267050ef1b776d534779166c824a
diff --git a/net-misc/xmrig/xmrig-6.22.2.ebuild b/net-misc/xmrig/xmrig-6.22.2.ebuild
new file mode 100644
index 000000000000..2061563b6ac5
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.22.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	keepdir /etc/xmrig
+	systemd_dounit "${FILESDIR}"/xmrig.service
+	dobin "${BUILD_DIR}/xmrig"
+	dobin "${S}/scripts/enable_1gb_pages.sh"
+	dobin "${S}/scripts/randomx_boost.sh"
+}
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 5df19169fbbd..cd6bed27699d 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,6 +1,8 @@
 DIST yt-dlp-2024.10.07.tar.gz 5752925 BLAKE2B c903ed6aaf88d96f0c99b0daa2d06b3388352ef0c100078e3474653ef8adc9a4c6988d01b118f03f187474ce0c3e90f36cfaa88e099527ee717127e0cb40c76f SHA512 2eef4db06cf970a7a8d84941daa28b193790f4cdc372794500c88beecfbd0e4dc464abc4cd53fb315d147c42c62bb9010f0a8903e68afaadce80c663bd734f27
 DIST yt-dlp-2024.10.22.tar.gz 5766340 BLAKE2B 6a1d0b1358196224b99333dec155b37401c1c73ad4d65752b8e776758aa1eec448317ebec9b007db1f318424f5853b4d25bec1b925032c7b9567c7c1496ed775 SHA512 486463af3487d3773fbeb975c741164131b802eac621eb1dc43f47704bcf2405bbb62b72d0fcc41a5b7e1651c81aec9fe284a42217bf06148d1870fbe362b0d7
+DIST yt-dlp-2024.11.04.tar.gz 5790714 BLAKE2B 01e28d2058ee7f899b8046bb8409b4eadcc2eb4ed2881068a9710913fea92fb37c5f7e638d94d0d1ef8314549d161c5e5b2a4a4065ad9620610ddd73cbcdeb0f SHA512 6af8973ca83cd622cfd61bbdd02fea6db34eb9b3986b9b2c402b7828d1c9da6c2931fc616f43be08be5332c6b2b1707a9ed21a14b71f639a5891a0ecbd1baccd
 EBUILD yt-dlp-2024.10.07.ebuild 2422 BLAKE2B 50c668d85da9dab582c8ba0a9a52b4bf80efedc4bead010de178d3c8763fcc22a406c538982d3ae2849db8572649a80cac339a4f7f30cbfe40a569b319aa3798 SHA512 bee00fae0f0ac28ee3af28e44caa37f61f6e9386b296d62484d22e4e72b64af4e3517b17bc6990ef76b21fe3ab3cf17862f495a748c215aa844ebb1374321f04
 EBUILD yt-dlp-2024.10.22.ebuild 2422 BLAKE2B 50c668d85da9dab582c8ba0a9a52b4bf80efedc4bead010de178d3c8763fcc22a406c538982d3ae2849db8572649a80cac339a4f7f30cbfe40a569b319aa3798 SHA512 bee00fae0f0ac28ee3af28e44caa37f61f6e9386b296d62484d22e4e72b64af4e3517b17bc6990ef76b21fe3ab3cf17862f495a748c215aa844ebb1374321f04
-EBUILD yt-dlp-9999.ebuild 2442 BLAKE2B 6923dbb9824c38ce22a3c627cf82ae24c25e0787a74eee4381007c31d9649c058913985a14bd33bce50dbf3f2bdd5f78b6014f81c5e9d4ad5c0ddd5f9060397d SHA512 7554088ec62ca5b8335052c6651150ea2943e9933c3f8a3b4fc8bc4fb8e23ce4cbda13289d9be4da016a040c0ad7347b89a75a0353b59f022d8c26cd4f895238
+EBUILD yt-dlp-2024.11.04.ebuild 2177 BLAKE2B 5a7c49c8b9c8929ca34cf4e1f271735d0f84f9d860157e3ee6b9c8af0fd7a15b7657a05c0dc79f680f146ed171577f4714ff82708e7134c0848d717722960a4e SHA512 276d7684b50801919ab4b66b169148f65174e1d630e632d4ea7410fecdf0ccff575826e1feb0e4c55d6e8abe934a77f6ccc643a882a577cc0187f438c3c2e404
+EBUILD yt-dlp-9999.ebuild 2197 BLAKE2B 61f5b720a56c7d82289c8a056146410d4817137e3085215c913a6f765853ac7989587fb98fdcbd52fe2e729137f53a8923f0732ad59522954170102049dac973 SHA512 29f9b741292ddf8333a062827265e589f98d2b2f040b83458f6937846e3f070e577d2aeddca69684182cc176d1ef793e3fd287856ea2164007e6fb639eea209e
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2024.11.04.ebuild b/net-misc/yt-dlp/yt-dlp-2024.11.04.ebuild
new file mode 100644
index 000000000000..3de67e0bfb4a
--- /dev/null
+++ b/net-misc/yt-dlp/yt-dlp-2024.11.04.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 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}]
+	!net-misc/youtube-dl[-yt-dlp(-)]
+"
+
+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\]
+	)
+
+	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 460b9890b303..2fb96ada27eb 100644
--- a/net-misc/yt-dlp/yt-dlp-9999.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-9999.ebuild
@@ -25,15 +25,6 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust pycryptodome and drop optional dependencies (bug #828466)
-	sed -Ei pyproject.toml \
-		-e 's/("pycryptodome)x/\1/' \
-		-e '/"(brotli.*|certifi|mutagen|requests|urllib3|websockets)/d' || die
-}
-
 python_compile() {
 	# generate missing files in live, not in compile_all nor prepare
 	# given need lazy before compile and it needs a usable ${PYTHON}
diff --git a/net-misc/ytmdl/Manifest b/net-misc/ytmdl/Manifest
index b23c9ce78039..5683ea586154 100644
--- a/net-misc/ytmdl/Manifest
+++ b/net-misc/ytmdl/Manifest
@@ -1,6 +1,4 @@
 AUX ytmdl-2023.11.26-data_files.patch 208 BLAKE2B 51cb77162812f798ce73d3d71d7a1ad113c047b3ed1e75747d09017b400353dc1fd7bd13ab180ad2e33f4d5c52c65330ff841240677b89da45c85e57a4328993 SHA512 66e6b4177c64232878c5ff04d09a931e0d3a51d0f797f5e2186d3c2870f606c6ac54a367abf90fb3805018f01f6ddb79065aa3a543171f1d1cbcc06e813f910c
-DIST ytmdl-2024.04.14.gh.tar.gz 1120264 BLAKE2B 018942cb9fa2534d225ba66e73e6b117581ce86cdc13b9bd3a39475dcde76d57fa97731264e3bf54863e0ab613a93861d51d7f0c678d332f029446cfaaa75820 SHA512 2d8b2e2189c6f0483dd32466f98281d8f173ad5d8a717ff9d828a7b08fc7f6313f108fb11da4b18ae66336c754c1c00f14010fe823c0a182387578db01795760
 DIST ytmdl-2024.08.15.1.gh.tar.gz 1120362 BLAKE2B ae6bdb8b610f585da7ed15cda298edbbed6a1274459ebb6f13e1afa3a7ed6666e49d7461cf197aa2ac46ca9f989d2d802dd89e83848204395e228d90cc6b9ed0 SHA512 431672b12f4366afd1b6a9dde9e52c14c51db53a7f41eb49a6680590bcf9ec0ca6736506c509262b99ffcf713f940bbb7c903937761ea16bc8dcdc6084201071
-EBUILD ytmdl-2024.04.14.ebuild 1644 BLAKE2B 9215f8dad81938cbbbdd85e1c358f53fcf69fa5267211f78064a063c2c0eb77e2113db2f488e4a638e1de314244664637a411122c5871b8c7225fe6172073227 SHA512 324cb8deb393dac2e1142541b48a3ea59914f4bd6a9621074db01b9104b1c1044604f72fe3e1384115e7087765334912029c9421d1025dbea2ec6f3d560e6196
 EBUILD ytmdl-2024.08.15.1.ebuild 1644 BLAKE2B 9215f8dad81938cbbbdd85e1c358f53fcf69fa5267211f78064a063c2c0eb77e2113db2f488e4a638e1de314244664637a411122c5871b8c7225fe6172073227 SHA512 324cb8deb393dac2e1142541b48a3ea59914f4bd6a9621074db01b9104b1c1044604f72fe3e1384115e7087765334912029c9421d1025dbea2ec6f3d560e6196
 MISC metadata.xml 450 BLAKE2B 9901cfebf346a8874315680cdef3ff19d49a84a812358aa122b99645ccde78f8c3b3ea42b1d16bdfcf9f670a694ebcbd9ce50cbcaefcef11c97eeee85264b442 SHA512 32a761ea39aaf5654523a09bfd5bfc6f4052cd35248439bb46175409085cb13b5fbb0097269785ae11df5701fa785ee564d756af5b00b4ab8112cdf3381f45e3
diff --git a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild b/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
deleted file mode 100644
index f73f070585ef..000000000000
--- a/net-misc/ytmdl/ytmdl-2024.04.14.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-
-inherit bash-completion-r1 distutils-r1 edo
-
-DESCRIPTION="Simple app to get songs from youtube in mp3 format"
-HOMEPAGE="https://ytmdl.deepjyoti30.dev/
-	https://github.com/deepjyoti30/ytmdl/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/deepjyoti30/${PN}.git"
-else
-	SRC_URI="https://github.com/deepjyoti30/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-	KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/ffmpeg-python[${PYTHON_USEDEP}]
-	dev-python/itunespy[${PYTHON_USEDEP}]
-	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
-	dev-python/pyDes[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	dev-python/simber[${PYTHON_USEDEP}]
-	dev-python/spotipy[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/youtube-search-python[${PYTHON_USEDEP}]
-	dev-python/ytmusicapi[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	net-misc/downloader-cli[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-2023.11.26-data_files.patch" )
-
-python_compile() {
-	distutils-r1_python_compile
-
-	edo "${EPYTHON}" ./utils/completion.py
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	newbashcomp "${PN}.bash" "${PN}"
-}