Merge updates from master

2026-07-18 03:23:20 -04:00 · 2021-10-28 21:06:22 +00:00
parent a42a78a73a 6e7a8a71c7
commit ba358e9ade
31 changed files with 586 additions and 390 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,15 +3,15 @@
 1. [Common Mistakes](#CommMist)
 2. [Other Tips and Tricks](#tips)

-</td>
-</tr></table>
-
 ## Common Mistakes <a name="CommMist"></a>

 - #### Gentoo projects shouldn't be in the metadata files

 Please don't put Gentoo projects (e.g. the proxy-maint project) in the metadata.xml files. Gentoo projects and developers are **not** responsible for the packages in GURU, as such they should not be listed in the metadata files.

+> "New maintainers can only be added with their consent. In particular, it is not acceptable to add generic projects (such as the Python project) as package maintainers without the approval of their members or against their explicit policy."
+> -- [Package Maintainers](https://devmanual.gentoo.org/general-concepts/package-maintainers/index.html#adding-and-removing-maintainers) section of the devmanual
+
 When moving a package from a Pull Request in the [main Gentoo Repository](https://github.com/gentoo/gentoo) to GURU it is easy to forget to remove the [proxy-maint](https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers) project from the metadata.xml file. The same is true for moving from GURU to a ::gentoo Pull Request, if you forget to add proxy-maint to the metadata file the `gentoo-repo-qa-bot` will complain.

 - #### Use repoman for committing
@@ -70,7 +70,7 @@ The xdg eclass will automatically export the correct functions to the `src_prepa

 - #### Use the latest EAPI whenever possible

-Since the packages in GURU are all 'new packages' (not in ::gentoo). It is good practice to use the latest [EAPI](https://devmanual.gentoo.org/ebuild-writing/eapi/index.html) (7 at the moment), this makes your ebuilds more future proof.
+Since the packages in GURU are all 'new packages' (not in ::gentoo). It is good practice to use the latest [EAPI](https://devmanual.gentoo.org/ebuild-writing/eapi/index.html) (8 at the moment), this makes your ebuilds more future proof.

 - #### `repoman -dx full` and `pkgcheck scan`

@@ -86,9 +86,9 @@ See the [dev manual](https://devmanual.gentoo.org/eclass-reference/distutils-r1.

 - #### Avoid introducing USE flags for small files and optional runtime dependencies.

-Installation of small files, like documentation, completions, man pages, etc, does not have to be toggle-able with an USE flag. Instead, just install these files unconditionally. This avoids unnecessary recompilations when an user forgot to enable a flag that installs a small file.
+Installation of small files, like documentation, completions, man pages, etc, does not have to be toggle-able with an USE flag. Instead, just install these files unconditionally. This avoids unnecessary recompilations when an user forgot to enable a flag that installs a small file ([PG 0301](https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301)).

-The same holds for optional runtime dependencies. It is not necessary to introduce a USE flag, that does not alter the compiled binary and just pulls in an extra optional runtime dependency. Instead, you can notify the user of these optional runtime dependencies with the `optfeature` function from the [optfeature](https://devmanual.gentoo.org/eclass-reference/optfeature.eclass/) eclass (early from currently deprecated [eutils](https://devmanual.gentoo.org/eclass-reference/eutils.eclass/) eclass). If, for whatever reason, it is still desired to introduce an USE flag for optional runtime dependencies, one can still use the `optfeature` function as well to allow the user to choose to avoid recompiling a package.
+The same holds for optional runtime dependencies ([PG 0001](https://projects.gentoo.org/qa/policy-guide/dependencies.html#pg0001)). It is not necessary to introduce a USE flag, that does not alter the compiled binary and just pulls in an extra optional runtime dependency. Instead, you can notify the user of these optional runtime dependencies with the `optfeature` function from the [optfeature](https://devmanual.gentoo.org/eclass-reference/optfeature.eclass/) eclass (early from currently deprecated [eutils](https://devmanual.gentoo.org/eclass-reference/eutils.eclass/) eclass). If, for whatever reason, it is still desired to introduce an USE flag for optional runtime dependencies, one can still use the `optfeature` function as well to allow the user to choose to avoid recompiling a package.

 - #### Clean your patches

--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ The [GURU regulations](https://wiki.gentoo.org/wiki/Project:GURU#The_regulations
 - https://devmanual.gentoo.org/function-reference
 - https://devmanual.gentoo.org/function-reference/install-functions
 - https://dev.gentoo.org/~mgorny/python-guide/eclass.html
- [GURU outdated packages](https://repology.org/projects/?search=&maintainer=&category=&inrepo=gentoo_ovl_guru&notinrepo=&repos=&families=&repos_newest=&families_newest=&outdated=on)
+- [GURU outdated packages](https://repology.org/projects/?inrepo=gentoo_ovl_guru&outdated=on)

 ## Email Addresses <a name="email"></a>

--- a/dev-cpp/wangle/wangle-2021.10.25.00.ebuild
+++ b/dev-cpp/wangle/wangle-2021.10.25.00.ebuild
@@ -7,16 +7,13 @@ inherit cmake

 DESCRIPTION="Framework providing common client/server abstractions"
 HOMEPAGE="https://github.com/facebook/wangle"
-
 SRC_URI="https://github.com/facebook/wangle/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"

-CMAKE_USE_DIR="${S}/wangle"
-
-DEPEND="
+RDEPEND="
 	~dev-cpp/fizz-${PV}:=
 	~dev-cpp/folly-${PV}:=
 	dev-cpp/gflags
@@ -26,7 +23,12 @@ DEPEND="
 	dev-libs/libfmt
 	dev-libs/openssl:0=
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+CMAKE_USE_DIR="${S}/wangle"

 src_configure() {
 	local mycmakeargs=(
--- a/dev-libs/dmd_core/dmd_core-0.6.2.ebuild
+++ b/dev-libs/dmd_core/dmd_core-0.6.2.ebuild
@@ -40,12 +40,12 @@ src_install() {
 	set_target_arch
 	dolib.a "${S}"/target/${target_arch}-unknown-linux-gnu/release/lib${PN}.a
 	insinto /usr/$(get_libdir)/pkgconfig
-	cp "${FILESDIR}/dmd_core.pc" "${S}"
-	sed -i "s/%VERSION%/${PV}/g" "${S}/dmd_core.pc"
+	cp "${FILESDIR}/dmd_core.pc" "${S}" || die "failed to copy pkgconfig file"
+	sed -i "s/%VERSION%/${PV}/g" "${S}/dmd_core.pc" || die "failed to set version in pkgconfig file"
 	doins "${S}/dmd_core.pc"

 	sed -e "s:^libdir.*:libdir=${EPREFIX}/usr/$(get_libdir):" \
-		-i "${ED}"/usr/$(get_libdir)/pkgconfig/dmd_core.pc
+		-i "${ED}"/usr/$(get_libdir)/pkgconfig/dmd_core.pc || die "failed to set libdir in pkgconfig file"
 	dodoc "${S}/LICENSE.txt"
 	dodoc "${S}/README.md"
 }
--- a/dev-libs/xqilla/xqilla-2.3.4.ebuild
+++ b/dev-libs/xqilla/xqilla-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="static-libs tidy"

-DEPEND=">=dev-libs/xerces-c-3.2.1 tidy? ( app-text/tidy-html5 )"
+DEPEND=">=dev-libs/xerces-c-3.2.1 tidy? ( app-text/htmltidy )"
 RDEPEND="${DEPEND}"
 BDEPEND=""

@@ -22,6 +22,11 @@ PATCHES=(

 S="${WORKDIR}"/XQilla-${PV}

+src_prepare() {
+	eapply -p1 "${FILESDIR}/lib_to_lib64.patch"
+	eapply_user
+	sed  -i 's/buffio.h/tidybuffio.h/g' src/functions/FunctionParseHTML.cpp || die "sed failed"
+}
 src_configure() {
 	econf $(use_enable static-libs static) \
 	--with-tidy=$(usex tidy /usr no) \
--- a/dev-python/WSME/WSME-0.11.0.ebuild
+++ b/dev-python/WSME/WSME-0.11.0.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1 +1 @@
-DIST oslo.middleware-4.1.1.tar.gz 55970 BLAKE2B 02b9fdeadfca183102601e8c765ec941c51ac15bb83af9b7d5682ba683a20cffbc478497c4b5391cf903923822cfd5c611ca0661d51c642e9089a71cc4c988d2 SHA512 53f0695da0c9bafa1d9cc18a723793a0e7a0ed09a1cd6d6a2aa0f158e6f2fb3a6b8c2ad2cc4fc248cc80ca4fc02997f586f82ca6f951c928f4efa9b2bc5d1a93
+DIST oslo.middleware-4.4.0.tar.gz 63935 BLAKE2B 36cd2f0c5e7ef17ae24eaa15fa64bbaf9e5d7e87475bea1d9170f7c29d1f6d946096638e5fc1d1af3a49137411654a73642a46ed47382bc77278ec24f59eb5c5 SHA512 6cbfb22ec4a513bed214de32924c370ac290ebc9c6dfd6e14b60035179695f49f623dffba9313d263f818c02eaed92596ba58912daf6289760570861307beaa5
--- a/dev-python/oslo-middleware/oslo-middleware-4.4.0.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-4.4.0.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_8 )

 inherit distutils-r1

-DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.org/project/oslo.middleware/"
+DESCRIPTION="Components injected into wsgi pipelines to intercept request/response flows"
+HOMEPAGE="
+	https://pypi.org/project/oslo.middleware
+	https://launchpad.net/oslo.middleware
+	https://opendev.org/openstack/oslo.middleware
+"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
 S="${WORKDIR}/oslo.middleware-${PV}"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-RESTRICT=""
+KEYWORDS="~amd64"

-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
@@ -34,4 +32,19 @@ RDEPEND="
 	>=dev-python/webob-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
 "
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,3 +1,3 @@
 DIST lazygit-0.29.tar.gz 3385768 BLAKE2B 4968a45572d85a3af84fc8f459dbab1cfd3a70954c650f16ddd8e937a810b590c974642e94b26614f4b24166b6c4db2fc8dd2538052875d827fdecc8bf8acb18 SHA512 f24d63a01bc64e2704805a20437af7ad0304921c2b4084f64014f9a8d9d9711ef02f4cdcf09ee9955ea5f2ef4f94de58c9ecc55fa7cb05fc59a89c7d8c9237d7
-DIST lazygit-0.30.tar.gz 3521302 BLAKE2B 4d8bbf02aec124b89e2f05b8fd357aeb9ff75139b753d958ed61f4bd5298563c11736c1cf2dff70c55ff5eb86829a0283bee0ef56ba1327ff48a66e5234efb3c SHA512 16bd4b8fce43354aec9bc4da69e08843346527897fba85aff966a992f4d75b12d731aed9095b9f7d24a7def7f5b017a6dbaa63c44456f06d8dd5fe9760672663
 DIST lazygit-0.30.1.tar.gz 3520967 BLAKE2B 442bec8a7ffc7246895966e57aebb0631f774cffacba451e63d0964b72eba307a520a56413c06f2debef61466379b0e94608df6194f9631bbfda0354026dab4d SHA512 428f49511de3c4fb00aaf28c0c095464ee367d64557e355b86c4ab995dd9285fc411f5f981e06a08d8a6cf30c04f9ee305bdc34bdbec46fe048b463d12eee8ab
+DIST lazygit-0.30.tar.gz 3521302 BLAKE2B 4d8bbf02aec124b89e2f05b8fd357aeb9ff75139b753d958ed61f4bd5298563c11736c1cf2dff70c55ff5eb86829a0283bee0ef56ba1327ff48a66e5234efb3c SHA512 16bd4b8fce43354aec9bc4da69e08843346527897fba85aff966a992f4d75b12d731aed9095b9f7d24a7def7f5b017a6dbaa63c44456f06d8dd5fe9760672663
--- a/media-fonts/linja-pona/Manifest
+++ b/media-fonts/linja-pona/Manifest
@@ -1 +1,2 @@
 DIST linja-pona-4.2.otf 81476 BLAKE2B e969077b3901168580005c63c9c7878ccde196fca2b8fd39d8e85a4d9270ab0d66334c026a56f47744a1429c4ae6287b61474a9cc59d8d0a7fd525499c9e0496 SHA512 1cedc5e20b2874ad36afb28e5cd95e568ba16eb227f35d686db517459ad43669c95ec4a31464f271527f4d27c49c8d19a2effa22b0942906ef7a554238c68ed3
+DIST linja-pona-4.9.otf 85784 BLAKE2B 4537a5ce399e63eadfcb24d6247bd44a5aa896d50eba8f84b81caf0c7645f0556d59a267b2d795e1e0ec7f64e009689ebb4c984a6b19fe6b3d13c38117afa935 SHA512 4189c19c6a8e6f96f6fd0490354c42c1f3cd4d957899f24771f8025f918a92f5ab25b560bc74c2f057412214cc72110f412059d16808aff134e58c3789e12f2b
--- a/media-fonts/linja-pona/linja-pona-4.9.ebuild
+++ b/media-fonts/linja-pona/linja-pona-4.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+DESCRIPTION="Font for sitelen pona, a script for toki pona"
+HOMEPAGE="http://musilili.net/linja-pona https://github.com/janSame/linja-pona"
+SRC_URI="https://drive.google.com/uc?export=download&id=1ukFvjXku_0Sdqq3u4oHlPLhTlR2J9b3I -> ${P}.otf"
+S="${WORKDIR}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+FONT_SUFFIX="otf"
+
+src_unpack() {
+	cp "${DISTDIR}/${A}" "${S}/${PN}.${FONT_SUFFIX}" || die
+}
--- a/media-fonts/linja-pona/metadata.xml
+++ b/media-fonts/linja-pona/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
 		<remote-id type="github">janSame/linja-pona</remote-id>
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -18,6 +18,22 @@
 # Headers for exporting/importing public headers
 include(GenerateExportHeader)
 set_target_properties(jxl_dec-obj PROPERTIES
+--- a/lib/jxl_extras.cmake
+++ b/lib/jxl_extras.cmake
+@@ -92,7 +92,7 @@
+ endif ()
+ 
+ if (JPEGXL_ENABLE_OPENEXR)
+-pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR)
+pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR-3)
+ if (OpenEXR_FOUND)
+   target_sources(jxl_extras-static PRIVATE
+     extras/codec_exr.cc
+@@ -114,3 +114,4 @@
+   endif()
+ endif() # OpenEXR_FOUND
+ endif() # JPEGXL_ENABLE_OPENEXR
+
 --- a/plugins/gdk-pixbuf/CMakeLists.txt
 +++ b/plugins/gdk-pixbuf/CMakeLists.txt
@@ -23,7 +23,7 @@
@@ -82,3 +98,28 @@
 -                 ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
 -endif ()
 -
+--- a/tools/comparison_viewer/CMakeLists.txt
+++ b/tools/comparison_viewer/CMakeLists.txt
+@@ -24,9 +24,6 @@
+   image_loading.cc
+   image_loading.h
+ )
+-target_include_directories(image_loading PRIVATE
+-  $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
+-)
+ target_link_libraries(image_loading PUBLIC
+   Qt5::Widgets
+   jxl-static
+--- a/tools/viewer/CMakeLists.txt
+++ b/tools/viewer/CMakeLists.txt
+@@ -26,10 +26,6 @@
+   viewer_window.h
+   viewer_window.ui
+ )
+-target_include_directories(viewer PRIVATE
+-  $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
+-  "${PROJECT_SOURCE_DIR}"
+-)
+ target_link_libraries(viewer
+   Qt5::Widgets
+   icc_detect
--- a/media-libs/libjxl/libjxl-0.6-r2.ebuild
+++ b/media-libs/libjxl/libjxl-0.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=8
+EAPI=7

-inherit xdg cmake
+inherit xdg cmake java-pkg-opt-2

 DESCRIPTION="JPEG XL image format reference implementation"
 HOMEPAGE="https://github.com/libjxl/libjxl"
@@ -12,17 +12,21 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
 KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #java
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers

-RDEPEND="
+CDEPEND="
 	app-arch/brotli
 	dev-cpp/highway:=
 	media-libs/libpng
 	media-libs/lodepng:=
 	media-libs/giflib
 	sys-libs/zlib
-	virtual/jpeg

+	benchmark? (
+		media-libs/libavif
+		media-libs/libwebp
+		virtual/jpeg
+	)
 	openexr? ( media-libs/openexr:= )
 	plugins? (
 		dev-libs/glib:2
@@ -37,17 +41,35 @@ RDEPEND="
 	!skcms? ( media-libs/lcms )
 	skcms? ( media-libs/skcms:= )
 	tcmalloc? ( dev-util/google-perftools )
-	viewers? ( media-libs/lcms )
+	viewers? (
+		dev-qt/qtconcurrent
+		dev-qt/qtwidgets
+		dev-qt/qtx11extras
+		media-libs/lcms
+		x11-libs/libxcb
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	java? ( virtual/jre:1.8 )
 "
 DEPEND="
-	${RDEPEND}
+	${CDEPEND}
 	dev-cpp/gtest
+	kde-frameworks/extra-cmake-modules
+	java? ( virtual/jdk:1.8 )
 	plugins? ( x11-misc/xdg-utils )
 "
-BDEPEND="man? ( app-text/asciidoc )"
+BDEPEND="
+	virtual/pkgconfig
+	man? ( app-text/asciidoc )
+"

 PATCHES=( "${FILESDIR}/${P}-system-libs.patch" )
 REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
+DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
+
+CMAKE_IN_SOURCE_BUILD=1

 src_prepare() {
 	# remove bundled libs cmake
@@ -60,6 +82,7 @@ src_configure() {
 		-DJPEGXL_ENABLE_BENCHMARK=$(usex benchmark)
 		-DJPEGXL_ENABLE_DEVTOOLS=$(usex devtools)
 		-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+		-DJPEGXL_ENABLE_JNI=$(usex java)
 		-DJPEGXL_ENABLE_MANPAGES=$(usex man)
 		-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
 		-DJPEGXL_ENABLE_PLUGINS=$(usex plugins)
@@ -88,6 +111,46 @@ src_configure() {

 src_install() {
 	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
+	einstalldocs
 	#TODO: install documentation
+	exeinto "/usr/libexec/${PN}"
+	if use examples; then
+		doexe {en,de}code_oneshot
+		dobin jxlinfo
+	fi
+	pushd "${BUILD_DIR}/tools" || die
+	insinto "/usr/share/${PN}"
+	doins progressive_saliency.conf example_tree.txt
+	if use java; then
+		dolib.so libjxl_jni.so
+		rm libjxl_jni.so || die
+		doins *.jar
+	fi
+	if use benchmark; then
+		docinto "/usr/share/doc/${PF}/benchmark/hm"
+		dodoc benchmark/hm/README.md
+	else
+		rm -r benchmark || die
+	fi
+	# remove non executable or non .m files
+	find . -type f \! -name '*.m' \! -executable -delete || die
+	# delete empty dirs
+	find . -type d -empty -print -delete || die
+	mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die
+	# install tools
+	cp -r . "${ED}/usr/libexec/${PN}/tools/" || die
+
+	# keep in /usr/bin only the executables with jxl in the name
+	rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
+	rm -f "${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
+
+	find "${D}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
 }
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="benchmark">Build JPEGXL benchmark tools</flag>
 		<flag name="devtools">Build JPEGXL developer tools</flag>
+		<!--<flag name="fuzzers">Build the fuzzers</flag>-->
 		<flag name="openexr">Build JPEGXL with support for OpenEXR</flag>
 		<flag name="plugins">Build third-party plugins to support JPEG XL in other applications</flag>
 		<flag name="sjpeg">Build JPEGXL with support for encoding with sjpeg</flag>
--- a/media-libs/sjpeg/CMakeLists.txt
+++ b/media-libs/sjpeg/CMakeLists.txt
@@ -0,0 +1,242 @@
+# Copyright 2020 Google LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 2.8.7)
+
+project(sjpeg
+        LANGUAGES C CXX)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 11)
+
+# Options for coder / decoder executables.
+option(SJPEG_ENABLE_SIMD "Enable any SIMD optimization." ON)
+option(SJPEG_BUILD_EXAMPLES "Build the sjpeg / vjpeg command line tools." ON)
+
+set(SJPEG_DEP_LIBRARIES)
+set(SJPEG_DEP_INCLUDE_DIRS)
+
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Release" CACHE STRING
+    "Build type: Release, Debug or RelWithDebInfo" FORCE
+  )
+endif()
+
+include(GNUInstallDirs)
+
+set(PROJECT_VERSION 0.1)
+
+################################################################################
+# Android only.
+
+if(ANDROID)
+  include_directories(${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures)
+  add_library(cpufeatures
+    STATIC ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures/cpu-features.c
+  )
+  target_link_libraries(cpufeatures dl)
+  set(SJPEG_DEP_LIBRARIES ${SJPEG_DEP_LIBRARIES} cpufeatures)
+  set(SJPEG_DEP_INCLUDE_DIRS ${SJPEG_DEP_INCLUDE_DIRS}
+      ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures
+  )
+endif()
+
+## Check for SIMD extensions.
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpu.cmake)
+
+################################################################################
+# sjpeg source files.
+
+# Build the sjpeg library.
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ ${SJPEG_DEP_INCLUDE_DIRS})
+add_library(sjpeg ${CMAKE_CURRENT_SOURCE_DIR}/src/bit_writer.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/bit_writer.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/colors_rgb.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/dichotomy.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/enc.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/fdct.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/headers.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/md5sum.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/jpeg_tools.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/score_7.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/sjpeg.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/sjpegi.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/yuv_convert.cc
+)
+if(SJPEG_DEP_LIBRARIES)
+  target_link_libraries(sjpeg ${SJPEG_DEP_LIBRARIES})
+endif()
+
+# Make sure the OBJECT libraries are built with position independent code
+# (it is not ON by default).
+set_target_properties(sjpeg PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+# Set the version numbers.
+set_target_properties(sjpeg PROPERTIES VERSION ${PROJECT_VERSION}
+                      SOVERSION ${PROJECT_VERSION})
+
+# Find the standard image libraries.
+set(SJPEG_DEP_IMG_LIBRARIES)
+set(SJPEG_DEP_IMG_INCLUDE_DIRS)
+foreach(I_LIB PNG JPEG)
+  find_package(${I_LIB})
+  set(SJPEG_HAVE_${I_LIB} ${${I_LIB}_FOUND})
+  if(${I_LIB}_FOUND)
+    set(SJPEG_DEP_IMG_LIBRARIES ${SJPEG_DEP_IMG_LIBRARIES}
+        ${${I_LIB}_LIBRARIES})
+    set(SJPEG_DEP_IMG_INCLUDE_DIRS ${SJPEG_DEP_IMG_INCLUDE_DIRS}
+        ${${I_LIB}_INCLUDE_DIRS})
+  endif()
+endforeach()
+
+# Find the OpenGL/GLUT libraries.
+set(SJPEG_DEP_GL_LIBRARIES)
+set(SJPEG_DEP_GL_INCLUDE_DIRS)
+find_package(OpenGL)
+if(OPENGL_gl_LIBRARY)
+  set(SJPEG_DEP_GL_LIBRARIES
+      ${SJPEG_DEP_GL_LIBRARIES} ${OPENGL_gl_LIBRARY})
+  set(SJPEG_DEP_GL_INCLUDE_DIRS
+      ${SJPEG_DEP_GL_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR})
+  set(SJPEG_HAVE_OPENGL TRUE)
+endif()
+find_package(GLUT)
+if(GLUT_FOUND)
+  set(SJPEG_DEP_GL_LIBRARIES
+      ${SJPEG_DEP_GL_LIBRARIES} ${GLUT_glut_LIBRARY})
+  set(SJPEG_DEP_GL_INCLUDE_DIRS
+      ${SJPEG_DEP_GL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR})
+  set(SJPEG_HAVE_GLUT TRUE)
+endif()
+
+# build the sjpeg-utils library
+include_directories(${SJPEG_DEP_IMG_INCLUDE_DIRS})
+add_library(sjpeg-utils
+            ${CMAKE_CURRENT_SOURCE_DIR}/examples/utils.cc
+            ${CMAKE_CURRENT_SOURCE_DIR}/examples/utils.h
+)
+
+if(WIN32)
+  # quiet warnings related to fopen, sscanf
+  target_compile_definitions(sjpeg-utils PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+if(SJPEG_HAVE_OPENGL)
+  # check pthread for GL libraries
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads)
+  if(Threads_FOUND)
+    if(CMAKE_USE_PTHREADS_INIT)
+      list(APPEND SJPEG_DEP_GL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+    endif()
+  endif()
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_OPENGL)
+  add_definitions(${OPENGL_DEFINITIONS})
+endif()
+if(SJPEG_HAVE_GLUT)
+  add_definitions(${GLUT_DEFINITIONS})
+endif()
+if(SJPEG_HAVE_JPEG)
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_JPEG)
+endif()
+if(SJPEG_HAVE_PNG)
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_PNG)
+endif()
+if(SJPEG_DEP_IMG_LIBRARIES)
+  # check pthread for GL libraries
+  target_link_libraries(sjpeg-utils ${SJPEG_DEP_IMG_LIBRARIES}
+                        ${SJPEG_DEP_GL_LIBRARIES})
+endif()
+# set_target_properties(sjpeg-utils PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+# Build the executables if asked for.
+if(SJPEG_BUILD_EXAMPLES)
+  # sjpeg
+  add_executable(sjpeg-bin ${CMAKE_CURRENT_SOURCE_DIR}/examples/sjpeg.cc)
+  target_link_libraries(sjpeg-bin sjpeg sjpeg-utils)
+  set_target_properties(sjpeg-bin PROPERTIES OUTPUT_NAME sjpeg)
+
+  # vjpeg
+  include_directories(${SJPEG_DEP_GL_INCLUDE_DIRS})
+  add_executable(vjpeg ${CMAKE_CURRENT_SOURCE_DIR}/examples/vjpeg.cc)
+  # Force to link against pthread.
+  include(CheckCXXSourceCompiles)
+  set(CMAKE_REQUIRED_FLAGS_INI ${CMAKE_REQUIRED_FLAGS})
+  set(CMAKE_REQUIRED_FLAGS "-Wl,--no-as-needed")
+  check_cxx_source_compiles("int main(void){return 0;}" FLAG_NO_AS_NEEDED)
+  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_INI})
+  if(FLAG_NO_AS_NEEDED)
+    target_link_libraries(vjpeg "-Wl,--no-as-needed")
+  endif()
+
+  # check whether we need to include GLUT/glut.h or GL/glut.h
+  include(CheckIncludeFileCXX)
+  check_include_file_cxx(GLUT/glut.h HAVE_GLUT_GLUT_H)
+  check_include_file_cxx(GL/glut.h HAVE_GL_GLUT_H)
+  if(HAVE_GLUT_GLUT_H)
+    add_definitions(-DHAVE_GLUT_GLUT_H)
+  elseif(HAVE_GL_GLUT_H)
+    add_definitions(-DHAVE_GL_GLUT_H)
+  endif()
+  target_link_libraries(vjpeg ${SJPEG_DEP_GL_LIBRARIES} sjpeg sjpeg-utils)
+
+  install(TARGETS sjpeg-bin vjpeg RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+# Install the different headers and libraries.
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sjpeg.h
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(TARGETS sjpeg
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+# Create the CMake version file.
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/sjpegConfigVersion.cmake"
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY AnyNewerVersion
+)
+
+# Create the Config file.
+include(CMakePackageConfigHelpers)
+set(ConfigPackageLocation ${CMAKE_INSTALL_DATADIR}/sjpeg/cmake/)
+configure_package_config_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sjpegConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/sjpegConfig.cmake
+  INSTALL_DESTINATION ${ConfigPackageLocation}
+)
+
+# Install the generated CMake files.
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/sjpegConfigVersion.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/sjpegConfig.cmake"
+  DESTINATION ${ConfigPackageLocation}
+)
+
+
+################################################################################
+# Man page.
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/sjpeg.1
+              ${CMAKE_CURRENT_SOURCE_DIR}/man/vjpeg.1
+  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+
+message(STATUS "<<< Gentoo configuration >>>
+Build type      ${CMAKE_BUILD_TYPE}
+Install path    ${CMAKE_INSTALL_PREFIX}
+Compiler flags:
+C               ${CMAKE_C_FLAGS}
+C++             ${CMAKE_CXX_FLAGS}
+Linker flags:
+Executable      ${CMAKE_EXE_LINKER_FLAGS}
+Module          ${CMAKE_MODULE_LINKER_FLAGS}
+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
--- a/media-libs/sjpeg/Manifest
+++ b/media-libs/sjpeg/Manifest
@@ -1 +1 @@
-DIST sjpeg-1.0_p20210422.tar.gz 2481123 BLAKE2B dc645e6e97873389b40463561683be744fb951c914b55dd5183e190982dbe4aeea98ee3c1271d2447ad1e5b4e23ea03cdf86ff3a9d7372631b0f9ca01cd4ac4f SHA512 cf9e5a744f79996817679dc2e64be2efd64cbc9bb5f505f5c6530f92d60fe99715c57bcf71e0bb80c77732ace1d71fbf1ff9b4e4ec2562a9576c74a4410c2cb1
+DIST sjpeg-1.0_p20210422-r1.tar.gz 2481123 BLAKE2B dc645e6e97873389b40463561683be744fb951c914b55dd5183e190982dbe4aeea98ee3c1271d2447ad1e5b4e23ea03cdf86ff3a9d7372631b0f9ca01cd4ac4f SHA512 cf9e5a744f79996817679dc2e64be2efd64cbc9bb5f505f5c6530f92d60fe99715c57bcf71e0bb80c77732ace1d71fbf1ff9b4e4ec2562a9576c74a4410c2cb1
--- a/media-libs/sjpeg/files/sjpeg-rename-libutils.patch
+++ b/media-libs/sjpeg/files/sjpeg-rename-libutils.patch
@@ -0,0 +1,68 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -119,16 +119,16 @@
+   set(SJPEG_HAVE_GLUT TRUE)
+ endif()
+ 
+-# build the utils library
+# build the sjpeg-utils library
+ include_directories(${SJPEG_DEP_IMG_INCLUDE_DIRS})
+-add_library(utils
+add_library(sjpeg-utils
+             ${CMAKE_CURRENT_SOURCE_DIR}/examples/utils.cc
+             ${CMAKE_CURRENT_SOURCE_DIR}/examples/utils.h
+ )
+ 
+ if(WIN32)
+   # quiet warnings related to fopen, sscanf
+-  target_compile_definitions(utils PRIVATE _CRT_SECURE_NO_WARNINGS)
+  target_compile_definitions(sjpeg-utils PRIVATE _CRT_SECURE_NO_WARNINGS)
+ endif()
+ if(SJPEG_HAVE_OPENGL)
+   # check pthread for GL libraries
+@@ -139,30 +139,30 @@
+       list(APPEND SJPEG_DEP_GL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+     endif()
+   endif()
+-  target_compile_definitions(utils PUBLIC SJPEG_HAVE_OPENGL)
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_OPENGL)
+   add_definitions(${OPENGL_DEFINITIONS})
+ endif()
+ if(SJPEG_HAVE_GLUT)
+   add_definitions(${GLUT_DEFINITIONS})
+ endif()
+ if(SJPEG_HAVE_JPEG)
+-  target_compile_definitions(utils PUBLIC SJPEG_HAVE_JPEG)
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_JPEG)
+ endif()
+ if(SJPEG_HAVE_PNG)
+-  target_compile_definitions(utils PUBLIC SJPEG_HAVE_PNG)
+  target_compile_definitions(sjpeg-utils PUBLIC SJPEG_HAVE_PNG)
+ endif()
+ if(SJPEG_DEP_IMG_LIBRARIES)
+   # check pthread for GL libraries
+-  target_link_libraries(utils ${SJPEG_DEP_IMG_LIBRARIES}
+  target_link_libraries(sjpeg-utils ${SJPEG_DEP_IMG_LIBRARIES}
+                         ${SJPEG_DEP_GL_LIBRARIES})
+ endif()
+-# set_target_properties(utils PROPERTIES POSITION_INDEPENDENT_CODE ON)
+# set_target_properties(sjpeg-utils PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ # Build the executables if asked for.
+ if(SJPEG_BUILD_EXAMPLES)
+   # sjpeg
+   add_executable(sjpeg-bin ${CMAKE_CURRENT_SOURCE_DIR}/examples/sjpeg.cc)
+-  target_link_libraries(sjpeg-bin sjpeg utils)
+  target_link_libraries(sjpeg-bin sjpeg sjpeg-utils)
+   set_target_properties(sjpeg-bin PROPERTIES OUTPUT_NAME sjpeg)
+ 
+   # vjpeg
+@@ -187,7 +187,7 @@
+   elseif(HAVE_GL_GLUT_H)
+     add_definitions(-DHAVE_GL_GLUT_H)
+   endif()
+-  target_link_libraries(vjpeg ${SJPEG_DEP_GL_LIBRARIES} sjpeg utils)
+  target_link_libraries(vjpeg ${SJPEG_DEP_GL_LIBRARIES} sjpeg sjpeg-utils)
+ 
+   install(TARGETS sjpeg-bin vjpeg RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
--- a/media-libs/sjpeg/sjpeg-1.0_p20210422-r1.ebuild
+++ b/media-libs/sjpeg/sjpeg-1.0_p20210422-r1.ebuild
@@ -27,6 +27,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+PATCHES="${FILESDIR}/${PN}-rename-libutils.patch"
 DOCS=( AUTHORS NEWS README README.md ChangeLog )

 src_configure() {
@@ -46,4 +47,5 @@ src_configure() {
 src_install() {
 	cmake_src_install
 	einstalldocs
+	dolib.so "${BUILD_DIR}/libsjpeg-utils.so"
 }
--- a/media-libs/skcms/Manifest
+++ b/media-libs/skcms/Manifest
@@ -1 +1 @@
-DIST skcms-0_pre20211006.tar.gz 9986356 BLAKE2B fc53659232cbdb4c994c805944c5c1560fc084b94a3ad016ec51346cfb0483f262d53ebe7001d86dbda250b231b935882c99bc648043a8a55c0f85d2bc927bf1 SHA512 9595c20fae2df23816e4e094fc92e8cd8bc361eb3af5a77b1647064ec63a59796828aa40e151a402b22e9aaef2b983e97020dd761e253872ab59927ddcb9154e
+DIST skcms-0_pre20211006.tar.gz 9986329 BLAKE2B 29bf5dc51dcf55f979920bf20c7ff4424f3edf0902795a3b52156148e642243093e919fd109c35537b248c447d2e4516da6a7a57afa72398236dc8444180434e SHA512 8f180f054ac7798a6738f61713d80f1c7d15ff0d463a700c0da8cab1af672ff623af830d78fef547d0f2086fde95bc809f278254acf500960725096567cdb6e1
--- a/sci-physics/SU2/SU2-7.2.0.ebuild
+++ b/sci-physics/SU2/SU2-7.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 PYTHON_COMPAT=( python3_{8..9} )

@@ -27,7 +27,13 @@ KEYWORDS="~amd64"
 # pastix is disabled as it's require additional external bundled libs;
 # autodiff (medi), directdiff (opti) features require additional external bundled libs.
 IUSE="cgns mkl +mpi mpp openblas parmetis tecio test tutorials"
+
+# Tests fail with FEATURES="network-sandbox" for most versions of openmpi and mpich it with error:
+# "No network interfaces were found for out-of-band communications.
+#  We require at least one available network for out-of-band messaging."
+PROPERTIES="test_network"
 RESTRICT="!test? ( test )"
+
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	mkl? ( !openblas )
--- a/sys-cluster/opencoarrays/opencoarrays-2.9.2.ebuild
+++ b/sys-cluster/opencoarrays/opencoarrays-2.9.2.ebuild
@@ -20,12 +20,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-#! Disable tests due for most versions of openmpi and mpich failed it with error:
-#! "No network interfaces were found for out-of-band communications.
-#!  We require at least one available network for out-of-band messaging."
-#! But tests run successfully with FEATURES="-network-sandbox"
-#IUSE="test"
-#RESTRICT="!test? ( test )"
+# Tests fail with FEATURES="network-sandbox" for most versions of openmpi and mpich it with error:
+# "No network interfaces were found for out-of-band communications.
+#  We require at least one available network for out-of-band messaging."
+IUSE="test"
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"

 RDEPEND="
 	|| ( >=sys-cluster/openmpi-1.10.7[fortran] >=sys-cluster/mpich-3.3[fortran] )
@@ -38,6 +38,6 @@ pkg_setup() {
 	fortran-2_pkg_setup
 }

-#src_test() {
-#	cmake_build test
-#}
+src_test() {
+	cmake_build test
+}
--- a/sys-fs/dwarfs/Manifest
+++ b/sys-fs/dwarfs/Manifest
@@ -1,2 +1 @@
-DIST dwarfs-0.5.4.tar.bz2 12155920 BLAKE2B 958acf2f47c26762d745f4f3ca350d518ce20095fa8fd613b33f9912b369acfedb61d2d11dbbcc718bbf6155652fbf46528b618393e8f98fb6c130b115bac061 SHA512 3affc809bab90dca6ea7b067e69da973f105524bdc8ec44a6b3e0f858f3e3c64438911b344afedbc67318fa1b0578a2f4aa7e69238319f837ea545000a36fbd5
 DIST dwarfs-0.5.6.tar.bz2 12146379 BLAKE2B 6d570de65358238eb8207297529f7cb632533eb6e63b5c27349add978d765e462fbeeb123962695b8092c919425454e7ef7cce6b2247ca46586b9732297ee1d1 SHA512 0b57f0ca5295d9b450cb0b9fd8086a87e29f0b010f70437374043689eb009f7ce10c2b862d7da3cc5613c305486c91866abe7840eb1fb09d00cde0d46f194ef6
--- a/sys-fs/dwarfs/dwarfs-0.5.4-r2.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.4-r2.ebuild
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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? ( ${PYTHON_REQUIRED_USE} )"
-
-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"
-}
--- a/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
+++ b/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
@@ -9,19 +9,12 @@ inherit check-reqs cmake flag-o-matic python-single-r1

 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=""
-
+KEYWORDS="~amd64"
 IUSE="python +jemalloc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=( "${FILESDIR}/unbundle.patch" )
-#TODO: unbundle libfsst

 RDEPEND="
 	${PYTHON_DEPS}
@@ -36,7 +29,7 @@ RDEPEND="
 	dev-cpp/glog[gflags]
 	dev-cpp/parallel-hashmap:=
 	dev-cpp/sparsehash
-	dev-libs/boost[context,threads,python?]
+	dev-libs/boost[context,threads(+),python?]
 	dev-libs/double-conversion
 	dev-libs/fsst:=
 	dev-libs/libevent
@@ -61,24 +54,24 @@ BDEPEND="
 	test? ( dev-cpp/gtest )
 "

-CHECKREQS_DISK_BUILD="1300M"
-
 DOCS=( "README.md" "CHANGES.md" "TODO" )
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )

+CHECKREQS_DISK_BUILD="1300M"
 CMAKE_IN_SOURCE_BUILD=1
 CMAKE_WARN_UNUSED_CLI=0

 src_prepare(){
-	rm -r fsst zstd fbthrift folly xxHash parallel-hashmap || die
+	rm -r fsst zstd fbthrift/* folly xxHash parallel-hashmap || die
 	cmake_src_prepare
-	einfo "setting library path to $(get_libdir)"
 	sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
 }

 src_configure(){
 	append-cxxflags "-I/usr/include"

-	einfo "setting configuration flags to:"
 	mycmakeargs=(
 		-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
 		-DWITH_PYTHON=$(usex python ON OFF)
@@ -88,8 +81,7 @@ src_configure(){
 		-DPREFER_SYSTEM_GTEST=1
 		-DWITH_LEGACY_FUSE=0
 	)
-	if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi
-	einfo ${mycmakeargs}
+	use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
 	cmake_src_configure
 }

--- a/sys-fs/dwarfs/files/dwarfs-0.5.6-unbundle.patch
+++ b/sys-fs/dwarfs/files/dwarfs-0.5.6-unbundle.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,8 +142,6 @@
+@@ -151,8 +151,6 @@
     ON
     CACHE BOOL "only build thrift compiler")
 
@@ -9,15 +9,7 @@
 if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
   add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
 endif()
-@@ -298,7 +296,6 @@
- if(WITH_TESTS OR WITH_BENCHMARKS)
-   add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
-                            test/loremipsum.cpp)
-  target_link_libraries(test_helpers dwarfs folly)
-   set_property(TARGET test_helpers PROPERTY CXX_STANDARD 17)
- endif()
- 
-@@ -364,70 +361,7 @@
+@@ -383,23 +381,6 @@
 
 list(
   APPEND
@@ -38,24 +30,13 @@
 -
 -list(
 -  APPEND
-  METADATA_THRIFT_SRC
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_for_each_field.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.tcc
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types_custom_protocol.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visit_union.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
-
-add_custom_command(
+   METADATA_THRIFT_SRC
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
+@@ -418,35 +399,20 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
+ 
+ add_custom_command(
 -  OUTPUT ${FROZEN_THRIFT_SRC}
 -  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
 -  COMMAND
@@ -67,32 +48,33 @@
 -          ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift)
 -
 -add_custom_command(
-  OUTPUT ${METADATA_THRIFT_SRC}
-  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
-  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
-          thrift/dwarfs/metadata.thrift
-  COMMAND
-    cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
+   OUTPUT ${METADATA_THRIFT_SRC}
+   COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
+   COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
+           thrift/dwarfs/metadata.thrift
+   COMMAND
+     cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
 -    ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2:frozen2
-    metadata.thrift
+    thrift1 --gen mstch_cpp2:frozen2
+     metadata.thrift
 -  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
 -          ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
-
-list(
-  APPEND
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
+ 
+ list(
+   APPEND
   INCLUDE_DIRS
 -  ${CMAKE_CURRENT_BINARY_DIR}/folly
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift
 -  ${CMAKE_CURRENT_SOURCE_DIR}/folly
 -  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
   ${CMAKE_CURRENT_BINARY_DIR})
 
 if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
-@@ -445,39 +379,6 @@
-   list(APPEND INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS})
+@@ -472,43 +438,24 @@
 endif()
 
-add_library(
+ add_library(
 -  thrift_light
 -  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
 -  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
@@ -114,30 +96,32 @@
 -target_include_directories(thrift_light PRIVATE ${INCLUDE_DIRS})
 -
 -add_library(
-  metadata_thrift
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
+   metadata_thrift
+  STATIC
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
+ 
+ set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
 -
-set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
-
-target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
+set_property(TARGET metadata_thrift PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET metadata_thrift PROPERTY CXX_VISIBILITY_PRESET hidden)
+set_property(TARGET metadata_thrift PROPERTY VISIBILITY_INLINES_HIDDEN 1)
+ target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
 -
 -add_dependencies(metadata_thrift thrift_light)
-
+target_link_libraries(metadata_thrift fmt glog folly)
+ 
 foreach(tgt dwarfs ${BINARY_TARGETS})
   target_include_directories(
     ${tgt} SYSTEM
-@@ -501,8 +402,6 @@
-   set_property(TARGET ${tgt} PROPERTY CXX_STANDARD_REQUIRED ON)
-   set_property(TARGET ${tgt} PROPERTY CXX_EXTENSIONS OFF)
+     PRIVATE ${Boost_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS} ${INCLUDE_DIRS}
+-            ${CMAKE_CURRENT_SOURCE_DIR}/parallel-hashmap)
+            )
 
-  add_dependencies(${tgt} metadata_thrift)
-
-   if(ENABLE_ASAN)
-     target_compile_options(${tgt} PRIVATE -fsanitize=address
-                                           -fno-omit-frame-pointer)
-@@ -535,25 +434,8 @@
+   target_include_directories(${tgt} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
+ 
+@@ -565,23 +512,11 @@
   endif()
 endforeach()
 
@@ -156,18 +140,18 @@
 -
 target_link_libraries(
   dwarfs
-  metadata_thrift
+  thriftprotocol
+  thriftfrozen2
+   metadata_thrift
 -  thrift_light
-  folly
-  fsst
+   folly
+   fsst
   ${Boost_LIBRARIES}
-   PkgConfig::LIBARCHIVE
-   PkgConfig::LIBLZ4
-@@ -582,11 +464,6 @@
+@@ -612,11 +547,6 @@
   if(USE_JEMALLOC)
     target_link_libraries(${tgt} ${Jemalloc_LIBRARIES})
   endif()
-  if(TARGET folly_exception_tracer)
+-  if(DWARFS_USE_EXCEPTION_TRACER)
 -    target_link_libraries(
 -      ${tgt} -Wl,--whole-archive folly_exception_tracer_base
 -      folly_exception_tracer -Wl,--no-whole-archive)
--- a/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
+++ b/sys-fs/dwarfs/files/unbundle-folly-fbthrift.patch
@@ -1,153 +0,0 @@
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -298,7 +298,7 @@
- if(WITH_TESTS OR WITH_BENCHMARKS)
-   add_library(test_helpers test/test_helpers.cpp test/test_strings.cpp
-                            test/loremipsum.cpp)
-  target_link_libraries(test_helpers dwarfs folly)
-+  target_link_libraries(test_helpers dwarfs)
-   set_property(TARGET test_helpers PROPERTY CXX_STANDARD 17)
- endif()
- 
-@@ -364,70 +364,7 @@
- 
- list(
-   APPEND
-  FROZEN_THRIFT_SRC
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.tcc
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types_custom_protocol.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_constants.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_metadata.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visitation.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_for_each_field.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_visit_union.h)
-
-list(
-  APPEND
-  METADATA_THRIFT_SRC
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_constants.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_for_each_field.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_metadata.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.tcc
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types_custom_protocol.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visit_union.h
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_visitation.h)
-
-add_custom_command(
-  OUTPUT ${FROZEN_THRIFT_SRC}
-  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
-  COMMAND
-    cp ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift
-    ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/
-  COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift &&
-          ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2 frozen.thrift
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
-          ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift)
-
-add_custom_command(
-  OUTPUT ${METADATA_THRIFT_SRC}
-  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
-  COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
-          thrift/dwarfs/metadata.thrift
-  COMMAND
-    cd ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs &&
-    ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1 --gen mstch_cpp2:frozen2
-    metadata.thrift
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
-          ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift)
-
-list(
-  APPEND
-   INCLUDE_DIRS
-  ${CMAKE_CURRENT_BINARY_DIR}/folly
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift
-  ${CMAKE_CURRENT_SOURCE_DIR}/folly
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
-   ${CMAKE_CURRENT_BINARY_DIR})
- 
- if(NOT (ZSTD_FOUND AND PREFER_SYSTEM_ZSTD))
-@@ -445,39 +382,6 @@
-   list(APPEND INCLUDE_DIRS ${Jemalloc_INCLUDE_DIRS})
- endif()
- 
-add_library(
-  thrift_light
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/FieldRef.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/CompactProtocol.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/BinaryProtocol.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/DebugProtocol.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocolCommon.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/protocol/JSONProtocol.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/protocol/TProtocolException.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp/util/VarintUtils.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/gen/module_types_cpp.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/Frozen.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/FrozenUtil.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/cpp2/frozen/schema/MemorySchema.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_data.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/gen-cpp2/frozen_types.cpp)
-
-set_property(TARGET thrift_light PROPERTY CXX_STANDARD 17)
-
-target_include_directories(thrift_light PRIVATE ${INCLUDE_DIRS})
-
-add_library(
-  metadata_thrift
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_layouts.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_types.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/gen-cpp2/metadata_data.cpp)
-
-set_property(TARGET metadata_thrift PROPERTY CXX_STANDARD 17)
-
-target_include_directories(metadata_thrift PRIVATE ${INCLUDE_DIRS})
-
-add_dependencies(metadata_thrift thrift_light)
-
- foreach(tgt dwarfs ${BINARY_TARGETS})
-   target_include_directories(
-     ${tgt} SYSTEM
-@@ -501,8 +405,6 @@
-   set_property(TARGET ${tgt} PROPERTY CXX_STANDARD_REQUIRED ON)
-   set_property(TARGET ${tgt} PROPERTY CXX_EXTENSIONS OFF)
- 
-  add_dependencies(${tgt} metadata_thrift)
-
-   if(ENABLE_ASAN)
-     target_compile_options(${tgt} PRIVATE -fsanitize=address
-                                           -fno-omit-frame-pointer)
-@@ -550,9 +452,6 @@
- 
- target_link_libraries(
-   dwarfs
-  metadata_thrift
-  thrift_light
-  folly
-   fsst
-   ${Boost_LIBRARIES}
-   PkgConfig::LIBARCHIVE
-@@ -582,11 +481,6 @@
-   if(USE_JEMALLOC)
-     target_link_libraries(${tgt} ${Jemalloc_LIBRARIES})
-   endif()
-  if(TARGET folly_exception_tracer)
-    target_link_libraries(
-      ${tgt} -Wl,--whole-archive folly_exception_tracer_base
-      folly_exception_tracer -Wl,--no-whole-archive)
-  endif()
- endforeach()
- 
- if(STATIC_BUILD_DO_NOT_USE)
--- a/sys-fs/gdu/Manifest
+++ b/sys-fs/gdu/Manifest
@@ -37,7 +37,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb6
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST gdu-5.8.1.tar.gz 62478 BLAKE2B a0fbb634abce198afc0a3df94ab766ede291652b82dd429e87a86dd72356c546beb0fe7dbaf2bfc01f1bf68a8a3612fa30750a9c958b8b401936dc2d2029c606 SHA512 f7f9d25c3b0041db272b9e888f52e5ebd2a344bcbb2a0ef5fd84c471fae79528d8f8fabfd1bbbe1ef66850270b95b260490a3fef4b551fe884f0cabbe2dc3cf8
+DIST gdu-5.9.0.tar.gz 63161 BLAKE2B c17031537a6184a3d00dba0a95df72d6a83db57cd2772039ec037065bf5122b62bb52f9e36e0f0c4ebc1a29d18c80a89b34381ad76b8f2274c82d489a7303b35 SHA512 7b63f78fae575b341edcd36476ad48f8f5c584bf2e7986b4ef39cf6182d580a245cacb9a9f91c59ddeae5468932fc2385bc53e9f727a784463e547d7c631ae5c
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
--- a/sys-fs/gdu/gdu-5.9.0.ebuild
+++ b/sys-fs/gdu/gdu-5.9.0.ebuild
@@ -617,7 +617,7 @@ EGO_SUM=(
 	"rsc.io/binaryregexp v0.2.0/go.mod"
 	"rsc.io/quote/v3 v3.1.0/go.mod"
 	"rsc.io/sampler v1.3.0/go.mod"
-)
+	)
 go-module_set_globals

 DESCRIPTION="Disk usage analyzer with console interface written in Go"
--- a/x11-terms/dmd5620/dmd5620-1.2.0.ebuild
+++ b/x11-terms/dmd5620/dmd5620-1.2.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="

 src_prepare() {
 	# remove bundled libraries
-	rm "${S}"/src/libtelnet.c "${S}"/src/libtelnet.h "${S}"/lib/libdmd_core.a
+	rm "${S}"/src/libtelnet.c "${S}"/src/libtelnet.h "${S}"/lib/libdmd_core.a || die "failed to remove bundled libraries"
 	rmdir "${S}"/lib
 	# apply patches
 	eapply "${FILESDIR}/${PN}-1.2.0-systemlibs-nostrip.patch"
--- a/x11-themes/vimix-xcursors/vimix-xcursors-20200224-r1.ebuild
+++ b/x11-themes/vimix-xcursors/vimix-xcursors-20200224-r1.ebuild
@@ -3,15 +3,17 @@

 EAPI=8

-DESCRIPTION="Vimix-cursors for Linux desktop."
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+
+DESCRIPTION="Vimix-cursors for Linux desktop"
 HOMEPAGE="https://github.com/vinceliuice/Vimix-cursors"
-SRC_URI="https://github.com/vinceliuice/Vimix-cursors/archive/refs/tags/2020-02-24.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/vinceliuice/Vimix-cursors/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-S="${WORKDIR}/Vimix-cursors-${PV:0:4}-${PV:4:2}-${PV:6:2}"
+S="${WORKDIR}/Vimix-cursors-${MY_PV}"

 src_install() {
 	insinto /usr/share/cursors/xorg-x11/Vimix/cursors