diff --git a/app-misc/afetch/afetch-2.1.0.ebuild b/app-misc/afetch/afetch-2.1.0.ebuild
index 377e2194e2..f8f6f7f095 100644
--- a/app-misc/afetch/afetch-2.1.0.ebuild
+++ b/app-misc/afetch/afetch-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit savedconfig toolchain-funcs
+inherit savedconfig
 
 DESCRIPTION="Simple system info written in C"
 HOMEPAGE="https://github.com/13-CF/afetch/"
@@ -14,16 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="savedconfig"
 
-src_compile() {
-	emake CC="$(tc-getCC)" DESTDIR="${ED}" PREFIX="${EPREFIX}"/usr afetch
-}
-
 src_prepare() {
 	default
+	sed -e '/^CFLAGS/d' -e 's/LDFLAGS =/LDFLAGS +=/' -i Makefile || die
 	restore_config src/config.h
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" PREFIX="/usr" install
 	save_config src/config.h
 }
diff --git a/app-text/OCRmyPDF/Manifest b/app-text/OCRmyPDF/Manifest
index d6bb63d7d0..04c33c563e 100644
--- a/app-text/OCRmyPDF/Manifest
+++ b/app-text/OCRmyPDF/Manifest
@@ -1,3 +1 @@
-DIST OCRmyPDF-11.6.2.tar.gz 7885633 BLAKE2B a4c09a8088abe3f9e984e8c7ce1b58699c5e40c46de8e9f81ac43838772541758467887b22c3a9fe8026fb8cd125466968e5745af69c9760a0f470879e40685b SHA512 1f92022352b63d2642a0fd49ea72d70973c08d2b2cc84d3d92f06bfd883a858f7dba06f83a921245846d20fc90a1afa0570e7d58fe673e1dfad82e5e047e8de3
-DIST OCRmyPDF-11.7.0.tar.gz 7885763 BLAKE2B 9658222f85f32958338823686e4c7d66a07060b4660033c167a8462fec7f9c863f516e877b9dca2979f9471a7bbda1a5c611dfbdcdc7ea75fafdb13bca2cef08 SHA512 d9353bc627a13d5092e79e264287942da757669992a3585f44d97d254d4043f41a6e4646026115bd81bf5bcf0d2810c1a382097a23938e0925cbc1fa46815595
-DIST OCRmyPDF-11.7.1.tar.gz 7886196 BLAKE2B 8da696926824b54061035157f7962f428f8c2bf8d94f9bec119a963e05b1bbade1a0740fa7fea4a5a8b8d442b18a294a9ba8ca3b824e5c40445fa7e50279d49b SHA512 75e8b969ff94e1d6b36ddfacc3d79aae00ada2622ace8ef911de2febb815a2b0a5d7b3e46e5adb74687871d75ff1a08bf9cd3f1529bc412fccade1bad16b5fc6
+DIST OCRmyPDF-12.0.1.tar.gz 7895727 BLAKE2B f31adaf417b50cad5140f7073e4e66350103b46f968c28892b50f5164834903cd214dc3a6e83c2d22b1df3f3d44ea48ab2fff7c356ec39adabb812b77deba3a3 SHA512 7e7718d9ad1349d4702f859a8f985c6523f136ce745bd9c69038792c5f580b1124c1a6c2efe9a06bf3bdd21cc2d6d005140ade29361be4e13e625b201791c680
diff --git a/app-text/OCRmyPDF/OCRmyPDF-11.7.0.ebuild b/app-text/OCRmyPDF/OCRmyPDF-11.7.0.ebuild
deleted file mode 100644
index ed5786c975..0000000000
--- a/app-text/OCRmyPDF/OCRmyPDF-11.7.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
-HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
-SRC_URI="https://github.com/jbarlow83/OCRmyPDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# This uses *a lot* of RAM, I have 32gb and these tests tried to use it all
-RESTRICT="test"
-IUSE="jbig2enc"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/tesseract
-	app-text/unpaper
-	dev-python/cffi[${PYTHON_USEDEP}]
-	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	>=dev-python/pdfminer-six-20191110[${PYTHON_USEDEP}]
-	<=dev-python/pdfminer-six-20201018[${PYTHON_USEDEP}]
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	media-gfx/img2pdf[${PYTHON_USEDEP}]
-	media-gfx/pngquant
-	media-libs/leptonica
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	jbig2enc? ( media-libs/jbig2enc )
-"
-DEPEND="
-	test? (
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		~dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/completion/ocrmypdf.fish
-}
diff --git a/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild b/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild
deleted file mode 100644
index ed5786c975..0000000000
--- a/app-text/OCRmyPDF/OCRmyPDF-11.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="OCRmyPDF adds an OCR text layer to scanned PDF files"
-HOMEPAGE="https://github.com/jbarlow83/OCRmyPDF"
-SRC_URI="https://github.com/jbarlow83/OCRmyPDF/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# This uses *a lot* of RAM, I have 32gb and these tests tried to use it all
-RESTRICT="test"
-IUSE="jbig2enc"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/tesseract
-	app-text/unpaper
-	dev-python/cffi[${PYTHON_USEDEP}]
-	dev-python/coloredlogs[${PYTHON_USEDEP}]
-	>=dev-python/pdfminer-six-20191110[${PYTHON_USEDEP}]
-	<=dev-python/pdfminer-six-20201018[${PYTHON_USEDEP}]
-	dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	media-gfx/img2pdf[${PYTHON_USEDEP}]
-	media-gfx/pngquant
-	media-libs/leptonica
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	jbig2enc? ( media-libs/jbig2enc )
-"
-DEPEND="
-	test? (
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		~dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs --no-autodoc
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp misc/completion/ocrmypdf.bash "${PN,,}"
-	insinto /usr/share/fish/vendor_completions.d
-	doins misc/completion/ocrmypdf.fish
-}
diff --git a/app-text/OCRmyPDF/OCRmyPDF-11.6.2.ebuild b/app-text/OCRmyPDF/OCRmyPDF-12.0.1.ebuild
similarity index 100%
rename from app-text/OCRmyPDF/OCRmyPDF-11.6.2.ebuild
rename to app-text/OCRmyPDF/OCRmyPDF-12.0.1.ebuild
diff --git a/app-text/klogg/Manifest b/app-text/klogg/Manifest
index bcfab41f14..14e1c45454 100644
--- a/app-text/klogg/Manifest
+++ b/app-text/klogg/Manifest
@@ -1 +1 @@
-DIST v20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62
+DIST klogg-20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62
diff --git a/app-text/klogg/klogg-20.12.ebuild b/app-text/klogg/klogg-20.12.ebuild
index 0e3108df0d..779c8be98b 100644
--- a/app-text/klogg/klogg-20.12.ebuild
+++ b/app-text/klogg/klogg-20.12.ebuild
@@ -3,16 +3,19 @@
 
 EAPI=7
 
-inherit cmake
+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"
+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
@@ -21,53 +24,31 @@ DEPEND="
 	dev-qt/qtxml:5
 	dev-qt/qtconcurrent:5
 "
-
-RDEPEND="${DEPEND} x11-themes/hicolor-icon-theme"
-
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
 BDEPEND="
-	>=dev-util/cmake-3.12
+	test? ( dev-qt/qttest:5 )
 "
 
-IUSE="+sentry lto"
+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"
-
-	eapply_user
 	cmake_src_prepare
 }
 
 src_configure() {
-	local cmakeopts="-DWARNINGS_AS_ERRORS=OFF -DDISABLE_WERROR=ON"
-
-	if use sentry; then
-		cmakeopts+=" -DKLOGG_USE_SENTRY=ON"
-	else
-		cmakeopts+=" -DKLOGG_USE_SENTRY=OFF"
-	fi
-
-	if use lto; then
-		cmakeopts+=" -DUSE_LTO=ON"
-	else
-		cmakeopts+=" -DUSE_LTO=OFF"
-	fi
-
-	local mycmakeargs=(
-		${cmakeopts}
-	)
 	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
 }
-
-src_compile() {
-	cmake_src_compile ${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/aiopg/Manifest b/dev-python/aiopg/Manifest
index b69212f506..609c9e71e3 100644
--- a/dev-python/aiopg/Manifest
+++ b/dev-python/aiopg/Manifest
@@ -1 +1,2 @@
 DIST aiopg-1.1.0.tar.gz 198388 BLAKE2B 4d1894f31ebd7bfd1234415c72727fb04fceef42ef86af7198447848846aef748fc9cf03958f9e5a2e2899836f304aebc97973117e0bc53e960f14ef7d4ab299 SHA512 375a7325a84a52a6eaff51132a9c7fe8982c4f69fbf747917fbf759a0be9ca6d2a3a1d90e852fa0a0c905c6679ff0603e3c85ddae6ee38b67f702d7d79b3b153
+DIST aiopg-1.2.1.tar.gz 197099 BLAKE2B 3c4300724da13d6f9d439a31a0fad02361eb3f95fde90abd4718a2298d291f760e2a4a2c15691cd90a2996c101759422bb372202768f43b2ad6923c4921d1387 SHA512 19c00a77cbf8bc60c7704bcc17f9baab6ec1b0554dc62c1bf8fbd4f97f56636fc5edf9479da5a9c27dfc06108c9d650b3fe5d2cddca445f1ffa7b18cbc1d896c
diff --git a/dev-python/aiopg/aiopg-1.2.1.ebuild b/dev-python/aiopg/aiopg-1.2.1.ebuild
new file mode 100644
index 0000000000..c34f8f75aa
--- /dev/null
+++ b/dev-python/aiopg/aiopg-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="aiopg is a library for accessing a PostgreSQL database from the asyncio"
+HOMEPAGE="
+	https://aiopg.readthedocs.io
+	https://github.com/aio-libs/aiopg
+"
+SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# tests seem to be wanting to send/recieve things
+# which is probably not allowed inside emerge so they fail?
+RESTRICT="test"
+
+RDEPEND="dev-python/psycopg[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+)"
+
+pkg_postinst() {
+	optfeature "sqlalchemy support" dev-python/sqlalchemy
+}
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio
diff --git a/dev-python/aiosqlite/Manifest b/dev-python/aiosqlite/Manifest
index 9f0d749313..442711215c 100644
--- a/dev-python/aiosqlite/Manifest
+++ b/dev-python/aiosqlite/Manifest
@@ -1 +1,2 @@
 DIST aiosqlite-0.16.0.tar.gz 25690 BLAKE2B be06e8ebea9f3e0c16649fbaaf86317584bd6329e5d890aa3cac432d54122c5441461a40f3690e59453a573bffc56277338391b466abaf121a28c2d71929687c SHA512 f554293663b15303f0aea0d1c10730d15766a30efa0538501a4f08acaccf8807bad78382d5c8a034cdffcfbceb42cbbe4eecdb97e2ef97c5143ab374e9b314b4
+DIST aiosqlite-0.17.0.tar.gz 25941 BLAKE2B 869d165bc8c791cb94159f6508f5113d915f5531117d0d79ac1f297de16cbb78574a7eaafc1bceccc9e4397f88f490b90d49becb4b7cc2c0d51e14f0afd7561b SHA512 50f9965ef7dafe91a2f41dc41489395e437080aa4b7853800d806d21f4f8042d92ff6cfd2aeadefa7ca5e4debd14f39d93ca28c89f3116b3b61b2e8829533e6e
diff --git a/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild b/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild
new file mode 100644
index 0000000000..0bd4cb0a59
--- /dev/null
+++ b/dev-python/aiosqlite/aiosqlite-0.17.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="asyncio bridge to the standard sqlite3 module"
+HOMEPAGE="https://github.com/jreese/aiosqlite"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? (
+	dev-python/aiounittest[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests unittest
+# TypeError: add_source_parser() takes 2 positional arguments but 3 were given
+#distutils_enable_sphinx docs
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 9ed5a6fc5b..0f682ca7d1 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1,3 @@
 DIST anyio-2.1.0.tar.gz 95186 BLAKE2B 5dcb110e0e3d543525bb5081c948124e0e0f6bb0a80038104a8ab793ecf961a56d56576ad96a78b0fb69f3c7731dea3d9573b757f859ee8e61e65490432b9b69 SHA512 923467cdfbf6d0f427345704e99aec44cafc21f78a8b3b88d1ca9be93fb52a77d472229a242664977a873faf05c7c47a44a55aa4d0158959f60bf4ac8a46cdeb
 DIST anyio-2.2.0.tar.gz 97217 BLAKE2B 7b50d997fd83950d16c0e562519b60dbef32bfd6d21e61583a83dd94edc26e27fcd26c7c630f22daaddebea5e148487db1a8c81e0bd82cf4641812dfac8807de SHA512 bca1265eec30830bea5f6fe15f3059793599e9c47d292b3008fcd86c802d76bd692f1a340fd6e3b0aa2401c38576459e516b3defa1ddf8353f18d51280fd73ab
+DIST anyio-3.0.0.tar.gz 116952 BLAKE2B d797afbd372d7e0ba3b9b5cd0c7df6d8c8a91e8616aa9af9abf6c7e20cb940592a50d6534eed63619c7a4ead5e431ba12238a0e8b78cc00949b0944012d687e8 SHA512 e677506cb5edfa86381a6e309fd6c1393d4280d3b31e2382b4adef1aef08b678a2418cbf669e9c5607f855066e72fdb9b3dbd196db10aa42a7ef6445ea737fbd
diff --git a/dev-python/anyio/anyio-3.0.0.ebuild b/dev-python/anyio/anyio-3.0.0.ebuild
new file mode 100644
index 0000000000..f74abd4081
--- /dev/null
+++ b/dev-python/anyio/anyio-3.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+# Build with USE="-doc" first because of circular dependency
+# otherwise one gets the error that sphinx-autodoc-typehints
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+DOCS_AUTODOC=1
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio
+	https://pypi.org/project/anyio
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/curio-1.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.16[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
+"
+
+BDEPEND="
+	${RDEPEND}
+	doc? (
+		dev-python/anyio[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-autodoc-typehints-1.2.0[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[asyncio+uvloop] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[curio] \
+			--deselect tests/test_sockets.py::test_getaddrinfo[trio] \
+	|| die
+}
diff --git a/dev-python/asyncpg/Manifest b/dev-python/asyncpg/Manifest
index 4d5625d938..48b3903ebd 100644
--- a/dev-python/asyncpg/Manifest
+++ b/dev-python/asyncpg/Manifest
@@ -1 +1,2 @@
 DIST asyncpg-0.21.0.tar.gz 746782 BLAKE2B b3f149b02833b1206d82df0f3f28f6b24a8333b861f53410e053a36e4a68359e2c0641bbd9953040b74f1198c301b1a709052110275686a038c0febcb931e688 SHA512 8bfd6689008ea964ac66d1c141bddd749f50d928b6cbc5e059f0e1d0a3597213ccae0b2fa7d694bf4e40c0b2650c445d2c54040a076ba69509e508bf51de2970
+DIST asyncpg-0.22.0.tar.gz 770278 BLAKE2B 86943140bc03546d038889a52dca18eb932b77f09a4660971d3f31a93f114fd77f8e1094a96047ee37ec536b600989038701345ba88944bd5c5b455ada219fcd SHA512 b953290e10ea408ad67ac28f394bb3aaf84c4e42d136f0af9e2f7befcf03e34faf46ef1806c98099453028963142a6e3bce63ff3cbe118b2026744de2103eb37
diff --git a/dev-python/asyncpg/asyncpg-0.22.0.ebuild b/dev-python/asyncpg/asyncpg-0.22.0.ebuild
new file mode 100644
index 0000000000..21455a2f94
--- /dev/null
+++ b/dev-python/asyncpg/asyncpg-0.22.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A fast PostgreSQL Database Client Library for Python/asyncio."
+HOMEPAGE="https://github.com/MagicStack/asyncpg"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# ModuleNotFoundError: No module named 'asyncpg.protocol.protocol'
+# for some reason, still doesn't work if package is already installed
+# or with distutils_install_for_testing function
+RESTRICT="test"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/uvloop[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinxcontrib-asyncio dev-python/sphinx_rtd_theme
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
index c4789da4e3..c9df08c1b4 100644
--- a/dev-python/graphql-core/Manifest
+++ b/dev-python/graphql-core/Manifest
@@ -1,2 +1 @@
-DIST graphql-core-3.1.2.tar.gz 487634 BLAKE2B d71d10e27b87772d9678c90f2bdcbf8d164fcab746c2905fd7414e9744708bb670e35ab0066a1d8d75076991c4b880acd678600f14b0e07a9093ca55d941dbff SHA512 659b245cdec7cfde998ab14444321240008a1fffe5d7f52153c8ecd121556e474001aecee405d73f9eabeae2cdd9ce8b5ede27a7c769b5a8715a9bb3e0c3ca03
-DIST graphql-core-3.1.3.tar.gz 496155 BLAKE2B 0a5461b3a43d17bfde595acce7340d9fb6cf66c6faa4acca6cf7d7d0d41d1c38d2a1d7fb3909b88a834bca3b366bc85c98671c2d4c5ce84467c28b1b1f773dfa SHA512 ffe0697ade66706378c5675771c62966c135c1d6cf399e0e8aa00acadbd7d7a5aa9ea07ee4f34d76d0a11b5ddf47eba7401583bc00347f5d8286e552a2ee4361
+DIST graphql-core-3.1.4.tar.gz 496344 BLAKE2B a8060e0f23b147d91a19ea6bf05bfdd137d8d543c7839f287dcaa49039c9a23dace692d605d29885ae38ed8ac1dbd2385fa24b4fb491063dfb2693f599e8310a SHA512 f4e700d9ff00d737930581ec52a2555594a398ea3b04f8b700c8baa6aa129003dfc0ed8d8f5783126ef3e7ae4e7c3f3a0cff2cc9f30e8a7a5a6cf0dd3df94205
diff --git a/dev-python/graphql-core/graphql-core-3.1.2.ebuild b/dev-python/graphql-core/graphql-core-3.1.2.ebuild
deleted file mode 100644
index c8b730ff10..0000000000
--- a/dev-python/graphql-core/graphql-core-3.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1
-
-DESCRIPTION="GraphQL for Python"
-HOMEPAGE="https://github.com/graphql-python/graphql-core"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( dev-python/pytest-benchmark[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/graphql-core/graphql-core-3.1.3.ebuild b/dev-python/graphql-core/graphql-core-3.1.4.ebuild
similarity index 100%
rename from dev-python/graphql-core/graphql-core-3.1.3.ebuild
rename to dev-python/graphql-core/graphql-core-3.1.4.ebuild
diff --git a/dev-python/portio/portio-0.5.ebuild b/dev-python/portio/portio-0.5.ebuild
index 583a66e483..e65ca345cd 100644
--- a/dev-python/portio/portio-0.5.ebuild
+++ b/dev-python/portio/portio-0.5.ebuild
@@ -18,3 +18,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 DOCS=( index.rst )
+
+src_prepare() {
+	sed -e '/include_dirs/d' \
+		-e '/library_dirs/d' \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pystray/Manifest b/dev-python/pystray/Manifest
index 7df4fc8e7c..8a341d8eb8 100644
--- a/dev-python/pystray/Manifest
+++ b/dev-python/pystray/Manifest
@@ -1 +1 @@
-DIST pystray-0.17.2.tar.gz 24618 BLAKE2B 8576c35d5cef59910d29688357aa37a47c7c508ffbce7451b698afb138cf96b55f1149071d381cad57b6c8931d30a015f28a793bb25a21ddd18480108162189b SHA512 d9527a34956837bd3193d80db0c4bcd2a4fb82025d3e62f339e09ee500101ced87d2cd461672d01ed07b34a6afe3f47a7c2fa9c83155cc78a9d024774dc0e6b9
+DIST pystray-0.17.3.tar.gz 24877 BLAKE2B 5faf19241436d56d90a021c24753b914b3ec72fe2f511c3d1cf610e091829a8b130ade1ed4fef19ef6972d0b8ec5a3845f6ba443392d50d1b26bf81ef0715e61 SHA512 63b8bcffe80b619b753169d9b61ff7525cab550e5695abac9f01b9b6623555384a592a92b4ac23e251ff162db1a131aa482f8b2ecb2821b56e3cbb232434821a
diff --git a/dev-python/pystray/pystray-0.17.2.ebuild b/dev-python/pystray/pystray-0.17.3.ebuild
similarity index 100%
rename from dev-python/pystray/pystray-0.17.2.ebuild
rename to dev-python/pystray/pystray-0.17.3.ebuild
diff --git a/net-misc/xmrig-mo/Manifest b/net-misc/xmrig-mo/Manifest
index 4f4ca55dcd..007797c1ec 100644
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -1,2 +1 @@
-DIST xmrig-mo-6.8.2-mo1.tar.gz 1676858 BLAKE2B b1723329f4370ec7f529105615409a2669a810fbfb55402db730c7a27610b8bd24524d83c9cedcd9403d6727d1016f301dd396fcf18b487ed31344131ecff0b4 SHA512 b5a6c39867b29009a161586949564968ada6ee88a570ad314826be7d67be1a4f14dd894234fd71999250523b67ef7f07239300ede9879b2e7299b47d6ecc778f
-DIST xmrig-mo-6.9.0-mo1.tar.gz 1678548 BLAKE2B 9d1ea56c302ac244be2bac9326e367bba3b131f07dee23cc4949ba84b4115ef99e60073eb40666e1295fca9e14b8510b323664cb3628863dff90d0c6603abc7e SHA512 125aa555323bae6275a041c5f96e85ba6c55885baaa38448b8cfd4f04ed6ed2185b42435d435d49a69ec70db7b1b21267a25f258a815a2c86aec23383959a936
+DIST xmrig-mo-6.12.1-mo2.tar.gz 1684464 BLAKE2B 76422786292a59fb2cd47cb5e84a21b273fa901ca599c50571f9aab5c0c951b7525da65119402eaadbce05434d98fdaed4d429fce4f27ece614ed9100872c440 SHA512 f37d3e74705cb9f2b11d341f81c1917ca51fe2dc2d6294b901637f55239620ecc8068def08ffc4bdc8a534889c11624b06fc3293b184e045e3d9d18b779786c1
diff --git a/net-misc/xmrig-mo/xmrig-mo-6.9.0.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild
similarity index 99%
rename from net-misc/xmrig-mo/xmrig-mo-6.9.0.ebuild
rename to net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild
index d1085fc5b3..887bcedc3d 100644
--- a/net-misc/xmrig-mo/xmrig-mo-6.9.0.ebuild
+++ b/net-misc/xmrig-mo/xmrig-mo-6.12.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake optfeature
 
-MO_PV="mo1"
+MO_PV="mo2"
 DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT and Argon2 miner for the MoneroOcean pool"
 HOMEPAGE="https://moneroocean.stream/ https://github.com/MoneroOcean/xmrig"
 SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
diff --git a/net-misc/xmrig-mo/xmrig-mo-6.8.2.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.8.2.ebuild
deleted file mode 100644
index d1085fc5b3..0000000000
--- a/net-misc/xmrig-mo/xmrig-mo-6.8.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature
-
-MO_PV="mo1"
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT and Argon2 miner for the MoneroOcean pool"
-HOMEPAGE="https://moneroocean.stream/ https://github.com/MoneroOcean/xmrig"
-SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	sys-apps/hwloc:=
-	ssl? ( dev-libs/openssl:= )
-"
-
-S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/notls/d' cmake/OpenSSL.cmake || die
-	sed -i 's/1;/0;/g' src/donate.h || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Create expanded USE flag for all of the PoW algos.
-		-DWITH_TLS=$(usex ssl)
-		# TODO: opencl USE flag.
-		-DWITH_OPENCL=OFF
-		# TODO: cuda USE flag.
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	newbin "${BUILD_DIR}/xmrig" xmrig-mo
-	dodoc -r doc/*.md
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Increase the vm.nr_hugepages sysctl value so that XMRig can allocate with huge pages."
-	elog "XMRig-MoneroOcean has been installed as /usr/bin/xmrig-mo"
-	elog "in order to differentiate between the original XMRig"
-	optfeature "CPU specific performance tweaks" sys-apps/msr-tools
-}
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index bab859c4fe..f84095754e 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,2 +1 @@
-DIST xmrig-6.8.2.tar.gz 1582902 BLAKE2B 7ce2cc327d07b11d1d165d9f369931d222e47c0595d09b777c7ae8b196d41f069e88567b56ff552825df9c5f333ac8a1afec0ade9d6f76b9c113b92b4081be0b SHA512 5f4c356602dcf82d5ba95d1dcde12eb7a004d75543fd5703a9d986485d3229f87e98e26e7fb3c2a6eb14a268545e2f1545fb48541ca41b66ef352ce1a2a42be4
-DIST xmrig-6.9.0.tar.gz 1584717 BLAKE2B 9790b29b639fa308c3b58509de84e621cb63b895efe3f0c390a3efebf7edb7f4fc74f2017dc8d49a39e5bf5f3548eba2f05e6345cac42ad408f6a0d97371c878 SHA512 8fb65c742e0c95a92cd5068d7169a61540babba32c73fbc412e434a9ba6d2ba5299ca1477c59bdd9e06b5df1083d9ffb9d010dfc0c85b9789dda38ecc14fea86
+DIST xmrig-6.12.1.tar.gz 1626568 BLAKE2B e43b25af131911f112dc54e213175ee10a0a6c5f4f8bde339bdd6e39df0dc0c8a058fd30c20994b52b68fe20539b8b95d714caeb94f699b4ba663d3fc3992c71 SHA512 813daf7f7363e60059290caddd7c85df90fd35148de2762b02c287a28e82e8a13dcfc9d514c4a4932d85049532c240eacc0201e6c8fede9b6bb26fa9505841b0
diff --git a/net-misc/xmrig/xmrig-6.8.2.ebuild b/net-misc/xmrig/xmrig-6.12.1.ebuild
similarity index 100%
rename from net-misc/xmrig/xmrig-6.8.2.ebuild
rename to net-misc/xmrig/xmrig-6.12.1.ebuild
diff --git a/net-misc/xmrig/xmrig-6.9.0.ebuild b/net-misc/xmrig/xmrig-6.9.0.ebuild
deleted file mode 100644
index 62d0c96cd8..0000000000
--- a/net-misc/xmrig/xmrig-6.9.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://github.com/xmrig/xmrig"
-SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+ssl"
-
-DEPEND="
-	dev-libs/libuv:=
-	sys-apps/hwloc:=
-	ssl? ( dev-libs/openssl:= )
-"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/notls/d' cmake/OpenSSL.cmake || die
-	sed -i 's/1;/0;/g' src/donate.h || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Create expanded USE flag for all of the PoW algos.
-		-DWITH_TLS=$(usex ssl)
-		# TODO: opencl USE flag.
-		-DWITH_OPENCL=OFF
-		# TODO: cuda USE flag.
-		-DWITH_CUDA=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/xmrig"
-	dodoc -r doc/*.md
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Increase the vm.nr_hugepages sysctl value so that XMRig can allocate with huge pages."
-	optfeature "CPU specific performance tweaks" sys-apps/msr-tools
-}
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 841b64b94e..2161c94fc2 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1 +1 @@
-DIST monero-0.17.1.9.tar.gz 10607015 BLAKE2B 2746fa1d8feafead39f10d1c8800ecd82e4049930b7acae42e946474558114422703e8cb37f1bd3833e57ec9987ccdff2fd530a632693cab206420153f8e6ab4 SHA512 b529d1c691584a5bf1e1fa342909dbb296ef57b0b7d018d95dd40ee418257a15f8f94ec74f780762f28f57f5db4a953becce97558af407f89828d55da88e61d8
+DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
diff --git a/net-p2p/monero/monero-0.17.1.9.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
similarity index 96%
rename from net-p2p/monero/monero-0.17.1.9.ebuild
rename to net-p2p/monero/monero-0.17.2.0.ebuild
index 2cfccaa2d9..1ee22fc10a 100644
--- a/net-p2p/monero/monero-0.17.1.9.ebuild
+++ b/net-p2p/monero/monero-0.17.2.0.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/monero-project/monero"
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
+	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -39,10 +40,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.17.1.7-linkjobs.patch"
-	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
index bb11cf5919..51a9d25b0b 100644
--- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
+++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
 inherit python-any-r1
 
-DESCRIPTION="Automatically expose the main performance trends in applications' computation structure"
+DESCRIPTION="Expose the main performance trends in applications computation structure"
 HOMEPAGE="
 	https://tools.bsc.es/cluster-analysis
 	https://github.com/bsc-performance-tools/clustering-suite
diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r2.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4-r2.ebuild
new file mode 100644
index 0000000000..755b47b81e
--- /dev/null
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake check-reqs python-single-r1 flag-o-matic
+
+DESCRIPTION="A fast very high compression read-only FUSE file system"
+HOMEPAGE="https://github.com/mhx/dwarfs"
+
+SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="python +jemalloc test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PYTHON_REQ_USE="python"
+
+DEPEND="sys-devel/flex"
+RDEPEND="${PYTHON_DEPS}
+		dev-libs/boost[context,threads,python?]
+		dev-libs/double-conversion
+		dev-libs/libfmt
+		dev-libs/libevent
+		dev-libs/xxhash
+		jemalloc? ( >=dev-libs/jemalloc-5.2.1 )
+		app-arch/libarchive
+		app-arch/zstd
+		app-arch/lz4
+		app-arch/xz-utils
+		app-arch/snappy
+		dev-cpp/sparsehash
+		dev-cpp/gflags
+		dev-cpp/glog[gflags]
+		sys-fs/fuse:3
+		sys-libs/binutils-libs
+		sys-libs/zlib
+		sys-libs/libunwind
+		!dev-cpp/folly"
+BDEPEND="app-text/ronn
+		test? ( dev-cpp/gtest )
+		dev-util/cmake
+		sys-apps/sed
+		sys-devel/bison
+		virtual/pkgconfig"
+
+CHECKREQS_DISK_BUILD="1300M"
+
+DOCS=( "README.md" "CHANGES.md" "TODO" )
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_WARN_UNUSED_CLI=0
+
+src_prepare(){
+	cmake_src_prepare
+	einfo "setting library path to $(get_libdir)"
+	sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
+}
+
+src_configure(){
+	append-flags "-fPIC"
+	einfo "setting configuration flags to:"
+	mycmakeargs=(
+		-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DWITH_PYTHON=$(usex python ON OFF)
+		-DWITH_TESTS=$(usex test ON OFF)
+		-DPREFER_SYSTEM_ZSTD=1
+		-DPREFER_SYSTEM_XXHASH=1
+		-DPREFER_SYSTEM_GTEST=1
+		-DWITH_LEGACY_FUSE=0
+	)
+	if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi
+	einfo ${mycmakeargs}
+	cmake_src_configure
+}
+
+src_install(){
+	cmake_src_install
+	dolib.so libmetadata_thrift.so libthrift_light.so libdwarfs.so libfsst.so
+	dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so
+}
+
+pkg_postinst(){
+	elog "Suggest to enable USE 'threads' globally if you have multicore machine"
+	elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
+	elog "You may find more information in the"
+	elog "${HOMEPAGE}"
+	elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
+	elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
+}
diff --git a/sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.5.4.ebuild
similarity index 98%
rename from sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
rename to sys-fs/dwarfs/dwarfs-0.5.4.ebuild
index 5ef7363bd6..2ef94b62b4 100644
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r1.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4.ebuild
@@ -33,7 +33,7 @@ RDEPEND="${PYTHON_DEPS}
 		app-arch/libarchive
 		app-arch/zstd
 		app-arch/lz4
-		app-arch/xz-utils[static-libs]
+		app-arch/xz-utils
 		app-arch/snappy
 		dev-cpp/sparsehash
 		dev-cpp/gflags