Merge updates from master

2026-07-17 11:04:10 -04:00 · 2022-07-11 07:01:25 +00:00
parent 18dded4657 4de31cb4ea
commit d81a76115e
95 changed files with 1155 additions and 454 deletions
--- a/app-containers/nvidia-container-toolkit/Manifest
+++ b/app-containers/nvidia-container-toolkit/Manifest
@@ -1944,6 +1944,8 @@ DIST mvdan.cc%2Fgofumpt%2F@v%2Fv0.1.1.mod 265 BLAKE2B 4232ab3ecc78532cc067fa1247
 DIST mvdan.cc%2Finterfacer%2F@v%2Fv0.0.0-20180901003855-c20040233aed.mod 27 BLAKE2B 1fc5a95e4432c2d8c9c211155dc66a8bfc53f823f2129174bc7155b63f4c58607127dbd2d6bd793c91fde596a5c36a0acc527b13031dd29da156c04cc1efae32 SHA512 d58e0c14bafe02b1366d43f00d07951b4c11c3e4d8771d0f658367c107d7ed05266443e50a50e10d01ff57c9eb5bfd3bd95e56b2f56fc5cd704e48d9140d93e3
 DIST mvdan.cc%2Flint%2F@v%2Fv0.0.0-20170908181259-adc824a0674b.mod 21 BLAKE2B ed7272fd29049af9e593f73cde21d7f73b40817f1e7592a1a706ee58c251aebdd423e4b1ce25405eaacb9a3b9b101af042bf12615e0cd907c8b24e183795a0f4 SHA512 a9fafa4c84459dc2958a4587b99823476dccd1e245fde663c42c3fa8784c99df27a3d90e0f9f1125f0a3b82ca89dc28ae58cc0d90084ff9df16acde7981b15ea
 DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20210104141923-aac4ce9116a7.mod 244 BLAKE2B 2c036357fc8644a98fe147a4725e68b93fbe6cdb18dc10bf2e49fbc37968b2c555cfb196eeae33ad873bbdaf4ee84fbe5f45bbfcc2148e54b82a71fbe6fb52e6 SHA512 1ee461698c2325a9cd8c3ec1927704384724570c74dddc6c6ea1c32aea50658db74553d3918ff23b311a1ade32ecafb276cb7bd53e318723e7e14716bd7ea399
+DIST nvidia-container-toolkit-1.10.0-deps.tar.xz 608539028 BLAKE2B 4442849f35ed952eea9cee180d27b21dbbb3bb01ea24f9536b59791bb2cf99e4c0de82eeafd1750620e4981a5f73428e6eaeee7350689df00b3e80af6354d33b SHA512 51c94b7114e357e3a8753eea3e8ddccec1ce40268328d777c7ec069bc6d539f1ffb81bdc17b7dfcb552c303fd21c6b64e130f92fe0f5b9dfff31013e3a1eeaa2
+DIST nvidia-container-toolkit-1.10.0.tar.gz 1817732 BLAKE2B 3a679aca183a62a16318a90442b764252e4e1048076c9d0fc439074c13370453152f19cf344c9c727892b4a998ce370c895a43b2fea77796c49e06f3e0628a37 SHA512 4f35918811edf7ea0f24d04eba12e4670b039edd0bb29ed4f16b47c4208f8a3d4316042f5ca52a278fedd1dce549070df69807080b1a7bda4a859369ad707bf9
 DIST nvidia-container-toolkit-1.9.0.tar.gz 1501756 BLAKE2B 5e6b34bab370eff531a67d03590c44512a1e48d8a05715b69b1ff67b145489f19fe6f00bd4bec8634768ef65155221cc750c4a23ea355648ae27ed4d86ace59a SHA512 aa734e5611d2ee6b5a55cbacebf29d7094ff4ff6f3317e381bee529582d7374cccc9297846fd77dbc569df6646095c186f1c0287fa39ea5f15d2a13cf55c8c32
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
--- a/app-containers/nvidia-container-toolkit/metadata.xml
+++ b/app-containers/nvidia-container-toolkit/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>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
--- a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.10.0.ebuild
+++ b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-1.10.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGO_PN="github.com/NVIDIA/${PN}"
+
+inherit go-module
+
+DESCRIPTION="NVIDIA container runtime toolkit"
+HOMEPAGE="https://github.com/NVIDIA/nvidia-container-toolkit"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+	inherit git-r3
+
+	src_unpack() {
+		git-r3_src_unpack
+		go-module_live_vendor
+	}
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+		https://media.githubusercontent.com/media/vowstar/distfiles/main/${P}-deps.tar.xz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="
+	sys-libs/libnvidia-container
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/unzip
+	sys-devel/make
+"
+
+src_compile() {
+	emake binaries
+}
+
+src_install() {
+	dobin "${PN}"
+	into "/usr/bin"
+	dosym "${PN}" "/usr/bin/nvidia-container-runtime-hook"
+	insinto "/etc/nvidia-container-runtime"
+	doins "${FILESDIR}/config.toml"
+}
+
+pkg_postinst() {
+	elog "Your docker service must restart after install this package."
+	elog "OpenRC: sudo rc-service docker restart"
+	elog "systemd: sudo systemctl restart docker"
+	elog "You may need to edit your /etc/nvidia-container-runtime/config.toml"
+	elog "file before running ${PN} for the first time."
+	elog "For details, please see the NVIDIA docker manual page."
+}
--- a/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
+++ b/app-containers/nvidia-container-toolkit/nvidia-container-toolkit-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGO_PN="github.com/NVIDIA/${PN}"
+
+inherit go-module
+
+DESCRIPTION="NVIDIA container runtime toolkit"
+HOMEPAGE="https://github.com/NVIDIA/nvidia-container-toolkit"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+	inherit git-r3
+
+	src_unpack() {
+		git-r3_src_unpack
+		go-module_live_vendor
+	}
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+		https://media.githubusercontent.com/media/vowstar/distfiles/main/${P}-deps.tar.xz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="
+	sys-libs/libnvidia-container
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	app-arch/unzip
+	sys-devel/make
+"
+
+src_compile() {
+	emake binaries
+}
+
+src_install() {
+	dobin "${PN}"
+	into "/usr/bin"
+	dosym "${PN}" "/usr/bin/nvidia-container-runtime-hook"
+	insinto "/etc/nvidia-container-runtime"
+	doins "${FILESDIR}/config.toml"
+}
+
+pkg_postinst() {
+	elog "Your docker service must restart after install this package."
+	elog "OpenRC: sudo rc-service docker restart"
+	elog "systemd: sudo systemctl restart docker"
+	elog "You may need to edit your /etc/nvidia-container-runtime/config.toml"
+	elog "file before running ${PN} for the first time."
+	elog "For details, please see the NVIDIA docker manual page."
+}
--- a/app-crypt/tang/files/tangd
+++ b/app-crypt/tang/files/tangd
@@ -0,0 +1,8 @@
+# Address for tang to listen to (default: 0.0.0.0)
+ADDRESS=0.0.0.0
+
+# Port for tang to listen to (default: 8888)
+PORT=8888
+
+# Directory where keys will be stored (default: /var/db/tang)
+TANGDIR=/var/db/tang
--- a/app-crypt/tang/files/tangd.initd
+++ b/app-crypt/tang/files/tangd.initd
@@ -2,15 +2,10 @@
 # Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-port=8888
-bind=0.0.0.0
-tangd=/usr/libexec/tangd
-tangdir=/var/db/tang
-
 name="tang daemon"
 description="Tang binding daemon"
 command=/usr/bin/socat
 pidfile="/var/run/${RC_SVCNAME}.pid"
 command_user="tang"
-command_args="TCP-LISTEN:${port},bind=${bind},fork SYSTEM:'${tangd} ${tangdir}'"
+command_args="TCP-LISTEN:${PORT},bind=${ADDRESS},fork SYSTEM:'/usr/libexec/tangd ${TANGDIR}'"
 command_background=true
--- a/app-crypt/tang/tang-11.ebuild
+++ b/app-crypt/tang/tang-11.ebuild
@@ -26,6 +26,8 @@ src_install(){
 	newinitd "${FILESDIR}"/tangd.initd tangd
 	systemd_dounit ${FILESDIR}/tangd.service

+	doconfd "${FILESDIR}"/tangd
+
 	dodir /var/db/tang
 	keepdir /var/db/tang
 	fowners tang:tang /var/db/tang
--- a/app-misc/mat2/Manifest
+++ b/app-misc/mat2/Manifest
@@ -1 +1,2 @@
-DIST mat2-0.12.4.tar.gz 10464411 BLAKE2B 161d92dfea16c7ab5a09e9271b5cd4fbd64ddeaca18187395ff3ffb5671d5fc5d98c70d2a081c566148cbed7b6c9923ca87f732552d0172cb841030edbf70192 SHA512 20936c80d0fa31dae9ee14c3d853c0e63a87b2d3ad5838a17bdbbc3e7cb4cf73462c9a9573d2aeab6e4ab0d6c18ce24c63a80e1a7cd044724c8ecc639d13da80
+DIST mat2-0.13.0.tar.gz 11784441 BLAKE2B 5f864a1b2dcce8d6e466fccfc66ad42ac079443b6668daaaf82c2870cddfa1b1227ed842431b2550e8e9435a58831b5b97782c89ac8e55da6573f2087cace09d SHA512 398732e2093c3167a2bb30325bbe5c738f8ac1c36213c63163a02a45b1005cde912f88318655e79276fac8df63c8fee41772eb0e3a53895c20d9c7ba3be16c6c
+DIST mat2-0.13.0.tar.gz.asc 833 BLAKE2B d9219377efcb3283965e55b0e60809381e285371466b48ed3bf344b34204885e0f1ac1360ae49a2b550774f051689624310a58259a5053ff7bb25616a667525d SHA512 6a2fb2a672a91f6eaa45d53d6c17bed888ee7c7e1c5d01a5830c5394881593662596a853da2d46ab1eec4b0e87aff902b8af97c042b6429889042c95c58c0bf7
--- a/app-misc/mat2/mat2-0.13.0.ebuild
+++ b/app-misc/mat2/mat2-0.13.0.ebuild
@@ -6,11 +6,14 @@ EAPI=8
 PYTHON_COMPAT=(python3_{8..11})
 PYTHON_REQ_USE="xml(+)"

-inherit distutils-r1 optfeature
+inherit distutils-r1 optfeature verify-sig

 DESCRIPTION="Metadata Anonymisation Toolkit: handy tool to trash your metadata"
 HOMEPAGE="https://0xacab.org/jvoisin/mat2"
-SRC_URI="https://0xacab.org/jvoisin/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="
+	https://0xacab.org/jvoisin/${PN}/-/archive/${PV}/${P}.tar.gz
+	verify-sig? ( https://0xacab.org/jvoisin/mat2/uploads/b8b7bce2a45aa6c1b2b48432025b2fef/mat2-0.13.0.tar.gz.asc )
+"

 LICENSE="LGPL-3"
 SLOT="0"
@@ -22,12 +25,14 @@ RDEPEND="
 	media-libs/mutagen:0[${PYTHON_USEDEP}]
 "
 BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-jvoisin )
 	test? (
 		media-libs/exiftool:*
 		media-video/ffmpeg[mp3,vorbis]
 		x11-libs/gdk-pixbuf:2[jpeg,tiff]
 	)
 "
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jvoisin.asc

 DOCS=( doc {CHANGELOG,CONTRIBUTING,INSTALL,README}.md )

--- a/app-text/md4c/md4c-9999.ebuild
+++ b/app-text/md4c/md4c-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+# TODO: enable tests, add stable version and useflag for static lib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mity/md4c.git"
+else
+	SRC_URI="https://github.com/mity/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="C Markdown parser. Fast, SAX-like interface, CommonMark Compliant."
+HOMEPAGE="https://github.com/mity/md4c"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DBUILD_SHARED_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm {} \; || die
+}
--- a/app-text/md4c/metadata.xml
+++ b/app-text/md4c/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nrk@disroot.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mity/md4c</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-R/farver/Manifest
+++ b/dev-R/farver/Manifest
@@ -1 +1 @@
-DIST farver_2.1.0.tar.gz 1281864 BLAKE2B 50c4a98b8b33efae95635137b1025de061f7bc3b76d79675e9b2df5342993d840f8828695eead73fbe861e53bd076b6aa3ac792eca537741074bf5d7fc5a3056 SHA512 a89c77a971e831d2b203a011539f5e077d953432156eaff588e8b0cb57536dfaace1d98bd656b9b48eccddb2b1d03dc395e01ae670bde1b769b905bc17eb4129
+DIST farver_2.1.1.tar.gz 1274363 BLAKE2B 8aae9b293163faaefa87227286e8c49fc7432689338120a07ec00f6337828eaf5bcee2ef1ab2ceadfe1846546fe1397647d324c69a43735f3e595d3361bcc3b5 SHA512 c37ae8ff31ff71140b7e2d8e69a32453bc7cf2a9b422fb273c00929f537f205845876cdea89038859106b167e1cb11bd8fb8625e4a78c7dd342717a14d56b030
--- a/dev-R/farver/farver-2.1.0.ebuild
+++ b/dev-R/farver/farver-2.1.0.ebuild
@@ -1,10 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit R-packages
-
-DESCRIPTION='High Performance Colour Space Manipulation'
-KEYWORDS="~amd64"
-LICENSE='MIT'
--- a/dev-R/farver/farver-2.1.1.ebuild
+++ b/dev-R/farver/farver-2.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit R-packages
+
+DESCRIPTION='High Performance Colour Space Manipulation'
+HOMEPAGE="
+	https://cran.r-project.org/package=farver
+	https://farver.data-imaginist.com/
+	https://github.com/thomasp85/farver
+"
+
+KEYWORDS="~amd64"
+LICENSE='MIT'
+
+SUGGESTED_PACKAGES="
+	dev-R/covr
+	>=dev-R/testthat-3.0.0
+"
--- a/dev-R/generics/Manifest
+++ b/dev-R/generics/Manifest
@@ -1 +1 @@
-DIST generics_0.1.2.tar.gz 123325 BLAKE2B 5b34d217a3cedba43488914bc61b3504662625b2a3a677059eda902617e737022dec5a07757aca8afbdf3eb9956e8310743788ee4525729ece4c199b87165933 SHA512 7de60e4b4b6be87100431c263d3150c8d272729c6d56d89bc43725410e47dd3543629b7ca60a9fde1e9df4d54ee165562a276e0a0842d1849b73300170d91ead
+DIST generics_0.1.3.tar.gz 172201 BLAKE2B 100745ecd8f979975e45852ffb41befc0ae8a34156d333b3e723743e2ecc93e882d31bae5f8dde192d21452edae119f4ed4f18eb9379203c67679b739450a374 SHA512 7825e22659ecd41d51f60cf33fd52cdf35c818ffa55197e11091e4e19dddf6303dc0d577a6af49c4ca14ad2deedcbe3c00846454e3129d3d24480bd0a9ed4896
--- a/dev-R/generics/generics-0.1.3.ebuild
+++ b/dev-R/generics/generics-0.1.3.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="7"
+EAPI=7

 inherit R-packages

 DESCRIPTION="Common S3 Generics not Provided by Base R Methods Related to Model Fitting"
+HOMEPAGE="
+	https://cran.r-project.org/package=generics
+	https://generics.r-lib.org/
+	https://github.com/r-lib/generics
+"
+
 KEYWORDS="~amd64"
-HOMEPAGE="https://cran.r-project.org/package=generics"
 LICENSE="MIT"
 DEPEND=">=dev-lang/R-3.2"
 RDEPEND="${DEPEND}"
--- a/dev-cpp/coeurl/coeurl-0.2.0-r1.ebuild
+++ b/dev-cpp/coeurl/coeurl-0.2.0-r1.ebuild
@@ -19,6 +19,7 @@ RESTRICT="test" # Tests turned off because they need a local webserver.
 RDEPEND="
 	net-misc/curl
 	dev-libs/libevent
+	dev-libs/libfmt:=
 	dev-libs/spdlog
 "
 DEPEND="
--- a/dev-cpp/parallel-hashmap/Manifest
+++ b/dev-cpp/parallel-hashmap/Manifest
@@ -1,2 +1 @@
-DIST parallel-hashmap-1.34.tar.gz 2043028 BLAKE2B 30629288656a22cfd56da9485458f604487383cc5951e230a833b182cbbcc706b78d0b8a45fb76c4fca6da930f49cdb79b2ca63926ca8cd60cc7445b58c8edbd SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429
 DIST parallel-hashmap-1.35.gh.tar.gz 2044770 BLAKE2B 18c4843ebd2ca046e1597a7fc0341440d888c4b39d2355e45b36e02b9f5dcf39baec1826434d70b591e6713fe2ff043a9ec8a68b7b43e0fbb2af176507b738ba SHA512 ffa70a6691784caa8acc6e191b3db4ffdbbc51db86c91118267fac96c178d434f890f773c9b31932eaed15b2cecbd74dcaddacefd0ef9771da0833c90d0f104c
--- a/dev-cpp/parallel-hashmap/parallel-hashmap-1.34-r1.ebuild
+++ b/dev-cpp/parallel-hashmap/parallel-hashmap-1.34-r1.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Family of header-only, fast and memory-friendly hashmap and btree containers"
-HOMEPAGE="
-	https://greg7mdp.github.io/parallel-hashmap/
-	https://github.com/greg7mdp/parallel-hashmap
-"
-SRC_URI="https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="examples test"
-
-CDEPEND="dev-libs/cereal"
-DEPEND="test? ( ${CDEPEND} )"
-RDEPEND="${CDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-src_compile() {
-	mycmakeargs=(
-		PHMAP_BUILD_EXAMPLES=$(usex examples)
-		PHMAP_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	if use examples ; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
--- a/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild
+++ b/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild
@@ -3,6 +3,8 @@

 EAPI=8

+CMAKE_MAKEFILE_GENERATOR=emake
+
 inherit cmake

 DESCRIPTION="Family of header-only, fast and memory-friendly hashmap and btree containers"
@@ -25,13 +27,13 @@ RDEPEND="${CDEPEND}"
 # https://github.com/greg7mdp/parallel-hashmap/issues/154
 RESTRICT="test"

-src_compile() {
-	mycmakeargs=(
-		PHMAP_BUILD_EXAMPLES=$(usex examples)
-		PHMAP_BUILD_TESTS=$(usex test)
+src_configure() {
+	local mycmakeargs=(
+		-DPHMAP_BUILD_EXAMPLES=$(usex examples)
+		-DPHMAP_BUILD_TESTS=$(usex test)
 	)

-	cmake_src_compile
+	cmake_src_configure
 }

 src_install() {
--- a/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
+++ b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
@@ -1,6 +1,6 @@
 --- a/make/gluegen-cpptasks-base.xml
 +++ b/make/gluegen-cpptasks-base.xml
-@@ -1872,16 +1872,6 @@
+@@ -1779,17 +1779,6 @@
        - Helper strip.libraries for stripping off debug information
       -->
     <target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
@@ -12,6 +12,7 @@
 -          <include name="**/*.so"/>     <!-- unix    -->
 -          <include name="**/*.dll"/>    <!-- windows -->
 -          <include name="**/*.dylib"/>  <!-- macosx  -->
+-          <include name="**/*.jnilib"/> <!-- macosx  -->
 -        </fileset>
 -      </apply>
     </target>
--- a/dev-java/gluegen/gluegen-2.3.2.ebuild
+++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
@@ -64,7 +64,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"

 	"${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
-	"${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
+	"${FILESDIR}/${PN}-2.3.2-dont-strip.patch"
 	"${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
 )
 EANT_BUILD_TARGET="all.no_junit"
--- a/dev-libs/libdwarf/Manifest
+++ b/dev-libs/libdwarf/Manifest
@@ -1 +1,2 @@
 DIST libdwarf-0.4.0.tar.xz 2380228 BLAKE2B ee9d02284740b3f4961299e2e4530c2934cde4defefebd8a8ca3aab232f0a18fc35d376c2f61ee323f7db7e6460a3f5e662781f8086438c287f716067c2b7594 SHA512 30e5c6c1fc95aa28a014007a45199160e1d9ba870b196d6f98e6dd21a349e9bb31bba1bd6817f8ef9a89303bed0562182a7d46fcbb36aedded76c2f1e0052e1e
+DIST libdwarf-0.4.1.tar.xz 2410800 BLAKE2B 88753ebc2606fbcc7a41ea3db8f5bc1b41357705f7b4e21acb49c13d96f3741a7305b764ab973bc9ac0c6c4246b668f82d93886451d9963f4237a9ff47694429 SHA512 793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693
--- a/dev-libs/libdwarf/libdwarf-0.4.1.ebuild
+++ b/dev-libs/libdwarf/libdwarf-0.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="The DWARF Debugging Information Format"
+HOMEPAGE="
+	https://www.prevanders.net/dwarf.html
+	https://www.dwarfstd.org
+	https://github.com/davea42/libdwarf-code
+"
+SRC_URI="https://www.prevanders.net/${P}.tar.xz"
+
+LICENSE="LGPL-2.1 GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc dwarfexample dwarfgen +elf"
+
+DEPEND="
+	sys-libs/zlib
+	elf? ( virtual/libelf:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use dwarfgen)
+		$(meson_use dwarfexample)
+		$(meson_use doc)
+		$(meson_use elf libelf)
+	)
+	meson_src_configure
+}
+
+src_install(){
+	meson_src_install
+	dodoc AUTHORS README README.md ChangeLog* NEWS doc/*.pdf
+	if use doc; then
+		dodoc -r "${ED}/usr/share/doc/${PN}/html"
+		rm -r "${ED}/usr/share/doc/${PN}" || die
+	fi
+}
--- a/dev-nim/cligen/Manifest
+++ b/dev-nim/cligen/Manifest
@@ -0,0 +1 @@
+DIST cligen-1.5.24.tar.gz 416445 BLAKE2B 22b1b30340dc56b8a7b3a422f1f9156939e2b027f060ca50f814e9ce491b8ef7aea082f7032fb7b1d417bf0a2b843b6dd10b79ad0b8529ad2f8fbeb5a56c9549 SHA512 9673766de8bf3f5da613bea3a143ab1ee9b9d569995f706fa459822dc20a86c46ec71dd24985d36c5120409e99dcb3eb7401ea50647c28f8128fa5fd0a671491
--- a/dev-nim/cligen/cligen-1.5.24.ebuild
+++ b/dev-nim/cligen/cligen-1.5.24.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Infer & generate command-line interface/option/argument parser"
+HOMEPAGE="
+	https://github.com/c-blake/cligen
+	https://nimble.directory/pkg/cligen
+"
+SRC_URI="https://github.com/c-blake/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+DOCS=( configs examples {MOTIVATION,README,RELEASE-NOTES,TODO}.md )
+
+set_package_url "https://github.com/c-blake/cligen"
+
+src_test() {
+	emake -f GNUmakefile
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/examples
+	nimble_src_install
+}
--- a/dev-nim/cligen/metadata.xml
+++ b/dev-nim/cligen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">c-blake/cligen</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-nim/inim/Manifest
+++ b/dev-nim/inim/Manifest
@@ -0,0 +1 @@
+DIST inim-0.6.1.tar.gz 577278 BLAKE2B b3581ad658b5d7134e557487453fa29a7f23c534d1c5def5e787f4e1ff7f7f7e17e44a6f40782ceae494b413354c0c9491ba328cc7347f95bb7c2b66c2f58df6 SHA512 3c153261aa6c16579f954e1e9dc713e8c33c177bbb6275b5bb613c811ed8f9be075f28ae7a1574a7742a8eb9918da5df49529501947edca927723a7a3c84d2d9
--- a/dev-nim/inim/inim-0.6.1.ebuild
+++ b/dev-nim/inim/inim-0.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Interactive Nim Shell / REPL / Playground"
+HOMEPAGE="https://github.com/inim-repl/INim"
+SRC_URI="https://github.com/${PN}-repl/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/INim-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-nim/cligen-1.5.22
+	>=dev-nim/noise-0.1.4
+"
+
+DOCS=( {README,SECURITY}.md readme.gif )
--- a/dev-nim/inim/metadata.xml
+++ b/dev-nim/inim/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inim-repl/INim</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-nim/nake/Manifest
+++ b/dev-nim/nake/Manifest
@@ -0,0 +1 @@
+DIST nake-1.9.4.tar.gz 10693 BLAKE2B e3de93537ac84818cd2dda60974d94a442b8d1aa7d3bd10f6f0a76f7641f38b153f5a7634a3dbe7e1cdcd91700cd37c846ab8e35d7e397101ce1eb2247fabf80 SHA512 cce92313d4668956dd48c3add0f6859fe9c5b33002c31dc9440dccc68636131591889fb7aa739d3ce0fb5d24725499ff6fd65c6f66294fd757461ad1f53942c3
--- a/dev-nim/nake/metadata.xml
+++ b/dev-nim/nake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fowlmouth/nake</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-nim/nake/nake-1.9.4.ebuild
+++ b/dev-nim/nake/nake-1.9.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="make-like for Nim. Describe your builds as tasks!"
+HOMEPAGE="https://github.com/fowlmouth/nake"
+SRC_URI="https://github.com/fowlmouth/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_test() {
+	local PATH="${BUILD_DIR}:${PATH}"
+
+	cd "${S}"/tests || die
+	for t in t*.nim; do
+		[[ -f ${t} ]] || continue
+		enim --hints:off r "${t}"
+	done
+}
--- a/dev-nim/noise/Manifest
+++ b/dev-nim/noise/Manifest
@@ -0,0 +1 @@
+DIST noise-0.1.14.tar.gz 30737 BLAKE2B c0b09ccfe55f3acad827af22def439d8bf00a9c14b8976a8681ed1aa8067c0f9f794ce68987384df2ccb4de3ffd3cc18d3aae73561b4576af47f299f5e4a9c2e SHA512 590c08e7fefdc95b5e3ed36e86467e999b479b4a38b80df56cbd9c0a5c3fb6f2d667f35bb3dcd6c44cae53d8fd77481f6534879fbd1e6230a61fa452eb296d0a
--- a/dev-nim/noise/metadata.xml
+++ b/dev-nim/noise/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jangko/nim-noise</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-nim/noise/noise-0.1.14.ebuild
+++ b/dev-nim/noise/noise-0.1.14.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="a Nim implementation of linenoise"
+HOMEPAGE="
+	https://github.com/jangko/nim-noise
+	https://nimble.directory/pkg/noise
+"
+SRC_URI="https://github.com/jangko/nim-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/nim-${P}"
+
+LICENSE="MIT"
+SLOT="0.1.4"
+KEYWORDS="~amd64"
+
+DOCS=( examples readme.md )
+
+set_package_url "https://github.com/jangko/nim-noise"
+
+src_test() {
+	nimble_src_test
+	rm examples/{primitives,test} || die
+}
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/examples
+	nimble_src_install
+}
--- a/dev-python/axisregistry/axisregistry-0.3.2.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
@@ -18,7 +18,10 @@ LICENSE="Apache-2.0"
 KEYWORDS="~amd64"
 SLOT="0"

-RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/fonttools[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
 DEPEND="
 	${RDEPEND}
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
--- a/dev-python/readability-lxml/Manifest
+++ b/dev-python/readability-lxml/Manifest
@@ -1 +1,2 @@
 DIST readability-lxml-0.6.1.tar.gz 13741 BLAKE2B 8bae46033e6eb3c171869746291a856267bc8f64ae088969405c5920229447fa470b6e14ea8b32b380c43d30e83ad9371149181d293bbfca6ff13fa271da3d74 SHA512 f7bead871dc84e2cc6dac18ced3f9fa223cd3961204330064e338b2e822ba9af58beb43be42b7f61a7cfb761f7c1d7a339d428c310d6be34b7546328f1eeb276
+DIST readability-lxml-0.8.1.gh.tar.gz 78871 BLAKE2B ef179d8bb727c0630e3af763a18170c1956be5cd3b8ad1cfe614b233964225e2e73b814c4ad628780eaffca21881d1ed276f45248a656b8c37ef1e6ccb121e85 SHA512 c5b296a35606f65643f72e7d9ee07d6820a7a6a36ce97350673ea6076b704f7ed72f92ded47dac56690cdf3776eb8fadbb02ea234355a9982d4127976b2e6c6e
--- a/dev-python/readability-lxml/metadata.xml
+++ b/dev-python/readability-lxml/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">readability-lxml</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
+++ b/dev-python/readability-lxml/readability-lxml-0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+MY_PN="python-readability"
+DESCRIPTION="fast html to text parser (article readability tool)"
+HOMEPAGE="
+	https://pypi.org/project/readability-lxml/
+	https://github.com/buriy/python-readability
+"
+SRC_URI="https://github.com/buriy/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	|| ( ( $(python_gen_cond_dep \
+			'dev-python/cchardet[${PYTHON_USEDEP}]' python3_{8..10}) )
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep \
+			'dev-python/timeout-decorator[${PYTHON_USEDEP}]' python3_{8..11})
+	)
+"
+
+distutils_enable_tests unittest
+
+distutils_enable_sphinx doc/source \
+	dev-python/recommonmark \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	[[ ${EPYTHON} == pypy3 ]] && \
+		return 0  # unsatisfied dep
+
+	distutils-r1_python_test
+}
--- a/eclass/boinc-app.eclass
+++ b/eclass/boinc-app.eclass
@@ -5,7 +5,7 @@
 # @MAINTAINER:
 # Anna Vyalkova <cyber+gentoo@sysrq.in>
 # @SUPPORTED_EAPIS: 8
-# @BLURB: Eclass that provides base functions for installing BOINC applications.
+# @BLURB: base functions for installing BOINC applications
 # @DESCRIPTION:
 # This eclass provides base functions for installation of software developed
 # for the BOINC platform.
@@ -77,7 +77,7 @@ in order to use this application with BOINC.}
 # Generate appropriate (R)DEPEND for wrapper-enabled or
 # native application.
 boinc-app_add_deps() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	if [[ $1 == "--wrapper" ]]; then
 		RDEPEND="sci-misc/boinc-wrapper"
@@ -85,6 +85,9 @@ boinc-app_add_deps() {
 		DEPEND="sci-misc/boinc"
 		RDEPEND="sci-misc/boinc"
 	fi
+
+	DEPEND="${DEPEND} acct-user/boinc"
+	RDEPEND="${RDEPEND} acct-user/boinc"
 }

 # @FUNCTION: boinc_master_url_check
@@ -92,9 +95,9 @@ boinc-app_add_deps() {
 # @DESCRIPTION:
 # Make sure BOINC_MASTER_URL has a value.
 boinc_master_url_check() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

-	[[ ! ${BOINC_MASTER_URL} ]] && \
+	[[ -n ${BOINC_MASTER_URL} ]] || \
 		die "BOINC_MASTER_URL is not set"
 	return 0
 }
@@ -103,7 +106,7 @@ boinc_master_url_check() {
 # @USAGE:
 # @RETURN: non-prefixed default BOINC runtime directory
 get_boincdir() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	echo /var/lib/boinc
 }
@@ -121,7 +124,7 @@ get_boincdir() {
 # -> boinc.berkeley.edu_example
 # @CODE
 get_project_dirname() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	boinc_master_url_check

@@ -137,7 +140,7 @@ get_project_dirname() {
 # @USAGE:
 # @RETURN: non-prefixed directory where applications and files should be installed
 get_project_root() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	echo "$(get_boincdir)/projects/$(get_project_dirname)"
 }
@@ -163,7 +166,7 @@ _boinc-app_fix_permissions() {
 # The default appinfo_prepare(). It replaces all occurences
 # of @PV@ with its corresponding value.
 boinc-app_appinfo_prepare() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	sed -i "$1" \
 		-e "s:@PV@:${PV}:g" \
@@ -196,7 +199,7 @@ boinc-app_appinfo_prepare() {
 # }
 # @CODE
 doappinfo() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	(( $# == 1 )) || \
 		die "${FUNCNAME} takes exactly one argument"
@@ -224,7 +227,7 @@ doappinfo() {
 # The default foreach_wrapper_job(). It replaces all occurences
 # of @PV@, @EPREFIX@ and @LIBDIR@ strings with their corresponding values.
 boinc-wrapper_foreach_wrapper_job() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	sed -i "$1" \
 		-e "s:@PV@:${PV}:g" \
@@ -260,7 +263,7 @@ boinc-wrapper_foreach_wrapper_job() {
 #
 # Keep your job.xml files in sync with app_info.xml!
 dowrapper() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	for app in "$@"; do
 		local wrapperjob="${app}_job_${PV}.xml"
@@ -293,7 +296,7 @@ dowrapper() {
 # Display helpful instructions on how to make the BOINC client use installed
 # applications.
 boinc-app_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	if [[ -f "${EROOT}/$(get_boincdir)/master_$(get_project_dirname).xml" ]]; then
 		if [[ -z ${REPLACING_VERSIONS} ]]; then
@@ -328,7 +331,7 @@ boinc-app_pkg_postinst() {
 # Display helpful instructions on how to cleanly uninstall unmerged
 # applications.
 boinc-app_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "${@}"]
+	debug-print-function ${FUNCNAME} "${@}"

 	if [[ -z ${REPLACED_BY_VERSION} ]]; then
 		local gui_rpc_auth="$(get_boincdir)/gui_rpc_auth.cfg"
--- a/games-util/legendary/Manifest
+++ b/games-util/legendary/Manifest
@@ -1,2 +1,3 @@
 DIST legendary-0.20.25.tar.gz 127548 BLAKE2B 7c2b10e04bfe30be01733184b07b470c8f77d5c911deee8109ce18b87b9f7d611aae5a677212c4e8c5487b2b3685a2c22c0685f481f24daabd3d1cd10ef5746c SHA512 2ba8d3ebcd751201e23dccb3666e849366529c0edcc926fe6fd3216f23683aff9a396eb6e7f2d9e26961bd02cf07578e1ded95a6065460e6977e8d10f0242962
 DIST legendary-0.20.26.tar.gz 128509 BLAKE2B b563b607dd76e93c591868a67ed3c0299291b1387aeed59bab447db75e6ff653e2bfaf8ad976f2915f7e1fa5bc6a36183d30ea3a0e2c481987e79dc322bd2b83 SHA512 d1b3244437bf2f2c7efb3fd181cc6a83d197c32256bb31d9f9b0c1b8a4712814a8ad5e6f227d953cd0bc5e31dffb816f456f33d14ebbd68355f5b4d78f4e5ea0
+DIST legendary-0.20.27.tar.gz 129234 BLAKE2B 0905cf0f7e3fe818fd19abf9ba7abcb981167d6eb8ab14d609051e9de59604e948f6929bc0daedaff682493810743977f61d0fea97c6419eefdf2ebdc3527a6d SHA512 6c58abf42be732adcae0f7efe56f449a2c166154d250b8a2914fcb8c6aa1d2a6ba642cf6471a377ce91018c9da7a740d5d2eebaf6d34d1fb626f1e0db1e4e7cb
--- a/games-util/legendary/legendary-0.20.27.ebuild
+++ b/games-util/legendary/legendary-0.20.27.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A free and open-source replacement for the Epic Games Launcher"
+HOMEPAGE="https://github.com/derrod/legendary"
+SRC_URI="https://github.com/derrod/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="webview"
+
+# NOTE: dev-python/pywebview[qt5] is not much tested and does not function
+# correctly in some cases, according to release notes for 0.20.16.
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/requests-3.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		webview? ( dev-python/pywebview[gtk,${PYTHON_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,6 +1,6 @@
 EAPI=7

-inherit git-r3 cmake xdg
+inherit git-r3 xdg cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"

 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
@@ -30,6 +30,7 @@ src_configure() {

 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=False
+		-DINSTALL_GTEST=off
 	)

 	echo | ./configure.sh
--- a/kde-frameworks/kirigami-addons/kirigami-addons-0.3.ebuild
+++ b/kde-frameworks/kirigami-addons/kirigami-addons-0.3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 KFMIN=5.91.0
 QTMIN=5.15.0
-inherit ecm virtualx
+VIRTUALX_REQUIRED=test
+inherit ecm

 DESCRIPTION="Convergent visual components for Kirigami-based applications"
 HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons"
@@ -24,7 +25,3 @@ DEPEND="
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
-
-src_test() {
-	virtx ecm_src_test
-}
--- a/media-gfx/oda-file-converter/Manifest
+++ b/media-gfx/oda-file-converter/Manifest
@@ -1 +1 @@
-DIST ODAFileConverter_QT5_lnxX64_7.2dll_22.10.deb 45661460 BLAKE2B 8297a7001dbe43b7d20c3f22b1c597eacdd47780f1f742e3301ac91a2e111a180b3344310774fbd6d5f37fd58548fea29b879eb65a0e48e63117025c059190cf SHA512 8d78183781d7d01164d78e700f614ade66277075dbff21455834cc2404585ab35c07b1924cadb8c5e2b38a50a6ebc62a0a8206d8b792c36ec0acb6a5a2e31d68
+DIST ODAFileConverter_QT5_lnxX64_8.3dll_23.5.deb 47326628 BLAKE2B 4f88c987427848d79d9f9bf59f230ff3a9bad654fe842f5d7c18ac36688e4fc9633b9d390e092be29458252dab920c957dc4b410c6a505a1cdd3f97deb07ddee SHA512 2a0e3b4cbbe227d98886307ec4db8aca1ab91f1adf6023a09dbd64d1278691c5bdb51bd3931511bd0c838c86a67a2d9a80abcc8a9ec82244851a26d9ca07ed49
--- a/media-gfx/oda-file-converter/oda-file-converter-22.10.0.0.ebuild
+++ b/media-gfx/oda-file-converter/oda-file-converter-22.10.0.0.ebuild
@@ -10,7 +10,7 @@ inherit desktop unpacker xdg
 DESCRIPTION="For converting between different versions of .dwg and .dxf"
 HOMEPAGE="https://www.opendesign.com"

-SRC_URI="https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_7.2dll_${MY_PV}.deb"
+SRC_URI="https://download.opendesign.com/guestfiles/Demo/ODAFileConverter_QT5_lnxX64_8.3dll_${MY_PV}.deb"

 LICENSE="all-rights-reserved"
 SLOT="0"
--- a/media-sound/mpvc/Manifest
+++ b/media-sound/mpvc/Manifest
@@ -12,8 +12,8 @@ DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
-DIST mpvc-1.1.0.tar.gz 33423 BLAKE2B 1369018d8a86ac44054952129ee3fcb4ff57385e5077be6ea8274e64310211c2f50713565371725e927ea2bd3c034c7f1a2d2913890fd2182ecb0a43ac549238 SHA512 ab19968d3d72db8dc69cff761024f6eab047680521c354937d599b108e387d29453762764e4540881d621f02a629012a7d618fb57e2454433fdc2e1bb83b71bd
-DIST mpvipc-1.1.9.crate 22576 BLAKE2B 7462a531b597fc74289af7199d313f167d22d82081a417cee405a1350315d408850da3443e2f3438da4504889f6f31a43a023b55921b07904d6bd3f638444e57 SHA512 7721c731e4402776ca77d39350afe1d1bf75c89da595a09102c560f3f0b7ec3c8d8a5c89821d3131d57adabc8ff081d09e95c768b030dca8d082e449be28ddb0
+DIST mpvc-1.1.2.tar.gz 33422 BLAKE2B 61ef19099e4493f78ca486df0904cbc0e5d6ee0a419624d99c625e44fc3eabc1ae755e2f666c0b93d79d9c10b5103689efd471d7c63b13f8f04300de94be321e SHA512 b4cd530f27e747d192e3266095071bb666bbcc86c4c38bc6ce5fcc062dbe1ee676bdbd2057490c3f0fbf4e05704af14a7ef2ae722bc2b285347ef8f4219d2e29
+DIST mpvipc-1.2.0.crate 22442 BLAKE2B 873aa124ac0820419a5225bb044ebfa0275a9724aa14b76f87acf0f6dbc4b37858074016f6647d7fbc5634a2e5468290e8b9fb9c60318205af0d0854ab2ffcdb SHA512 5a4207421b5f3ef9c26577afc99cf43f63ebab091ae81d677b92266bb0c61f150fe507dad1bfa2a77202121d5d824b821dcce337f4eeba115c553a5437d1a661
 DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
 DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST serde-1.0.138.crate 76271 BLAKE2B 9e5021cbb5e4bdc82f8bdb3f079a24cb7909acad498fcd7e38b03bc75e2675dfd99658507b3208f5b1fde69f79c29f546b16a4b1be17da0e4b155acd92dd6b6a SHA512 e303d863d5ebdef27c38047427789ab6d3c4e1034d3e2bdd4048c09ef0da0e5f5b2cb25d00e1d47269fcc345458cc496af4e1a0ba64a3d627205337144a1c854
--- a/media-sound/mpvc/mpvc-1.1.2.ebuild
+++ b/media-sound/mpvc/mpvc-1.1.2.ebuild
@@ -20,7 +20,7 @@ CRATES="
 	lazy_static-1.4.0
 	libc-0.2.126
 	log-0.4.17
-	mpvipc-1.1.9
+	mpvipc-1.2.0
 	os_str_bytes-6.1.0
 	ryu-1.0.10
 	serde-1.0.138
--- a/media-sound/nulloy/files/add-dark-theme.patch
+++ b/media-sound/nulloy/files/add-dark-theme.patch
@@ -1,4 +1,3 @@
-index 4ddee63..5f02c60 100644
 --- a/src/skins/skins.pri
 +++ b/src/skins/skins.pri
@@ -12,7 +12,7 @@ win32 {
--- a/media-sound/nulloy/nulloy-0.9.3.ebuild
+++ b/media-sound/nulloy/nulloy-0.9.3.ebuild
@@ -58,6 +58,12 @@ src_configure() {
 	)

 	QMAKE=/usr/bin/qmake5 LRELEASE=/usr/lib64/qt5/bin/lrelease ./configure "${myconfargs[@]}" || die
+
+	# Because stripping should not be done by the build tools,
+	# because Portage does it when the install phase is run to be able
+	# to support the `splitdebug` and `installsources` FEATURES.
+	# See related issue https://bugs.gentoo.org/856292
+	echo "CONFIG += nostrip" >> $WORKDIR/$P/.qmake.cache
 }

 src_install() {
--- a/media-sound/nulloy/nulloy-9999.ebuild
+++ b/media-sound/nulloy/nulloy-9999.ebuild
@@ -43,10 +43,10 @@ src_unpack() {
 }

 src_prepare() {
-	if use skins ; then
-		default
+	default

-		eapply "${FILESDIR}"/nulloy.patch
+	if use skins ; then
+		eapply $FILESDIR/add-dark-theme.patch
 		cp -r $WORKDIR/night src/skins
 	fi
 }
@@ -65,6 +65,12 @@ src_configure() {
 	)

 	QMAKE=/usr/bin/qmake5 LRELEASE=/usr/lib64/qt5/bin/lrelease ./configure "${myconfargs[@]}" || die
+
+	# Because stripping should not be done by the build tools,
+	# because Portage does it when the install phase is run to be able
+	# to support the `splitdebug` and `installsources` FEATURES.
+	# See related issue https://bugs.gentoo.org/856292
+	echo "CONFIG += nostrip" >> $WORKDIR/$P/.qmake.cache
 }

 src_install() {
--- a/net-client/offpunk/Manifest
+++ b/net-client/offpunk/Manifest
@@ -1,2 +1,2 @@
-DIST offpunk-0.1.tar.gz 25356 BLAKE2B 45169fae6f566dfab0b8416442f220e62c49cd32ed020bb516f2474ebe7736fca413a68ecf3ec9d609897b02b9092dfe6c7d03dc403c52eaaf63541e4ce16a88 SHA512 5592a314bf3ebd91be083c5a8b43db483f80138113825cdfe0d141cecf0ca9482011eab1a05a7212323c2c1b5a95eb1dbdad4363a281e8229287d433552b6fd5
 DIST offpunk-0.3.tar.gz 37000 BLAKE2B b47fd241acef4155337a336d5a25b4a727849a28d2b1a9a9f3c2475960f472e238f5bc50ac59f582daf5ed3b1ec69edc1c6b4c6e5eebe64fd2c962eb7dbe00a2 SHA512 1336e7f0aab177a786c114143b5b8fa4eaa3a4b675581d2ec38d55268f8a006158a181b659732a89cf000f8be550ae38e222bbae827abaea2bc7a2875397acc9
+DIST offpunk-1.4.tar.gz 206458 BLAKE2B ca13838db2697e336c2e574a4995f55f2026d162679690d7e3fdff998f2b0a4c7e9ad5ee0749c9bfc1edaedba5572f177df6e67684b43fcb355d2cce25366c78 SHA512 929c036cee562c09b4f637e09f51a62a8e8547a4eeaa34bbea4c2ddaf69556a0474e7b0682063842cc0387b0823507fb102dcd1866cad3d39fbd51ff5d2c94c6
--- a/net-client/offpunk/offpunk-0.1.ebuild
+++ b/net-client/offpunk/offpunk-0.1.ebuild
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 optfeature
-
-MY_PN="av-98-offline"
-DESCRIPTION="A command-line, text-based and offline-first Gemini browser"
-HOMEPAGE="https://tildegit.org/ploum/AV-98-offline"
-SRC_URI="https://tildegit.org/ploum/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-pkg_postinst() {
-	optfeature "better TOFU certificate validation" dev-python/cryptography
-	#optfeature "ANSI escape codes support" dev-python/ansiwrap
-	optfeature "MIME type detection support" dev-python/python-magic
-	optfeature "clipboard support" x11-misc/xsel
-}
--- a/net-client/offpunk/offpunk-1.4.ebuild
+++ b/net-client/offpunk/offpunk-1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Offline-First Gemini/Web/Gopher/RSS reader and browser"
+HOMEPAGE="https://notabug.org/ploum/offpunk"
+SRC_URI="https://notabug.org/ploum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( doc/. CHANGELOG README.md )
+
+pkg_postinst() {
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.4; then
+		ewarn 'You should run once the command "list subscribe subscribed".'
+		ewarn 'Without that, the subscribed list will be seen as a normal list by sync.'
+	fi
+
+	optfeature "HTML support" "dev-python/beautifulsoup4 dev-python/readability-lxml"
+	optfeature "HTTP support" dev-python/requests
+	optfeature "RSS/Atom feed support" dev-python/feedparser
+	optfeature "XDG support" x11-misc/xdg-utils
+	optfeature "better TOFU certificate validation" dev-python/cryptography
+	optfeature "clipboard support" x11-misc/xsel
+	optfeature "custom process title support" dev-python/setproctitle
+	optfeature "external MP3 player" media-sound/mpg123
+	optfeature "external OGG player" media-sound/vorbis-tools[ogg123]
+	optfeature "external PDF viewer" app-text/zathura
+	optfeature "external image viewer support" media-gfx/feh
+	optfeature "inline images support" media-gfx/chafa
+}
--- a/net-dialup/tio/Manifest
+++ b/net-dialup/tio/Manifest
@@ -1 +1 @@
-DIST tio-1.40.tar.xz 3069480 BLAKE2B 5d5ef6478fa80eecf96599c6c55a77fd8e2b9259fd44fab105ee5f6c6b5494d5656599374f7ffe43741c7925a2bedac4c593ad8695abd6ba9ceca559f9272d4c SHA512 41f92d757fea3099e9974c64736aa75f69961ba5baf7b01cdb281656bcbf6490afe3748ce49c080624b5f4d3493a8398b8d702be0423f2bcbd0f0484bf76fdf6
+DIST tio-1.42.tar.xz 3070588 BLAKE2B 24ab0f72d6927a5c56b7fc73ab763aef208749bd2c5b6d91cfd346c577a7128e5f6d66596b75dff06b3189a9dfacdb53f66f1c7975b9ce6b5b116520e0cf8479 SHA512 83e9681e33962c2aeb3b4a4e80f8ee190ec087451bb570fa3655b12f2d4f2740a281ac177659627f6c5f694f1f78003881d3ec2388f9702e4da3f5999e70976d
--- a/net-dialup/tio/tio-1.42.ebuild
+++ b/net-dialup/tio/tio-1.42.ebuild
--- a/net-p2p/yggdrasil-go/Manifest
+++ b/net-p2p/yggdrasil-go/Manifest
@@ -63,5 +63,5 @@ DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200320.zip 146832 BLAKE2B 99a9b5
 DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.0.mod 677 BLAKE2B 8d6dcae94321a2495f9ef9be5eadf503c7e53de3fececaaa35fa2cd462f4d3286168c2606de103cf9d4e8e43895f81a18aa843d093db0a728510c2804bc59e15 SHA512 b00baab7efde4ba31f3cac2e4ba14c8e7678b1273538dd1d19951e3b6cd380a31b1f49518be57d4048a3101a18aa21887701c942274aa58217884d713bc7f812
 DIST golang.zx2c4.com%2Fwireguard%2Fwindows%2F@v%2Fv0.1.0.zip 257029 BLAKE2B ca5e6b076624bf9cb12252f3b8736ffa81d1f2e969793ceed16f250ca26711e264c11a109f91276c3ce35444ef72953231b16e402d2dbb8197e35235723bbd44 SHA512 a7ecec8842fced40ecda8acd303725c16c90f45d3c0568d4efb0075d99a7f0281bbc9900ebd506083bf1c10859afafc9b7e38bef778decd846c1b93b67c4d7df
 DIST yggdrasil-go-0.3.15.tar.gz 166072 BLAKE2B 8375a6f731ec175b98d68155c1cabb3af7bc3dd6efee93701bd74acbc5ef2a6a724284abb99792ecb65e423b66a47d6f291f19f287e220435000115689b3fcd7 SHA512 1b59fecfa210a3d8d41776e4cb4b5399121e820389a64f4f1df893a9c537b67b1a26ca68c735fcae3208f24163ac809fa278f2ee2a1102c88145fdb6ac4c9db4
-DIST yggdrasil-go-0.4.3-deps.tar.bz2 50002287 BLAKE2B 3c26a9cbc5056388c1877427f941c97a70f4d5f8765de7c8046f85fce799d16c3c611006a0aac36429a72241d4b9b607de62e5a110910c544a13353cd7693756 SHA512 6b283a5dbb47827f4fa5e056e1453f33097d345497b688482402b46e22fa4eb8bc7dcf019b82963a4070d4d245985452ca67d19c9910554b76698d15713ac145
-DIST yggdrasil-go-0.4.3.tar.gz 96364 BLAKE2B 8474f52771d7a34027a56de83f74c3ed0f66127b5bcdf498c5820713079e2da1c9ac0c44b0e19903b15ae32fd47d79f8b4cbbe9607dff1951c5ea74ff1af409d SHA512 00ba6e611c6073e150db0d402edfcd4d548021b30c7afcc11507dfb2ac2e730433bd9f39438331e9d9de6d8a36fc57dc9f01b0d1cbad4927ffbf60906042aac3
+DIST yggdrasil-go-0.4.4-deps.tar.bz2 36254982 BLAKE2B 40fa8fac4d04dabcb3b514cfb1163e815f0daa2101e4f1c000f891e444cb1ba8a4792c309896c02003ada8d01c8ed0caa850b8692253bf2460f0c7a0f2f5484c SHA512 cbd56752a929f1611ed1fee45a60e08fc089e0183eade81fdd4f7245236b6fe80e1aaf331f2f1d38a98b99cf5104644b7f52ce24fcb13c084738730e69b17bea
+DIST yggdrasil-go-0.4.4.tar.gz 95207 BLAKE2B 3cba1302419af4cda0f6960d2a1b12e2c62d9ab68443ccf4cc328b2d7bd7d96145197a3eb895bb9df2976efed8b1a19e71d3ea05404d400c2b72effd62539f90 SHA512 b61e5a22534d181ef48bde708c36eca83197a25e7e758dda7e81215e9e97db1a536f728fd4170784f6bdaf0742dbb1e3396fe71c06938272b0436cdb8665c0e0
--- a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
+++ b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.4.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	acct-group/yggdrasil
 "

-BDEPEND=">=dev-lang/go-1.16.0"
+BDEPEND=">=dev-lang/go-1.17.0"

 pkg_setup() {
 	linux-info_pkg_setup
--- a/net-voip/discover-overlay/Manifest
+++ b/net-voip/discover-overlay/Manifest
@@ -1,3 +1,3 @@
 DIST discover-overlay-0.3.3.tar.gz 33364 BLAKE2B a29f64b42e93c88638a299922e17425e992dcb34fd64dc7c2e3bd3554fcb7c9c13b9b9b5937ba8c7b91d721512d2eace961b847f249b410580167321c8a333a9 SHA512 1e145b64d1d0ea4d094dc16fc7871d9177604fd72991c06c6067d08bb49c95b8b4e1e84121b61c6393ddd45bb307eb5796c8a83ce708e30ec2a93c9043e971a3
 DIST discover-overlay-0.4.5.tar.gz 76114 BLAKE2B c0c735cea547374f6f7338e09954930a105fc883ea9faa1f4e457800636694d47988726884360643eab9de0df2786ef1242fa036df15896301a48f0f2e684312 SHA512 6a7121c0923a68bf6b278b6985a82a3bba98b155c8812056cc0532961cb54ee5045c1279a32fdde8708a15f444d2a2ba0afdeea61f79a89cc542b3a1d5b2aed4
-DIST discover-overlay-0.5.3.tar.gz 87132 BLAKE2B a9ac3b15972d530d346e7b75edd07a10acd173774bf5a49628ffa7921aafae02750b9e2c2f11f1aac91a635ce15d7b39a3320b9746d02457c99f3e647e495715 SHA512 64d93c7e975698322f32798b031bd2a8da50b35747a46440a993d6306d8b769c2637375015b590b2f7c6849073b011c61f861d717db6ecd43dae91e6797ef786
+DIST discover-overlay-0.5.4.tar.gz 87273 BLAKE2B bb34ec75f575aadc1ede2ebc7118026bdc47c3c5f0a13a994e28811e6765c3f375c45b941f99aa72b7e779e5d0e94915089d4c8a8f2b7a262723e09d3032813b SHA512 8e1893636063b741335c19438a85c65353b0ea82269de8deb342a3537016b3324d3a8549dd6f7d08a029512d4a34870bfb4ef88e57bd2a32be7766536f6b2040
--- a/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild
+++ b/net-voip/discover-overlay/discover-overlay-0.5.4.ebuild
--- a/sci-electronics/dsview/Manifest
+++ b/sci-electronics/dsview/Manifest
@@ -1 +1 @@
-DIST dsview-1.1.2.tar.gz 8150237 BLAKE2B 0f746d0691f006d368cf9f40bf0c1b91223a7f6011d0ce55bdded7924ef940ecb18eec4bfe4cf842eea7eda85e97f3516a6f07e7e361eff991191e6d8bf7628c SHA512 a0b90d654ea64121540815627e8559c147a0b3bb77d10b65d98587b1f67dc3c0ed4d1c022cd686c31aab2879ee602eade69a02f32c5c9947a3bbdf1e7ab475dd
+DIST dsview-1.2.0.tar.gz 8471857 BLAKE2B 581050fc2f9e68b1f6e3a48ccd0d6672482e5358f27aacb07ded652a4a1aea0061e097dc313e12e83d7d428d3e7cb55f03955274f272c5059bf04a5e97a4bd55 SHA512 f1f22a7d08a83b123d2a777907299c9250a86976cd7edfc9b883b89d06f9664740182a5ae86ab1df9035a83e2ffbb1dad9f88b7fe6eeb2b0f815915b776119d7
--- a/sci-electronics/dsview/dsview-1.1.2-r1.ebuild
+++ b/sci-electronics/dsview/dsview-1.1.2-r1.ebuild
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GITHUB_PN="DSView"
-MY_PV="$(ver_rs 2 '')" # 'a.b.c' -> 'a.bc'
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake python-r1 toolchain-funcs udev xdg
-
-DESCRIPTION="An open source multi-function instrument"
-HOMEPAGE="
-	https://www.dreamsourcelab.com
-	https://github.com/DreamSourceLab/DSView
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/DreamSourceLab/${GITHUB_PN}.git"
-else
-	SRC_URI="https://github.com/DreamSourceLab/${GITHUB_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${GITHUB_PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-cpp/glibmm:2
-	dev-libs/boost
-	dev-libs/glib
-	dev-libs/libzip
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtsvg:5
-	dev-qt/qtconcurrent:5
-	sci-libs/fftw:3.0
-	virtual/libusb:1
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktop.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-fix-qt.patch
-	"${FILESDIR}"/${P}-fix-segfault.patch
-	"${FILESDIR}"/${P}-fix-extern-c.patch
-	"${FILESDIR}"/${P}-fix-python3.patch
-)
-
-src_prepare() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-
-	default
-
-	local LIBDIR="/usr/$(get_libdir)"
-
-	grep -rl "/usr/local/lib" "${S}" | xargs sed -i "s@/usr/local/lib@${LIBDIR}@g" || die
-	grep -rl "/usr/local" "${S}" | xargs sed -i "s@/usr/local@/usr@g" || die
-	cd "${S}/libsigrok4DSL" || die
-	sh ./autogen.sh || die
-	cd "${S}/libsigrokdecode4DSL" || die
-	sh ./autogen.sh || die
-}
-
-src_configure() {
-	local LIBDIR="/usr/$(get_libdir)"
-
-	cd "${S}/libsigrok4DSL" || die
-	sh ./configure --libdir=${LIBDIR} --prefix=/usr || die
-	cd "${S}/libsigrokdecode4DSL" || die
-	sh ./configure --libdir=${LIBDIR} --prefix=/usr || die
-}
-
-src_compile() {
-	cd "${S}/libsigrok4DSL" || die
-	emake
-	cd "${S}/libsigrokdecode4DSL" || die
-	emake
-}
-
-src_install() {
-	local LIBDIR="/usr/$(get_libdir)"
-
-	cd "${S}/libsigrok4DSL" || die
-	emake DESTDIR="${D}" install
-	cd "${S}/libsigrokdecode4DSL" || die
-	emake DESTDIR="${D}" install
-	cd "${S}/DSView" || die
-
-	DESTDIR="${D}" \
-	PKG_CONFIG_PATH="${D}${LIBDIR}/pkgconfig" \
-	CFLAGS="-I${D}/usr/include" \
-	CXXFLAGS="-I${D}/usr/include" \
-	LDFLAGS="-L${D}${LIBDIR}" \
-	cmake -DCMAKE_INSTALL_PREFIX=/usr . || die
-	emake DESTDIR="${D}" install
-	if ! use static-libs; then
-		find "${ED}" -name "*.la" -delete || die
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
-
-pkg_postinst() {
-	udev_reload
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_pkg_postrm
-}
--- a/sci-electronics/dsview/dsview-1.2.0.ebuild
+++ b/sci-electronics/dsview/dsview-1.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GITHUB_PN="DSView"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-r1 udev xdg
+
+DESCRIPTION="An open source multi-function instrument"
+HOMEPAGE="
+	https://www.dreamsourcelab.com
+	https://github.com/DreamSourceLab/DSView
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/DreamSourceLab/${GITHUB_PN}.git"
+else
+	SRC_URI="https://github.com/DreamSourceLab/${GITHUB_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${GITHUB_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-cpp/glibmm:2
+	dev-libs/boost
+	dev-libs/glib
+	dev-libs/libzip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtsvg:5
+	dev-qt/qtconcurrent:5
+	sci-libs/fftw:3.0
+	virtual/libusb:1
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_pkg_postrm
+}
--- a/sci-electronics/dsview/dsview-9999.ebuild
+++ b/sci-electronics/dsview/dsview-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=8

 GITHUB_PN="DSView"
-MY_PV="$(ver_rs 2 '')" # 'a.b.c' -> 'a.bc'
 PYTHON_COMPAT=( python3_{8..11} )

 inherit cmake python-r1 udev xdg
@@ -19,9 +18,9 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/DreamSourceLab/${GITHUB_PN}.git"
 else
-	SRC_URI="https://github.com/DreamSourceLab/${GITHUB_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/DreamSourceLab/${GITHUB_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${GITHUB_PN}-${MY_PV}"
+	S="${WORKDIR}/${GITHUB_PN}-${PV}"
 fi

 LICENSE="GPL-3"
--- a/sci-electronics/dsview/files/dsview-1.1.2-cmake.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-cmake.patch
@@ -1,26 +0,0 @@
-diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt
-index 29f848d..554952f 100755
--- a/DSView/CMakeLists.txt
-+++ b/DSView/CMakeLists.txt
-@@ -420,15 +420,17 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_
- #-------------------------------------------------------------------------------
- 
- # Install the executable.
-install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
-+install(TARGETS ${PROJECT_NAME} DESTINATION bin)
- install(DIRECTORY res DESTINATION share/${PROJECT_NAME})
- install(FILES icons/logo.svg DESTINATION share/${PROJECT_NAME} RENAME logo.svg)
-+install(FILES icons/logo.svg DESTINATION share/icons/hicolor/scalable/apps RENAME dsview.svg)
-+install(FILES icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg)
- install(FILES ../NEWS25 DESTINATION share/${PROJECT_NAME} RENAME NEWS25)
- install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31)
- install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf)
- install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf)
-install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)
-install(FILES DSView.desktop DESTINATION /usr/share/applications/)
-+install(FILES DreamSourceLab.rules DESTINATION /lib/udev/rules.d RENAME 60-dreamsourcelab.rules)
-+install(FILES DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop)
- 
- #===============================================================================
- #= Packaging (handled by CPack)
- 
--- a/sci-electronics/dsview/files/dsview-1.1.2-desktop.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-desktop.patch
@@ -1,20 +0,0 @@
-diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop
-index fba3202..e114324 100755
--- a/DSView/DSView.desktop
-+++ b/DSView/DSView.desktop
-@@ -1,9 +1,10 @@
- [Desktop Entry]
-Version=0.96
-Exec=/usr/local/bin/DSView
-+Type=Application
-+Encoding=UTF-8
- Name=DSView
- Comment=GUI Program for DreamSourceLab USB-based Instruments
-Icon=/usr/local/share/DSView/logo.png
-Type=Application
-+TryExec=DSView
-+Exec=DSView
-+Icon=dsview
- Terminal=false
-Categories=Development
-+Categories=Development;Electronics;Qt;
--- a/sci-electronics/dsview/files/dsview-1.1.2-fix-extern-c.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-fix-extern-c.patch
@@ -1,42 +0,0 @@
-diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
-index c433a28..7f23e36 100755
--- a/DSView/pv/data/decode/annotation.cpp
-+++ b/DSView/pv/data/decode/annotation.cpp
-@@ -19,9 +19,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-  */
- 
-extern "C" {
- #include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
- 
- #include <vector>
- #include <assert.h>
-diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
-index ad943ac..733497f 100755
--- a/DSView/pv/view/decodetrace.cpp
-+++ b/DSView/pv/view/decodetrace.cpp
-@@ -19,9 +19,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-  */
- 
-extern "C" {
- #include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
- 
- #include <extdef.h>
- 
-diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
-index 79d3cd8..80c4c44 100755
--- a/DSView/pv/widgets/decodergroupbox.cpp
-+++ b/DSView/pv/widgets/decodergroupbox.cpp
-@@ -18,9 +18,7 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-  */
-extern "C" {
- #include <libsigrokdecode4DSL/libsigrokdecode.h>
-}
- 
- #include "decodergroupbox.h"
- #include "../data/decoderstack.h"
--- a/sci-electronics/dsview/files/dsview-1.1.2-fix-python3.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-fix-python3.patch
@@ -1,11 +0,0 @@
--- a/libsigrokdecode4DSL/configure.ac	2020-05-11 21:07:38.000000000 +0800
-+++ b/libsigrokdecode4DSL/configure.ac	2021-06-05 01:54:35.937525565 +0800
-@@ -90,7 +90,7 @@
- 
- # Python 3 is always needed.
- SR_PKG_CHECK([python3], [SRD_PKGLIBS],
-	[python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
-+	[python3 >= 3.2], [python-3.10 >= 3.10], [python-3.9 >= 3.9], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2])
- AS_IF([test "x$sr_have_python3" = xno],
- 	[AC_MSG_ERROR([Cannot find Python 3 development headers.])])
- 
--- a/sci-electronics/dsview/files/dsview-1.1.2-fix-qt.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-fix-qt.patch
@@ -1,13 +0,0 @@
-diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp
-index 921d3db..16cdce9 100755
--- a/DSView/pv/view/viewport.cpp
-+++ b/DSView/pv/view/viewport.cpp
-@@ -37,7 +37,7 @@
- 
- #include <QMouseEvent>
- #include <QStyleOption>
-
-+#include <QPainterPath>
- 
- #include <math.h>
- 
--- a/sci-electronics/dsview/files/dsview-1.1.2-fix-segfault.patch
+++ b/sci-electronics/dsview/files/dsview-1.1.2-fix-segfault.patch
@@ -1,22 +0,0 @@
-diff --git a/libsigrokdecode4DSL/instance.c b/libsigrokdecode4DSL/instance.c
-index 5ede710..5d96701 100755
--- a/libsigrokdecode4DSL/instance.c
-+++ b/libsigrokdecode4DSL/instance.c
-@@ -370,6 +370,8 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
- 		}
- 	}
- 
-+	gstate = PyGILState_Ensure();
-+
- 	/*
- 	 * Prepare a default channel map, where samples come in the
- 	 * order in which the decoder class defined them.
-@@ -389,8 +391,6 @@ SRD_API struct srd_decoder_inst *srd_inst_new(struct srd_session *sess,
- 	/* Default to the initial pins being the same as in sample 0. */
- 	oldpins_array_seed(di);
- 
-	gstate = PyGILState_Ensure();
-
- 	/* Create a new instance of this decoder class. */
- 	if (!(di->py_inst = PyObject_CallObject(dec->py_dec, NULL))) {
- 		if (PyErr_Occurred())
--- a/sci-electronics/verible/Manifest
+++ b/sci-electronics/verible/Manifest
@@ -23,7 +23,7 @@ DIST rules_m4-v0.2.tar.xz 16888 BLAKE2B a191c332b916ca8d06e1e2e13fb8d4098947acb0
 DIST rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313.zip 14252 BLAKE2B 152b72f967835685d11e1e84ca548198022ccc9ad5b55e5007fe6fb1e38dd1d4b4e0473841d23c658f31ca8dc10509d9d2bb81b211e487c97f7714af53b8aafe SHA512 4aead3ec92fe74da92640926f7f8626b6e3db2318856ef374d6fda83cafcf7b45ea9b425d63b7aa0ab4f17e787909c795b916addc63c07918ee2656655a5d093
 DIST rules_python-0.2.0.tar.gz 2503614 BLAKE2B 07c1e4e642587bfe03373733fc6c30aa195285002c4f1e532c40aba9c111629787aab78600a5d83e3833e2fddcc86407084cfc74cf2bb0ee23012a59b4bccef0 SHA512 674f89c8e262008e2d8a7329ff7b09275ec34ced73d131786a2106c414ab5213c15259b8188f976e730f568def139a5e0fd29e8a1caa905d22afe9628d544e26
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
-DIST verible-0.0.2135.tar.gz 1302067 BLAKE2B 55409fa4891d4e55941094893af54dc35154ce42f6a56dc35589829ca1d6777fd81e557ebf72f112754a12552b2a8038f4b33dd11d29e3211a0337ba981fe451 SHA512 b09598bf39cb553fc470e55e1fca2add52f7c7b186bc4569857682b93991bcba64b8e31abe4b5426c52ccfec840d1049e5b7078c62034fb23acde338f82d7b36
+DIST verible-0.0.2152.tar.gz 1302265 BLAKE2B 0f9d77e62e57dd2845acfc29cf6fc7932c13ebd160de93cd454ed363aa0f40394d36a3b79a6060e5a65f3968caec8ddce4021f0a2c316f59fa7ca234845bffad SHA512 b2a77d827cfb29d88d58cd3a9f84f3b1701ad83afadb8f61eedf130778f5bc78ca65f4b97ee3e137c659a04aa547dd85b68b2470c65f22c41a67a3b25e57e911
 DIST win_flex_bison-2.5.18.zip 977634 BLAKE2B dfc5f5ee13665948398df61f3993b6ffe8120b3c390e8e12c6dcc5f603f91921cf182097df83931a4fe57b8ffbfdd0c67e67daed4a7ca633b1dddd2527359ea7 SHA512 8b30f046e090a0ddcf85b38197913bbf5ac6f5e3063bdfebf288fd7e3d22288c72ba98fd2d04c5eaf9157997bc4bd9911c1e0f6007106589d25b58a9673f7b83
 DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
 DIST zulu11.50.19-ca-jdk11.0.12-linux_x64.tar.gz 202599005 BLAKE2B 0de0c845c34b339092f139bf67c874ce6f835bfb4ddafd6f96f3c9d77fb6264cc4cdd64c9264cf4d809b3bcdeae75a63fe2abb17f9164dbc0ae115b418bbbf82 SHA512 e4d22b2b04d3e48631c389075a3c0b7e30ee63d47dde1fc4b48f8a9507450aeb0db134ee0394871bc34455ab8bca98c8b8dd728b3541a03334b3baf16c2daa27
--- a/sci-electronics/verible/metadata.xml
+++ b/sci-electronics/verible/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>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
--- a/sci-electronics/verible/verible-0.0.2152.ebuild
+++ b/sci-electronics/verible/verible-0.0.2152.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"

 # From release tag name
-MY_PV="0.0-2135-gb534c1fe"
+MY_PV="0.0-2152-gdd5e91a4"

 inherit bazel

--- a/sci-electronics/verilator/Manifest
+++ b/sci-electronics/verilator/Manifest
@@ -1,2 +1 @@
-DIST verilator-4.218.tar.gz 2532208 BLAKE2B 85015aa06128a2d31414674d993efb4e93f2f133373ef98698dd9ab336461c2f6740d4e39512e9f37034f927ce8c72eed99595365c12723a57f08e82396ade78 SHA512 26b36f60a10a13adae34d8401f55afbb32fc48a4cade7b1e58226930fe7d5c982deffaae1cff2cc52a8f9a22638ae73957d3ae7f6ac77d35ac6a8e4228dcf9e4
-DIST verilator-4.220.tar.gz 2540714 BLAKE2B f283dec5c1797aee243476fb5c11146c134ca6d59d495065ea712a3e07957de735b77147a9b0698ec6ba5f4ad89bdb037c81af8aaba623d96e2f7e74d844bf46 SHA512 d7435de47cf66a2a360b154e2073f75a540100cb66249eeaa24de78d60bc9376ebbe6cac6df3a421c4f6c7b883eb17e47118835b9b2ed973486d4291fe8fc588
+DIST verilator-4.224.tar.gz 2574010 BLAKE2B 470e8f29044e9ed7356b236a9a8da4d36eb9b51b8d358edc44a6c41c4339c256a3ff883f07826ec18fa5acda3fe0933073615090f6c061f80379d0713da239d1 SHA512 a2a37948878ad897668ce89b0f12978dcbda3726cebb134db6ff6f172573d4e488748699a84008359d808d5b6fad19c013edaebc7f8a24a5452b61b1d57dc283
--- a/sci-electronics/verilator/metadata.xml
+++ b/sci-electronics/verilator/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>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
--- a/sci-electronics/verilator/verilator-4.220.ebuild
+++ b/sci-electronics/verilator/verilator-4.220.ebuild
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
-HOMEPAGE="
-	https://verilator.org
-	https://github.com/verilator/verilator
-"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="|| ( Artistic-2 LGPL-3 )"
-SLOT="0"
-
-RDEPEND="
-	dev-lang/perl
-	sys-libs/zlib
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	default
-	eautoconf --force
-}
--- a/sci-electronics/verilator/verilator-4.224.ebuild
+++ b/sci-electronics/verilator/verilator-4.224.ebuild
--- a/sci-electronics/verilator/verilator-9999.ebuild
+++ b/sci-electronics/verilator/verilator-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="7"
+EAPI="8"

 inherit autotools

--- a/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r2.ebuild
+++ b/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r2.ebuild
@@ -49,15 +49,7 @@ REQUIRED_USE="
 # slate? ( mpi )
 # magma? ( cuda )
 DOCS=( README.md CHANGELOG SUPPORT )
-
-src_prepare() {
-	sed \
-		-e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" \
-		-e "s|lib/cmake|$(get_libdir)/cmake|g" \
-		-i CMakeLists.txt \
-		|| die
-	cmake_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-multilib-was-not-respected.patch" )

 src_configure() {
 	use combblas && append-cppflags '-I/usr/include/CombBLAS'
--- a/sci-libs/STRUMPACK/files/STRUMPACK-6.3.1-multilib-was-not-respected.patch
+++ b/sci-libs/STRUMPACK/files/STRUMPACK-6.3.1-multilib-was-not-respected.patch
@@ -0,0 +1,27 @@
+From f4345f9ef6365d29634e12e42cd9040a1693e600 Mon Sep 17 00:00:00 2001
+From: Pieter Ghysels <pghysels@lbl.gov>
+Date: Fri, 24 Jun 2022 17:17:05 -0700
+Subject: [PATCH] multilib was not respected, see
+ https://github.com/pghysels/STRUMPACK/issues/65
+
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ include(CheckLibraryExists)
+ # include(CMakePushCheckState)
+ include(CheckCXXSourceCompiles)
+ 
+include(GNUInstallDirs)
+
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+ 
+ # figure out Fortran/C name mangling
+@@ -723,7 +725,8 @@ install(FILES
+   DESTINATION include)
+ 
+ install(TARGETS strumpack EXPORT STRUMPACKTargets
+-  LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ 
+ # export targets and all
--- a/sci-libs/superlu_dist/Manifest
+++ b/sci-libs/superlu_dist/Manifest
@@ -1 +1,2 @@
 DIST superlu_dist-8.0.0_p20220526.tar.gz 2293062 BLAKE2B 34c2d1d4bc8c6ac0b2285457b81d3d6fff449c31689130eb8a4844ff8ceee9f1d7c21a19632a2dd01a13fc07e6614c02934a2c6f4f3d3808352c82d44aa2bc6c SHA512 e8724b05156fcad2b347643dcbdb6a4183b6b36c4d54f4a9f14e4527f0a62fc5eb76f649909773d770f729fe1a33879bef54581fc0faee54224a67f2e1b8b9c5
+DIST superlu_dist-8.1.0.tar.gz 2297109 BLAKE2B 49439150b5b5b90c7dcf731dd3ba8b079302f101fb5f6c38f41546febbecbb8e2902a1362740f8790227997138ed8423b284c73f43bbf0c7a32eec9876dfe403 SHA512 4c7fc7e4649282755cff018fa37413161224e9a35a471c4e64c09e439f4397d196fb4e7976edc6ca030867c1b61d88d91cb1505be522a1588c7b4de4a813a625
--- a/sci-libs/superlu_dist/superlu_dist-8.1.0.ebuild
+++ b/sci-libs/superlu_dist/superlu_dist-8.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="DoxyConfig"
+FORTRAN_NEEDED="fortran"
+
+inherit cmake docs fortran-2
+
+DESCRIPTION="MPI distributed sparse LU factorization library"
+HOMEPAGE="
+	https://portal.nersc.gov/project/sparse/superlu/
+	https://github.com/xiaoyeli/superlu_dist
+"
+SRC_URI="https://github.com/xiaoyeli/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="combblas +complex-precision +double-precision examples hip lapack fortran metis single-precision test"
+# TODO: cuda
+
+RDEPEND="
+	sci-libs/colamd
+	virtual/blas
+	virtual/mpi
+
+	combblas? ( sci-libs/CombBLAS )
+	hip? (
+		sci-libs/hipBLAS
+		sci-libs/rocBLAS
+		sci-libs/rocSOLVER
+	)
+	lapack? ( virtual/lapack )
+	metis? ( sci-libs/parmetis )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.0.0_p20220526-system-colamd.patch"
+	"${FILESDIR}/${PN}-8.0.0_p20220526-fortran.patch"
+)
+RESTRICT="test" # tests require an MPI setup
+
+src_prepare() {
+	rm -r CBLAS || die
+	rm SRC/colamd.{c,h} || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable_openmp=ON
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=OFF
+		-DTPL_ENABLE_CUDALIB=OFF
+		-DTPL_ENABLE_INTERNAL_BLASLIB=OFF
+
+		-Denable_complex16=$(usex complex-precision)
+		-Denable_double=$(usex double-precision)
+		-Denable_examples=$(usex examples ON OFF)
+		-Denable_single=$(usex single-precision)
+		-Denable_tests=$(usex test ON OFF)
+		-DTPL_ENABLE_COMBBLASLIB=$(usex combblas)
+		-DTPL_ENABLE_HIPLIB=$(usex hip)
+		-DTPL_ENABLE_LAPACKLIB=$(usex lapack)
+		-DTPL_ENABLE_PARMETISLIB=$(usex metis)
+		-DXSDK_ENABLE_Fortran=$(usex fortran)
+	)
+	if use combblas; then
+		mycmakeargs+=(
+			-DTPL_COMBBLAS_LIBRARIES="${EPREFIX}/usr/$(get_libdir)/libCombBLAS.so"
+			-DTPL_COMBBLAS_INCLUDE_DIRS="${EPREFIX}/usr/include/CombBLAS/"
+		)
+	fi
+	if use metis; then
+		mycmakeargs+=(
+			-DTPL_PARMETIS_LIBRARIES="${EPREFIX}/usr/$(get_libdir)/libparmetis.so"
+			-DTPL_PARMETIS_INCLUDE_DIRS="${EPREFIX}/usr/include"
+		)
+	fi
+	cmake_src_configure
+}
--- a/sec-keys/openpgp-keys-jvoisin/Manifest
+++ b/sec-keys/openpgp-keys-jvoisin/Manifest
@@ -0,0 +1 @@
+DIST pubkey.asc 20965 BLAKE2B 47d9c32a58237f797c9f45df109f201a954dcb3360df6733c7f6b24dbbd62a5aea87232dab714b61edf37bf864b6bf46bdded24c8e147c2ac24a5f4f9fd6b0cb SHA512 18fc3b260e7545b09a120e3550d532009cfed968fcfa054e69359aa839bbacb8650edbcaa9b1d389f4eda0cb95fa37bc83cc76f2c23194abb57b07a360629715
--- a/sec-keys/openpgp-keys-jvoisin/metadata.xml
+++ b/sec-keys/openpgp-keys-jvoisin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+</pkgmetadata>
--- a/sec-keys/openpgp-keys-jvoisin/openpgp-keys-jvoisin-20200714.ebuild
+++ b/sec-keys/openpgp-keys-jvoisin/openpgp-keys-jvoisin-20200714.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by Julien Voisin"
+HOMEPAGE="https://dustri.org/"
+SRC_URI="https://dustri.org/pub/pubkey.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - jvoisin.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
--- a/sys-cluster/SOS/Manifest
+++ b/sys-cluster/SOS/Manifest
@@ -1 +1,2 @@
 DIST SOS-1.5.0.tar.gz 544478 BLAKE2B f2a63fbf39958ac238e2d687d866c2f600956b933f956a4d8552acff29973de4d3e46a323b3f8eb3a63d395728cbafdfe119ea99d0fb5e17250d879ff269fb0e SHA512 0506bda8ab898cd1aaea82e230c64e17dde4ccfb3b70c9a4397c90d08643b3c7f96e7eae70e1a2b706b33737e979315372bcc338fc957652cd1b5e55d7a560ad
+DIST SOS-1.5.1.tar.gz 590101 BLAKE2B c6ca85942dbfbd4ecc02700ec2b84ab4f6fd00809ba77448973255ddea8ffab13977bbbe6bb7a2d69476f7fc5e6de43e077193dc8a6761a0de05d5a9c8a0a6a2 SHA512 a181a14c841611fbac2ba69b8f25ce856e1e5e9c9a7bbd37482e77d61b83365863778bcbaf898c4d6489c6b9c0aa69fb8fd60bc5468bcc01f82002d0533d0378
--- a/sys-cluster/SOS/SOS-1.5.1.ebuild
+++ b/sys-cluster/SOS/SOS-1.5.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="fortran"
+
+inherit autotools fortran-2
+
+DESCRIPTION="implementation of the OpenSHMEM specification"
+HOMEPAGE="https://github.com/Sandia-OpenSHMEM/SOS"
+SRC_URI="https://github.com/Sandia-OpenSHMEM/SOS/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE_OFI_MR="
+	ofi_mr_basic
+	+ofi_mr_scalable
+	ofi_mr_rma-event
+"
+IUSE_TOTAL_DATA_ORDERING="
+	total_data_ordering_always
+	+total_data_ordering_check
+	total_data_ordering_never
+"
+IUSE="${IUSE_OFI_MR} ${IUSE_TOTAL_DATA_ORDERING} av-map bounce-buffers cma completion-polling cxx
+debug error-checking fortran long-fortran-header manual-progress memcpy ofi ofi-fence openmp
+pmi portals4 profiling pthread-mutexes remote-virtual-addressing threads
+thread-completion ucx xpmem"
+
+RDEPEND="
+	ofi? ( sys-block/libfabric )
+	pmi? ( || ( sys-cluster/slurm sys-cluster/pmix[pmi] ) )
+	portals4? ( sys-cluster/portals4 )
+	ucx? ( sys-cluster/ucx )
+	xpmem? ( sys-kernel/xpmem )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	^^ ( ${IUSE_OFI_MR/+/} )
+	^^ ( ${IUSE_TOTAL_DATA_ORDERING/+/} )
+	?? ( cma xpmem )
+	?? ( ofi portals4 )
+"
+
+pkg_setup() {
+	FORTRAN_NEED_OPENMP=0
+	use openmp && FORTRAN_NEED_OPENMP=1
+
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	#copied from bootstrap
+	if [[ ! -d ./config ]]; then
+		mkdir ./config || die
+	fi
+	FILES=./man/*.1
+	echo -n "dist_man1_MANS =" > ./man/Makefile.am || die
+	for f in $FILES
+	do
+		echo -n " $(basename $f)" >> ./man/Makefile.am || die
+	done
+	FILES=./man/*.3
+	echo -e -n "\ndist_man3_MANS =" >> ./man/Makefile.am || die
+	for f in $FILES
+	do
+		echo -n " $(basename $f)" >> ./man/Makefile.am || die
+	done
+	echo -e "\n" >> ./man/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	if use pmi; then
+		export CC=mpicc
+		export CXX=mpicxx
+	fi
+
+	local ofimr
+	use ofi_mr_basic && ofimr="basic"
+	use ofi_mr_scalable && ofimr="scalable"
+	use ofi_mr_rma-event && ofimr="rma-event"
+
+	local tda
+	use total_data_ordering_always && tda="always"
+	use total_data_ordering_check && tda="check"
+	use total_data_ordering_never && tda="never"
+
+	local myconf=(
+		--disable-picky
+		--disable-pmi-simple
+		--disable-rpm-prefix
+		--enable-ofi-mr="${ofimr}"
+		--enable-total-data-ordering="${tda}"
+		$(use_enable av-map)
+		$(use_enable bounce-buffers)
+		$(use_enable completion-polling)
+		$(use_enable cxx)
+		$(use_enable debug)
+		$(use_enable error-checking)
+		$(use_enable fortran)
+		$(use_enable long-fortran-header)
+		$(use_enable manual-progress)
+		$(use_enable memcpy)
+		$(use_enable ofi-fence)
+		$(use_enable openmp)
+		$(use_enable pmi pmi-mpi)
+		$(use_enable profiling)
+		$(use_enable pthread-mutexes)
+		$(use_enable remote-virtual-addressing)
+		$(use_enable threads)
+		$(use_enable thread-completion)
+
+		$(use_with cma)
+		$(use_with ofi)
+		$(use_with pmi)
+		$(use_with portals4)
+		$(use_with ucx)
+		$(use_with xpmem)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-libs/libnvidia-container/Manifest
+++ b/sys-libs/libnvidia-container/Manifest
@@ -1 +1,2 @@
+DIST libnvidia-container-1.10.0.tar.gz 1396089 BLAKE2B 7b3ee77be1d5094a4b98522674e042d30b5b673efdf74e694f2bcc91e6edbcffb9c776f5c3fd957c98623c1c917fbf50234c365cdbc0691835e26fabc4b68963 SHA512 114e074a1fb713771457ae37003eb1bf82b8a1699367756e22dc9276be76e6e5be357777b8c83627f7a79591aae833ca63e481c1e8ecb9898e60c34fecec6f27
 DIST libnvidia-container-1.9.0.tar.gz 1406639 BLAKE2B fbeec48a49926ab3168c83d209bf3603b6685d358417950acd29c734f1874356eca4e209e5e652d4c2cf492743ea7a43162c2bc93061caf0c602faa308e9ff9f SHA512 beb4767911a5b705313f4e4cce64eaf0f47a3a639ee112612fea59bfae33f89b15858cff2c89620f2cf248ce12af312dfe926515a6bab2e8ba0f3fef4382f986
--- a/sys-libs/libnvidia-container/libnvidia-container-1.10.0.ebuild
+++ b/sys-libs/libnvidia-container/libnvidia-container-1.10.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="NVIDIA container runtime library"
+HOMEPAGE="https://github.com/NVIDIA/libnvidia-container"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="
+	net-libs/libtirpc
+	sys-libs/libcap
+	sys-libs/libseccomp
+	x11-drivers/nvidia-drivers
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	sys-devel/bmake
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-add-enum-h.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-sysfs-c.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-sysfs-h.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-utils-c.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-utils-h.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-git.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-makefile.patch
+	"${FILESDIR}"/${PN}-1.1.1-fix-nvc.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-nvc-info.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-nvc-mount.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-c.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-h.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-nvcgomk.patch
+)
--- a/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild
+++ b/sys-libs/libnvidia-container/libnvidia-container-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="NVIDIA container runtime library"
+HOMEPAGE="https://github.com/NVIDIA/libnvidia-container"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+else
+	SRC_URI="
+		https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
+	"
+	S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="
+	net-libs/libtirpc
+	sys-libs/libcap
+	sys-libs/libseccomp
+	x11-drivers/nvidia-drivers
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	net-libs/rpcsvc-proto
+	sys-apps/lsb-release
+	sys-devel/bmake
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-add-enum-h.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-sysfs-c.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-sysfs-h.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-utils-c.patch
+	"${FILESDIR}"/${PN}-1.1.1-add-utils-h.patch
+	"${FILESDIR}"/${PN}-1.7.0-fix-git.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-makefile.patch
+	"${FILESDIR}"/${PN}-1.1.1-fix-nvc.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-nvc-info.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-nvc-mount.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-c.patch
+	"${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-h.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-nvcgomk.patch
+)
--- a/sys-libs/libnvidia-container/metadata.xml
+++ b/sys-libs/libnvidia-container/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>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
--- a/sys-process/nvtop/Manifest
+++ b/sys-process/nvtop/Manifest
@@ -1,3 +1,4 @@
 DIST nvidia-settings-455.38.tar.bz2 1057087 BLAKE2B 81a287aecd2d0e788b0fe581c3dd10aa0f1fff19746b04a426a2ce9c7fa9dd9492cc5162c6bcd42496735c1b11482c3d9409aba5ec297e69afc19ddf11b1907c SHA512 56f5684ad3258c5449d747894a441aaef17403fc5406a3d61e0d7ffd983e908e3f909dc933b57dd9c98a47c4be7205c62157ce7097bf3937b3a8145e77fb354d
 DIST nvtop-1.2.2.tar.gz 197300 BLAKE2B dcab86606e2581d5d1d18e77a59fd5c41e665bbaaa876d0cdc7211cc2fe21d14e4a38e23afaf662616bc373b2c05cc85a969fc20ee78c0b42ead1cb6ac93fa84 SHA512 034ca55e773a34b433cc54e6dabf36911973b2ec0669a7f2757f9edcd6ae6e14493c8e31ecb9d7a8e45026ddd97cf543fa57b046d96de6cc650614cd539a6c6a
 DIST nvtop-2.0.1.tar.gz 215348 BLAKE2B 9e288a51dd2f61122ceeac11711c01c13f989e06c5b85c2e4ec90d217e0eb5081aff0aa33140cc511b8864b75a572045c1572e76aaab4bdcb30bbe0a83306771 SHA512 0694fd5327f5fdab926c6bd4862499ead2a4b7d17ec9e60ca1ff2ff3dfca56386600407d6ea8d65e7bea230fb450460e9a70879563764898c4dd5d320df96886
+DIST nvtop-2.0.2.tar.gz 218873 BLAKE2B a1c4faeaefd638da705d9a6b8de9bde4f99c58939a3cc3ab417081ecc24d229b211273432d4f71ff6a4f54b773a78d86c07a068660491a9e70524bd0a3e15596 SHA512 8cc4859ae26428b8b4835d5205be4533c38ab90f5a369261b2650200bab16f7953c4d012dba375be5d1c793ca5031775c64b18f1629cae381d6f1e3b29992cb5
--- a/sys-process/nvtop/metadata.xml
+++ b/sys-process/nvtop/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>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
--- a/sys-process/nvtop/nvtop-2.0.2.ebuild
+++ b/sys-process/nvtop/nvtop-2.0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+NVIDIA_PV="455.38"
+
+DESCRIPTION="NVIDIA GPUs htop like monitoring tool"
+HOMEPAGE="https://github.com/Syllo/nvtop"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Syllo/${PN}.git"
+	inherit git-r3
+	SRC_URI="
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
+	"
+else
+	SRC_URI="
+		https://github.com/Syllo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${NVIDIA_PV}.tar.bz2
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="unicode video_cards_amdgpu video_cards_nvidia"
+
+RDEPEND="
+	video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu] )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCURSES_NEED_WIDE=$(usex unicode)
+		-DNVIDIA_SUPPORT=$(usex video_cards_nvidia)
+		-DAMDGPU_SUPPORT=$(usex video_cards_amdgpu)
+	)
+
+	cp "${WORKDIR}/nvidia-settings-${NVIDIA_PV}/src/nvml.h" "${S}/include/nvml.h" || die
+
+	cmake_src_configure
+}
				`@@ -0,0 +1 @@`
				`DIST cligen-1.5.24.tar.gz 416445 BLAKE2B 22b1b30340dc56b8a7b3a422f1f9156939e2b027f060ca50f814e9ce491b8ef7aea082f7032fb7b1d417bf0a2b843b6dd10b79ad0b8529ad2f8fbeb5a56c9549 SHA512 9673766de8bf3f5da613bea3a143ab1ee9b9d569995f706fa459822dc20a86c46ec71dd24985d36c5120409e99dcb3eb7401ea50647c28f8128fa5fd0a671491`
				`@@ -0,0 +1 @@`
				`DIST inim-0.6.1.tar.gz 577278 BLAKE2B b3581ad658b5d7134e557487453fa29a7f23c534d1c5def5e787f4e1ff7f7f7e17e44a6f40782ceae494b413354c0c9491ba328cc7347f95bb7c2b66c2f58df6 SHA512 3c153261aa6c16579f954e1e9dc713e8c33c177bbb6275b5bb613c811ed8f9be075f28ae7a1574a7742a8eb9918da5df49529501947edca927723a7a3c84d2d9`
				`@@ -0,0 +1 @@`
				`DIST nake-1.9.4.tar.gz 10693 BLAKE2B e3de93537ac84818cd2dda60974d94a442b8d1aa7d3bd10f6f0a76f7641f38b153f5a7634a3dbe7e1cdcd91700cd37c846ab8e35d7e397101ce1eb2247fabf80 SHA512 cce92313d4668956dd48c3add0f6859fe9c5b33002c31dc9440dccc68636131591889fb7aa739d3ce0fb5d24725499ff6fd65c6f66294fd757461ad1f53942c3`
				`@@ -0,0 +1 @@`
				`DIST noise-0.1.14.tar.gz 30737 BLAKE2B c0b09ccfe55f3acad827af22def439d8bf00a9c14b8976a8681ed1aa8067c0f9f794ce68987384df2ccb4de3ffd3cc18d3aae73561b4576af47f299f5e4a9c2e SHA512 590c08e7fefdc95b5e3ed36e86467e999b479b4a38b80df56cbd9c0a5c3fb6f2d667f35bb3dcd6c44cae53d8fd77481f6534879fbd1e6230a61fa452eb296d0a`
				`@@ -0,0 +1 @@`
				`DIST pubkey.asc 20965 BLAKE2B 47d9c32a58237f797c9f45df109f201a954dcb3360df6733c7f6b24dbbd62a5aea87232dab714b61edf37bf864b6bf46bdded24c8e147c2ac24a5f4f9fd6b0cb SHA512 18fc3b260e7545b09a120e3550d532009cfed968fcfa054e69359aa839bbacb8650edbcaa9b1d389f4eda0cb95fa37bc83cc76f2c23194abb57b07a360629715`