7 files changed, 2 insertions, 129 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b60333e29c09..56b5da754610 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 27a304d92740..f50e8538f50e 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -3,6 +3,6 @@ DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da8
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.76.ebuild 1707 BLAKE2B 5da5dbaf196d105ffcdeac1fba6b49f0be19d69d851bfbb0e79812aabc3573d717a440c693ffd96df62d8290c43581b08130c794f0000ed66c7018bbcc10e038 SHA512 93f499eb5fe6fbf3844cbc8a3c970d5329660d85da134b2811de6f9be0c930951057445cc7e663c91467e4e4646cf4f8e1c11d7f3f4de1ebce5a1ea5295d7161
 EBUILD putty-0.77-r1.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
-EBUILD putty-0.77-r2.ebuild 1832 BLAKE2B bfe643ae7e8bc7979ecacf17fa3596fe653c704d2b14383802fe04457463bbaa1d9d0b8d4eea028868020d63bb2e0f41da6b60517dfb71ff4685d7d1fff240e6 SHA512 17b049539bac24b43820efa6ff473d8c00dddef40ba6338973c7bd2b498b56276c07ece2852103ffa466985790f3390c5faae88f6e63be6ca67ad8025524e1ed
+EBUILD putty-0.77-r2.ebuild 1831 BLAKE2B 1d829824482af8079cb7a80227d00553b980c722ffa76ba84973d2f885f58fe3251476bc2de8848f8bbd0d95753ff813905012eeeceaea7560a978ea0c4ffd7f SHA512 9c5e0711759336b3b3642b18f819b575efb9778695cad0874f061b8b52f3853fec1b1c4da1ea6fed86cad94b7e5f6a820ef0532bfa16e7b57e74851e198a2e63
 EBUILD putty-9999.ebuild 1851 BLAKE2B 81beaf794457204d0e8cd5c54d11b61a47cc2541abf8722677727859ac2977d145645a317eb01254d248ee4e7dde5162edb131f435a0102b7a1a853fbe0cbd2d SHA512 e08e2470968a83cef9a8f225dcf316e00db231a4ce2f43dec93894735dbef3e8571d08b5c569bfb5888017e1d9b3ae91f56b8f69b7542f6503d53120c58b105d
 MISC metadata.xml 1007 BLAKE2B 358ab09685c2020a9d0bd49a7c4845cf3b0f31776d7ad9d11c99b70b325b9d902bad73690e68aa991b0123a3a720eb55f50d07f6df35e7142ddddb5146b92ed8 SHA512 45ed3f5781db722328f6101496538c2d920c6cfe5f9422ba838e4d723b9ca53ad2fa783a6c0dd36557e7d0008071d7886bd7e5f1ca76e1b83465a6312c01d772
diff --git a/net-misc/putty/putty-0.77-r2.ebuild b/net-misc/putty/putty-0.77-r2.ebuild
index db09be43b8d9..f064771f6cea 100644
--- a/net-misc/putty/putty-0.77-r2.ebuild
+++ b/net-misc/putty/putty-0.77-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 else
 	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ppc64 sparc x86"
 fi
 LICENSE="MIT"
 
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index a186f9507b73..8b3ab2755766 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,3 @@
-DIST yt-dlp-2022.8.19.tar.gz 2373949 BLAKE2B c95aabee39ebf4a9285f05e17f85c6fcdb2d7ddc07bc9866e59f55cbbc10bbbb048d22d6dda434eae8383834308e29c959e47ed40d07d20296ead8ad09efb999 SHA512 277a91f4790d7bc34f913e420d3c8b1c563a6a88e6175077cdbf53c60d05afaae56b4103acfc3725015e5075fc1346194e06a81d1d68de743d7173265cb39d25
 DIST yt-dlp-2022.9.1.tar.gz 2387756 BLAKE2B d13f27a4666a967d6bc99a0705cb534b940cf42079eb9d3003c7759542ac8587375b0bf88e0d9c9ddba4f2cace5de00f97f025a624cc15324714e8f3b370737e SHA512 972bc3228ea7800007e56de0c0e182f99fddda76ebee05154827a6d4cf50e056cbaee3ca50d9fc396b2080a65ad5d02cde64de9c26896f33c617346465568355
-EBUILD yt-dlp-2022.8.19.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 EBUILD yt-dlp-2022.9.1.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.8.19.ebuild b/net-misc/yt-dlp/yt-dlp-2022.8.19.ebuild
deleted file mode 100644
index 705a62db9da4..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2022.8.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-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="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl[-yt-dlp(-)]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# adjust requires for pycryptodome and optional dependencies (bug #828466)
-	sed -ri requirements.txt \
-		-e "s/^(pycryptodome)x/\1/" \
-		-e "/^(brotli.*|certifi|mutagen|websockets)/d" || die
-}
-
-python_test() {
-	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
-
-	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/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 60de96f35354..775f50dd10b2 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,6 +1,4 @@
 AUX ytfzf-2.5.0-cachedir.patch 607 BLAKE2B b97199a2162f83071dd4018a637bafd52c0ab9deb28981e44fe0205e2f2129dc77333467e1686a0f1d61be0bcec8a011dcbc6ef0855101f51526ea346d45871b SHA512 da5ae7bc3ee100aae8e697824b4df34b64dea855ba572172b5513d045a55acb6266cfbe1caa0fff1740d53222998ae050518a691fd50c7a7cecdead9ab3e12d1
-DIST ytfzf-2.4.1.tar.gz 3256903 BLAKE2B e95fc86d1ed2099aeb96d8daf808861e279865e17758dc8b0b5fa4c349dd819371012d13073f89b94469f1d69f00b66bb01860e3190e324baadc30e2cbae8074 SHA512 f0be168d5fd32cc75f95d0533a093cb9e3aa238d39e024271d69f078b974da51504bd1fd65a34378085a148f1ddae68f6c2fdc15c7a56c2353ec3d6695451771
 DIST ytfzf-2.5.0.tar.gz 3260280 BLAKE2B 33535afc6be18fe9efeddf666ccdc646db227fcb601a52baeaca91b9316b87b1300fdab50ceca5eb9e21fef5571a87e917f78f71b97e7ec2abbebf5158b4487d SHA512 43e366694687be517a0b3da0d16e423f32046ab5de92368748e87c622f43e34bd1037f01b37fcb05ae8ce87ca536672cf3f5ca2b2608bab07ec9f4abeabb61ec
-EBUILD ytfzf-2.4.1.ebuild 1421 BLAKE2B 15a4578d3332238ff71b4a8c9c5eb86f10307b6fb6d8a03a0650af27d0a30bc0311010e3d15a6497d77ac4c861f18889930232495920fc7accfe76fce41b37a3 SHA512 2b1bea0a13a963e5eff2b473b2c124c5fb6488462095f9c9d584e643ed39386a03f411ea887deb7610c20ed511a7c4374f0b6b51e8bb0e71727a3c6d6c7054f2
 EBUILD ytfzf-2.5.0.ebuild 1469 BLAKE2B a9c45e8de3cae522fd547131f6e64ccbbf6f3ff14befbd2c9325a59aa8d6e19321d6c49821ccf8645aaf9316804827ee3990107aefd6af756a1ef8f3d821acd6 SHA512 8887ff344c2a3b335602509c32b94be73f2c41e8d18288880733840b8de0f016ee2bff3315d8d898f8021be3510cb61cc7d17e6fc34fa48d9872ae8f140ebf15
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.4.1.ebuild b/net-misc/ytfzf/ytfzf-2.4.1.ebuild
deleted file mode 100644
index 36a2a31e9d01..000000000000
--- a/net-misc/ytfzf/ytfzf-2.4.1.ebuild
+++ /dev/null
@@ -1,59 +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
-	)"
-
-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
-}