diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index 28e612550c..0844212241 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,3 +1,2 @@
-DIST awscli-bin-2.3.2.zip 44955907 BLAKE2B dd5331e3a7944f2910fdbb1539fac9773a751b655620cc014db638cb6bc2f87b8e8889bf861bad8c0e36d7e315ad863f56c762b51fe4737c6c344bd085e5b3cf SHA512 b435f9352c910ebf7daf3ae641135b06024fefa17596780ae0c1b4d20f5d5400e930ea5643072a15fee404c093914f394acf990c5483cfeff4edc248f67932a8
-DIST awscli-exe-linux-aarch64-2.4.27.zip 45315570 BLAKE2B 1477cbdbdbf1306f43b4cd138c3484dfb1579d8504d52d887b714aed4f90ee45396fc252e5a2533f023bf054f67000cdeef14c325d611cd1df26bf085f0b3156 SHA512 0efef5333c535f1f46ea9cdb867e3b43abeb3a898086e0ba59d5a2d0d55471f679c26643d30738e7b4de5f19ce365341358f515d278e93fe44ca852fdfae2142
-DIST awscli-exe-linux-x86_64-2.4.27.zip 46271162 BLAKE2B a9c9852764b9241ed962a40fe122c6c6ba838fb3dc60eb9dea3c6c98e8b94fd4a06f3fb3a6161959500d52860c97a2e4b740016d2bafe62c1c348f629fadd09f SHA512 906d884f24414c4737aee73b0a93285377b07fba173b77a8432c0c5bf77be9f7eb31854d8455105db51fd666352a3c88e2bdd1748ab274047f899a846d5cb1cb
+DIST awscli-exe-linux-aarch64-2.7.9.zip 46346746 BLAKE2B 6e80e508ab107c8b61db307e558bfc54a84c41a9939d113b7d8ab2fde26434b38021b5ac01ac3f08906b34ae504fa58efc00a838178af8a60b58388aab3f000b SHA512 05e3b2aa83d26fefaf6722d7d4b19e7e68b5859a3794ba7578abfbf6d9c507d6641cbc17bffba950606b908af2a6703a391a9757e860d083ef1ba446f07c1160
+DIST awscli-exe-linux-x86_64-2.7.9.zip 47162780 BLAKE2B afe1db8044e967cdf547a20575912eed231e8091966a0448d5740556c9a95984a5e353782cf31fd5bbc6463e4d4081ed46a7492a858ed7461c3c7d6526ce2537 SHA512 0074fe707a87bc1d63eb0a3f01502b4e0811db6d4fd711240d314c9a370a898f76f8ab351a886a98847468b814c170a10f71f0e6bf8a39896601751248d0e9dc
diff --git a/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild b/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild
deleted file mode 100644
index 27ddfa4626..0000000000
--- a/app-admin/awscli-bin/awscli-bin-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Universal Command Line Interface for Amazon Web Services version 2"
-HOMEPAGE="https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"
-SRC_URI="https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip -> ${P}.zip"
-S="${WORKDIR}/aws"
-
-LICENSE="Apache-2.0 MIT LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND="!app-admin/awscli"
-BDEPEND="app-arch/unzip"
-
-QA_PREBUILT="*"
-QA_PRESTRIPPED="*"
-
-src_install() {
- ./install --install-dir "${D}/opt/awscli" --bin-dir "${D}/usr/bin" \
- || die "install failed"
-}
diff --git a/app-admin/awscli-bin/awscli-bin-2.4.27.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.9-r1.ebuild
similarity index 77%
rename from app-admin/awscli-bin/awscli-bin-2.4.27.ebuild
rename to app-admin/awscli-bin/awscli-bin-2.7.9-r1.ebuild
index 3b1b45b0d7..979c76c747 100644
--- a/app-admin/awscli-bin/awscli-bin-2.4.27.ebuild
+++ b/app-admin/awscli-bin/awscli-bin-2.7.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -10,10 +10,9 @@ SRC_URI="
arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception openssl PSF-2 BSD-2 GPL-3+ public-domain"
SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="-* ~amd64 ~arm64"
RDEPEND="!app-admin/awscli"
BDEPEND="app-arch/unzip"
@@ -23,11 +22,7 @@ QA_PRESTRIPPED="*"
S="${WORKDIR}/aws"
-DOCS=( THIRD_PARTY_LICENSES )
-
src_install() {
./install --install-dir "${D}/opt/awscli" --bin-dir "${D}/usr/bin" \
|| die "install failed"
-
- einstalldocs
}
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 20d9eb09e5..afb080563b 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1 @@
-DIST fastfetch-1.5.3.tar.gz 345268 BLAKE2B 98c385d345bc2947f0301175269c72b61c6858f553b581705be1d81479355b6140a5cf2fb0dacd988ed7726d5079d5d26f7438223acddf22c9b2a4a1b39bdf09 SHA512 4f3656189f90141c3b9c26f75afee1ae9aa658058d54f00d8cb1a2a33baa17578d3847dfdcf1732fb35abd3391911954651f5af13049bb63a8940b65b007ca28
+DIST fastfetch-1.5.4.tar.gz 345879 BLAKE2B fac422642e6d2af4658d8f7c23c83b3c15a485eda8705626eda9eba024a4714b814e654f688015932cef3b80332c9e6ea5308d371848719786daca4e73ae059e SHA512 20a305235018ddb1af911246222c7f625311abaf95aa3feed6d7dc06e98b974453f80c34933e286709c721a48238d06b532f2770e72cb3f4018ad54de399a084
diff --git a/app-misc/fastfetch/fastfetch-1.5.3.ebuild b/app-misc/fastfetch/fastfetch-1.5.4.ebuild
similarity index 100%
rename from app-misc/fastfetch/fastfetch-1.5.3.ebuild
rename to app-misc/fastfetch/fastfetch-1.5.4.ebuild
diff --git a/app-misc/vocabsieve/Manifest b/app-misc/vocabsieve/Manifest
index f94b7d4deb..92032d99c6 100644
--- a/app-misc/vocabsieve/Manifest
+++ b/app-misc/vocabsieve/Manifest
@@ -1 +1 @@
-DIST vocabsieve-0.7.3.tar.gz 157929 BLAKE2B a93b37e34e80161431308d5741094438226f522434de8ba876d67be8a958d45065fed61234beb1e20d88b2fa51842839353e2e7bab7ca579a8e1b3f2625e32ad SHA512 7357c6f57493376af416f2d93aed09328217f0c5591b4d9b2a087678fcf3b56ef153aba5ee84fc20bdd4144d047b4d712c1ca6544f6a9d895a64ee215028ba8f
+DIST vocabsieve-0.8.1.tar.gz 183443 BLAKE2B 83a79720382e32ca061375135759d96b65cb882db3cd48940e85e62a27393b5dc0661b967ee1584916c410b25d0e8f51fe2e6fad1e31e085205c9dbbae52a10c SHA512 ea1c83647056c26100179dbb16a5dcfa708c13f0fc9c626c13770029235ec5948c73a72869184933e97cffa2e99e41f8ea933370b55cd226158da95400582a08
diff --git a/app-misc/vocabsieve/vocabsieve-0.7.3.ebuild b/app-misc/vocabsieve/vocabsieve-0.8.1.ebuild
similarity index 87%
rename from app-misc/vocabsieve/vocabsieve-0.7.3.ebuild
rename to app-misc/vocabsieve/vocabsieve-0.8.1.ebuild
index 0d258197a2..63e21b5c97 100644
--- a/app-misc/vocabsieve/vocabsieve-0.7.3.ebuild
+++ b/app-misc/vocabsieve/vocabsieve-0.8.1.ebuild
@@ -26,11 +26,14 @@ RDEPEND="
dev-python/pystardict[${PYTHON_USEDEP}]
dev-python/pymorphy2[${PYTHON_USEDEP}]
dev-python/pymorphy2-dicts-ru[${PYTHON_USEDEP}]
- dev-python/playsound[${PYTHON_USEDEP}]
dev-python/charset_normalizer[${PYTHON_USEDEP}]
dev-python/EbookLib[${PYTHON_USEDEP}]
dev-python/sentence-splitter[${PYTHON_USEDEP}]
dev-python/mobi[${PYTHON_USEDEP}]
dev-python/SLPP[${PYTHON_USEDEP}]
dev-python/pycountry[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/markdownify[${PYTHON_USEDEP}]
+ dev-python/readmdict[${PYTHON_USEDEP}]
+ dev-python/python-lzo[${PYTHON_USEDEP}]
"
diff --git a/app-text/klogg/Manifest b/app-text/klogg/Manifest
index 14e1c45454..80f9e16243 100644
--- a/app-text/klogg/Manifest
+++ b/app-text/klogg/Manifest
@@ -1 +1,2 @@
-DIST klogg-20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62
+DIST klogg-22.06.0.1289.deps.tar.gz 144508849 BLAKE2B b25c6660251ebe8240bcf9c6344baa1eaafea61abcbfb5bdaf4cd40caac601d5c48ddeb3a42d46f41dd7a71d8b883d5f27621c05cd03b64c297f9c8836c005e2 SHA512 7745902134f67731ebf98aec4e9cb8ae224851d9920aa81546a33e4a4994d2fdd3d56fcda21b71ade5dcbf1a5dfda2e556be09b162f2e4afe5058e40cfe8af83
+DIST klogg-22.06.0.1289.tar.gz 26092443 BLAKE2B b2bca0a30c6ddcdcecda2ce5a1342169522cdea0333eab7cafdf2d3db5b1ec2353d25bc7181e26a3df0a5263e0acd17f58124c13edc3dc6400e71c21eccfd9c9 SHA512 6e60632a859a4edbfb66a6c02abe1917c5d5254bc835870a6d63bf2893ac8860bd618403c29a1f0ee469a540fc92c3b18f0d6691fcb09b11d3aedbc7e9cb09f6
diff --git a/app-text/klogg/klogg-20.12.ebuild b/app-text/klogg/klogg-20.12.ebuild
deleted file mode 100644
index 779c8be98b..0000000000
--- a/app-text/klogg/klogg-20.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="A GUI application to browse and search through long and complex log files"
-HOMEPAGE="https://klogg.filimonov.dev"
-SRC_URI="https://github.com/variar/klogg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+sentry lto test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- dev-qt/qtconcurrent:5
-"
-RDEPEND="
- ${DEPEND}
- x11-themes/hicolor-icon-theme
-"
-BDEPEND="
- test? ( dev-qt/qttest:5 )
-"
-
-QA_PREBUILT="usr/bin/klogg_minidump_dump"
-
-src_prepare() {
- sed -e 's|share/doc/klogg|${CMAKE_INSTALL_DOCDIR}|' -i "${S}/CMakeLists.txt" || die "sed CMAKE_INSTALL_DOCDIR"
- sed -e 's|TBB_INSTALL_LIBRARY_DIR lib|TBB_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}|' -i "${S}/3rdparty/tbb/CMakeLists.txt" || die "sed TBB_INSTALL_LIBRARY_DIR"
- cmake_src_prepare
-}
-
-src_configure() {
- export KLOGG_VERSION=${PV}.0.813
- local mycmakeargs=(
- -DDISABLE_WERROR=ON
- -DKLOGG_USE_SENTRY=$(usex sentry)
- -DBUILD_TESTS=$(usex test)
- -DUSE_LTO=$(usex lto)
- -DWARNINGS_AS_ERRORS=OFF
- )
-
- cmake_src_configure
-}
diff --git a/app-text/klogg/klogg-22.06.0.1289.ebuild b/app-text/klogg/klogg-22.06.0.1289.ebuild
new file mode 100644
index 0000000000..75401e6dfe
--- /dev/null
+++ b/app-text/klogg/klogg-22.06.0.1289.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="A GUI application to browse and search through long and complex log files"
+HOMEPAGE="https://klogg.filimonov.dev"
+MAJOR_VERSION=22.06
+SRC_URI="
+ https://github.com/variar/klogg/archive/refs/tags/v${MAJOR_VERSION}.tar.gz -> ${P}.tar.gz
+ https://github.com/variar/klogg/releases/download/v${MAJOR_VERSION}/${P}.deps.tar.gz
+ "
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="lto test kde"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+ dev-qt/qtconcurrent:5
+ >=dev-libs/hyperscan-5.4.0
+ >=dev-libs/xxhash-0.8.0
+ >=app-i18n/uchardet-0.0.7
+ >=dev-cpp/tbb-2021.5
+ kde? ( kde-frameworks/karchive:5 )
+"
+RDEPEND="
+ ${DEPEND}
+ x11-themes/hicolor-icon-theme
+"
+BDEPEND="
+ >=dev-cpp/robin-hood-hashing-3.11.5
+ test? ( dev-qt/qttest:5 >=dev-cpp/catch-2.13.8 )
+"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ mv ${WORKDIR}/${PN}-${MAJOR_VERSION} ${WORKDIR}/${P}
+
+ unpack ${P}.deps.tar.gz
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ export KLOGG_VERSION=${PV}
+ local mycmakeargs=(
+ -DCPM_SOURCE_CACHE=${WORKDIR}/cpm_cache
+ -DCPM_USE_LOCAL_PACKAGES=ON
+ -DWARNINGS_AS_ERRORS=OFF
+ -DKLOGG_USE_LTO=$(usex lto)
+ -DKLOGG_BUILD_TESTS=$(usex test)
+ -DKLOGG_USE_MIMALLOC=OFF
+ -DKLOGG_USE_SENTRY=OFF
+ )
+
+ cmake_src_configure
+}
diff --git a/app-text/klogg/metadata.xml b/app-text/klogg/metadata.xml
index 425aa46ec0..d099eb33ad 100644
--- a/app-text/klogg/metadata.xml
+++ b/app-text/klogg/metadata.xml
@@ -9,9 +9,6 @@
variar/klogg