gentoo auto-resync : 02:12:2022 - 08:55:37

15 files changed, 13 insertions, 186 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8a87c5701bec..2e90dd0d6e19 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 2db12581935d..54bf63071249 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -5,7 +5,7 @@ AUX hylafaxplus-init-r1 3220 BLAKE2B d1cbf8ec446bffdfed9f78d2766b95a0bf6d645c2f3
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-7.0.3.tar.gz 1405116 BLAKE2B dbf8f87380929eb79ca0f18042c3397460dd6774f16defde8e9427d1d14094e00f6be491552f3ff6cc4c3d1fad0ec67a0c1a5fa3b4cb1e07c2f0c956eaefe8ed SHA512 938a21e4573fdf12bbc03dfee85e00555e7790a83a26316ac9cd1983501860858175d599c35f3b383cb0748518644587c203fb429966b5de3b615689d856281a
 DIST hylafax-7.0.6.tar.gz 1418749 BLAKE2B 83fff43dbc5c51f542aa847f61ae1617514a4260695d5c79a036416578ac632a778d0b5263a80fa7ccea9e9923a783759295a39199bdd32a2cb0ecac47ac91b4 SHA512 d1f69e13017f5d013ff39cf050c3a7ac6cef19a9ee5910ebe774a7ae06d7d22fd21e31de9734847764caea995539f578c3c458ecec7b9523b5823a841337d9cb
-EBUILD hylafaxplus-7.0.3-r5.ebuild 4169 BLAKE2B f30fbdcc4af40423bbad7a4be0acc27a19f6f09f72fbff6f0c0bc6d0a4b3565a11bb279c93d143d3b3fa9b1cab8ce5e60bd232c8edcd758ce0000713fd7cc978 SHA512 b5336c1cdd451bc9fb097745cfaa9b2471ce10eec4da4ffe8eabd86b7591c9d84c193ebb6b1d860b6c886c665088d55869a1d83198ec4a44e647d2c8ba11c795
-EBUILD hylafaxplus-7.0.3-r6.ebuild 4021 BLAKE2B 5b564d7ebd89d4fbea6bd5a637eb1ca77177c42906a564ecfa05f1af30d62bf8c1992c8377f0d1d30a43128632f53e188251fa8c3ba1ec7bb413c77ecab8610f SHA512 19f5c7cb8affc35aed1200578cbf04f1589085ff372ea296893acb565f70595334de44823a50976fe33724f9a8082a459251902d355cb4610ccfda551057398d
-EBUILD hylafaxplus-7.0.6-r1.ebuild 4047 BLAKE2B 69fc80838b97f089fbc62c29c87bbeccf8a00760e4eddeafd35813b5817b8e0c9fbbcdf3c04b9bac7d9073bbe0b31e0def5a909547efe9c94b19e63c5c5897b0 SHA512 c7a37697987fa35d8cdc0be04934378e8bb2370ba67ea71e1916060f4c686b5513c7ddc539ed6b375c2f057927788a3f3facd009ba65441dc986eb21356237b9
+EBUILD hylafaxplus-7.0.3-r5.ebuild 4178 BLAKE2B 88f019915b77b4353544425e9fa4b249c522956f29c6d25809264c4f4882b995787d73bbbf21a4b1fb3a2d018d740cd489227e86e1021eb9054692e667e84276 SHA512 a4cc4d9ab8208426e48a718c3589ea718ca7b84cd825d4d94a95585ff6205819d20e7aac5c523e02617b9d1de9abf3c2f75e6a19c4134e7ddd19c7b9864772e2
+EBUILD hylafaxplus-7.0.3-r6.ebuild 4030 BLAKE2B 00b408d98dbd21f7b164f5aa06fcdaf64858ddfe4693f88e3ee0082536dcc2ef20dfb615152de1279473b20f372218f0e8801bb2fcedee475989c225868d727d SHA512 1461b0a27210c046da978dc1804d978969e7647e8c8713c707ad9a55f0dcc6a38b34053b09a30f0a3b01473e164bd00ffbd5cdc1d1dd327c3025facc2a66af2f
+EBUILD hylafaxplus-7.0.6-r1.ebuild 4056 BLAKE2B da6759284df5f71ad9e6d5510bf3ec219514ce262c8fcc921186f4e1ba65028b7054b76b0dbcad306834fab523f9195bbffd0575aa5638fbd891b4d8f8ba8d48 SHA512 82740233e327a002a9ac4c2ab9697149863522f91b7bc9e0f7d021e5f30b2430a773e963c029375a3c9bdc8caa6034c343dc28be1d86f7ab08b5d7663598397c
 MISC metadata.xml 497 BLAKE2B b3f400cee9f701675dfc8b5bd0a23d497b5f4d2e7211ba421b442782e90a1b60017d33ba482f614d0017f5abf2fa72e886ab445353eec72a9217c45aa23565ae SHA512 4b0b543bf8816e2ffff95334bf0cb64e022cc507f5ccc6b766dd183d272303d31cb43b4b6c4352991b1ceba8aaefc76276e64c5adda3caae9bff5872189deef3
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
index bf2154198c0c..b5e33be8f054 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r5.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff:0[jbig?]
 	!net-dialup/mgetty[fax]
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/jpeg:0
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
index 16fda5b580e5..a3b81cb42512 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.3-r6.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/libcrypt:=
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
index f934beebed22..3a82ac03b413 100644
--- a/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-7.0.6-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 	media-libs/tiff[jbig?]
 	media-libs/libjpeg-turbo:=
 	>=sys-libs/zlib-1.1.4
-	virtual/awk
+	app-alternatives/awk
 	virtual/libcrypt:=
 	virtual/mta
 	jbig? ( media-libs/jbigkit )
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 0a54640e306f..5d631f6f3dca 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST nextcloud-client-3.5.4.tar.gz 15436558 BLAKE2B e95aac753e4fcc70093ba497022572d4ee2988ed943e09247a0ddec3b039d658e3f1f498c24f5b5a92c15bd50b14c7e5c71f420c35e8de4894c2f65d06563766 SHA512 7b8afe19acad7f7ca96184b0f925e0eb324605a11bc468ef5662e5a879cada16483b9185e12336471ca2a9debf2e00671d8245bdbae2f7be01af756b57225bae
 DIST nextcloud-client-3.6.1.tar.gz 15346135 BLAKE2B 116a2632ad1c653bb1dbf184c6156ebc469ed8c0bfe209282e8239d4113c46b761f4049daa6833d23d5179c0b2a3f9dd94f506e63c401775da419c92104a069f SHA512 444062440570efd82b8cd9acf85dcc5826552c86c31edc19ae2f87d9fdf23afa501aac03e4b8135bb037feb523fdcbc230339387acbf56c0ca6e5df3e7bae583
 DIST nextcloud-client-3.6.2.tar.gz 15406717 BLAKE2B 1408745e8adfd76507ffba63a20abfc34db155ef3d4f8cff1eb3736c8d1ede4cebc536cecf8f5a843ff0b22b1cf46ffd5e6cdf9c87b2e9960728e030f2f7ae66 SHA512 1baae103c08a981e86aee74550d31a195f639fef830d0a78213f7890b820ddf2cd39fa742b99c9222930a4ef9587acc820678c56527e98ca482689b3bffd14ff
-EBUILD nextcloud-client-3.5.4.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.6.1.ebuild 2325 BLAKE2B 210232aa19801f2eba06f956ebf725eaa7eef552167b6a4253354362f29f763d1633740683d7b05bc2fef46ed803688a77b896a7198c81724bdc23ea01132de7 SHA512 250fa76d1da6da6ba842c3e448747c8682bcc533ccb3063d659527900cbdd1d81ff184ee1e007c84cac6241a20d8e8e2ca84b4224cb4b0be02d79e1f25d7a6ea
 EBUILD nextcloud-client-3.6.2-r1.ebuild 2240 BLAKE2B 2ec5ef1aca91f808bcf621acc1f9685cfd3d78af53de542a13f272ce472fae8ac2e3862af07cd6a02a9a1e3be03d6edbf24ad72f9279b09b7820593863cad40f SHA512 029f0c30ff14659a2a3a41f7555936b97788c7b48f25e6e8d1f7e9049308a813528b01ab045b470082b5592f7ae691bcf9728ea720530f86793b4b5018a5d406
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
deleted file mode 100644
index d44483e6593b..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.5.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-src_prepare() {
-	# We do not package libcloudproviders
-	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
-
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
index f6d7b1a68dc3..c643fc70ef09 100644
--- a/net-misc/shmux/Manifest
+++ b/net-misc/shmux/Manifest
@@ -1,4 +1,4 @@
 AUX shmux-1.0.3-tinfo.patch 532 BLAKE2B 47e60a565b660417527e198b7eaabccb4e220d57c06005622e094a0afa3b69e9b1d8ff0a7413e74844974de4d6cb5561d472c7f63b12838caf7b1ed4897dcb61 SHA512 5d3de39d37375c90e699dd2bef9cc02f182f01259e351909107cb033ddbba2a238d783c2b2f3b523288471a92f3a6e69b128e3dc44a1f4bfd5dfa9f52cba3613
 DIST shmux-1.0.3.tgz 116613 BLAKE2B 3d46edf3633e7d91a7fdb65e578c4541b2de35c885f1f449bdf347d3e3107ae014e6771e54b11f996a2783b303950f6ca66b46c3ef98586b932dc2fe4cb2f9ed SHA512 fb1dbb9701913fb97fb82914b9ae277703aec48cafdf74bcaa4a194ba242b62aff34e004507d6931475f320f89d62ed465360c0bc5cf2ff45abe7482b3127197
-EBUILD shmux-1.0.3.ebuild 680 BLAKE2B 5f7844ab8d56be35fa27bf26f6deff26a15920c475b5a1b46b31e39351591f3d4516f1a8cd87935267ae82b24e538673534fb12de095e16f1e80b7cbc2cd40d2 SHA512 5fd616cc50cb07293c6f3aa348e2b7bfba22356120f41dcc8c72cff2df9f801012150242a15099668a2c9448992ed6c32cb2e849933f0b31f285e75675d9c099
+EBUILD shmux-1.0.3.ebuild 689 BLAKE2B 6ca177c785f678f80458f376234491c40c03f9a3d25b995bfa5e91ad4821560947cb8e5b3f4a0d7ad1ac54aa2916fca9eb523c0619cebaef2874246357b11dc2 SHA512 2e619f43753d700992a17f55c960e9a6608a090fc18d0d1b02cd14807f6de1bfdb507d1235d2fd0faab26580e853c5a5d01b9ee280ef949a44e159e07e034f15
 MISC metadata.xml 747 BLAKE2B 12d77e1acf5d36a3a8b88d4f53bd51ce77bcd2ddea0a1ac49a3c93884b9bcbbcc5a62fda3b09fafcacb630a61554394172cf91bd35deee659722bbf70dc967ce SHA512 9b69246f06e1b66cdada8cb2b6f20be6a4b7312b7f492be103e967ee9df5fe711e6bfd2255b5b9fc8f38be93da4f258484305ff854a803932a044717ba9e3916
diff --git a/net-misc/shmux/shmux-1.0.3.ebuild b/net-misc/shmux/shmux-1.0.3.ebuild
index 226598b33b39..e1d72b0d9f1b 100644
--- a/net-misc/shmux/shmux-1.0.3.ebuild
+++ b/net-misc/shmux/shmux-1.0.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 
 DEPEND="
 	${RDEPEND}
-	virtual/awk"
+	app-alternatives/awk"
 
 PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
 
diff --git a/net-misc/tiers/Manifest b/net-misc/tiers/Manifest
index 13ffdf5096af..16787ef1a62f 100644
--- a/net-misc/tiers/Manifest
+++ b/net-misc/tiers/Manifest
@@ -2,5 +2,5 @@ AUX tiers-1.1-gcc43.patch 3170 BLAKE2B 58deb7b271f90d681a4560af610e5109bd2464628
 AUX tiers1.1-gccfixes.patch 5840 BLAKE2B 432bf2a8dd67b0a14af699e8a505e3dff93f439aeef31a23295a2dbf69abc6cdd6a411be7cd457cf611e0ed089b96e3f298c781b188be5a5adb33a0b2278159b SHA512 81913aa857d3251c358e91aa1644324399e60cf1bf7811ccc96d482ee4d56c5ba38138b882380f39d842e78f44d9d985465221b98283d2654bb8f4898552775e
 DIST tiers1.1.tar.gz 392532 BLAKE2B 0d729b48bb24feeb98b5584e15bf5ce572bc1c959830de97f8f601ff0cc38bdb3d39152e9644a5437b2cf4d29a5c43e8f2729666c8568227f2a3e5077919048c SHA512 b72a98aeeb3e1799536e1424e8f60bffcef59c61cc709232a670174c80d23fb4c3b60249c7ff2a33442b62b81a493b7ecef4bf0e950147fa8fe81bb9eabb9a08
 DIST tiers2ns-lan.awk 3258 BLAKE2B 5a6838cc332cdd617f17d01ae56494d12f43344cbb36c5e39766c4c0481a300607a7bab8922918de22d72661e92d51bca0645ea436c3b95958e448d1b42a6f25 SHA512 562204765e0e7c973e6d88c494e5aba9cd47d79c68309359cd232c34be6175f727411a64a6033a246a042987f1ad423008857eaf25c6254bd006c4a3ff4d083e
-EBUILD tiers-1.1.ebuild 1280 BLAKE2B 7a4f0477a24980f65664fb63c693dc3f012b7e467aa373d93230d8cf731474dc3044d38eed10d097fa0f371cd1044bb34fe748b63d4a068a217a01d7e9418b8b SHA512 405adf240436b9a429bcede1aaf7cad6a98be46f486cade3dafd7f1d76389d9cfa068f233371eb4b952d15b54b2f2f5b8585503d1ab9d75fc7334799d676dc0c
+EBUILD tiers-1.1.ebuild 1289 BLAKE2B c3e132ba29f279003b1d9279d3636fe2779bca9a40f4e4e990afde21c82a0db405dbae5838a94141351de569aaffc55d948a662287791da9773827f296281dde SHA512 a6a87803d9c792bb6f7fa90f5ec7be818e9a1bb3b716d5d9e544204c39404f9b5a4071469791400bb770319b017e98c7110e45626a9b0f8204ce0823deb4b9e5
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/tiers/tiers-1.1.ebuild b/net-misc/tiers/tiers-1.1.ebuild
index 5d489c5a5959..841db16c476f 100644
--- a/net-misc/tiers/tiers-1.1.ebuild
+++ b/net-misc/tiers/tiers-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="sci-visualization/gnuplot
-	virtual/awk"
+	app-alternatives/awk"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 99103cfa9ccb..f2bbbf665c69 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,3 @@
-DIST yt-dlp-2022.10.4.tar.gz 2427017 BLAKE2B b3dfde252217ef7ed9f5b99351e956a1f30bfe7bf545e28bb262db90dc9b9cb5e44af7259a815f84cd4e821c8ae93f6372e9a5108483208cd8dec403cf194790 SHA512 286e219057505e4de2bb8af6dc334b43b4e46e7b998d98437f78e9cfa82294e2ac17432c22f741ad101dfe05fa0d2dc0111904be51f32ab3a002bda7b17a86b7
 DIST yt-dlp-2022.11.11.tar.gz 2470530 BLAKE2B 0d453d08678cccffccd7e4639fd66d08bead30d0cfae6f5a09d46d2a79a03a24b84b7c27d28a1f4b3bb03fdb96b8f9734e7f9910d02b9cd4a04bacdc3ff2c705 SHA512 be29154746f4c499eb25489be45ea759bf83f7aeb086a2a0e90a2bee6936c0d9362b1cd7af5eebed4f01f84a3542a9d5fa5746b647c349cad2e26b45cf4a861b
-EBUILD yt-dlp-2022.10.4.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 EBUILD yt-dlp-2022.11.11.ebuild 1824 BLAKE2B a5be6f4534e7476a6a89961e4e38ada99f9ebff77c673332cd1795646a59b3a267d29c514e9aeb4eec3344c8f203859920c19e3dccaa4cf1b7a882d6ded1f823 SHA512 6931b2c14a083ee20476a5ca0abfecf14639d3f1ab628c507352c77ffb255095e7614f0b9010d7a63ac35bbb36d04b5cf3a1a7dde72df586a8ea518a437ecf69
 MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734
diff --git a/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild b/net-misc/yt-dlp/yt-dlp-2022.10.4.ebuild
deleted file mode 100644
index 705a62db9da4..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2022.10.4.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 000f26bf620d..2c29a019a691 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,3 +1,3 @@
 DIST ytfzf-2.5.2.tar.gz 3263326 BLAKE2B aa0e6b01ba90217df1e488cfbe74f44baadee0fa5f6e29f45ef79af9a0d9587ef394b345ddf6b8a86282f57f097c6728adccba2e444eda38d1746ae95438900f SHA512 aa87d2f3c50bfed3c49d363b23bdf17c6c5307116648f3042148d828d204cc9f1ce61888a82fade26e46dc46991cb2c8f559f5f9aa671d8bcf425d343fdff389
-EBUILD ytfzf-2.5.2.ebuild 1419 BLAKE2B 116e90deb0f8c9128b741e53e4449b8a45390e5a39ac05ebdd7c537a1e62afee1d9fb97422da569507af49217c1609fcf51db0d561d51d86821e2f6d6705b39b SHA512 c2a25a86d74ff9c8885c9595116219020a3c27fb393c33a465bad34e74f69aa3257cd031f8e87e40547eda440eef133041c8e1c83e64bf61b7dc0da8828b2fd3
+EBUILD ytfzf-2.5.2.ebuild 1428 BLAKE2B e2eddcee03517c5a01ceac852c4e4945f3da15d3fcb96f9fa028dafd4a0d52884e5b19e1ed0660ad49d4155b4171b88f731e16599ef26ff1f4c582ed77bb7992 SHA512 07d64edc61bb5ecd11ea4f88622da466999f353fb0b25cd86a3c9cd386739ec61e9f641ad082cb8113f4fd555a8e7d00347516f5153925173027ca6821ccff3a
 MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.5.2.ebuild b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
index 05675648180c..5be910b165b7 100644
--- a/net-misc/ytfzf/ytfzf-2.5.2.ebuild
+++ b/net-misc/ytfzf/ytfzf-2.5.2.ebuild
@@ -17,7 +17,7 @@ IUSE="X minimal"
 RDEPEND="
 	app-misc/jq
 	net-misc/curl[ssl]
-	virtual/awk
+	app-alternatives/awk
 	!minimal? (
 		X? ( media-gfx/ueberzug )
 		app-shells/fzf