Merge updates from master

2026-07-15 18:13:10 -04:00 · 2022-03-25 15:34:19 +00:00
parent 0a70a68917 e1b84bad93
commit df564fcbed
102 changed files with 1088 additions and 829 deletions
--- a/app-misc/ani-cli/Manifest
+++ b/app-misc/ani-cli/Manifest
@@ -0,0 +1 @@
+DIST ani-cli-1.9.tar.gz 8016229 BLAKE2B 0b4120fb038e8f01f74e5a9c43b665e978e2c47e1b76059d20b364a7cec386e7c3cd3028d4e03ba8ef02bf45ae9df3ee66d896f9be09118736c605110ce3e5dd SHA512 f3fe0109fc3f1d910fa4f621bc056d7c291ed2c0f91b76f9b65fc65925d864d3ab86a6610ec5960cc24a329507ab1fbb054e4304c4ececeb88c2411e66b48452
--- a/app-misc/ani-cli/ani-cli-1.9.ebuild
+++ b/app-misc/ani-cli/ani-cli-1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A cli to browse and watch anime."
+HOMEPAGE="https://github.com/pystardust/ani-cli/"
+SRC_URI="https://github.com/pystardust/$PN/archive/refs/tags/v$PV.tar.gz -> $P.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-video/mpv
+	dev-libs/openssl
+	net-misc/curl
+	media-video/ffmpeg"
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+	dobin ani-cli
+
+}
--- a/app-misc/ani-cli/metadata.xml
+++ b/app-misc/ani-cli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>j327aq10@anonaddy.me</email>
+	<description>Primary maintainer</description>
+</maintainer>
+<upstream>
+	<remote-id type="github">pystardust/ani-cli</remote-id>
+</upstream>
+</pkgmetadata>
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1 @@
-DIST fastfetch-1.0.0.tar.gz 326757 BLAKE2B 65a63a930bcc59f8ffc95f41515ea1eb924803c9365d830a8b5f17627b64ba4b64795cc5c3af24d0971fd8969f557fcd398234fca845481b38417ebe3ea0177c SHA512 c32df2276176e475c434ea9aae60debd9d05b0fed1861f2b1ce659ff693d98b181bf54aeb35abbd80944d72fd2280d2b7325f91eef1ee124083a81c46c9c7a10
+DIST fastfetch-1.1.0.tar.gz 327601 BLAKE2B d3fca85fba1ac51540dde8a2ca9fed5ebe1e1c288d6e8aae2db5ad09cc149cfb218699a4825673c8c0160849493ee035243ad520143dd6106b0090a0418f538f SHA512 6273592c422a8a7740c8719bb9b6cad3b583b14ebdc14c7d4abc2ea51c24164cdf84976109df41d99df5385d2627d67a8be1ede04a7c1ac852da1e131c1fc362
--- a/app-misc/fastfetch/fastfetch-1.1.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-1.1.0.ebuild
--- a/dev-R/MASS/MASS-7.3.54.ebuild
+++ b/dev-R/MASS/MASS-7.3.54.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+MYPV="$(ver_rs 2 -)"
+
 inherit R-packages

 DESCRIPTION="Support Functions and Datasets for variables and Ripley's MASS"
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
-SRC_URI="mirror://cran/src/contrib/MASS_7.3-54.tar.gz"
 LICENSE='|| ( GPL-2 GPL-3 )'

 DEPEND="
 	>=dev-lang/R-3.3.0
-	dev-lang/R[minimal]
+	!dev-lang/R[-minimal]
 "
 RDEPEND="${DEPEND}"
--- a/dev-R/Matrix/Matrix-1.3.4.ebuild
+++ b/dev-R/Matrix/Matrix-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,12 +8,14 @@ MYPV="$(ver_rs 2 -)"
 inherit R-packages

 DESCRIPTION='Sparse and Dense Matrix Classes and Methods'
-KEYWORDS="~amd64"
 SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE='GPL-2+'

 DEPEND="
-	>=dev-lang/R-3.5.0[minimal]
+	>=dev-lang/R-3.5.0
+	!dev-lang/R[-minimal]
 	virtual/lattice
 "
 RDEPEND="${DEPEND}"
--- a/dev-R/brew/Manifest
+++ b/dev-R/brew/Manifest
@@ -1 +1 @@
-DIST brew_1.0-6.tar.gz 83315 BLAKE2B 2d73b04f3918b31b34f1ed9dbe625f0f5d18f3682054a1fb0f437b38b1bf30dcec7db918b2f855362d3ad0455d7b9484267790b4666d44c15c44445dbd7cf84a SHA512 258e0ed8097226a44bace2d6a68db846d7f665dcb0005d0809bdbb20775bca8b7f9f8e45310bbedd7a3cb11560fd0d454f36f0cfee6d1cdb5798da8d7e571f30
+DIST brew_1.0-7.tar.gz 55517 BLAKE2B ea3c5b2de180c1e43fc69b17c267f356715cfe4692bc1f291f6084e91fa15f7405ede22503b343f62d3677d02eca1eaa094871930c5f6e71d1debbabdb860d19 SHA512 3613919a3072df74fc782a16cf69c7f8d4a16ef5deec5b0ff7b70be311f5f428b597322f87a029f48b9799b1c05cbd5608f8967a6e40cae7c3a050106c125652
--- a/dev-R/brew/brew-1.0.7.ebuild
+++ b/dev-R/brew/brew-1.0.7.ebuild
@@ -1,11 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+MYPV="$(ver_rs 2 -)"
+
 inherit R-packages

 DESCRIPTION='Templating Framework for Report Generation'
-SRC_URI="mirror://cran/src/contrib/brew_1.0-6.tar.gz"
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
 LICENSE='GPL-2'
+
+SUGGESTED_PACKAGES="
+	dev-R/testthat
+"
--- a/dev-R/colorspace/Manifest
+++ b/dev-R/colorspace/Manifest
@@ -1 +1 @@
-DIST colorspace_2.0-1.tar.gz 2193384 BLAKE2B c2ddcccd8fbf74a9f65a4533b13c6d8b43d2b97bf1776a1316cdead362b22e4fd9e367813f9f69b99e3636339733e8ca513514193e5c83ca7a50c161057db94f SHA512 59a84c3d08370e6818b26501400c74340fce283e73d549fec53e62c0ae47d476be65a589e8f35cbd17866ce8fbe926bc14021d8196bc82dc2abeec8a0cfd0db7
+DIST colorspace_2.0-3.tar.gz 2199185 BLAKE2B 2a6002ea58b04f6850baf8ae3e9174b4ffdf6597491b671a337ca20bb0dac858f3b82c9a46aaa09895827ccb8e8f35687f2b64abd1ee5bc897f9f397c1b1e754 SHA512 6bfaff35986008a136f1e77694bb7c1acf44edb0a74a8fb0b16430f5592348dd97a6da02dfad73a280f52446e33fede0cd4e10d368670b44e126c130db6ffceb
--- a/dev-R/colorspace/colorspace-2.0.1.ebuild
+++ b/dev-R/colorspace/colorspace-2.0.1.ebuild
@@ -1,14 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit R-packages
-
-DESCRIPTION='A Toolbox for Manipulating and Assessing colors and palettes'
-SRC_URI="mirror://cran/src/contrib/colorspace_2.0-1.tar.gz"
-KEYWORDS="~amd64"
-LICENSE='BSD'
-
-DEPEND=">=dev-lang/R-3.0.0"
-RDEPEND="${DEPEND}"
--- a/dev-R/colorspace/colorspace-2.0.3.ebuild
+++ b/dev-R/colorspace/colorspace-2.0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYPV="$(ver_rs 2 -)"
+
+inherit R-packages
+
+DESCRIPTION='A Toolbox for Manipulating and Assessing colors and palettes'
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE='BSD'
+
+DEPEND=">=dev-lang/R-3.0.0"
+RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/KernSmooth
+	dev-R/MASS
+	dev-R/kernlab
+	dev-R/mvtnorm
+	dev-R/vcd
+	dev-R/shiny
+	dev-R/shinyjs
+	dev-R/ggplot2
+	dev-R/dplyr
+	dev-R/scales
+	dev-R/png
+	dev-R/jpeg
+	dev-R/knitr
+	dev-R/rmarkdown
+	dev-R/RColorBrewer
+	dev-R/rcartocolor
+	dev-R/scico
+	dev-R/viridis
+	dev-R/weseanderson
+"
--- a/dev-R/lattice/Manifest
+++ b/dev-R/lattice/Manifest
@@ -1,2 +1,2 @@
 DIST lattice-0.20.44.tar.gz 399257 BLAKE2B 98ce0b74478dc5bf2e9e1f8282a1793d38a3cabdce3e48e8bc7f9a18b438bc91e32a61195e845308892a8c290ac7326b1d842a8760903f413d8407d6901c264a SHA512 425cbe4e0efa3a53b1b5609cecd6065d4b1c6cb0eb00f4595d1446a642efb8b95da769f66081b7f106b43170dcded146151d7597a74daef4c9ec79302792f5f2
-DIST lattice-0.20.45.tar.gz 399470 BLAKE2B b228bfb8e5d8e01a0e6977bcc1f63f61d097d01bd429bf4050de00ac4e1b3230153bb418bd778c4e352201246041bd141c4d5860b7a66bd3703e7ab97feb8a05 SHA512 b27975007c86e05653ddf1b9f0188e1fdbf4497965279928b71bc7b39df5a42c05e3fcee2dbd4284dbc6f3af4e32730c259b1abb29c6632ac90571ba15e65391
+DIST lattice_0.20-45.tar.gz 399470 BLAKE2B b228bfb8e5d8e01a0e6977bcc1f63f61d097d01bd429bf4050de00ac4e1b3230153bb418bd778c4e352201246041bd141c4d5860b7a66bd3703e7ab97feb8a05 SHA512 b27975007c86e05653ddf1b9f0188e1fdbf4497965279928b71bc7b39df5a42c05e3fcee2dbd4284dbc6f3af4e32730c259b1abb29c6632ac90571ba15e65391
--- a/dev-R/lattice/lattice-0.20.45.ebuild
+++ b/dev-R/lattice/lattice-0.20.45.ebuild
@@ -1,22 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit R-packages optfeature
+MYPV="$(ver_rs 2 '-')"
+
+inherit R-packages

 DESCRIPTION='Trellis Graphics for R'
-HOMEPAGE="http://lattice.r-forge.r-project.org/index.php"
+HOMEPAGE="
+	https://lattice.r-forge.r-project.org/index.php
+	https://CRAN.R-project.org/package=lattice
+"
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
-SRC_URI="mirror://cran/src/contrib/"${PN}"_"$(ver_rs 2 '-')".tar.gz -> "${P}".tar.gz"
 LICENSE='GPL-2+'

 DEPEND="
 	>=dev-lang/R-3.0.0
-	dev-lang/R[minimal]
+	!dev-lang/R[-minimal]
 "
 RDEPEND="${DEPEND}"

-pkg_postinst() {
-	optfeature "immer in the MASS package for data from the same experiment (expressed as total yield for 3 blocks) for a subset of varieties" dev-R/MASS
-}
+SUGGESTED_PACKAGES="
+	dev-R/KernSmooth
+	dev-R/MASS
+	dev-R/latticeExtra
+"
--- a/dev-R/mgcv/mgcv-1.8.36.ebuild
+++ b/dev-R/mgcv/mgcv-1.8.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,12 +8,14 @@ MYPV="$(ver_rs 2 -)"
 inherit R-packages

 DESCRIPTION='Mixed GAM Computation Vehicle with automatic smoothness estimation'
-KEYWORDS="~amd64"
 SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE='GPL-2+'

 DEPEND="
-	>=dev-lang/R-3.6.0[minimal]
+	>=dev-lang/R-3.6.0
+	!dev-lang/R[-minimal]
 	virtual/nlme
 	virtual/Matrix
 "
--- a/dev-R/nlme/Manifest
+++ b/dev-R/nlme/Manifest
@@ -1 +1 @@
-DIST nlme_3.1-152.tar.gz 805569 BLAKE2B 9a8e387dcfa053d6238d6198925b20cc70ceac302e4b8f55a1b8288881990927010b9a483d6f10bba5b65dc83de15b2cd9f2b124e79de21cad429cbeff5d573c SHA512 96f4d786280befd1fa3ac3cbd7d08777dd7059fa52071377fad854b98a7b2ba360c464951dbf77a1395a35a594bdd02c49fcd3794424a1ad343185d496078d4d
+DIST nlme_3.1-155.tar.gz 806854 BLAKE2B 6c0b011edca6d8f4dac604485c94d7189776ee4c9486af741b356f2c8d088aa50fd8b590afb53ee346ce065d5f6ab2fa476c00290df03277fb909cde20a7b351 SHA512 1dcb7b1bffd75e2907237143eb31c46f30da0248be4f3731cbe2e3c85d42f1074db8be47f94fb98bc3b0a5cd2dbc5292627c457677d4c5565cdc676428c21656
--- a/dev-R/nlme/nlme-3.1.155.ebuild
+++ b/dev-R/nlme/nlme-3.1.155.ebuild
@@ -1,18 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+MYPV="$(ver_rs 2 -)"
+
 inherit R-packages

 DESCRIPTION='Linear and Nonlinear Mixed Effects Models'
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
-SRC_URI="http://cran.r-project.org/src/contrib/nlme_3.1-152.tar.gz"
 LICENSE='GPL-2+'

 DEPEND="
 	>=dev-lang/R-3.4.0
+	!dev-lang/R[-minimal]
 	virtual/lattice
-	dev-lang/R[minimal]
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev-R/Hmisc
+	dev-R/MASS
+"
--- a/dev-R/nnet/Manifest
+++ b/dev-R/nnet/Manifest
@@ -1 +1 @@
-DIST nnet_7.3-16.tar.gz 29097 BLAKE2B cfcb117da291a85f841ecdf5186bff8742a4f218fe617f04704cb8ee645d99ce3cf1f080e7b6d5edc23dcaeb3675a3a5a215105271cbc2a03574ae5058e4e635 SHA512 100b5000020b92212af68fd2ecdab0ee194c8a47d48db8b1646974e3467960a1f0369572b40e799d0c7c93c7888212f6b61346b401d872b98bee94cc5e419afd
+DIST nnet_7.3-17.tar.gz 29099 BLAKE2B 056bf0fc79fb3c13cf8bcd867504742b5ed81550bb02dbbd8127f166b29d614d5af53d787a455ef8d6a7a525d791becc83e0ee416d5e24c29ce5b6e1ccdca7b6 SHA512 6d85a68fc88cc8c3f6200b40491618691619a1e00985edb6190bdacef935c77151d77e0757a899807c1ddf84e78a57c7482e87b4e892cf269ecc623eff7fbcdc
--- a/dev-R/nnet/nnet-7.3.17.ebuild
+++ b/dev-R/nnet/nnet-7.3.17.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+MYPV="$(ver_rs 2 -)"
+
 inherit R-packages

 DESCRIPTION='Feed-Forward Neural Networks and multinomial log-linear models'
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
-SRC_URI="http://cran.r-project.org/src/contrib/nnet_7.3-16.tar.gz"
 LICENSE='|| ( GPL-2 GPL-3 )'

 DEPEND="
 	>=dev-lang/R-3.0.0
-	dev-lang/R[minimal]
+	!dev-lang/R[-minimal]
 "
 RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+	dev_R/MASS
+"
--- a/dev-R/survival/Manifest
+++ b/dev-R/survival/Manifest
@@ -1 +1 @@
-DIST survival_3.2-11.tar.gz 6274168 BLAKE2B 2a8be50021773094fdaa548d6d9859f4c41d6dedebcbaefd07d7b2c8dce2507b1eb8192efe1f0b04df666b0ab38829bb0932afae3d9798b5e93e91a6f7cd2d2b SHA512 0f829dafe292994cb02c84f4bd679586a6fba80e7678eca89bef6db7dd1f5da5019f27f3bce4e8b90376ac94013115298bec9b6058d46d1d748cb2df823994a5
+DIST survival_3.3-1.tar.gz 6577371 BLAKE2B 5f6cd5becc11967a38102a3f89b2afa4e4486630e0e42977ab5498a3f51ca60ed5a6fd09f53d913ca3ede12b327a01f77f91071fa31b304beacf613a361ef0d3 SHA512 19c7108ab0cfbb05414766b611615e76289d6df9b7fac053e56474e4d1e416c8ebb16421656bff78f9dbbc661a786d392bf2de56f293f2790dfc884ffab1cc0a
--- a/dev-R/survival/survival-3.2.11.ebuild
+++ b/dev-R/survival/survival-3.2.11.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+MYPV="$(ver_rs 2 -)"
+
 inherit R-packages

 DESCRIPTION='Survival Analysis'
-SRC_URI="mirror://cran/src/contrib/survival_3.2-11.tar.gz"
+SRC_URI="mirror://cran/src/contrib/${PN}_${MYPV}.tar.gz"
+
 KEYWORDS="~amd64"
 LICENSE='LGPL-2+'

 DEPEND="
-	virtual/Matrix
-	dev-lang/R[minimal]
 	>=dev-lang/R-3.5.0
+	!dev-lang/R[-minimal]
+	virtual/Matrix
 "
 RDEPEND="${DEPEND}"
--- a/dev-cpp/fbthrift/Manifest
+++ b/dev-cpp/fbthrift/Manifest
@@ -1 +1,2 @@
 DIST fbthrift-2022.02.28.00.tar.gz 6814491 BLAKE2B ce2646a04d1b59821d23162d51b02507a91a81208328d4c983cd99be8fa0e79efb66d4af3f244fa6e3a50e9e84a794cea9ec970e1f0b266b40d632aa064f7a9f SHA512 303e7c328f1ae7132ad81e2135b082997a40c9079bbeea701762f939ada2d80cf4f140ad6981d20273df9731bfb286f3336a999c13e26d3add49bf1c091de82c
+DIST fbthrift-2022.03.21.00.tar.gz 7178541 BLAKE2B 6e875f19ae19b5ccd1740d5eadb0b4f106d96b95ca1ced9e05a5bfd7f8e7de84aec722f0dfb0721c81e320185359d3f9c595ebfebef8638b6ca6788df98d37d4 SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab
--- a/dev-cpp/fbthrift/fbthrift-2022.03.21.00.ebuild
+++ b/dev-cpp/fbthrift/fbthrift-2022.03.21.00.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Facebook's branch of Apache Thrift, including a new C++ server"
+HOMEPAGE="https://github.com/facebook/fbthrift"
+SRC_URI="https://github.com/facebook/fbthrift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-arch/zstd
+	~dev-cpp/fizz-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	~dev-cpp/wangle-${PV}:=
+	dev-libs/libfmt
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+DEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+	cmake_src_configure
+}
--- a/dev-cpp/fizz/Manifest
+++ b/dev-cpp/fizz/Manifest
@@ -1 +1,2 @@
 DIST fizz-2022.02.28.00.tar.gz 581059 BLAKE2B 31b086ca41db7919abdfc1fb8f88efe93f09ad59b5727ada2d04bd95f22f03bec7346de3944dad44d688b1281a5d789df2e134c0990dd1c751723b60791c1770 SHA512 ccfd493b04cca5e8e76e64dea2659b88ec1fe0dcdfa3b1133d46fe8d37abc4fc78710c0831c2038ce0806f7ebad47607aa7597f9ee8577b9bbd11436ff1cdeaf
+DIST fizz-2022.03.21.00.tar.gz 581670 BLAKE2B 2dc9691abfaf646db56e047a74894b745102764c773b9f244c4b357b74b6d00d1a2548664a5e343f2c5f84458de36d453e99b9901c89bc621c54840a7b45b5e4 SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e
--- a/dev-cpp/fizz/fizz-2022.03.21.00.ebuild
+++ b/dev-cpp/fizz/fizz-2022.03.21.00.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++14 implementation of the TLS-1.3 standard"
+HOMEPAGE="https://github.com/facebookincubator/fizz"
+SRC_URI="https://github.com/facebookincubator/fizz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+RDEPEND="
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	dev-libs/double-conversion
+	dev-libs/libevent
+	dev-libs/libfmt
+	dev-libs/libsodium
+	dev-libs/openssl:0=
+"
+#TODO: discover if gtest is linked
+DEPEND="
+	${RDEPEND}
+	test? ( <dev-cpp/gtest-1.11.0 )
+"
+
+RESTRICT="!test? ( test )"
+CMAKE_USE_DIR="${S}/fizz"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/Sodium/d' fizz/cmake/fizz-config.cmake.in || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTS=$(usex test)
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
--- a/dev-cpp/highway/Manifest
+++ b/dev-cpp/highway/Manifest
@@ -1,2 +0,0 @@
-DIST highway-0.14.2.tar.gz 1545892 BLAKE2B c19d040ea7bf6d5ee0ff87213f36bfe77759cc4cec514b972379490dbac5e8d55f99490b998f73133ca0ba3b34a98f2684b85206ae32d655aa574aeaabeaeb27 SHA512 fc1a35463c95c45b646c53f91a9996112726de1d588dcd4d25a7d366840f704ad9a4c0bb6e0a001e929409f04aad6922cbffcf93774a0c360aff875956c7cc8d
-DIST highway-0.15.0.tar.gz 1598512 BLAKE2B f0ee61b5f19591d88d6fd3950072c9302b13e589ac9e8759444c0bcde2c804438313b1b37c2e3d9c40296898c8fc938a2ae57eba3e17d73a9388c21f20b97b59 SHA512 ed07e855721f87ea67d762b30e001643a76bd16d70372415023c8e6f1a43c58759a14a638e8eb20566863d8358d994153bf7a660fcf604e808adfea5f938a013
--- a/dev-cpp/highway/files/highway-shared-libraries.patch
+++ b/dev-cpp/highway/files/highway-shared-libraries.patch
@@ -1,21 +0,0 @@
--- a/CMakeLists.txt	2021-10-24 04:46:57.475685128 +0200
-+++ b/CMakeLists.txt	2021-10-24 04:45:56.218467838 +0200
-@@ -182,15 +182,16 @@
- 
- endif()  # !MSVC
- 
-add_library(hwy STATIC ${HWY_SOURCES})
-+add_library(hwy SHARED ${HWY_SOURCES})
- target_compile_options(hwy PRIVATE ${HWY_FLAGS})
- set_property(TARGET hwy PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(hwy PUBLIC ${CMAKE_CURRENT_LIST_DIR})
- 
-add_library(hwy_contrib STATIC ${HWY_CONTRIB_SOURCES})
-+add_library(hwy_contrib SHARED ${HWY_CONTRIB_SOURCES})
- target_compile_options(hwy_contrib PRIVATE ${HWY_FLAGS})
- set_property(TARGET hwy_contrib PROPERTY POSITION_INDEPENDENT_CODE ON)
- target_include_directories(hwy_contrib PUBLIC ${CMAKE_CURRENT_LIST_DIR})
-+target_link_libraries(hwy_contrib hwy)
- 
- # -------------------------------------------------------- hwy_list_targets
- # Generate a tool to print the compiled-in targets as defined by the current
--- a/dev-cpp/highway/highway-0.14.2.ebuild
+++ b/dev-cpp/highway/highway-0.14.2.ebuild
@@ -1,42 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
-HOMEPAGE="https://github.com/google/highway"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/highway.git"
-else
-	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/${PN}-shared-libraries.patch" )
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DHWY_WARNINGS_ARE_ERRORS=OFF
-	)
-
-	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
-
-	cmake_src_configure
-}
-
-src_install() {
-	dodoc g3doc/*
-	cmake_src_install
-}
--- a/dev-cpp/highway/highway-0.15.0.ebuild
+++ b/dev-cpp/highway/highway-0.15.0.ebuild
@@ -1,42 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
-HOMEPAGE="https://github.com/google/highway"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/highway.git"
-else
-	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/${PN}-shared-libraries.patch" )
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DHWY_WARNINGS_ARE_ERRORS=OFF
-	)
-
-	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
-
-	cmake_src_configure
-}
-
-src_install() {
-	dodoc g3doc/*
-	cmake_src_install
-}
--- a/dev-cpp/highway/highway-9999.ebuild
+++ b/dev-cpp/highway/highway-9999.ebuild
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
-HOMEPAGE="https://github.com/google/highway"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/highway.git"
-else
-	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DHWY_WARNINGS_ARE_ERRORS=OFF
-	)
-
-	use test && mycmakeargs+=( "-DHWY_SYSTEM_GTEST=ON" )
-
-	cmake_src_configure
-}
--- a/dev-cpp/highway/metadata.xml
+++ b/dev-cpp/highway/metadata.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dnovomesky@gmail.com</email>
-		<name>Daniel Novomesky</name>
-	</maintainer>
-	<longdescription>
-		Highway is a C++ library for SIMD (Single Instruction, Multiple Data),
-		i.e. applying the same operation to multiple 'lanes' using a single CPU instruction.
-	</longdescription>
-</pkgmetadata>
--- a/dev-cpp/wangle/Manifest
+++ b/dev-cpp/wangle/Manifest
@@ -1 +1,2 @@
 DIST wangle-2022.02.28.00.tar.gz 354455 BLAKE2B a48b7e926d2bc0c196fda2c4db52322e4e8c82a09471e196ff759076cca2e17e9efd2ce0b95608a69e1288de2154e8be153741f6edd5bac3d5d791cc788811f1 SHA512 be69ea8318ebd0f75f8d6ffe82c833f868837cff965e99aacc11abb90f572e2d9b837782ac1e23e86355e52f5ca2b2be13be54ac4651db9ef22afa95bb0b3cc3
+DIST wangle-2022.03.21.00.tar.gz 355164 BLAKE2B 876863bb5d0e5c7fd5f3408f9f2233b1995ef838b165bbb9f8772667e1ca5fa98f4ae5eb686e2ef94198bdb373daa2ce96720253f550a808369b8cca0ec6d10b SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e
--- a/dev-cpp/wangle/wangle-2022.02.28.00.ebuild
+++ b/dev-cpp/wangle/wangle-2022.02.28.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
--- a/dev-cpp/wangle/wangle-2022.03.21.00.ebuild
+++ b/dev-cpp/wangle/wangle-2022.03.21.00.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+RDEPEND="
+	~dev-cpp/fizz-${PV}:=
+	~dev-cpp/folly-${PV}:=
+	dev-cpp/gflags
+	dev-cpp/glog
+	dev-libs/double-conversion
+	dev-libs/libevent
+	dev-libs/libfmt
+	dev-libs/openssl:0=
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+
+CMAKE_USE_DIR="${S}/wangle"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+
+	cmake_src_configure
+}
--- a/dev-libs/fortran-stdlib/Manifest
+++ b/dev-libs/fortran-stdlib/Manifest
@@ -1 +1,2 @@
 DIST fortran-stdlib-0.1.0.tar.gz 210357 BLAKE2B 0727c0d280bb4c95383d9436245b82a43ed7aa0f762652d010501960d25a752694e8a12de149d80d1e107f3c6252d7af4f2db7ae64be6df58c4110dd929c0318 SHA512 247ad9e3db46847bbb5565aee995242f1c86ad3f623e9b91ca8505a92d6c27984a12fe32d4f3025e662176a025f72ddadc2d87ba646ab6b46ccc88e13f94f387
+DIST fortran-stdlib-0.2.0.tar.gz 323170 BLAKE2B b81c04a52fc466fe87668a1280fda0a3305e85fe90c8db07d7a8271804d775d07dc1e16278d87abc8c63990c825dbf2ae7ae9dd142ba8c2edf4fb32609471188 SHA512 aadf5e1fa96a95143fec9f7778c37d82c515d7db9afb723d02685a3f751428f82121d57529caaba79b5d6aab92af7790616640a09128ec5f3cf57528d68975ed
--- a/dev-libs/fortran-stdlib/fortran-stdlib-0.2.0.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-0.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_STANDARD="2003"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake fortran-2 python-any-r1
+
+MY_PN="stdlib"
+SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="A community driven standard library for (modern) Fortran"
+HOMEPAGE="https://stdlib.fortran-lang.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="mirror !test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-util/fypp[${PYTHON_USEDEP}]
+	')
+	doc? (
+		$(python_gen_any_dep '
+			app-doc/ford[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/fortran-test-drive )
+"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs+=(
+		-DBUILD_SHARED_LIBS=on
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc ; then
+		einfo "Build API documentation:"
+		${EPYTHON} ford API-doc-FORD-file.md || die
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/src:${BUILD_DIR}/src/tests/hash_functions" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && HTML_DOCS=( "${WORKDIR}/${MY_PN}-${PV}"/API-doc/. )
+	einstalldocs
+}
--- a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
@@ -1,10 +1,10 @@
-# 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

 FORTRAN_STANDARD="2003"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )

 inherit cmake fortran-2 git-r3 python-any-r1

@@ -29,6 +29,7 @@ DEPEND="
 			app-doc/ford[${PYTHON_USEDEP}]
 		')
 	)
+	test? ( dev-util/fortran-test-drive )
 "

 pkg_setup() {
@@ -38,6 +39,7 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs+=(
 		-DBUILD_SHARED_LIBS=on
+		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
 }
@@ -51,6 +53,10 @@ src_compile() {
 	fi
 }

+src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/src:${BUILD_DIR}/src/tests/hash_functions" cmake_src_test
+}
+
 src_install() {
 	cmake_src_install

--- a/dev-python/glyphsLib/glyphsLib-6.0.4.ebuild
+++ b/dev-python/glyphsLib/glyphsLib-6.0.4.ebuild
@@ -13,15 +13,20 @@ HOMEPAGE="https://github.com/googlefonts/glyphsLib"
 SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 SLOT="0"

 RDEPEND="
-	>=dev-python/fonttools-4.14[${PYTHON_USEDEP}]
-	>=dev-python/ufoLib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.27.1[${PYTHON_USEDEP}]
+	>=dev-python/ufoLib2-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/openstep-plist-0.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-python/setuptools_scm-6.0[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/setuptools_scm-6.0[${PYTHON_USEDEP}]
 	test? (
 		dev-python/defcon[${PYTHON_USEDEP}]
 		dev-python/ufoNormalizer[${PYTHON_USEDEP}]
@@ -33,6 +38,5 @@ distutils_enable_tests pytest

 python_prepare_all() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	sed -e '/\<wheel\>/d' -i setup.cfg
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/hypercorn/hypercorn-0.13.2.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.13.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://pgjones.gitlab.io/hypercorn
 	https://gitlab.com/pgjones/hypercorn
 	https://github.com/pgjones/hypercorn
-	https://pypi.org/project/Hypercorn/
+	https://pypi.org/project/hypercorn/
 "
 SRC_URI="https://github.com/pgjones/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

--- a/dev-python/hyperglot/hyperglot-0.3.8.ebuild
+++ b/dev-python/hyperglot/hyperglot-0.3.8.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1

 DESCRIPTION="Detect language support for font binaries"
 HOMEPAGE="
-	http://hyperglot.rosettatype.com/
+	https://hyperglot.rosettatype.com/
 	https://github.com/rosettatype/hyperglot
 	https://pypi.org/project/hyperglot/
 "
--- a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-/.}
 DESCRIPTION="Alternate keyring backend implementations for use with the keyring package"
 HOMEPAGE="
 	https://github.com/jaraco/keyrings.alt
-	https://pypi.org/project/keyrings.alt
+	https://pypi.org/project/keyrings.alt/
 "
 SRC_URI="https://github.com/jaraco/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

--- a/dev-python/microversion-parse/metadata.xml
+++ b/dev-python/microversion-parse/metadata.xml
@@ -4,7 +4,7 @@
 	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">microversion_parse</remote-id>
+		<remote-id type="pypi">microversion-parse</remote-id>
 		<remote-id type="github">openstack/microversion-parse</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/nosexcover/metadata.xml
+++ b/dev-python/nosexcover/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">cmheisel/nosexcover</remote-id>
+		<remote-id type="pypi">nosexcover</remote-id>
 		<remote-id type="github">cmheisel/nose-xcover</remote-id>
 		<bugs-to>https://github.com/cmheisel/nose-xcover/issues</bugs-to>
 	</upstream>
--- a/dev-python/openstep-plist/Manifest
+++ b/dev-python/openstep-plist/Manifest
@@ -0,0 +1 @@
+DIST openstep-plist-0.3.0.tar.gz 20692 BLAKE2B 4be8190b08ad6146df92f774597405977af898dfa0dd7b639d8c07674641fec54c139f292ec15f04c44062c9c128e29716f1fa642e4d04d160d6c1b310128a68 SHA512 623fbe4b169805f42828e41ff949c2a9a91620b76c0adda33e4e66c19345826bef21ac645571e5c52208f029389b37b6b9918ad3e85388475b50c243e16ca715
--- a/dev-python/openstep-plist/metadata.xml
+++ b/dev-python/openstep-plist/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+      <email>lssndrbarbieri@gmail.com</email>
+      <name>Alessandro Barbieri</name>
+    </maintainer>
+    <upstream>
+        <bugs-to>https://github.com/fonttools/openstep-plist/issues</bugs-to>
+        <remote-id type="github">fonttools/openstep-plist</remote-id>
+        <remote-id type="pypi">openstep-plist</remote-id>
+    </upstream>
+</pkgmetadata>
--- a/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
+++ b/dev-python/openstep-plist/openstep-plist-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="ASCII plist parser written in Cython"
+HOMEPAGE="https://github.com/fonttools/openstep-plist"
+SRC_URI="https://github.com/fonttools/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	>=dev-python/cython-0.28.5[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-cython[${PYTHON_USEDEP}]
+		dev-python/pytest-randomly[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+	default
+}
--- a/dev-python/os-ken/os-ken-2.3.1.ebuild
+++ b/dev-python/os-ken/os-ken-2.3.1.ebuild
@@ -48,6 +48,6 @@ BDEPEND="
 distutils_enable_tests nose

 src_prepare() {
-	rm -r os-ken/os-ken/tests/integrated || die
+	rm -r "${S}/os_ken/tests/integrated" || die
 	default
 }
--- a/dev-python/pyVows/Manifest
+++ b/dev-python/pyVows/Manifest
@@ -1 +1 @@
-DIST pyVows-3.0.0.tar.gz 39112 BLAKE2B 83ae675ac75c57b977457ae8e7ed21459821c5583de105b90b2b1590322f7583c9d842c248c6baa64e7be7aafd26b2fd4623fcce7df904b69a5cd4862d09c893 SHA512 7dbbe5b641c9c374f4c51c45cf5db2188685dd889a50dcf3eba9100c0c899c8785ab7ec3743e3b3eebc590aeb06d4aeb8843a0c43037fcac85d8b6b7eba30b1f
+DIST pyVows-3.0.0-5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7.tar.gz 41052 BLAKE2B 98a373d4a98cf5416d173fd9c1889a82480a476ad7ccce0895a9a626068f7a3831ce131433ab9f38726c41cd92cb47426bd8ef1d5a4fb9aab7efd9ee7c06face SHA512 bfef76cce283a77cfb1fd4f3e4d9e73da648390f42ce79524151be44693d9c13864aa75411394a2e294eea93820118f08a160a291146fab4f7d23ef5e14de071
--- a/dev-python/pyVows/pyVows-3.0.0.ebuild
+++ b/dev-python/pyVows/pyVows-3.0.0.ebuild
@@ -3,6 +3,7 @@

 EAPI=8

+COMMIT="5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7"
 PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1
@@ -12,7 +13,8 @@ HOMEPAGE="
 	https://github.com/heynemann/pyvows
 	https://pypi.org/project/pyVows/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/heynemann/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz" # only for 3.0.0
+S="${WORKDIR}/${PN,,}-${COMMIT}"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/python-binary-memcached/python-binary-memcached-0.31.1.ebuild
+++ b/dev-python/python-binary-memcached/python-binary-memcached-0.31.1.ebuild
@@ -39,3 +39,8 @@ BDEPEND="
 RESTRICT="test" # tests require a running memcached

 distutils_enable_tests pytest
+
+src_prepare() {
+	rm README.rst || die
+	default
+}
--- a/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-4.4.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A client for the OpenStack Mistral API"
 HOMEPAGE="
 	https://github.com/openstack/python-mistralclient
 	https://opendev.org/openstack/python-blazarclient
-	https://pypi.org/project/python-blazarclient
+	https://pypi.org/project/python-blazarclient/
 	https://launchpad.net/python-mistralclient/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
--- a/dev-python/python_jwt/Manifest
+++ b/dev-python/python_jwt/Manifest
@@ -1 +1 @@
-DIST python_jwt-3.3.2.tar.gz 266223 BLAKE2B 42bda6e45e33e15811e0fcdd613147c2fba0bd4115190e97df41ccb0ea4dbec3d132fab0743ed88aca524e19453cef66036759aaf880a3f3df2aba1459475201 SHA512 7ca5f8f211b4b12b20b2b3875b5811dca47d7f552d7d625e423d0ba488cdb9fe76a04168a91edb17cd3b2a381e00d55b1fc797e81e25f6c20d4358beb2284be7
+DIST python_jwt-3d9747df616d209c07bffe2bcf28b42e92a7d8d4.tar.gz 239032 BLAKE2B 2221d0445898ff1fa7737369e6488cf87287b359751113df61f4677bc9a31d3c90790c77bbaa4df08789019bca93c432dca96245ff28fa931557c046bc705f83 SHA512 43896e20bb2104d43b800f86342035d9eea3a0c70175c47d7875fa9b926dbb7c0f2840a68f25bdae5689df1f80198f74a7738c6a5a19d30748d53c1ebac39cf5
--- a/dev-python/python_jwt/python_jwt-3.3.2.ebuild
+++ b/dev-python/python_jwt/python_jwt-3.3.2.ebuild
@@ -3,6 +3,8 @@

 EAPI=8

+COMMIT="3d9747df616d209c07bffe2bcf28b42e92a7d8d4"
+MYPN="${PN/_/-}"
 PYTHON_COMPAT=( python3_{8..10} )

 inherit distutils-r1
@@ -12,7 +14,8 @@ HOMEPAGE="
 	https://github.com/davedoesdev/python-jwt
 	https://pypi.org/project/python-jwt/
 "
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/davedoesdev/${MYPN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${MYPN}-${COMMIT}"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-util/afdko/afdko-3.6.2.ebuild
+++ b/dev-util/afdko/afdko-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1 toolchain-funcs

 DESCRIPTION="Adobe Font Development Kit for OpenType"
-HOMEPAGE="https://adobe-type-tools.github.io/afdko"
+HOMEPAGE="https://adobe-type-tools.github.io/afdko/"
 SRC_URI="https://github.com/adobe-type-tools/afdko/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

 KEYWORDS="~amd64"
--- a/dev-util/afdko/afdko-3.8.1.ebuild
+++ b/dev-util/afdko/afdko-3.8.1.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1

 DESCRIPTION="Adobe Font Development Kit for OpenType"
 HOMEPAGE="
-	https://adobe-type-tools.github.io/afdko
+	https://adobe-type-tools.github.io/afdko/
 	https://github.com/adobe-type-tools/afdko
 "
 SRC_URI="https://github.com/adobe-type-tools/afdko/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
@@ -42,6 +42,7 @@ DEPEND="
 	>=dev-python/cython-0.29.5[${PYTHON_USEDEP}]
 	>=dev-python/scikit-build-0.11.1[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.2.0[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-util/ninja
@@ -50,10 +51,7 @@ BDEPEND="

 DOCS=( {README,NEWS}.md docs )

-PATCHES=(
-	"${FILESDIR}/${PN}-nowheel.diff"
-	"${FILESDIR}/${PN}-3.6.2-_get_scripts-to-data_files.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-3.6.2-_get_scripts-to-data_files.patch" )

 distutils_enable_tests pytest

--- a/dev-util/fontmake/fontmake-2.4.0.ebuild
+++ b/dev-util/fontmake/fontmake-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -10,7 +10,7 @@ inherit distutils-r1
 SRC_URI="https://github.com/googlefonts/fontmake/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="A wrapper for several Python libraries to compile fonts from sources"
-HOMEPAGE="https://github.com/googlei18n/fontmake"
+HOMEPAGE="https://github.com/googlefonts/fontmake"
 LICENSE="Apache-2.0"
 SLOT="0"

--- a/dev-util/fontmake/fontmake-3.2.0.ebuild
+++ b/dev-util/fontmake/fontmake-3.2.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{8,9} )
 inherit distutils-r1 optfeature

 DESCRIPTION="A wrapper for several Python libraries to compile fonts from sources"
-HOMEPAGE="https://github.com/googlei18n/fontmake"
+HOMEPAGE="https://github.com/googlefonts/fontmake"
 SRC_URI="https://github.com/googlefonts/fontmake/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 KEYWORDS="~amd64"
--- a/dev-util/fortran-test-drive/Manifest
+++ b/dev-util/fortran-test-drive/Manifest
@@ -0,0 +1 @@
+DIST fortran-test-drive-0.4.0.tar.gz 26298 BLAKE2B 24e1df399c27258474f0599877585965ac9429b8e8849f093f9ec3d27ba1bb9c98abf83091b7290e79231544f16b2d3a73c4112a794c375267b4c4adc379afb2 SHA512 c5c0b64aa370a59d1b04504419cdb62dbbc639b61a7efb9f557bc85f088a63afa24c4cbd1f7455ad57487fba87b1e291fc7a16706ddeaacff498f8019eaec729
--- a/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild
+++ b/dev-util/fortran-test-drive/fortran-test-drive-0.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_STANDARD="2003"
+
+inherit cmake fortran-2
+
+MY_PN="test-drive"
+SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="The simple testing framework (for Fortran)"
+HOMEPAGE="https://github.com/fortran-lang/test-drive"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="mirror !test? ( test )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DEPEND=""
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
--- a/dev-util/fortran-test-drive/metadata.xml
+++ b/dev-util/fortran-test-drive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fortran-lang/test-drive</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-util/ots/files/ots-8.2.1-meson-gtest.diff
+++ b/dev-util/ots/files/ots-8.2.1-meson-gtest.diff
@@ -0,0 +1,21 @@
+--- a/meson.build
+++ b/meson.build
+@@ -244,6 +244,7 @@ if cxx.has_header('sys/time.h')
+ 
+ 
+ # https://mesonbuild.com/Dependencies.html#gtest-and-gmock
+if get_option('tests')
+ gtest = dependency('gtest', main : true, fallback : ['gtest', 'gtest_main_dep'])
+ 
+ cff_charstring = executable('cff_charstring',
+@@ -283,3 +283,4 @@ test('test_fuzzed_fonts',
+     suite: 'fuzzing',
+   )
+ endforeach
+endif
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+option('tests', type : 'boolean', value : false, description : 'Enable tests')
+ option('graphite', type : 'boolean', value : true, description : 'Sanitize Graphite tables')
+ option('fuzzer_ldflags', type: 'string', description : 'Extra LDFLAGS used during linking of fuzzing binaries')
--- a/dev-util/ots/ots-8.2.1.ebuild
+++ b/dev-util/ots/ots-8.2.1.ebuild
@@ -32,7 +32,7 @@ DOCS=(
 	docs/{DesignDoc,HowToFix,HowToTest}.md
 )

-PATCHES=( "${FILESDIR}/meson-gtest.diff" )
+PATCHES=( "${FILESDIR}/${P}-meson-gtest.diff" )

 src_configure() {
 	local emesonargs=(
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1 +0,0 @@
-DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -1,125 +0,0 @@
--- a/lib/jxl.cmake
-+++ b/lib/jxl.cmake
-@@ -387,17 +387,6 @@
- target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
- endif()
- 
-#TODO(lode): don't depend on CMS for the core library
-if (JPEGXL_ENABLE_SKCMS)
-  target_include_directories(jxl_enc-obj PRIVATE
-    $<TARGET_PROPERTY:skcms,INCLUDE_DIRECTORIES>
-  )
-else ()
-  target_include_directories(jxl_enc-obj PRIVATE
-    $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
-  )
-endif ()
-
- # 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 @@
- 
- # Note: This only needs the decoder library, but we don't install the decoder
- # shared library.
-target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface PkgConfig::Gdk-Pixbuf)
-+target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms PkgConfig::Gdk-Pixbuf)
- 
- pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
- install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
--- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
-@@ -113,15 +113,6 @@
-   endif()  # JPEGXL_DEP_LICENSE_DIR
- endif()
- 
-# lodepng
-if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" )
-  message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-          "build dependencies.")
-endif()
-include(lodepng.cmake)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE"
-               ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY)
-
- # brotli
- if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
-     JPEGXL_FORCE_SYSTEM_BROTLI)
-@@ -190,34 +181,3 @@
-     endforeach()
-   endif()  # BROTLI_EMSCRIPTEN
- endif()
-
-# *cms
-if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
-  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
-    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-            "build dependencies.")
-  endif()
-  include(skcms.cmake)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
-                 ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
-endif ()
-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
-  if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
-    message(SEND_ERROR "Please run git submodule update --init")
-  endif()
-  include(lcms2.cmake)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
-                 ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
-endif()
-
-# sjpeg
-if (JPEGXL_ENABLE_SJPEG)
-  if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
-    message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-            "build dependencies.")
-  endif()
-  include(sjpeg.cmake)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
-                 ${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.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -1,159 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake java-pkg-opt-2
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers
-
-CDEPEND="
-	app-arch/brotli
-	dev-cpp/highway:=
-	media-libs/libpng
-	media-libs/lodepng:=
-	media-libs/giflib
-	sys-libs/zlib
-
-	benchmark? (
-		media-libs/libavif
-		media-libs/libwebp
-		virtual/jpeg
-	)
-	openexr? ( media-libs/openexr:= )
-	plugins? (
-		dev-libs/glib:2
-		media-gfx/gimp
-		media-libs/babl
-		media-libs/gegl
-		media-libs/skcms:=
-		x11-libs/gdk-pixbuf
-		x11-misc/shared-mime-info
-	)
-	sjpeg? ( media-libs/sjpeg:= )
-	!skcms? ( media-libs/lcms )
-	skcms? ( media-libs/skcms:= )
-	tcmalloc? ( dev-util/google-perftools )
-	viewers? (
-		dev-qt/qtconcurrent
-		dev-qt/qtwidgets
-		dev-qt/qtx11extras
-		media-libs/lcms
-		x11-libs/libxcb
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( virtual/jre:1.8 )
-"
-DEPEND="
-	${CDEPEND}
-	dev-cpp/gtest
-	kde-frameworks/extra-cmake-modules
-	java? ( virtual/jdk:1.8 )
-	plugins? ( x11-misc/xdg-utils )
-"
-BDEPEND="
-	virtual/pkgconfig
-	man? ( app-text/asciidoc )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6-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
-	rm third_party/*.cmake || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-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)
-		-DJPEGXL_ENABLE_PROFILER=$(usex profile)
-		-DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
-		-DJPEGXL_ENABLE_SKCMS=$(usex skcms)
-		-DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
-		-DJPEGXL_ENABLE_TOOLS=$(usex tools)
-		-DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
-		-DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
-
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTING=OFF
-		-DJPEGXL_BUNDLE_SKCMS=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_STATIC=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dolib.so libjxl_dec.so*
-	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/libjxl-9999.ebuild
+++ b/media-libs/libjxl/libjxl-9999.ebuild
@@ -1,82 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib git-r3 xdg
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
-EGIT_SUBMODULES=(third_party/skcms)
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples gdk-pixbuf gimp210 openexr"
-
-DEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
-	dev-cpp/gflags[${MULTILIB_USEDEP}]
-	>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
-	media-libs/giflib[${MULTILIB_USEDEP}]
-	media-libs/libpng[${MULTILIB_USEDEP}]
-	openexr? ( media-libs/openexr:= )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/jpeg[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
-"
-
-BDEPEND=""
-
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTING=OFF
-		-DJPEGXL_ENABLE_BENCHMARK=OFF
-		-DJPEGXL_ENABLE_COVERAGE=OFF
-		-DJPEGXL_ENABLE_FUZZERS=OFF
-		-DJPEGXL_ENABLE_SJPEG=OFF
-		-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-
-		-DJPEGXL_ENABLE_SKCMS=ON
-		-DJPEGXL_ENABLE_VIEWERS=OFF
-		-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-		-DJPEGXL_FORCE_SYSTEM_HWY=ON
-		-DJPEGXL_ENABLE_DOXYGEN=OFF
-		-DJPEGXL_ENABLE_MANPAGES=OFF
-		-DJPEGXL_ENABLE_JNI=OFF
-		-DJPEGXL_ENABLE_TCMALLOC=OFF
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=ON
-			-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
-			-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-			-DJPEGXL_ENABLE_PLUGINS=ON
-			-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
-			-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
-		)
-	else
-		mycmakeargs+=(
-			-DJPEGXL_ENABLE_TOOLS=OFF
-			-DJPEGXL_ENABLE_EXAMPLES=OFF
-			-DJPEGXL_ENABLE_OPENEXR=OFF
-			-DJPEGXL_ENABLE_PLUGINS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-	if use examples && multilib_is_native_abi; then
-		dobin "${BUILD_DIR}/jxlinfo"
-	fi
-}
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dnovomesky@gmail.com</email>
-		<name>Daniel Novomesky</name>
-	</maintainer>
-	<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="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
-		<flag name="gimp210">Enable plugin for GIMP 2.10.x series</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>
-		<flag name="skcms">Build with skcms instead of lcms2</flag>
-		<flag name="tcmalloc">Build JPEGXL using gperftools (tcmalloc) allocator</flag>
-		<flag name="tools">Build JPEGXL user tools: cjxl and djxl</flag>
-		<flag name="viewers">Build JPEGXL viewer tools for evaluation</flag>
-	</use>
-</pkgmetadata>
--- a/media-plugins/gimp-avif-plugin/gimp-avif-plugin-9999.ebuild
+++ b/media-plugins/gimp-avif-plugin/gimp-avif-plugin-9999.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""

-DEPEND=">media-gfx/gimp-2.99.11
+DEPEND=">=media-gfx/gimp-2.99.11
 	>=media-libs/gexiv2-0.12.2
 "

--- a/net-im/nheko/Manifest
+++ b/net-im/nheko/Manifest
@@ -1,3 +1,2 @@
-DIST nheko-0.9.0.tar.gz 1398941 BLAKE2B 353ac9a70282281ac9a9351df6f17e11ba06844b1116255ddf9a1135ecbfc5773ecf0e8a38944c398fb6d69db72d1819d8b86fb14ee69f4d0aed64f4b675b033 SHA512 277d322a2c5cf4631814bb57bf49e26bafdc0a048c17b821b02bbec19e9d12bff91697d307f5ebc2192e1fe0ebc394ba3342d4c3f0d4ad890d0aa9dc59c344a8
-DIST nheko-0.9.1.tar.gz 1374697 BLAKE2B 72ef8805c0fa59c4b5fa0a1c359028a19989003b61edf9e7ad714d7ee8006e4727c98b6acd3bea5ddafeaddde1ae6d323322d7dfaf146195ec084b0dfa482219 SHA512 a914265052e6c2e327f45ea490999ea2fd22dda3955117f7d92a13b56018bd2c6999318c730e0c03b0e62a5a692678d1655f5bc15e4947db8a3bb9c4cea90e73
 DIST nheko-0.9.2.tar.gz 1418814 BLAKE2B e3f2f9358dd39d648c219eddea93f48ff7574cd954189f6c08bc7ace0429602acd1b859bb4987b1a34c93e17f8e547f6b0fb3c2a113a3a8a060dec5e25adbcc5 SHA512 86c0b5bf8e767125cc9e78c3a898df35fae5b34277253c8c98777f1814fcab36ff558576fa5b71de05df63223a866671473674fb8250eeee905a979dd0c978a9
+DIST nheko-0.9.3.tar.gz 1455446 BLAKE2B da68617e8cd2a74a41b9a14e107fdbc58a667ef2187e9680bb4514d2542ad99176aaed9bcc1184ec3cbd10b258b3910da99a0e63dfe82ccfc1c7e4f7715d4d95 SHA512 187348e8e274f727a638ca3cb3ed015b9f7cbb50eea2e33bc519cd216a74763cab265466001a82c584dcf91f950c41c3f7a4f3c1ac1f1564a8d5f7711eb37d5a
--- a/net-im/nheko/metadata.xml
+++ b/net-im/nheko/metadata.xml
@@ -9,7 +9,6 @@
 		<remote-id type="github">Nheko-Reborn/nheko</remote-id>
 	</upstream>
 	<use>
-		<flag name="pipewire">Pull in dependencies for media-video/pipewire support</flag>
 		<flag name="video">Enables video calls</flag>
 		<flag name="voip">Enables audio calls</flag>
 	</use>
--- a/net-im/nheko/nheko-0.9.0-r1.ebuild
+++ b/net-im/nheko/nheko-0.9.0-r1.ebuild
@@ -1,75 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Native desktop client for Matrix using Qt"
-HOMEPAGE="https://github.com/Nheko-Reborn/nheko"
-SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X pipewire video voip"
-REQUIRED_USE="video? ( voip )"
-
-MY_GST_V="1.18"
-RDEPEND="
-	app-text/cmark
-	dev-cpp/qt-jdenticon
-	>=dev-db/lmdb++-1.0.0
-	>=dev-libs/mtxclient-0.6.0
-	>=dev-libs/qtkeychain-0.12.0
-	dev-libs/spdlog
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5[gif,jpeg,png]
-	dev-qt/qtimageformats
-	dev-qt/qtmultimedia:5[gstreamer,qml]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	pipewire? ( media-video/pipewire[gstreamer] )
-	voip? (
-		>=media-plugins/gst-plugins-dtls-${MY_GST_V}
-		media-plugins/gst-plugins-libnice
-		>=media-plugins/gst-plugins-meta-${MY_GST_V}[opus]
-		>=media-plugins/gst-plugins-srtp-${MY_GST_V}
-		>=media-plugins/gst-plugins-webrtc-${MY_GST_V}
-		video? (
-			>=media-libs/gst-plugins-base-${MY_GST_V}[opengl]
-			>=media-plugins/gst-plugins-meta-${MY_GST_V}[v4l,vpx]
-			>=media-plugins/gst-plugins-qt5-${MY_GST_V}
-			X? (
-				>=media-plugins/gst-plugins-ximagesrc-${MY_GST_V}
-				x11-libs/xcb-util-wm
-			)
-		)
-	)
-"
-DEPEND="
-	dev-cpp/nlohmann_json
-	${RDEPEND}
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	local -a mycmakeargs=(
-		"-DVOIP=$(usex voip)"
-	)
-	if use video && use X; then
-		mycmakeargs+=("-DSCREENSHARE_X11=yes")
-	else
-		mycmakeargs+=("-DSCREENSHARE_X11=no")
-	fi
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "Audio & video file playback support" \
-			   "media-plugins/gst-plugins-meta[ffmpeg]"
-
-	xdg_pkg_postinst
-}
--- a/net-im/nheko/nheko-0.9.3.ebuild
+++ b/net-im/nheko/nheko-0.9.3.ebuild
@@ -12,15 +12,19 @@ SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="X pipewire video voip"
+IUSE="X video voip"
 REQUIRED_USE="video? ( voip )"

 MY_GST_V="1.18"
 RDEPEND="
+	|| (
+		app-text/asciidoc
+		dev-ruby/asciidoctor
+	)
 	app-text/cmark
 	dev-cpp/qt-jdenticon
 	>=dev-db/lmdb++-1.0.0
-	>=dev-libs/mtxclient-0.6.1:=
+	>=dev-libs/mtxclient-0.7.0:=
 	>=dev-libs/qtkeychain-0.12.0
 	dev-libs/spdlog
 	dev-qt/qtconcurrent:5
@@ -31,7 +35,6 @@ RDEPEND="
 	dev-qt/qtmultimedia:5[gstreamer,qml,widgets]
 	dev-qt/qtquickcontrols2:5[widgets]
 	dev-qt/qtsvg:5
-	pipewire? ( media-video/pipewire[gstreamer] )
 	voip? (
 		>=media-plugins/gst-plugins-dtls-${MY_GST_V}
 		media-plugins/gst-plugins-libnice
--- a/net-misc/maestral/maestral-1.6.0.ebuild
+++ b/net-misc/maestral/maestral-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools

-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg

 DESCRIPTION="Maestral is an open-source Dropbox client written in Python"
 HOMEPAGE="https://maestral.app"
@@ -51,13 +51,3 @@ python_prepare_all()

 	distutils-r1_python_prepare_all
 }
-
-pkg_postinst()
-{
-	xdg_icon_cache_update
-}
-
-pkg_postrm()
-{
-	xdg_icon_cache_update
-}
--- a/net-p2p/popura/Manifest
+++ b/net-p2p/popura/Manifest
@@ -0,0 +1,2 @@
+DIST popura-0.4.3+popura1-deps.tar.bz2 52737816 BLAKE2B 9bb9d8d14e9c968a86af950cc876937f7984541b87aaf9aa991d04edb0d264ffa80ccafb34ff5e56aba33d0980aa9aeed47e6deadf1bbdc2d7f1fbd419052f11 SHA512 def5d9a37dfb93fbd6329e78610b61d39aa00ddf8e4db04cbe553fb2f13ca61dd6331e2773333ad4e082812793818481576fe4f62674638432e9258a0f89e1a0
+DIST popura-0.4.3+popura1.tar.gz 46530 BLAKE2B 192600801d120b85c11566090c7ce6e72d32a96d9600531c1669693e34063b1d7530be1e28a1b9d5859a31fc68fb4cb341acf9e8ff561f2609c554f9331b1dd3 SHA512 a6a1d40df4db94bc4a497530e4fcd67c34a598d02e1708a7f934f84c87105ce74fdfc70fd2745b7ad88198759a7d0fa5c7963dc41b96086020205a5411fda344
--- a/net-p2p/popura/metadata.xml
+++ b/net-p2p/popura/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bratishkaerik@getgoogleoff.me</email>
+		<name>BratishkaErik</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">popura-network/Popura</remote-id>
+		<bugs-to>https://github.com/popura-network/Popura/issues</bugs-to>
+		<doc lang="en">https://github.com/popura-network/Popura/wiki</doc>
+	</upstream>
+</pkgmetadata>
--- a/net-p2p/popura/popura-0.4.3.ebuild
+++ b/net-p2p/popura/popura-0.4.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info systemd
+
+DESCRIPTION="Popura: alternative Yggdrasil network client"
+HOMEPAGE="https://github.com/popura-network/Popura/"
+DOCS=( README.md )
+
+KEYWORDS="~amd64"
+SRC_URI="
+	https://github.com/popura-network/Popura/archive/v${PV}+popura1.tar.gz -> ${P}+popura1.tar.gz
+	https://gitea.minecast.xyz/BratishkaErik/distfiles/media/branch/master/${P}+popura1-deps.tar.bz2
+"
+
+S="${WORKDIR}/Popura-${PV}-popura1"
+
+LICENSE="LGPL-3 MPL-2.0 MIT Apache-2.0 BSD ZLIB"
+SLOT="0"
+
+DEPEND="
+	acct-user/yggdrasil
+	acct-group/yggdrasil
+"
+
+RDEPEND="!!net-p2p/yggdrasil-go"
+
+BDEPEND=">=dev-lang/go-1.16.0"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! linux_config_exists; then
+		eerror "Unable to check your kernel for TUN support"
+	else
+		CONFIG_CHECK="~TUN"
+		ERROR_TUN="Your kernel lacks TUN support."
+	fi
+}
+
+src_compile() {
+	PKGNAME="${PN}" PKGVER="${PV}+popura1" \
+	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
+	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+}
+
+src_install() {
+	dobin {yggdrasil,yggdrasilctl}
+	systemd_dounit "contrib/systemd/yggdrasil.service"
+	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
+	doinitd "contrib/openrc/yggdrasil"
+}
--- a/net-p2p/popura/popura-9999.ebuild
+++ b/net-p2p/popura/popura-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info systemd git-r3
+
+EGIT_REPO_URI="https://github.com/popura-network/Popura"
+
+DESCRIPTION="Popura: alternative Yggdrasil network client"
+HOMEPAGE="https://github.com/popura-network/Popura"
+DOCS=( README.md )
+
+LICENSE="LGPL-3 MPL-2.0 MIT Apache-2.0 BSD ZLIB"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+	acct-user/yggdrasil
+	acct-group/yggdrasil
+"
+
+RDEPEND="!!net-p2p/yggdrasil-go"
+
+BDEPEND=">=dev-lang/go-1.16.0"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if ! linux_config_exists; then
+		eerror "Unable to check your kernel for TUN support"
+	else
+		CONFIG_CHECK="~TUN"
+		ERROR_TUN="Your kernel lacks TUN support."
+	fi
+}
+
+src_unpack() {
+	git-r3_src_unpack
+	go-module_live_vendor
+}
+
+src_compile() {
+	GOFLAGS="-trimpath -buildmode=pie -mod=readonly" \
+	./build -l "-linkmode external -extldflags \"${LDFLAGS}\""
+}
+
+src_install() {
+	dobin {yggdrasil,yggdrasilctl}
+	systemd_dounit "contrib/systemd/yggdrasil.service"
+	systemd_dounit "contrib/systemd/yggdrasil-default-config.service"
+	doinitd "contrib/openrc/yggdrasil"
+}
--- 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.2.tar.gz 73860 BLAKE2B b6489112df1e1adc15d1ced37218a945858ba33376b1259b323cdcd9eec0ff60d9caaa8b233b8d6754f05b150a0c263d21e20a88a54ccdfa36cc47238ceb8acc SHA512 7ebd40dd910046ffc0dd915f20b20e6c7bb6acb9ec8b7b21fda8f53770c0fd4dc57dfb6840db94768e531337c042688b24fda4d0589a30ebb7262a8e32308e2d
 DIST discover-overlay-0.4.5.tar.gz 76114 BLAKE2B c0c735cea547374f6f7338e09954930a105fc883ea9faa1f4e457800636694d47988726884360643eab9de0df2786ef1242fa036df15896301a48f0f2e684312 SHA512 6a7121c0923a68bf6b278b6985a82a3bba98b155c8812056cc0532961cb54ee5045c1279a32fdde8708a15f444d2a2ba0afdeea61f79a89cc542b3a1d5b2aed4
+DIST discover-overlay-0.5.0.tar.gz 76554 BLAKE2B 9c2197d6f6be8ae071479422e00de6f3c5b387419bf473d29739c1d4deac244fe47f5fc2c3d43d92501bf5dde73aa3cf1f5ee949c9c28ee1d4f9169826bf4fc0 SHA512 a8ba2dbe357b2b7a420caf25a46d86153f5db6b99b80ba4a7e37913ec21c056671201801d708d498533293fbc5de8c5ac7f573bad908f845e0c712fc855c79a5
--- a/net-voip/discover-overlay/discover-overlay-0.5.0.ebuild
+++ b/net-voip/discover-overlay/discover-overlay-0.5.0.ebuild
--- a/sys-cluster/AXL/AXL-0.7.0.ebuild
+++ b/sys-cluster/AXL/AXL-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AXL provides a common C interface to transfer files in an HPC storage hierarchy"
+HOMEPAGE="https://github.com/ECP-VeloC/AXL"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test threads"
+
+RDEPEND="
+	sys-libs/zlib
+	sys-cluster/KVTree
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.0-no-static.patch"
+	"${FILESDIR}/no-install-readme.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DAXL_LINK_STATIC=OFF
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_CRAY_DW=OFF
+		-DENABLE_IBM_BBAPI=OFF
+		-DENABLE_PTHREADS=$(usex threads)
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r doc/.
+}
--- a/sys-cluster/AXL/Manifest
+++ b/sys-cluster/AXL/Manifest
@@ -1,3 +1,4 @@
 DIST AXL-0.3.0.tar.gz 36436 BLAKE2B c2d4b42426f7ff879d4329879f0f50d79c163925ce6010c3a38fdafd911dc0378be658d0d25154814ffc7442dca2bd036a547800827171383eb855df9a4010ea SHA512 7cacd3614be94b0344cdd5a5e489c9d1b17cef777749e1c3c4eba642f853d767de1c9eced1fa44f931abeb70c89da2468f6a8fa857c213766bbdac6f3f83ce21
 DIST AXL-0.4.0.tar.gz 47348 BLAKE2B a84b53b2c8d17a33a1ea95a3063210b40d3ca17151d9579f40ac8f70e32fe36bb79f4660efa3dedfbb0cce550cf6f14cdf7861d883b2e7f4c79ed88ab432ee70 SHA512 64d13600da8540b8d40b7de6ec242434fc437bb6b62aa5cebd6a3c5c2d8e2c0cae9311a6af99f19981fbeb0522b7148a28efb3d4e69b727bfc69711cf21a8419
 DIST AXL-0.5.0.tar.gz 47792 BLAKE2B acc82ac512f2e598bd0f11b9e762b9aad618a50e38b3e3f117232b9c94efa444b39ed8d8923278a18db39ba4db46fc95867a3c9efaa7a38ed9a5280649d8ceae SHA512 81d9bb0c5cd100dee8bc813f7f39ad8c7f18ed6415525845bf6d79ccfe6e84c00d0660e0621ad9458522826068fbbb8cbf4680abc5b23cd4da058ce9f5482a4d
+DIST AXL-0.7.0.tar.gz 48339 BLAKE2B 57525b6288617f0f9b2d4fcbe653a2bdc312d81a9b00671d79f625a8ea9b8b79dcfc3122acf2d27fc60c5f1d04b4f90d688fe9e1441fa3f9a44575cac9056318 SHA512 5d57f1dd60dfe8ceb27348a1c0389291a3cac6d909514fdbd6fdf31eeaba974a0b5aca23e7de35fea63585485c841622f4993cf0b3a060aa54af532728fc826d
--- a/sys-cluster/KVTree/KVTree-1.3.0.ebuild
+++ b/sys-cluster/KVTree/KVTree-1.3.0.ebuild
@@ -1,45 +1,44 @@
-# 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 cmake

-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 DESCRIPTION="KVTree provides a fully extensible C data structure modeled after Perl hashes"
 HOMEPAGE="https://github.com/ECP-VeloC/KVTree"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
 LICENSE="MIT"
 SLOT="0"
 IUSE="fcntl +flock mpi test"
-REQUIRED_USE="
-		?? ( fcntl flock )
-"
-RESTRICT="test? ( userpriv ) !test? ( test )"
+
 RDEPEND="
 	mpi? ( virtual/mpi )
 	sys-libs/zlib
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
-	app-admin/chrpath
-"
+BDEPEND="app-admin/chrpath"

-src_prepare() {
-	#do not build static library
-	sed -i '/kvtree-static/d' src/CMakeLists.txt || die
-	sed -i '/kvtree_base-static/d' src/CMakeLists.txt || die
-	#do not install README.md automatically
-	sed -i '/FILES README.md DESTINATION/d' CMakeLists.txt || die
-	default
-	cmake_src_prepare
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-no-install-readme.patch"
+	"${FILESDIR}/${PN}-1.2.0-no-static.patch"
+)
+REQUIRED_USE="?? ( fcntl flock )"
+RESTRICT="test? ( userpriv ) !test? ( test )"

 src_configure() {
+	local flock="NONE"
+	use fcntl && flock="FCNTL"
+	use flock && flock="FLOCK"
+
 	local mycmakeargs=(
+		-DENABLE_TESTS=$(usex test)
 		-DMPI="$(usex mpi ON OFF)"
-		-DKVTREE_FILE_LOCK="$(usex flock FLOCK $(usex fcntl FCNTL NONE))"
+		-DKVTREE_FILE_LOCK="${flock}"
+
+		-DBUILD_SHARED_LIBS=ON
 		-DKVTREE_LINK_STATIC=FALSE
 	)
 	cmake_src_configure
@@ -54,3 +53,12 @@ src_install() {
 	docinto "${DOCSDIR}/users"
 	dodoc -r doc/rst/users/.
 }
+
+src_test() {
+	if mountpoint -q /dev/shm ; then
+		cmake_src_test
+	else
+		eerror "make sure to mount /dev/shm or tests will fail"
+		die
+	fi
+}
--- a/sys-cluster/KVTree/Manifest
+++ b/sys-cluster/KVTree/Manifest
@@ -1,2 +1,2 @@
-DIST KVTree-1.1.1.tar.gz 61667 BLAKE2B 26a5bf968b51d9ad9579563f144199243304040fb3c4f0d72cb4aa465292bb73ef8f85dd4e86a8ad9e5092550e97632b72ac7e632f30d10d668bca96a37b4c8f SHA512 229bd0bb1145aa38c244b4fd10da7a78fe37bf7aae93affb8401955ac0053218a6970a2459c043e46bdc74b0f8c2db421ea0d9f6a989cac24fe0ed31a2bb4d03
 DIST KVTree-1.2.0.tar.gz 61844 BLAKE2B 4bd7a975f3c2f510b7ade983c393ac86cb9bcb7216776fd59db8cc258f869f1157f5a08aee3c19fb8e23c796928b6b44c9e3dd95eee13c7e4a4c1fdf3b5d8f00 SHA512 ddc6f2b32bcf8e1a369a17b238d4454679f3a8a4fc1a9fa18e5317418cf73c7d0db2169b53513e15ad05e1f22c80cdd9d66cddbc8aa2ad2a1c95d4910b3d7f88
+DIST KVTree-1.3.0.tar.gz 62063 BLAKE2B 205d6cec078857846a6faa4544901e1d381e7e695fd7935ca690cabf9d65d51d5dda7a4ab5f9afd0ebb378ef6205d6982740ee71504e07f4db94be0775b8e27d SHA512 578c452e07ebf1df36f56fe740fac171535fc8ab421f1f211eab89438207a459b2376b2b645b6ca393f1c5c1c484fbfd467230598b1a4e785e429e521c5c22fd
--- a/sys-cluster/er/Manifest
+++ b/sys-cluster/er/Manifest
@@ -1,2 +1,2 @@
-DIST er-0.0.4.tar.gz 20824 BLAKE2B 05d49669a04d94a39ae46f71fb2cf034b7b9d43831f9b5d12468264dd550a97db2fae1d2a0e1b73188d23404e091ef4a4870e04f7c37d5318961b0b542b5656a SHA512 8e5b78a7b3013c5e1bb71584afddb2f0162a2c1a6845cca112e36c5929eafb8f227288eabd237ed1fbb04fcf6e00edfa4042650d9910198f3d98abfccdb562fe
 DIST er-0.1.0.tar.gz 20960 BLAKE2B f7e40459928a7a9b62c6fc2b89590b8e19087ba8741ec2666570a750bb58557e87e852e2a5fd80cf8ba59396533d8ffe9e69f089a2deda9d99f83e112e557f93 SHA512 e642ff388b810fd612a6482f9b324ecd5b0f93240d3cc476725aed21f84f3f9421a29838dac2ea6e4e12b7bbb57b628d82cb40d017094ab80c2b229478072a1b
+DIST er-0.3.0.tar.gz 20740 BLAKE2B 7180d8cdbfbfe56c323b8919a983add202b817b8bd39570ea7c836717a4018c2f1db222f66444da887c5d133978e825ba17dabf5070a08722f916866ae339c52 SHA512 96f0a17d28e19b895d0cc3be980b3af5c0e938e37d198d603153fc8388ce094250f6986d43894457ea673fea222f8db84b6dab7ea0c9b32b7cf58ddd7d452959
--- a/sys-cluster/er/er-0.3.0.ebuild
+++ b/sys-cluster/er/er-0.3.0.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 cmake

@@ -18,13 +18,21 @@ RDEPEND="
 	sys-cluster/KVTree[mpi]
 	sys-cluster/redset
 	sys-cluster/shuffile
-	sys-libs/zlib
 	virtual/mpi
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
+DEPEND="
+	${RDEPEND}
+	test? ( sys-cluster/rankstr )
 "

-PATCHES=( "${FILESDIR}/no-static-${PV}.patch" )
-RESTRICT="test" # https://github.com/ECP-VeloC/er/issues/20
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-no-static.patch" )
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_TESTS=$(usex test)
+		-DER_LINK_STATIC=OFF
+	)
+	cmake_src_configure
+}
--- a/sys-cluster/rankstr/Manifest
+++ b/sys-cluster/rankstr/Manifest
@@ -1,2 +1,2 @@
-DIST rankstr-0.0.3.tar.gz 14734 BLAKE2B 574dff65368912e0f63da81b35069888cf40c6768e7bea456aa8104976a87c49102ee860f22f405bcc732f1d36be3e4d35e4e58dfba901eda85ce18a0d9d557b SHA512 d1672bb6d09567c44c6bdf96d2dd670edc1d1abb113bb5b893c1cb5a78428b95e425639d5d65f2a68a76f11034a9009c659b5e53ca9f543a6a78d0c14ba59e57
 DIST rankstr-0.1.0.tar.gz 14909 BLAKE2B 488386e2588e71db43d59b02ba277cc409df21615ae6c8e2fa822a0aee2ebf4d0ac4f09c262759b7c4066cf118420404d297c9dfcf2fe80bdd19977a2e120174 SHA512 be36c6316fe2286015f704dbf8733ae2b682f32f5c180cfa5e1adf91ebec2dcba24af1fda8a9f83612edb20327d21aaaf869bb41fcdfb7873b0f1aab7bf6c36a
+DIST rankstr-0.2.0.tar.gz 14805 BLAKE2B cb448147dec904fd306069e452039f3cb219961748d73de313bc559dded1e77c12771a1330b3e73960dbc59b5d3255f3bc9221d813ac82fd6eabab3d562f244b SHA512 af9ac1ae3272626c39d0e5628bd12b9bb14db70fe8e752961919f2cda1e69da3637c84c32584d7f4c89d58cfebdf71efa1b2fb7903059ce2792c64596a06475a
--- a/sys-cluster/rankstr/rankstr-0.2.0.ebuild
+++ b/sys-cluster/rankstr/rankstr-0.2.0.ebuild
@@ -1,13 +1,13 @@
-# 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 cmake

 DESCRIPTION="Split an MPI communicator into subcomms based on string values"
 HOMEPAGE="https://github.com/ECP-VeloC/rankstr"
-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE="test"
 RDEPEND="virtual/mpi"
 DEPEND="${RDEPEND}"

-PATCHES=( "${FILESDIR}/${PN}-no-static.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-no-static.patch" )
 RESTRICT="!test? ( test )"

 src_configure() {
--- a/sys-cluster/redset/Manifest
+++ b/sys-cluster/redset/Manifest
@@ -1,2 +1,2 @@
-DIST redset-0.0.5.tar.gz 465120 BLAKE2B 2050015cdc2b5e8b7e209d99ef5a85dd6ea301c9dec774206e9eab23e5a49b355c89acd05a0997295240b2d3831601e0247295b992af8834bf5667295c407791 SHA512 80c44dd7eb72d8da234f9247743be67bbdf6943bf1f20fe6e66b015d1be47f8b519702bd027b15f43473dae69096a6677a4db58b8bd16fbeffe0d692f7b987a9
 DIST redset-0.1.0.tar.gz 466858 BLAKE2B bf60cdc95dc7cb748c9ce131265a2c24d575137b9642ff7ba63f520fbe67c58cd5bbe026f2036d54f239ffadebb5ac4a4a266b7ec8bd9a66eca541b378c8089e SHA512 dc78b668d03a309c44f7c070a08c3fbf9f00fa82bf517c199fac4a67116e6c5b2ab73776299b0b1942a90f9decc6fb238fcf1d0f06a81f6130ae2fdf8eb82541
+DIST redset-0.2.0.tar.gz 466707 BLAKE2B b990753af7029316b132dfbf804bc7c2dd49944aea8306290a0cceae3a772014d0e89332b5c5d5d9f866c694fb24de9e06e154f05de65115fe1e6f863e86305f SHA512 d323a1d062e683f1af4269a1a278611de9656cade58ed5bff6d3bc1ec37410dc0785066d7ab4c4d381a51badea850f205f9ee93ab0cafb3dea4f31e17f710e6d
--- a/sys-cluster/redset/redset-0.0.5.ebuild
+++ b/sys-cluster/redset/redset-0.0.5.ebuild
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-DESCRIPTION="Low-level distributed erasure coding lib to protect datasets of MPI applications"
-HOMEPAGE="https://github.com/ECP-VeloC/redset"
-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	sys-cluster/KVTree[mpi]
-	sys-cluster/rankstr
-	sys-libs/zlib
-	virtual/mpi
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
-"
-
-RESTRICT="test" # https://github.com/ECP-VeloC/redset/issues/30
-PATCHES=( "${FILESDIR}/no-static-${PV}.patch" )
-
-src_install() {
-	cmake_src_install
-	dodoc -r doc/rst/.
-}
--- a/sys-cluster/redset/redset-0.2.0.ebuild
+++ b/sys-cluster/redset/redset-0.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Low-level distributed erasure coding lib to protect datasets of MPI applications"
+HOMEPAGE="https://github.com/ECP-VeloC/redset"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="slurm test"
+
+RDEPEND="
+	sys-cluster/KVTree[mpi]
+	sys-cluster/rankstr
+	sys-libs/zlib
+	virtual/mpi
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		slurm? ( sys-cluster/slurm )
+	)
+"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-no-static.patch" )
+
+src_configure() {
+	local resman="NONE"
+	use slurm && resman="SLURM"
+	export "VELOC_RESOURCE_MANAGER=${resman}"
+
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DREDSET_LINK_STATIC=OFF
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc -r doc/rst/.
+}
--- a/sys-cluster/scr/Manifest
+++ b/sys-cluster/scr/Manifest
@@ -1 +1,2 @@
+DIST scr-3.0.tar.gz 1235509 BLAKE2B 3a470c1f55d633993db6ca7c7980e6b8b34513370a8233202ac21d625f64c1630eafd6084735e81fe60e05f182b71114f51f8f4fe69df8cf609b1e6d6ded01f5 SHA512 168bffb7c0280094075879fa5c626dfc57f9004c9ebe09a97cf0d2b0e67c3979f31c7b39466586eb20562e6768ce576625a6d4d99f9ad9fe5ae02a82cfbc988f
 DIST scr-3.0_pre2.tar.gz 1231943 BLAKE2B a4d8e779edc4b48a5b13a0cff851496068076a8ae901f3c3d3ad2344708a0abc6b69ce71bd7313286a91844a87930e6fa5c097d1c5b15ebbc12247ba293f843f SHA512 7b90b14cfbb6fa3020b6c3c3a7f5568963374d9fe7ad0b6962632f776c3699d6c38fa04800736d423350190542896ca9240033dca1e820f7f698c336518c891a
--- a/sys-cluster/scr/scr-3.0.ebuild
+++ b/sys-cluster/scr/scr-3.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="sphinx"
+DOCS_DIR="${S}/doc/rst"
+FORTRAN_NEEDED="fortran"
+MYPV="${PV/_pre/rc}"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit cmake python-single-r1 fortran-2 docs
+
+DESCRIPTION="Scalable Checkpoint / Restart Library"
+HOMEPAGE="
+	https://computing.llnl.gov/projects/scalable-checkpoint-restart-for-mpi
+	https://github.com/LLNL/scr
+"
+SRC_URI="https://github.com/LLNL/scr/archive/refs/tags/v${MYPV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MYPV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples fcntl +flock +fortran mysql slurm syslog test threads txt-log +yogrt"
+
+RDEPEND="
+	${PYTHON_DEPS}
+
+	app-shells/pdsh
+	>=sys-cluster/AXL-0.5.0
+	sys-cluster/dtcmp
+	sys-cluster/er
+	sys-cluster/KVTree
+	sys-cluster/rankstr
+	sys-cluster/redset
+	sys-cluster/spath
+	sys-libs/zlib
+	virtual/mpi
+
+	mysql? ( dev-db/mysql-connector-c  )
+	slurm? ( sys-cluster/slurm )
+	yogrt? ( sys-cluster/libyogrt[slurm?] )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0_pre2-shared-libscr_base.patch"
+	"${FILESDIR}/${PN}-3.0_pre2-no-static.patch"
+)
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+
+	?? ( fcntl flock )
+"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	local lock="NONE"
+	use fcntl && lock="FCNTL"
+	use flock && lock="FLOCK"
+
+	local log="0"
+	use syslog && log="1"
+	use txt-log && log="1"
+
+	local resman="NONE"
+	use slurm && resman="SLURM"
+
+	local mycmakeargs=(
+		-DBUILD_PDSH=OFF
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_CRAY_DW=OFF
+		-DENABLE_IBM_BBAPI=OFF
+		-DENABLE_PDSH=ON
+		-DSCR_LINK_STATIC=OFF
+
+		-DSCR_FILE_LOCK="${lock}"
+		-DSCR_LOG_ENABLE="${log}"
+		-DSCR_RESOURCE_MANAGER="${resman}"
+
+		-DENABLE_EXAMPLES=$(usex examples)
+		-DENABLE_FORTRAN=$(usex fortran)
+		-DENABLE_PTHREADS=$(usex threads)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_YOGRT=$(usex yogrt)
+		-DSCR_LOG_SYSLOG_ENABLE=$(usex syslog 0 1)
+		-DSCR_LOG_TXT_ENABLE=$(usex txt-log 0 1)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_install() {
+	cmake_src_install
+#	find "${ED}" -name '*.a' -delete || die
+}
+
+src_test() {
+	if mountpoint -q /dev/shm ; then
+		cmake_src_test
+	else
+		eerror "make sure to mount /dev/shm or tests will fail"
+		die
+	fi
+}
--- a/sys-cluster/shuffile/Manifest
+++ b/sys-cluster/shuffile/Manifest
@@ -1,2 +1,2 @@
-DIST shuffile-0.0.4.tar.gz 28847 BLAKE2B 7e36c8d96457eb44f59f9017d69ad53265d88c47b33d37b8b2ab6ea2365eb2bd0eb78a25a2496754d839ae5507615356e2cb5508879b82c99e2ef91ef9f7af0e SHA512 2c90e1aa852413f15fabc78c0553344b1b8975972ff84239d872738f102d7784f16422ccc2807189307db0feb0abb28b4db02c1666957a94a92e6be329f4a277
 DIST shuffile-0.1.0.tar.gz 28999 BLAKE2B bd8b972d75740ece74de91aa4a2bafad3ce1fc6ed3bd93d5ef4ad7df2264cb7abc26e37b2985bc79219163e1817f3925d76d828ff5a83677b4d601b161fc1d83 SHA512 750eb38a303dea5bb97ad72fcb040fb49c3c059ae974218fbeeaa23a3aa0296d971af45636895a099c719c1eed120e747c1fc06be8d77c0b3d948f89b8586c22
+DIST shuffile-0.2.0.tar.gz 29001 BLAKE2B 18b832174eee212ad979bb9913c3767d054edc5c95c901241fd95c0571bf143aa42cd47be5aef4ee94bd1d8df9528020e973bad14b5e13b326ea74590192db0d SHA512 9de8bbd3ef832395853d00dda972464ea9aeab2312a68a1194cfd29cc816c6319b06750c5121197aea696418f5fe6d7ed4f22adb5cc882c87c522cfbb1704bd7
--- a/sys-cluster/shuffile/shuffile-0.0.4.ebuild
+++ b/sys-cluster/shuffile/shuffile-0.0.4.ebuild
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-DESCRIPTION="SHUFFILE Shuffle files between processes"
-HOMEPAGE="https://github.com/ECP-VeloC/shuffile"
-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	>=sys-cluster/KVTree-1.0.2[mpi]
-	sys-libs/zlib
-	virtual/mpi
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
-"
-
-PATCHES=( "${FILESDIR}/no-static-${PV}.patch" )
-RESTRICT="test" # https://github.com/ECP-VeloC/shuffile/issues/18
--- a/sys-cluster/shuffile/shuffile-0.2.0.ebuild
+++ b/sys-cluster/shuffile/shuffile-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -7,7 +7,7 @@ inherit cmake

 DESCRIPTION="SHUFFILE Shuffle files between processes"
 HOMEPAGE="https://github.com/ECP-VeloC/shuffile"
-SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
@@ -20,11 +20,8 @@ RDEPEND="
 	virtual/mpi
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-2.8
-"

-PATCHES=( "${FILESDIR}/${P}-no-static.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-no-static.patch" )
 RESTRICT="!test? ( test )"

 src_configure() {
@@ -35,3 +32,12 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	if mountpoint -q /dev/shm ; then
+		cmake_src_test
+	else
+		eerror "make sure to mount /dev/shm or tests will fail"
+		die
+	fi
+}
--- a/sys-cluster/spath/Manifest
+++ b/sys-cluster/spath/Manifest
@@ -1 +1,2 @@
 DIST spath-0.1.0.tar.gz 25189 BLAKE2B b122e3606d226e610650c97f4e2809183af2b1fce6991f3d55c5652fac4b9fb2ddebc83efca5b10fa24a096e344639076c9be445548e0cc3e89cac6d3e69cd51 SHA512 77e8207e2d1fa62b12133237e9adccc15dcb72f96bf5abbf5883d85d9cde5fac36b39208e1ae30e4386acffea3b7f69aac8abda9ff1ad28cbd6ffac8ad1aac8e
+DIST spath-0.2.0.tar.gz 25166 BLAKE2B 2d3ddc15456a2c3112078bd6e41954a115842e52d875966d85469579250c4a813b2a6eb06acbe7d0f86bd97f452e979ac325f81e85aaec69349b3f48b72326e4 SHA512 bdfb5188914fbb4568686e9b72cf5350afa8d57010cc363d485a2eed3b2463e97f9609a2697e16e2e09958652d27fe0f146bf0adfaf4bf3b483cd254781ae26a
--- a/sys-cluster/spath/spath-0.2.0.ebuild
+++ b/sys-cluster/spath/spath-0.2.0.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
+
+DESCRIPTION="Path manipulation functions"
+HOMEPAGE="https://github.com/ECP-VeloC/spath"
+SRC_URI="https://github.com/ECP-VeloC/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+mpi slurm test"
+
+RDEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	${RDEPEND}
+	test? ( slurm? ( sys-cluster/slurm ) )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.0-no-static.patch" )
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( mpi )"
+
+src_configure() {
+	local vrm="NONE"
+	use slurm && vrm="SLURM"
+	export "VELOC_RESOURCE_MANAGER=${vrm}"
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DSPATH_LINK_STATIC=OFF
+		-DTVDISPLAY=OFF
+
+		-DENABLE_TESTS=$(usex test)
+		-DMPI=$(usex mpi)
+	)
+	cmake_src_configure
+}
--- a/sys-cluster/swift/swift-2.28.0.ebuild
+++ b/sys-cluster/swift/swift-2.28.0.ebuild
@@ -53,6 +53,7 @@ BDEPEND="
 "

 REQUIRED_USE="|| ( proxy account container object )"
+RESTRICT="test" # tests run forever

 distutils_enable_tests nose

--- a/sys-cluster/veloc/Manifest
+++ b/sys-cluster/veloc/Manifest
@@ -1 +1,2 @@
 DIST veloc-1.5.tar.gz 252563 BLAKE2B 03e5957990f449e7e3ac9a543ce1317c2347e965c455dcd29d0ed525c93d3e4134592cce73fa388af807c293e8ba7db3943dd039400b86878b7bc91b4956a76d SHA512 618d30b9e1e28882fdb3559bd65ed52b2541dcd1aeb04fcc2943ed96501fa3219c8a3dc32861f1c14454e6e42a6a04b1affd1472a770be9e7ae4525eb43cc755
+DIST veloc-1.6.tar.gz 243253 BLAKE2B 38f2878481a5895d3b73bfb9ae6cb7a59b2231b465ca8c31c2bcfa02cef27f74fd09482a52a90ece8ae67f4a4555f696ac3391d48bd45c847df2c78c1f19eae1 SHA512 d09b748d5e85212a3abbbe1b3fc554b6a612a1fd1af2b384836af571112007e1b3354a243633cee9794f49124f539caec4f9a941e64ce5b3cc052a6e5b4cba95
--- a/sys-cluster/veloc/files/veloc-1.6-strip-cflags.patch
+++ b/sys-cluster/veloc/files/veloc-1.6-strip-cflags.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ ##### Global settings
+ include(GNUInstallDirs)
+ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+-add_definitions(-O2 -g -Wall -D__BENCHMARK -D__ASSERT -D__INFO)
+add_definitions( -Wall -D__BENCHMARK -D__ASSERT -D__INFO)
+ set(CMAKE_CXX_STANDARD 17)
+ 
+ ##### Configuration setting
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`DIST ani-cli-1.9.tar.gz 8016229 BLAKE2B 0b4120fb038e8f01f74e5a9c43b665e978e2c47e1b76059d20b364a7cec386e7c3cd3028d4e03ba8ef02bf45ae9df3ee66d896f9be09118736c605110ce3e5dd SHA512 f3fe0109fc3f1d910fa4f621bc056d7c291ed2c0f91b76f9b65fc65925d864d3ab86a6610ec5960cc24a329507ab1fbb054e4304c4ececeb88c2411e66b48452`
				`@@ -0,0 +1 @@`
				`DIST openstep-plist-0.3.0.tar.gz 20692 BLAKE2B 4be8190b08ad6146df92f774597405977af898dfa0dd7b639d8c07674641fec54c139f292ec15f04c44062c9c128e29716f1fa642e4d04d160d6c1b310128a68 SHA512 623fbe4b169805f42828e41ff949c2a9a91620b76c0adda33e4e66c19345826bef21ac645571e5c52208f029389b37b6b9918ad3e85388475b50c243e16ca715`
				`@@ -0,0 +1 @@`
				`DIST fortran-test-drive-0.4.0.tar.gz 26298 BLAKE2B 24e1df399c27258474f0599877585965ac9429b8e8849f093f9ec3d27ba1bb9c98abf83091b7290e79231544f16b2d3a73c4112a794c375267b4c4adc379afb2 SHA512 c5c0b64aa370a59d1b04504419cdb62dbbc639b61a7efb9f557bc85f088a63afa24c4cbd1f7455ad57487fba87b1e291fc7a16706ddeaacff498f8019eaec729`
				`@@ -1 +0,0 @@`
				`DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52`