Merge updates from master

2026-07-14 17:43:11 -04:00 · 2023-04-09 10:16:47 +00:00
parent 4a9e2b7848 531c6427c6
commit f7d428c4ac
96 changed files with 790 additions and 1294 deletions
--- a/app-crypt/certbot-dns-rfc2136/Manifest
+++ b/app-crypt/certbot-dns-rfc2136/Manifest
@@ -1,3 +1,4 @@
 DIST certbot-2.2.0.gh.tar.gz 1331053 BLAKE2B 4a3e6d8b0b3b7f8537bd6b24234bad7657842ee64865bcef2701e572501640b7a2d49cf4dc62db25cda1039be2d20fb77ac6415cdcb4756fce0f96b5cb7410c6 SHA512 242bfa8e5b60c28b49457403b41421ef782b9f98f325cc423b58283fef410b33691c3ce126188b191c80fcd488fe5d51acfc5ca575c8e7c5b6b08198844bffb7
 DIST certbot-2.3.0.gh.tar.gz 1335613 BLAKE2B af8ff393f92755e8e312f7596fe99abefa35c42cef6fa6688f7f3dd4a310205385fec81366df30d8edfe28d8abd3db447c9e1a3770fe31c3d45c69f04a038660 SHA512 5f52d9b0dd390fc696389a94ff897d803ee062feca50bb66972e197dcd79b0096b337cece2798557c3878903577171fd9afe1f18a4a2131ad7e6a62d0d945ebb
 DIST certbot-2.4.0.gh.tar.gz 1333159 BLAKE2B 534c7d090cc8a2b77b2dd8bd8c407409260c18e7741223a327bb240dac9685b1ca152d4a20bb0ec46d8717f89bd3de6f494019c57afe22a74db69641a3ed209e SHA512 c307c97154935a3a01b468d6e91505caba6073b4c01071c87382bdc08c892094d95d75b047047d3221b7d8018a61ce974c0f4defbfdee00b136af920fd579108
+DIST certbot-2.5.0.gh.tar.gz 1333903 BLAKE2B 2d30764616d2253fe320ad94182e64cc3e1ce75bd90322fcf7c303a52e32420a57cf84a3acf3f8f4825e058d6fe1e59438b728dacdf9032c4d8797312903825e SHA512 92313e352409d543f260fedee3f376c4750d9428cd39fde3518b162091667173ba6d582b4e91477f7122cf198f24119ecf34b2dce12734afbfc0ebedc395a49e
--- a/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.5.0.ebuild
+++ b/app-crypt/certbot-dns-rfc2136/certbot-dns-rfc2136-2.5.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+PARENT_PN="${PN%-dns-rfc2136}"
+PARENT_P="${PARENT_PN}-${PV}"
+
+if [[ "${PV}" == *9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	EGIT_SUBMODULES=()
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PARENT_P}"
+else
+	SRC_URI="
+		https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+			-> ${PARENT_P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="RFC 2136 DNS Authenticator plugin for Certbot (Let’s Encrypt client)"
+HOMEPAGE="
+	https://github.com/certbot/certbot
+	https://letsencrypt.org/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+S="${WORKDIR}/${PARENT_P}/${PN}"
+
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+# Same than PATCHES but from repository's root directory,
+# please see function `python_prepare_all` below.
+# Simplier for users IMHO.
+PARENT_PATCHES=(
+)
+
+# Here for patches within "${PN}" subdirectory.
+PATCHES=(
+)
+
+python_prepare_all() {
+	pushd "${WORKDIR}/${PARENT_P}" > /dev/null || die
+	[[ -n "${PARENT_PATCHES[@]}" ]] && eapply "${PARENT_PATCHES[@]}"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
--- a/app-editors/imhex/metadata.xml
+++ b/app-editors/imhex/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vowstar@gmail.com</email>
-		<name>Huang Rui</name>
-	</maintainer>
+	<!-- maintainer needed -->
 	<upstream>
 		<changelog>https://github.com/WerWolv/ImHex/releases</changelog>
 		<bugs-to>https://github.com/WerWolv/ImHex/issues</bugs-to>
--- a/app-editors/neovim-qt/Manifest
+++ b/app-editors/neovim-qt/Manifest
@@ -1,2 +1 @@
-DIST neovim-qt-0.2.16.1.tar.gz 1069176 BLAKE2B ccb9d7275735969dc0576b498e017068da63e14ba82e3160621822d83c3902e35064be393dda57f8e70d83bcbb22e8e663f2ec996ffb48ff0140099ae0793a88 SHA512 63910b0416103f8c4f2450a07d4790c2b7fd26e2ba324445a20700a12d1dc3cb6fb06c674f3a1173348dad5c2256e8018167765306ca33ad94bc176bf5e4e45c
 DIST neovim-qt-0.2.17.tar.gz 1076230 BLAKE2B ab322d7f03bca40b4b3ee6e89a20dc04ec06d9ba3f49c0e658586f55e5219d13770078ed956a889dbe100836cb83cbc1829a39d60e9164e3bcb43ba085a72412 SHA512 ff290c6797c51ac23acd87ecd4c8d034321c4994c76b60f5d15626aa31db377090359d4bc681c6a9d0462ff5847269c35b95561ccd156600cf3f09f28ad4b8b2
--- a/app-editors/neovim-qt/files/neovim-qt-0.2.17-fix-finding-msgpack-6+.patch
+++ b/app-editors/neovim-qt/files/neovim-qt-0.2.17-fix-finding-msgpack-6+.patch
@@ -0,0 +1,26 @@
+# upstream commit: https://github.com/equalsraf/neovim-qt/commit/c6ae970
+
+From c6ae9709237b6a55a705687afe4103646f34ac60 Mon Sep 17 00:00:00 2001
+From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
+Date: Sun, 5 Mar 2023 23:03:47 +0800
+Subject: [PATCH] Fix finding msgpack 6+
+
+`libmsgpackc` was renamed to `libmsgpack-c` in 6.0.0. See
+msgpack/msgpack-c#1053.
+---
+ cmake/FindMsgpack.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake
+index 0e2013f9d..41e2d7b5c 100644
+--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
+@@ -5,7 +5,7 @@ find_path(MSGPACK_INCLUDE_DIR
+ )
+ 
+ find_library(MSGPACK_LIBRARY
+-    NAMES msgpack msgpackc libmsgpack.a libmsgpackc.a
+    NAMES msgpack-c msgpack msgpackc libmsgpack.a libmsgpackc.a
+ )
+ 
+ mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)
--- a/app-editors/neovim-qt/metadata.xml
+++ b/app-editors/neovim-qt/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>gentoo@tastytea.de</email>
+		<name>tastytea</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">equalsraf/neovim-qt</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
+++ b/app-editors/neovim-qt/neovim-qt-0.2.16.1.ebuild
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Neovim client library and GUI, in Qt5"
-HOMEPAGE="https://github.com/equalsraf/neovim-qt"
-SRC_URI="https://github.com/equalsraf/neovim-qt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/msgpack
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	app-editors/neovim"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_MSGPACK=ON
-		-DUSE_GCOV=OFF
-		-DENABLE_TESTS=OFF
-		-DBUILD_SHARED_LIBS=OFF # it links to static lib
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
--- a/app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild
+++ b/app-editors/neovim-qt/neovim-qt-0.2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -38,7 +38,8 @@ RDEPEND="
 RESTRICT="!test? ( test )"

 PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.17-only-require-Qt5Test-if-tests-are-enabled.patch
+	"${FILESDIR}"/${P}-only-require-Qt5Test-if-tests-are-enabled.patch
+	"${FILESDIR}"/${P}-fix-finding-msgpack-6+.patch
 )
 src_configure() {
 	local mycmakeargs=(
--- a/app-misc/doublecmd-bin/Manifest
+++ b/app-misc/doublecmd-bin/Manifest
@@ -1,8 +1,8 @@
-DIST doublecmd-1.0.9.gtk2.i386.tar.xz 7551984 BLAKE2B 9a3d8c7def8ff2d78dce9af7afd520cbab8295db809f20507d058901e079b288048c30fcfce9cba4969db34cb610107fc402a4bc552ce7405d843cf37969d733 SHA512 e08e92601b757ab81431f5325a6d0c74db9df2478035cbde4650a7d062001f3e5ec09b821f3779e7e5437843fc9c01cb48a08eecf8377baafa909f6356911756
-DIST doublecmd-1.0.9.gtk2.x86_64.tar.xz 8310944 BLAKE2B 7b68e79494e1beb5f4ef9c0d3ba84f8d1e5e84828dce189d127e8d4f46d682ecfcfd13655c526ec9328b761db6420a42003ba071c75903c66199b8ee123b5e15 SHA512 4ce5ff95a5fed1bd76099a05f947d2f847a98ccbe072a7a3e347fbd9ec6b579ffbe0d7e0f78909cf3665d90112632a6b02d0fc1a8e53ebf8e6ac1ec6dddf2e9e
-DIST doublecmd-1.0.9.qt.i386.tar.xz 7942828 BLAKE2B 0715bce73a40587a3f297359e7808c95ab9d9a7b0812f90627666daf96714a9a518d200abf9f195ccac3fe7ef0c85308fbf1a390e9759e2bf610d2a8b1bd2ff1 SHA512 0e79d4275829e9407ae5d6de153778153b5c5a9562be1c3ebaf692ac7df797cd9ee4b5575b020494907e1a764879e19325383ede2d5d933065b44aa33d9ba5b3
-DIST doublecmd-1.0.9.qt.x86_64.tar.xz 8647280 BLAKE2B 4aaa111eac9a2a7e60be55446b77c30d0277db818ff3844b2680ed120f7dcc4e001cd7817864a2c18ba27c89b59b96b7476e76b3271c920ffd5570623a45f0f1 SHA512 7795cbef2e59783a8f9b6d5170e91fc1dd96cf70caa7cfaab652c21c5bd055a490fae8598f7f9988cc0ba98aa7b9a6456aee4fe49a2a9f83c57ff18845fb3bfb
 DIST doublecmd-1.0.10.gtk2.i386.tar.xz 7552092 BLAKE2B 1cdcd0b267aa4ad3ad1c3abb93b066527daf352ea26caab6e05a38a029d4aa8d81448722e5cfca5cc04a5e3d7976d4805650767369a5f5101689342eda1a6342 SHA512 ee5522b9e5ad884d001622f4c2b450d4137eac93c21c837d9a86e0d03d774882778f162f2450c8053b35db0d793c9fb6d03881e8e3b078355bc1c884a39f00fd
 DIST doublecmd-1.0.10.gtk2.x86_64.tar.xz 8312764 BLAKE2B 6a4cb5664b6bf4c426e9bcba4b0e152a3ebe7a9cd256cdb8f58000c6d37c950834abed711a5590421e803ba845e37c826490a214484748450d00d21b60933d6f SHA512 a6848d5e92203c403b0ad5837608374bf50049d82da9417f3c710afd3bf3f00204786782ea5e7b29f11d34b66117fb80412071952826fd6f46c2bdbf37e36fef
 DIST doublecmd-1.0.10.qt.i386.tar.xz 7943236 BLAKE2B 27b9bbc3cd09147ce5017aad02a6d36ae1e88f595116ab4e979226cfac411a13060281bc92f65e7798a0c4a5b3ef2bc94a5cce476c92f566a3f85b373103cc37 SHA512 9713db03bdd72c868975912616c368c9f87ec9af80f79c78f14820d867116c5bc7264e05d8adacc2f8eb10f9ac7f1d87fcc45773a0d286b848c8ff252fddc685
 DIST doublecmd-1.0.10.qt.x86_64.tar.xz 8656960 BLAKE2B f13b5e566181612119ee853bdfe02c712eb14f47fe9a34ba50536583d9ab475cab4937c381a3695c68895e0c3c18f4f939f357f168d827642310d90d1c4d9ba4 SHA512 292b78ac54235a567b72529769dae0f4d5293622cab3e8b29891736386f6e00f72768140f405ad32b92b3d29fce42faaf89b411afa457646b0bd15faf72c47d6
+DIST doublecmd-1.0.11.gtk2.i386.tar.xz 7555420 BLAKE2B 7b80c8eac6d561b054375ea89094998e077b16ea1f2e20ac46b8d985597d320cc5d13a978da8d4ef00f0445cc8d67bc35c750ce6f7db4475528c51de5638e0c0 SHA512 66d2e00abded6a96a39317741a4e270631904c786c4178d7ff659c9f3d2b43844d2a416e438216ae699bda17e7849130f575fc5b56728200b2cd2446d1f2111c
+DIST doublecmd-1.0.11.gtk2.x86_64.tar.xz 8315448 BLAKE2B 74ae77064382a76bb743bf63c3f152788156e9e178ab3fd7e2fb4e645e2cd6f1c34365b350490e45521c6d550bad543b94d9ef226f64284b347c1a7f097e33f6 SHA512 edf881df859e6ea4f7de9b65111b9ff4bc4dc0bd1c5a84e1ac218c0ffbf76fcf6ea99f3e412f037a591ee9401261afb95312ba95f197bb3d974f07868bf88f04
+DIST doublecmd-1.0.11.qt.i386.tar.xz 7946756 BLAKE2B 828f0925da2939f9234eb587628ec6b038942b26d96d1372e2985055e176a3970048c1e25c0f44a9bde72afc5120215e5534a61d8530f3a64a4ee890657ffc82 SHA512 25fe8d71df7172e64915db2e3a025f5e3e45582f20893bab53db62968d810ddc4c4e9801a9c320821e4bbc22130944d40a7e81fa8cf5d4ce3fe641956990ead8
+DIST doublecmd-1.0.11.qt.x86_64.tar.xz 8649332 BLAKE2B 5009b9b001a5605bf130485ee92a39c1310ab2abe543e39278dccca3240a4558e53d2fd9f1fe6010f01da2f82fe625da5ebd1d7aff326e81dcf82abb83e93582 SHA512 2dd4088ea9b7309bf5d9f9bee2bf590d11e1e96690393fae17f04a8b59d7e245fc1c43c6e92a2a44a37e59c54448d42b562ff98fe36eeab85999013ba1719da6
--- a/app-misc/doublecmd-bin/doublecmd-bin-1.0.11.ebuild
+++ b/app-misc/doublecmd-bin/doublecmd-bin-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -31,6 +31,8 @@ S="${WORKDIR}/${MY_PN}"
 QA_PREBUILT="
 	*/doublecmd
 	*/libQt5Pas.so.1
+	*/libunrar.so                                                                                                                                     │
+	*/plugins/.*
 "

 ## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
--- a/app-misc/nwg-look/nwg-look-0.2.1.ebuild
+++ b/app-misc/nwg-look/nwg-look-0.2.1.ebuild
@@ -17,8 +17,14 @@ KEYWORDS="~amd64"
 IUSE=""

 DEPEND="
+	media-libs/fontconfig"
+	media-libs/freetype
+	media-libs/harfbuzz
+	x11-apps/xcur2png
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
-	x11-apps/xcur2png"
+	x11-libs/pango
 RDEPEND="${DEPEND}"
 BDEPEND=""

--- a/dev-embedded/rauc/Manifest
+++ b/dev-embedded/rauc/Manifest
@@ -1 +1 @@
-DIST rauc-1.8.tar.xz 1114180 BLAKE2B d88cc35b773f79515227eb8c7f2b8aa15072add6ad38b249d0bc3ee2430e9a78d2ff235c9b257542d365bad59f2e9e8f7463a6c98a8ae5344519dd2d90d742b6 SHA512 126601a567d185ac22b7f58cbfff2a8c42d0d80badc939ef48ea988f1897f2957ec83b3611d80d8f34d39050cc5e205e15041b09d474bfa9a075ff04ee461374
+DIST rauc-1.9.tar.xz 880236 BLAKE2B a42996be51b1afd34be7e72a257d3932bbc4328ced5efa1190a6f5f74296c427e49b819bbd477a8a46a07fa12a4e616278e3370241413989a1a4889f690a84d4 SHA512 461c545619d5827dc0190e0134df04afaf3d10e235b5e521a81be0759aeb8c8452ee5ab8a5a627265d8878fd25f614ad6b8fabaa085fb203ec7c5b4e3e8448a3
--- a/dev-embedded/rauc/files/rauc-1.9-tests.patch
+++ b/dev-embedded/rauc/files/rauc-1.9-tests.patch
@@ -13,7 +13,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>

 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -170,10 +170,6 @@ check_PROGRAMS = \
+@@ -171,10 +171,6 @@ check_PROGRAMS = \
 	test/slot.test \
 	test/stats.test
 
@@ -24,7 +24,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 if ENABLE_STREAMING
 check_PROGRAMS += test/nbd.test
 endif
-@@ -280,9 +276,6 @@ test_utils_test_LDADD = librauctest.la
+@@ -282,9 +278,6 @@ test_utils_test_LDADD = librauctest.la
 test_install_test_SOURCES = test/install.c
 test_install_test_LDADD = librauctest.la
 
--- a/dev-embedded/rauc/rauc-1.9.ebuild
+++ b/dev-embedded/rauc/rauc-1.9.ebuild
--- a/dev-libs/boinc-zip/Manifest
+++ b/dev-libs/boinc-zip/Manifest
@@ -1,2 +1,2 @@
-DIST boinc-7.18.0.tar.gz 50848912 BLAKE2B 1088b734a5111dac1b42110cc5059e7114ef2bb2a7e786d20e681ac96543869fbf170c566c6c7ea93ac97f54f347e388d33d7d39c19d59cbe7bf3066d8c69fde SHA512 4bccd576bc786cf5d7b01a1ff379545b4d9ddb818c8561d3dccb836b6490668c73a0c10884609980dfc6e8250173ead71a5f6044cabe69a0c93316e03515a0d9
-DIST boinc-7.20.2.tar.gz 46555666 BLAKE2B 4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb
+DIST boinc-client-7.18.0.tar.gz 50848912 BLAKE2B 1088b734a5111dac1b42110cc5059e7114ef2bb2a7e786d20e681ac96543869fbf170c566c6c7ea93ac97f54f347e388d33d7d39c19d59cbe7bf3066d8c69fde SHA512 4bccd576bc786cf5d7b01a1ff379545b4d9ddb818c8561d3dccb836b6490668c73a0c10884609980dfc6e8250173ead71a5f6044cabe69a0c93316e03515a0d9
+DIST boinc-client-7.20.2.tar.gz 46555666 BLAKE2B 4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb
--- a/dev-python/azure-core/Manifest
+++ b/dev-python/azure-core/Manifest
@@ -1,2 +1,2 @@
-DIST azure-core-1.26.2.zip 368264 BLAKE2B 72c611f506c1773917a15dd354b8d97922d7f5b24e114a4e45a7fb3a65505ae5019aa4b6993c37c3840d6bffce648cb2b065904420cc3034209f58e55d2513f7 SHA512 3084c8f24d01e4a283175839be673061b8de13ffa85ab956f3753bd64cd0efb4eff421e239a41433834a8de9a3af620ddb27f24f1fcb475ec963456c0a86a084
 DIST azure-core-1.26.3.zip 369524 BLAKE2B 96af5ee7f57086981f7660907ccc8422091b4e36510e45daae4151fc92f282b111b0ed487d47d0824470a0c8e79e33ae1a8c9f30f1e4a497fb6cc7bc45951aab SHA512 b332603a3e304ef256923abb22949ea5cf88bc0638c79aec716b10d6e48ff21aba2579f0395e1631929b060818bd88bbbf1d75777c2b678d1182edc6cb3355ee
+DIST azure-core-1.26.4.zip 370584 BLAKE2B ed0974ed62e5a7c66488cbdc452fb97ab018d217764064cf002db9235c580d061ea61e83b612b541ce3385d4d9c9133632833d1d43fa10c7c8de1410f4b503c3 SHA512 babc50a5db328bfae3b6be2625f9cc2ee2922674437062f03e617c08906757e942fa9015e8d1af95d0cb89b791a6d5fca3c30fdecb5542a41d7fe2cf2c8565ae
--- a/dev-python/azure-core/azure-core-1.26.4.ebuild
+++ b/dev-python/azure-core/azure-core-1.26.4.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 optfeature
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 optfeature pypi

 DESCRIPTION="Microsoft Azure Core Library for Python"
 HOMEPAGE="
 	https://pypi.org/project/azure-core/
 	https://github.com/Azure/azure-sdk-for-python
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/mkdocs-mkdocstrings-python/mkdocs-mkdocstrings-python-0.8.3.ebuild
+++ b/dev-python/mkdocs-mkdocstrings-python/mkdocs-mkdocstrings-python-0.8.3.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 		dev-python/mkdocs-mkdocstrings[${PYTHON_USEDEP}]
 		dev-python/mkdocs-autorefs[${PYTHON_USEDEP}]
 		dev-python/pymdown-extensions[${PYTHON_USEDEP}]
-		dev-python/mkdocs_pymdownx_material_extras[${PYTHON_USEDEP}]
+		dev-python/mkdocs-pymdownx-material-extras[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="${BDEPEND}"
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -1,31 +0,0 @@
-DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e
-DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed1e76ac6be7f7c6b0d8ee65c0eaf03dbae7fea04cf0921299f69234ad91e1cf41342de86f554f74e287dd3ba1 SHA512 80cc6e55b6032f4882362813de970d3d99e600ada774b28ac6a24c9c8e018fda3b35c5750ac3a09fca6fb9496e2e3fe608b58d21b1b84685ebd170f567a0ecbc
-DIST associative-cache-1.0.1.crate 14048 BLAKE2B 77f36f2d23b6d07e556f20e743c9a0e47c0b54899397c64dd6d4fc9b4c31469481d4a99ceb28b250924e0aa5f52de9fb65ce93ed96f23191f2984c32156bace0 SHA512 2ad673ab907c71cbd45abf3cf59630fd56aeb95888c94932b9fe5d83d71d0c14f908915670cbc0566b691035f82ac2069ed17589edbc97db1e4388225ac2a040
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST beef-0.5.2.crate 15275 BLAKE2B 95d60fb1840ca26581841ad65a4e8f3f99d5f8d44c569219f4d06ce441bb3a4ba558e231e73a51cd1c6b4d9e4cc6a07942115c134289fb1982dace03049d3a1e SHA512 755fc588acbf730bc9c80dbfc20cd0ef81f792a94da0dd28379ad83a7359ddd4c7b136ba8048dd460bb8652475db3d12814fcbd04eff4ebe8ec8a1bcd024c2aa
-DIST bytecount-0.6.3.crate 12416 BLAKE2B 462e41d5a4ee23a6c9ff2bf350171e309cbc32f14bbdbde25a5743072a6511634d6c0429903edcfa8df4b9ef3c7bd95d73fff8a7b2018f3b4a8147de2bbfd3f4 SHA512 0c5f424329883726589e69842d2ac0767dc0b440d744a4452a14cbd449b8ca2e8117fa2978b4aa9b803a1a7cf79e9cf67e948057e8ee521e2422ca2e145ea670
-DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4
-DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
-DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
-DIST compact_str-0.6.1.crate 54555 BLAKE2B 4f389035aa42b763035c2d7a49500c1ec98cb563fc7f693d7fd468de9132105a86d5d180866fc1dbbb5e79e2281f882f3a9667fe81173db189930a40878e0f3d SHA512 4f017210cd42ed6d1a641cbd1c9f214c356dd9a188675413751aef2359eff27f2045622802f9df633fa803073099e32619c7a67477369197be81035da0c10acc
-DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a
-DIST itoa-1.0.5.crate 10622 BLAKE2B 0d08db487ee791a252389e40e08e47a649d9eb90faad16bfbdfdfde46366082d2e3561fb8a62da80b122e7771052c50a0483e9618260d094820e20748d99882e SHA512 b90841e3a016a9a68cb090e4bf78959bbadecb3391cba71e0deeb5ac2723379ccd3251ec18a0bd055fba7cb6e71608ab1d7db990ad4d03cf2fd1289bd5834540
-DIST itoap-1.0.1.crate 83316 BLAKE2B db0d9f712155bfe4285c3d3debf314da2d64ffd127d6b9dd471074eb7e5dcda41f1e5b04bdad63e0fbd695043eff21956709ffdf2cdd7fc5b329d1d79ee69fc6 SHA512 ed15ba3e1ee1ef5f1658fbb47e8cba66e62acf05d8ac45340e15ace24c86e5adf072b52bfb90ebc5e90f31a9a8e91ada23d4322db9a87bb966922afdd4775840
-DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
-DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e17eadd0d4abb8e34b0fc8784607f71eebaa2f308dedb3185969f092d4305cd1d2cef7a53f7d8774390e38f SHA512 6bc647425ec8be5995ad4798427a86e28282b06532b8e6a53745e2a2ac16652d087b84c0946a4858a49d98995b9e543e1764765d270bf5569cd2ad92d52b81f2
-DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
-DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
-DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
-DIST orjson-3.8.7.tar.gz 655531 BLAKE2B d8c854c752a5a89c3f04eaf96bdda3028c65f234f422323f74a7ad8e0df30a88d46df3f80969aa384267a47b62b738163ed51889ebb4dd4889523bf6f91fd4e0 SHA512 6cfdd0f1898807fec11db70ba4881dbbab85d770e26ace0b81d1dcf51eed1f585f2cc09928e5fa58750f91bb21f7286eee1fa48f9d2fbee5566b4618023ea71a
-DIST packed_simd_2-0.3.8.crate 97388 BLAKE2B 89d2a1401efef8e0a665d883b41a587601cd4704a6acf80c542f3e6e274a6fa9c975a03799857c409c8764bf6698784cf85f1fb73b4fab2c4f98b368326760c4 SHA512 de1ff7cc43f6d0f6e2a94073ab80bd178864d375d334c4d8aaf30f8ae3320b6aa470f14b25babc264d9032af0c4fa7663e442321fc91acbd7adc7550b5177984
-DIST pyo3-build-config-0.18.1.crate 29134 BLAKE2B 288519ea8b17bf81564ea7e91fa548ca5b966cb08939eccd80356935372aa7bbac1c9f1f8780b49010f4f66d1724d698a6197a740b232d62c75df341194c8ac5 SHA512 6277726d3f0faf70453f61f90c547db01ce5d50823ca9ba731d57309edbb33729bcfa3299415716cf6154ec2cb3a4c1e7eabc8ea18e400e746b37324bfca2ec9
-DIST pyo3-ffi-0.18.1.crate 62852 BLAKE2B 86bc534333e05578b1bf890fdd71af685d626aebbd8b4132162c1d29ab89ee493f903497fecb576164a1b23df11b36f20c18cede97ded567428724a702f0529f SHA512 35f2838f6b06bbb1ad6ebdc0d68c750fc8cffc43b62fadf2b76d4a395a4655797e9d93543ffb204ff7ea312f7f37444375c556831a231122f9fc1477ec986bec
-DIST rustversion-1.0.11.crate 17485 BLAKE2B 940646bc3783dfc663b179e4624ed03d3726bc745517581fd3d6eef607fea2b2c75e636f1e1dd2d9e30cded59e2b9fb64b964f47693baf2928b515eba0e89f09 SHA512 60b94f8378cb1d0ee61dad768e14f50bd043d4c0e4a4e0ef4979d7366886909e1b186abe2c65cd36ef077bc2663f1610f3bc4328ab2f078b94405384a07dcd76
-DIST ryu-1.0.12.crate 47070 BLAKE2B 02b0eec6bf266b7c482aea15ff83de4bf3cd6f607f8cd6f17f1c3ffc60cc64b62b15738907b4069f5816dd81669ed4f5b00c4bbc8705abaebe3a0846f56e8e29 SHA512 070f0b2b52e47cc9a6d8f003439d257c27aec15ffb030a92481ac22d5052436156e25127ea3ea7986cc514d2a7a924f9328710d743c216d7b1379beacae79829
-DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
-DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
-DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
-DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
-DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f
-DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
--- a/dev-python/orjson/metadata.xml
+++ b/dev-python/orjson/metadata.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://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/ijl/orjson/issues</bugs-to>
-        <remote-id type="github">ijl/orjson</remote-id>
-        <remote-id type="pypi">orjson</remote-id>
-    </upstream>
-</pkgmetadata>
--- a/dev-python/orjson/orjson-3.8.7.ebuild
+++ b/dev-python/orjson/orjson-3.8.7.ebuild
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=1
-CRATES="
-	ahash-0.8.3
-	arrayvec-0.7.2
-	associative-cache-1.0.1
-	autocfg-1.1.0
-	beef-0.5.2
-	bytecount-0.6.3
-	castaway-0.2.2
-	cc-1.0.79
-	cfg-if-1.0.0
-	chrono-0.4.23
-	compact_str-0.6.1
-	encoding_rs-0.8.32
-	itoa-1.0.5
-	itoap-1.0.1
-	libc-0.2.139
-	libm-0.1.4
-	num-integer-0.1.45
-	num-traits-0.2.15
-	once_cell-1.17.1
-	packed_simd_2-0.3.8
-	pyo3-build-config-0.18.1
-	pyo3-ffi-0.18.1
-	rustversion-1.0.11
-	ryu-1.0.12
-	serde-1.0.152
-	serde_json-1.0.93
-	simdutf8-0.1.4
-	smallvec-1.10.0
-	target-lexicon-0.12.6
-	version_check-0.9.4
-"
-
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
-HOMEPAGE="
-	https://pypi.org/project/orjson/
-	https://github.com/ijl/orjson
-"
-SRC_URI="
-	$(pypi_sdist_url)
-	$(cargo_crate_uris)
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-# Dependent crate licenses
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pendulum[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-QA_FLAGS_IGNORED=".*"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
--- a/dev-python/pdm/pdm-2.4.9.ebuild
+++ b/dev-python/pdm/pdm-2.4.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=pdm
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..11} )

 inherit bash-completion-r1 distutils-r1 pypi

@@ -15,7 +15,7 @@ HOMEPAGE="
 "

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

 RDEPEND="
--- a/dev-python/pysftp/Manifest
+++ b/dev-python/pysftp/Manifest
@@ -1 +0,0 @@
-DIST pysftp-0.2.9.tar.gz 25949 BLAKE2B 18a06ffb13d9c266dc03a79b982550c8fcead8588ad6f962fdae026c92dd951c963b67033548057700fe5aaed7db3c0fb91ed992e6beb7f1d04173f221a8866e SHA512 408e28c362b3f2573a6717cda811de3c88a8026d3a0c21eae8fb05156be941b16874cd8c318f3a0f533b8524831f22a90bcc208b061ee4c28fc8fda4e441173d
--- a/dev-python/pysftp/metadata.xml
+++ b/dev-python/pysftp/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>svdm-gentoo@protonmail.com</email>
-        <name>Simon van der Maas</name>
-    </maintainer>
-</pkgmetadata>
--- a/dev-python/pysftp/pysftp-0.2.9.ebuild
+++ b/dev-python/pysftp/pysftp-0.2.9.ebuild
@@ -1,15 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-inherit distutils-r1
-
-DESCRIPTION="A friendly face on SFTP"
-HOMEPAGE="https://pypi.org/project/pysftp/"
-SRC_URI="https://files.pythonhosted.org/packages/36/60/45f30390a38b1f92e0a8cf4de178cd7c2bc3f874c85430e40ccf99df8fe7/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
--- a/dev-python/pytest-isort/files/stray-files.patch
+++ b/dev-python/pytest-isort/files/stray-files.patch
@@ -0,0 +1,15 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 64d36bc..a6420fd 100644
+--- a/pyproject.toml
+++ b/pyproject.toml
+@@ -25,7 +25,9 @@ classifiers = [
+ 	"Framework :: Pytest",
+ ]
+ packages = [{ include = "pytest_isort" }]
+-include = ["LICENSE.rst"]
+include = [
+	{ path = "LICENSE.rst", format = "sdist" },
+]
+ 
+ [tool.poetry.plugins.pytest11]
+ isort = "pytest_isort"
--- a/dev-python/pytest-isort/pytest-isort-3.1.0-r1.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-3.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin to check import ordering using isort"
+HOMEPAGE="https://github.com/stephrdev/pytest-isort"
+SRC_URI="https://github.com/stephrdev/pytest-isort/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/isort[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/stray-files.patch"
+)
--- a/dev-python/pytest-isort/pytest-isort-3.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-3.1.0.ebuild
@@ -23,3 +23,7 @@ RDEPEND="
 	dev-python/isort[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/stray-files.patch"
+)
--- a/dev-python/shellingham/Manifest
+++ b/dev-python/shellingham/Manifest
@@ -1 +0,0 @@
-DIST shellingham-1.5.0.tar.gz 8974 BLAKE2B 07ae56303d046d224d84ab39816171c6c8a440182528857bbbd10075cd074882b0a984ddc6f6d9b0165b4f4461204568e088a6238129d5cf096d62898d00fd88 SHA512 1772cf807f37feb2ea9301aca9c84149b7d718b70daccfe80c8dfd90b20461ab22c11798b240c63c12861d544a99dca4671d560da68e757bf9acb02a62242afe
--- a/dev-python/shellingham/metadata.xml
+++ b/dev-python/shellingham/metadata.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>falbrechtskirchinger@gmail.com</email>
-    <name>Florian Albrechtskirchinger</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sarugaku/shellingham</remote-id>
-    <remote-id type="pypi">shellingham</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/dev-python/shellingham/shellingham-1.5.0.ebuild
+++ b/dev-python/shellingham/shellingham-1.5.0.ebuild
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Tool to Detect Surrounding Shell"
-HOMEPAGE="
-	https://github.com/sarugaku/shellingham/
-	https://pypi.org/project/shellingham/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
--- a/dev-python/uhashring/Manifest
+++ b/dev-python/uhashring/Manifest
@@ -1 +0,0 @@
-DIST uhashring-2.1.tar.gz 18288 BLAKE2B 95d76b1999d21b52ff33b5f76b2eee125d22fa02c51281d6b72058b9d608ea69cca11608f41f50b9348d46a26cc8931c40a6873f0fe17b72d76891b51dcaa1cb SHA512 0e3b3647f1b8b648389fa1018f5903d880947556244633e0b2b4809ccab3d14cf8e742cd14a99e2e88972a84c8fb97956dc290b023e514de63c7793a21b6c294
--- a/dev-python/uhashring/metadata.xml
+++ b/dev-python/uhashring/metadata.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<description>comaintainers welcome</description>
-		<email>lssndrbarbieri@gmail.com</email>
-		<name>Alessandro Barbieri</name>
-	</maintainer>
-	<longdescription lang="en">
-uhashring implements consistent hashing in pure Python.
-
-Consistent hashing is mostly used on distributed systems/caches/databases as this avoid the total reshuffling of your key-node mappings when adding or removing a node in your ring (called continuum on libketama). More information and details about this can be found in the literature section.
-
-This full featured implementation offers:
-
-a lot of convenient methods to use your consistent hash ring in real world applications.
-simple integration with other libs such as memcache through monkey patching.
-a full ketama compatibility if you need to use it (see important mention below).
-all the missing functions in the libketama C python binding (which is not even available on pypi) for ketama users.
-possibility to use your own weight and hash functions if you don't care about the ketama compatibility.
-instance-oriented usage so you can use your consistent hash ring object directly in your code (see advanced usage).
-native pypy support, since this is a pure python library.
-tests of implementation, key distribution and ketama compatibility.
-Per node weight is also supported and will affect the nodes distribution on the ring.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">ultrabug/uhashring</remote-id>
-		<remote-id type="pypi">uhashring</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/uhashring/uhashring-2.1.ebuild
+++ b/dev-python/uhashring/uhashring-2.1.ebuild
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Full featured consistent hashing python library compatible with ketama"
-HOMEPAGE="https://github.com/ultrabug/uhashring"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-python/python-memcached-1.59[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
--- a/dev-util/bash-language-server/Manifest
+++ b/dev-util/bash-language-server/Manifest
@@ -1,4 +1,4 @@
-DIST bash-language-server-4.8.3-deps.tar.xz 2192036 BLAKE2B baff7c37f8ecbdd4e0de1feed11e75790b64b2be6cd89fc490f843cdcf53942ab90a76d8a2bffd384fe3836ec82d511573ba970e21e2d1d7148fd1e465421401 SHA512 cd50420e191113194b2422c85c49416bce6b38ccb05095bd974419494526ceb86c1bc94548fec0cc5d5ca05d84dc557ae2c938b78d5d8b526f40d2ab04e9251f
-DIST bash-language-server-4.8.3.tgz 186679 BLAKE2B c183c813e793c3f6754a88b4deccc839393c12aa4ae9aa5d9fa0254a5d300ebb70af7db3a47794a57b49b3467e00cb9541d6048a10b129d267ff549357ec9455 SHA512 3495eaccd38297127f1ba1ebf2069fbea701898d6236f0400b1665cf9b4e3f2a25a137aac8eb65e82f72654c56f2bc96f06009d93512e3bf65cb9b6af648c404
 DIST bash-language-server-4.8.4-deps.tar.xz 2196888 BLAKE2B 754af32f1955662904c2c202b6fdd35fd92dcadf84da338b5cd74c305ef31387e19df8fa768a33ea8512e71ef37bf756b0b182a20f92c04682187e75f9acdd33 SHA512 596b2b79e1e4d6abdbee8265be982a25f25ce2f8f255a83188953f974da1492a75ba841d59c037e1e6e228523b1df1837928a27cf07fb3c356a96f5bba2be79f
 DIST bash-language-server-4.8.4.tgz 187465 BLAKE2B 2eea73fca9e91825009cb0817dd59ab9da3f230512d4fefd48434036154c7558f92286f6a75fad4d7e40bc6cb24958732b020ee8a75c17bf33f4b6a7a7a845d5 SHA512 93c6f0d86e1bce97bc3efdb422c721e8aa0056c39d9b874d64d3d342675fd336a938f88344039e85dd4ca68c5a99e2a0c33ea78c5ea84546b11fa5bee0b4d42b
+DIST bash-language-server-4.9.0-deps.tar.xz 2203152 BLAKE2B fd0aaa05e6fef5e2951ffe55626bca7df4d2609c39b5145daa3cf6100c9732287a33717065db411334cad9805f147acdd29470069b4c4a41ebf2018419809108 SHA512 3c6ff2ff44321adbd805aad749ff3eacc320d276add2f5d68eea6f68c95e26cfeeac8d319d5242514fb69b572fbab64327ab4134e736b5425ffd1ef8d1a0079a
+DIST bash-language-server-4.9.0.tgz 190986 BLAKE2B 09b371d143815fc0b839c8c0d5b0e93592077b8cdd396b2f6e028e0feb133ab22fe59e4fd006324d8fb0b5b26816389528001d4210fc2b37d055cc4d8a24fab3 SHA512 acc6ff77935e156be2333b96e4348949643a7879463e7b7402b7ca3f4032934d1b510cdde469404c9d41510f14002606fe79fba54ebe25688b818030df618bdd
--- a/dev-util/bash-language-server/bash-language-server-4.9.0.ebuild
+++ b/dev-util/bash-language-server/bash-language-server-4.9.0.ebuild
--- a/dev-util/pmbootstrap/Manifest
+++ b/dev-util/pmbootstrap/Manifest
@@ -1 +1 @@
-DIST pmbootstrap-1.46.0.tar.gz 226827 BLAKE2B 5352f6c9bc359698d85aad53bbd9046869fed084d0f81c7a40efff829e186b7635e166cd6812f205ce017bfbd9e1f9f5744e0fb241d909889e0de1cc7abf8a0f SHA512 d685cb9e1ee457f4839935f92c3e2941e7642439b29a02a352b217f4bf2dc270ecff5883bb7fb1ccb2e413d20d3d92fc9cd7db048e90d5bfa0bc570f7a7db39d
+DIST pmbootstrap-1.51.0.tar.gz 230563 BLAKE2B d1832a699c7e5a86eaa2c145df1e48c92b3f370be92a82b6841d302a85ba5450ca7c6a4cae040cb0191fcc7cea909e63e5d7915bf1cd16891577d654ea86ecdb SHA512 288a2ad12f93f4ff7d11ec37448b739611acb684f41b68327ca83997e6d9bbf8110dc42f93e00d356728b16193092142055378c18d23c49c2b11324cee6121b3
--- a/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
+++ b/dev-util/pmbootstrap/pmbootstrap-1.51.0.ebuild
--- a/eclass/boinc.eclass
+++ b/eclass/boinc.eclass
@@ -45,7 +45,7 @@ fi
 if [[ ! ${_BOINC_ECLASS} ]]; then

 # @FUNCTION: get_boinc_src
-# @USAGE: <SRC_URI|S> <release> [client|server]
+# @USAGE: <SRC_URI|S> <release> [client|server|vboxwrapper|wrapper]
 # @RETURN: SRC_URI snippet or temporary build directory for given BOINC release
 get_boinc_src() {
 	debug-print-function ${FUNCNAME} "${@}"]
@@ -55,18 +55,20 @@ get_boinc_src() {
 	local RELEASE_MINOR=$(ver_cut 1-2 ${RELEASE_PATCH})
 	local RELEASE_TYPE=${3:-client}

-	local SUFFIX=
+	local TAG
 	case ${RELEASE_TYPE} in
-		server) SUFFIX="-server" ;;
-		client) ;;
-		*) die "${FUNCNAME}: unknown release type '${RELEASE_TYPE}'"
+		client|server)
+			TAG="${RELEASE_TYPE}_release/${RELEASE_MINOR}/${RELEASE_PATCH}" ;;
+		vboxwrapper|wrapper)
+			TAG="${RELEASE_TYPE}/${RELEASE_PATCH}" ;;
+		*)
+			die "${FUNCNAME}: unknown release type '${RELEASE_TYPE}'"
 	esac

-	local _SRC_URI="https://github.com/BOINC/boinc/archive/"
-	_SRC_URI+="${RELEASE_TYPE}_release/${RELEASE_MINOR}/${RELEASE_PATCH}.tar.gz"
-	_SRC_URI+=" -> boinc${SUFFIX}-${RELEASE_PATCH}.tar.gz"
+	local _SRC_URI="https://github.com/BOINC/boinc/archive/refs/tags/${TAG}.tar.gz"
+	_SRC_URI+=" -> boinc-${RELEASE_TYPE}-${RELEASE_PATCH}.tar.gz"

-	local _S="${WORKDIR}/boinc-${RELEASE_TYPE}_release-${RELEASE_MINOR}-${RELEASE_PATCH}"
+	local _S="${WORKDIR}/boinc-${TAG////-}"

 	case ${query_var} in
 		SRC_URI) echo "${_SRC_URI}" ;;
@@ -82,7 +84,7 @@ get_boinc_src() {
 # Temporary build directory, where BOINC sources are located.

 # @FUNCTION: boinc_require_source
-# @USAGE: [boinc version] [client|server]
+# @USAGE: [boinc version] [client|server|vboxwrapper|wrapper]
 # @DESCRIPTION:
 # Set up SRC_URI and S for building application within BOINC source tree.
 #
@@ -107,15 +109,15 @@ boinc_require_source() {
 # @DESCRIPTION:
 # Configure BOINC source tree using autotools.
 #
-# If no arguments are given, econf will be called
-# with --enable-pkg-devel flag.
+# If no arguments are given, econf will be called with
+# '--enable-static --enable-pkg-devel --disable-fcgi' flags.
 #
 # This function must be called in global scope.
 boinc_enable_autotools() {
 	debug-print-function ${FUNCNAME} "${@}"]

 	_BOINC_RUN_AUTOTOOLS=1
-	_BOINC_ECONF_ARGS=${@:---enable-pkg-devel}
+	_BOINC_ECONF_ARGS=${@:---enable-static --enable-pkg-devel --disable-fcgi}
 }

 # @FUNCTION: boinc_override_config
@@ -202,7 +204,7 @@ boinc_src_configure() {
 	edo bash ./generate_svn_version.sh

 	if [[ ${_BOINC_RUN_AUTOTOOLS} ]]; then
-		econf "${_BOINC_ECONF_ARGS[@]}"
+		econf ${_BOINC_ECONF_ARGS}
 	else
 		tc-export AR CC CPP CXX LD OBJDUMP RANLIB
 	fi
--- a/media-gfx/bonzomatic/Manifest
+++ b/media-gfx/bonzomatic/Manifest
@@ -1 +1,2 @@
 DIST bonzomatic-2022.02.05.tar.gz 2721552 BLAKE2B 0c89a88e82c0eeb20d3b40f2107590ae37168a16327431d1e296c6e9cb0ae6dc661d669a0b4c91c8cd9124e2001defbf0bcf4840161efb64e20ee9b2fe93f495 SHA512 5a1ed8c2dd1b2f45de5a9cb3b859b6d599d833114a8bab95b25ac1f3ad62b536371fffd4e19ee317b79190afd1bacaa2a46000c9c5f17ff239068d13e6630bd1
+DIST bonzomatic-2022.08.20.tar.gz 8883259 BLAKE2B 698695e0925fa0dc43a195fce0e622a2000781682fdbf7e3fdb90c174c32a937bb42aa2a2823f5ec3f2ad322309f98dd43eecaa517d81db5180ecfac12087cfa SHA512 0a9718f3d99bedcdbc3b60467d8a15846c48e8ef8583e793140077215b59d69fbd8ac7b7644ca811e810c5cf8b15c7c6cb2ec21f40b0493a69f93805cc24b8fd
--- a/media-gfx/bonzomatic/bonzomatic-2022.08.20.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-2022.08.20.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Live shader coding tool and Shader Showdown workhorse"
+HOMEPAGE="https://github.com/Gargaj/Bonzomatic"
+if [[ "${PV}" == "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Gargaj/Bonzomatic"
+else
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="https://github.com/Gargaj/Bonzomatic/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Bonzomatic-${MY_PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE="system-glfw system-glew system-miniaudio system-stb wayland"
+
+# TODO: system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
+# kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name
+#	system-kissfft? ( sci-libs/kissfft )
+RDEPEND="
+	system-glfw? ( media-libs/glfw )
+	!system-glfw? (
+		wayland? (
+			dev-libs/wayland
+			media-libs/mesa[egl(+),wayland]
+			dev-libs/wayland-protocols
+		)
+		!wayland? (
+			x11-libs/libX11
+			x11-libs/libXcursor
+			x11-libs/libXinerama
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm
+			x11-libs/libXi
+		)
+	)
+	system-glew? ( media-libs/glew:= )
+	!system-glew? (
+		>=x11-libs/libX11-1.6.2
+		>=x11-libs/libXext-1.3.2
+		>=x11-libs/libXi-1.7.2
+		>=x11-libs/libXmu-1.1.1-r1
+	)
+	system-stb? ( dev-libs/stb )
+	virtual/opengl
+	virtual/glu
+	media-libs/alsa-lib
+	media-libs/fontconfig
+"
+# miniaudio is headers-only
+DEPEND="
+	${RDEPEND}
+	system-miniaudio? ( >=dev-libs/miniaudio-0.10 )
+"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+		-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
+		-DBONZOMATIC_USE_SYSTEM_MINIAUDIO=$(usex system-miniaudio)
+		-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
+		-DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF
+	)
+
+	if use !system-glfw; then
+		mycmakeargs+=( -DGLFW_USE_WAYLAND="$(usex wayland)" )
+	fi
+
+	cmake_src_configure
+}
--- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
@@ -15,19 +15,19 @@ else
 	MY_PV="$(ver_rs 1- -)"
 	SRC_URI="https://github.com/Gargaj/Bonzomatic/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Bonzomatic-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi

 LICENSE="Unlicense"
 SLOT="0"
-IUSE="system-glfw system-glew system-stb wayland"
+IUSE="system-glfw system-glew system-miniaudio system-stb wayland"

-# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# TODO: system-jsonxx/json++, system-scintilla
 # !system-glfw copied from media-libs/glfw-3.3.3::gentoo
 # !system-glew copied from media-libs/glew-2.2.0::gentoo
 # kissfft: Bonzomatic targets non-existent `kissfft` pkg-config name
 #	system-kissfft? ( sci-libs/kissfft )
-DEPEND="
+RDEPEND="
 	system-glfw? ( media-libs/glfw )
 	!system-glfw? (
 		wayland? (
@@ -57,17 +57,25 @@ DEPEND="
 	media-libs/alsa-lib
 	media-libs/fontconfig
 "
-RDEPEND="${DEPEND}"
+# miniaudio is headers-only
+DEPEND="
+	${RDEPEND}
+	system-miniaudio? ( >=dev-libs/miniaudio-0.10 )
+"
 BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"

 src_configure() {
 	local mycmakeargs=(
 		-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
-		-DGLFW_USE_WAYLAND="$(usex wayland)"
 		-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
+		-DBONZOMATIC_USE_SYSTEM_MINIAUDIO=$(usex system-miniaudio)
 		-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
 		-DBONZOMATIC_USE_SYSTEM_KISSFFT=OFF
 	)

+	if use !system-glfw; then
+		mycmakeargs+=( -DGLFW_USE_WAYLAND="$(usex wayland)" )
+	fi
+
 	cmake_src_configure
 }
--- a/media-gfx/bonzomatic/metadata.xml
+++ b/media-gfx/bonzomatic/metadata.xml
@@ -10,6 +10,10 @@
 		<flag name="wayland">Build non-system-glfw for wayland instead of X11</flag>
 		<flag name="system-glew">Use the systems installed version of GLEW (upstream-unsupported)</flag>
 		<flag name="system-stb">Use the systems installed version of STB (upstream-unsupported)</flag>
+		<flag name="system-miniaudio">Use the systems installed version of Miniaudio (upstream-unsupported)</flag>
 		<!-- <flag name="system-kissfft">Use the systems installed version of Kissfft (upstream-unsupported)</flag> -->
 	</use>
+	<upstream>
+		<remote-id type="github">Gargaj/Bonzomatic</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/media-libs/skcms/Manifest
+++ b/media-libs/skcms/Manifest
@@ -1 +0,0 @@
-DIST skcms-0_pre20211006-r1.tar.gz 9986375 BLAKE2B f95ab6fb05c422e58e10aca053df670b44b98dbc0c6bf7d75ad6ff9e5fc312c0f7c0447e1d8ecf8eedfb110df232d01924227a42c178e6b09e7e9ce078f5bbe8 SHA512 cff5d835934f125373854c651f6ea50a10b212f207c6101ef2cf36ac4a27dc1e5d45a5e932595824f7385a4fe1611508f4c8861094219029aabe3d6462211fd7
--- a/media-libs/skcms/skcms-0_pre20211006-r1.ebuild
+++ b/media-libs/skcms/skcms-0_pre20211006-r1.ebuild
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="A complete 2D graphic library for drawing Text, Geometries, and Images"
-HOMEPAGE="https://skia.googlesource.com/skcms"
-SRC_URI="https://drive.google.com/uc?export=download&id=1BmWRhwDnribygNRsR2UwaxIMrAB7GZw4 -> ${PF}.tar.gz"
-S="${WORKDIR}"
-
-KEYWORDS="~amd64"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-src_compile() {
-	tc-export CC CXX
-
-	${CXX} ${CXXFLAGS} ${LDFLAGS} -fPIC -shared -I./src -Wl,-soname,libskcms.so skcms.cc -o libskcms.so || die
-	${CC} ${CFLAGS} -fPIC -I./src -c test_only.c || die
-	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -I./src test_only.o iccdump.c -o iccdump -ldl -L. -lskcms || die
-	${CC} ${CFLAGS} ${LDFLAGS} -fPIE -I./src test_only.o tests.c -o tests -L. -lskcms || die
-}
-
-src_install() {
-	dolib.so libskcms.so
-	dobin iccdump
-	doheader skcms.h
-}
-
-src_test() {
-	LD_LIBRARY_PATH="./:${LD_LIBRARY_PATH}" ./tests || die
-}
--- a/media-libs/skia/Manifest
+++ b/media-libs/skia/Manifest
@@ -1 +0,0 @@
-DIST skia-97.gh.tar.gz 55736513 BLAKE2B a3fddcab23b395e884b64179577c0e88b22c5580c484b79ce11a598ea8822fe797248071ca638541c9146f6752d93e99d9effb7e3499cf1f1efd75e375f9d3d5 SHA512 c30cd68fd69cbe998c04db8a9d7d201fefa2e72541745a1216a51bde809152c11f53fd3ba66a5c7bfb971c090e5eecc2be50a3cf013645052c2c447bf70d5f7a
--- a/media-libs/skia/files/skia-97-questionable-flags.patch
+++ b/media-libs/skia/files/skia-97-questionable-flags.patch
@@ -1,52 +0,0 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/skia/BUILD.gn
-@@ -335,7 +335,7 @@
- config("no_exceptions") {
-   # Exceptions are disabled by default on Windows.  (Use /EHsc to enable them.)
-   if (!is_win) {
-    cflags_cc = [ "-fno-exceptions" ]
-+    cflags_cc = [ "" ]
-   }
- }
- 
-@@ -572,7 +572,7 @@
-     if (is_win) {
-       cflags_cc = [ "/GR-" ]
-     } else {
-      cflags_cc = [ "-fno-rtti" ]
-+      cflags_cc = [ "" ]
-     }
-   }
- }
-@@ -592,10 +592,6 @@
-     if (is_mac || is_ios) {
-       ldflags = [ "-dead_strip" ]
-     } else {
-      cflags += [
-        "-fdata-sections",
-        "-ffunction-sections",
-      ]
-       ldflags = [ "-Wl,--gc-sections" ]
-     }
-     if (target_cpu == "wasm") {
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
-@@ -358,7 +358,6 @@
-     -DSK_DISABLE_AAA \
-     -DSK_FORCE_8_BYTE_ALIGNMENT \
-     -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
-    -fno-rtti \
-     $WASM_GPU \
-     $WASM_PATHOPS \
-     $WASM_RT_SHADER \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/pathkit/compile.sh
-@@ -113,7 +113,7 @@
- --no-entry \
- --pre-js $BASE_DIR/helper.js \
- --pre-js $BASE_DIR/chaining.js \
--fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
-+-DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
- $WASM_CONF \
- -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
- -s EXPORT_NAME="PathKitInit" \
--- a/media-libs/skia/files/skia-97-system-skcms-headers.patch
+++ b/media-libs/skia/files/skia-97-system-skcms-headers.patch
@@ -1,232 +0,0 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/dm/DMSrcSink.cpp
-@@ -28,7 +28,7 @@
- #include "include/ports/SkImageGeneratorWIC.h"
- #include "include/private/SkImageInfoPriv.h"
- #include "include/private/SkTLogic.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "include/utils/SkNullCanvas.h"
- #include "include/utils/SkPaintFilterCanvas.h"
- #include "include/utils/SkRandom.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/experimental/wasm-skp-debugger/compile.sh
-@@ -130,7 +130,7 @@
-     $RELEASE_CONF \
-     -I. \
-     -Ithird_party/icu \
-    -Ithird_party/skcms \
-+    -lskcms \
-     -DSK_DISABLE_AAA \
-     -DSK_FORCE_8_BYTE_ALIGNMENT \
-     -std=c++17 \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/pictureshadercache.cpp
-@@ -22,7 +22,7 @@
- #include "include/core/SkString.h"
- #include "include/core/SkSurface.h"
- #include "include/core/SkTileMode.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- 
- #include <utility>
- 
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gm/readpixels.cpp
-@@ -23,7 +23,7 @@
- #include "include/core/SkString.h"
- #include "include/core/SkTypes.h"
- #include "include/gpu/GrDirectContext.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "tools/Resources.h"
- 
- #include <string.h>
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/gn_to_bp.py
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/gn/gn_to_bp.py
-@@ -485,10 +485,6 @@
- gn_to_bp_utils.GrabDependentValues(js, '//:nanobench', 'sources',
-                                    nanobench_srcs, 'skia')
- 
-# skcms is a little special, kind of a second-party library.
-local_includes.add("include/third_party/skcms")
-dm_includes   .add("include/third_party/skcms")
-
- # Android's build will choke if we list headers.
- def strip_headers(sources):
-   return {s for s in sources if not s.endswith('.h')}
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/core/SkColorSpace.h
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/core/SkColorSpace.h
-@@ -11,7 +11,7 @@
- #include "include/core/SkRefCnt.h"
- #include "include/private/SkFixed.h"
- #include "include/private/SkOnce.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include <memory>
- 
- class SkData;
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/private/SkEncodedInfo.h
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/private/SkEncodedInfo.h
-@@ -12,7 +12,7 @@
- 
- #include "include/core/SkData.h"
- #include "include/core/SkImageInfo.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- 
- struct SkEncodedInfo {
- public:
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/canvaskit/compile.sh
-@@ -353,7 +353,7 @@
-     $RELEASE_CONF \
-     -I. \
-     -Ithird_party/icu \
-    -Ithird_party/skcms \
-+    -lskcms \
-     -Ithird_party/externals/icu/source/common/ \
-     -DSK_DISABLE_AAA \
-     -DSK_FORCE_8_BYTE_ALIGNMENT \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/public.bzl
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/public.bzl
-@@ -534,7 +534,6 @@
-     "include/pathops",
-     "include/ports",
-     "include/private",
-    "include/third_party/skcms",
-     "include/utils",
-     "include/utils/mac",
-     "src/codec",
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpace.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpace.cpp
-@@ -8,7 +8,7 @@
- #include "include/core/SkColorSpace.h"
- #include "include/core/SkData.h"
- #include "include/private/SkTemplates.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpacePriv.h"
- #include "src/core/SkOpts.h"
- 
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpaceXformSteps.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/core/SkColorSpaceXformSteps.cpp
-@@ -5,7 +5,7 @@
-  * found in the LICENSE file.
-  */
- 
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpacePriv.h"
- #include "src/core/SkColorSpaceXformSteps.h"
- #include "src/core/SkRasterPipeline.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/gpu/GrDataUtils.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/gpu/GrDataUtils.cpp
-@@ -8,7 +8,7 @@
- #include "src/gpu/GrDataUtils.h"
- 
- #include "include/private/SkTPin.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpaceXformSteps.h"
- #include "src/core/SkCompressedDataUtils.h"
- #include "src/core/SkConvertPixels.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/images/SkImageEncoderFns.h
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/src/images/SkImageEncoderFns.h
-@@ -12,7 +12,7 @@
- #include "include/core/SkICC.h"
- #include "include/core/SkTypes.h"
- #include "include/private/SkColorData.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- 
- typedef void (*transform_scanline_proc)(char* dst, const char* src, int width, int bpp);
- 
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/AndroidCodecTest.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/AndroidCodecTest.cpp
-@@ -18,7 +18,7 @@
- #include "include/core/SkSize.h"
- #include "include/core/SkString.h"
- #include "include/core/SkTypes.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/codec/SkCodecImageGenerator.h"
- #include "src/core/SkPixmapPriv.h"
- #include "tests/Test.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/CodecTest.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/CodecTest.cpp
-@@ -37,7 +37,7 @@
- #include "include/encode/SkWebpEncoder.h"
- #include "include/private/SkMalloc.h"
- #include "include/private/SkTemplates.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "include/utils/SkRandom.h"
- #include "src/codec/SkCodecImageGenerator.h"
- #include "src/core/SkAutoMalloc.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ColorSpaceTest.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ColorSpaceTest.cpp
-@@ -12,7 +12,7 @@
- #include "include/core/SkRefCnt.h"
- #include "include/core/SkStream.h"
- #include "include/core/SkTypes.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpacePriv.h"
- #include "tests/Test.h"
- #include "tools/Resources.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ICCTest.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/ICCTest.cpp
-@@ -9,7 +9,7 @@
- 
- #include "include/core/SkICC.h"
- #include "include/core/SkString.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpacePriv.h"
- #include "tests/Test.h"
- #include "tools/Resources.h"
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/NonlinearBlendingTest.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tests/NonlinearBlendingTest.cpp
-@@ -6,7 +6,7 @@
-  */
- 
- #include "include/core/SkColorSpace.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpaceXformSteps.h"
- #include "tests/Test.h"
- 
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/doxygen/Doxyfile
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/doxygen/Doxyfile
-@@ -795,7 +795,6 @@
-   ../../include/docs \
-   ../../include/gpu \
-   ../../include/pathops \
-  ../../third_party/skcms \
-   ../../modules/particles/include \
-   ../../modules/skottie/include \
-   ../../modules/sksg/include \
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/imgcvt.cpp
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/imgcvt.cpp
-@@ -10,7 +10,7 @@
- #include "include/core/SkImage.h"
- #include "include/core/SkStream.h"
- #include "include/core/SkSurface.h"
-#include "include/third_party/skcms/skcms.h"
-+#include "skcms.h"
- #include "src/core/SkColorSpacePriv.h"
- 
- static void write_png(const char* path, sk_sp<SkImage> img) {
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
-@@ -76,8 +76,7 @@
- need_rewriting = []
- for file_path in to_rewrite():
-   if ('/generated/' in file_path or
-      'tests/sksl/' in file_path or
-      'third_party/skcms' in file_path):
-+      'tests/sksl/' in file_path):
-     continue
-   if (file_path.endswith('.h') or
-       file_path.endswith('.c') or
--- a/media-libs/skia/files/skia-97-system-skcms.patch
+++ b/media-libs/skia/files/skia-97-system-skcms.patch
@@ -1,52 +0,0 @@
--- a/BUILD.gn
-+++ b/BUILD.gn
-@@ -93,7 +93,7 @@
-       "GR_TEST_UTILS=1",
-     ]
-   }
-  libs = []
-+  libs = [ "skcms" ]
-   lib_dirs = []
-   if (skia_use_gl && skia_use_angle) {
-     defines += [ "SK_ANGLE" ]
-@@ -1110,21 +1110,6 @@
-   sources = [ "src/codec/SkRawCodec.cpp" ]
- }
- 
-import("third_party/skcms/skcms.gni")
-skia_source_set("skcms") {
-  cflags = []
-  if (!is_win || is_clang) {
-    cflags += [
-      "-w",
-      "-std=c11",
-    ]
-  }
-
-  public = [ "include/third_party/skcms/skcms.h" ]
-  include_dirs = [ "include/third_party/skcms" ]
-  sources = rebase_path(skcms_sources, ".", "third_party/skcms")
-}
-
- optional("typeface_freetype") {
-   enabled = skia_use_freetype
- 
-@@ -1225,7 +1210,6 @@
-     ":gpu",
-     ":graphite",
-     ":pdf",
-    ":skcms",
-     ":xps",
-   ]
- 
-@@ -2096,9 +2080,9 @@
-     test_app("imgcvt") {
-       sources = [ "tools/imgcvt.cpp" ]
-       deps = [
-        ":skcms",
-         ":skia",
-       ]
-+      libs = [ "skcms" ]
-     }
-     test_app("fm") {
-       sources = [
--- a/media-libs/skia/files/skia-97-system-vulkan.patch
+++ b/media-libs/skia/files/skia-97-system-vulkan.patch
@@ -1,101 +0,0 @@
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/BUILD.gn
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/BUILD.gn
-@@ -1479,10 +1479,6 @@
-   deps = [ "experimental/sktext" ]
- }
- 
-config("our_vulkan_headers") {
-  include_dirs = [ "include/third_party/vulkan" ]
-}
-
- # Targets guarded by skia_enable_tools may use //third_party freely.
- if (skia_enable_tools) {
-   skia_public_includes = [
-@@ -1569,7 +1565,6 @@
-   skia_source_set("public_headers_warnings_check") {
-     sources = [ "tools/public_headers_warnings_check.cpp" ]
-     configs = [
-      ":our_vulkan_headers",
-       ":cpp14",
-     ]
-     if (defined(skia_header_target_default_configs)) {
-@@ -1681,10 +1676,6 @@
-   test_lib("gpu_tool_utils") {
-     public_defines = []
- 
-    # Bots and even devs may not have Vulkan headers, so put
-    # include/third_party/vulkan on our path so they're always available.
-    all_dependent_configs = [ ":our_vulkan_headers" ]
-
-     defines = []
-     if (skia_enable_discrete_gpu) {
-       defines += [ "SK_ENABLE_DISCRETE_GPU" ]
-@@ -2204,7 +2195,6 @@
- 
-   test_app("skpinfo") {
-     sources = [ "tools/skpinfo.cpp" ]
-    configs = [ ":our_vulkan_headers" ]
-     deps = [
-       ":flags",
-       ":skia",
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/gpu/vk/GrVkVulkan.h
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/include/gpu/vk/GrVkVulkan.h
-@@ -11,7 +11,7 @@
- #include "include/core/SkTypes.h"
- 
- #if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
-#include "include/third_party/vulkan/vulkan/vulkan_core.h"
-+#include "vulkan/vulkan_core.h"
- #else
- // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
- // headers stay up to date for our needs
-@@ -21,7 +21,7 @@
- #ifdef SK_BUILD_FOR_ANDROID
- // This is needed to get android extensions for external memory
- #if SKIA_IMPLEMENTATION || !defined(SK_VULKAN)
-#include "include/third_party/vulkan/vulkan/vulkan_android.h"
-+#include "vulkan/vulkan_android.h"
- #else
- // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan
- // headers stay up to date for our needs
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/particles/BUILD.gn
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/modules/particles/BUILD.gn
-@@ -27,7 +27,6 @@
-     sources = skia_particle_sources
-     configs += [
-       "../../:skia_private",
-      "../../:our_vulkan_headers",
-     ]
-   }
- }
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/third_party/vulkanmemoryallocator/BUILD.gn
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/third_party/vulkanmemoryallocator/BUILD.gn
-@@ -12,7 +12,6 @@
- 
-   include_dirs = [
-     "../..",
-    "../../include/third_party/vulkan",
-   ]
- 
-   sources = [
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/check-headers-self-sufficient
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/check-headers-self-sufficient
-@@ -32,7 +32,6 @@
-     r'include/private/.*_impl\.h',
-     r'include/private/.*_neon\.h',
-     r'include/private/.*_sse\.h',
-    r'include/third_party/vulkan/.*',
-     r'include/utils/mac/SkCGUtils\.h',
-     r'include/views/SkOSWindow_.*\.h',
-     r'modules/.*',
--- /var/tmp/portage/media-libs/skia-97-r1/work/skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
-+++ skia-f2093bf1b076210bd017f237eaab84ea4d3d6771/tools/rewrite_includes.py
-@@ -43,7 +43,7 @@
- # Don't count our local Vulkan headers as Skia headers;
- # we don't want #include <vulkan/vulkan_foo.h> rewritten to point to them.
- # Nor do we care about things in node_modules, used by *Kits.
-ignorelist = ['include/third_party/vulkan', 'node_modules']
-+ignorelist = ['node_modules']
- 
- assert '/' in [os.sep, os.altsep]
- def fix_path(p):
--- a/media-libs/skia/files/skia-97-system-zlib.patch
+++ b/media-libs/skia/files/skia-97-system-zlib.patch
@@ -1,16 +0,0 @@
--- a/third_party/zlib/BUILD.gn
-+++ b/third_party/zlib/BUILD.gn
-@@ -196,13 +196,3 @@
- 
- config("zlib_config") {
- }
-
-third_party("compression_utils_portable") {
-  visibility = [ "//third_party/externals/angle2:*" ]
-  public_include_dirs = [ "../externals/zlib/google" ]
-  sources = [
-    "../externals/zlib/google/compression_utils_portable.cc",
-    "../externals/zlib/google/compression_utils_portable.h",
-  ]
-  public_deps = [ ":zlib" ]  # either system or from source
-}
--- a/media-libs/skia/metadata.xml
+++ b/media-libs/skia/metadata.xml
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <longdescription lang="en">
-Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.
-  </longdescription>
-  <use>
-    <flag name="ccpr">enable coverage counting path renderer</flag>
-    <flag name="freetype">enable <pkg>media-libs/freetype</pkg> support</flag>
-    <flag name="gpu">enable GPU backend</flag>
-    <flag name="harfbuzz">enable <pkg>media-libs/harfbuzz</pkg> support</flag>
-    <flag name="lottie">Play back bodymovin lottie files</flag>
-    <flag name="opencl">enable opencl support</flag>
-    <flag name="rive">enable support for rive files</flag>
-    <flag name="svg">enable support for SVG files</flag>
-    <flag name="vulkan">enable vulkan backend</flag>
-  </use>
-</pkgmetadata>
--- a/media-libs/skia/skia-97-r2.ebuild
+++ b/media-libs/skia/skia-97-r2.ebuild
@@ -1,213 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
-COMMIT="f2093bf1b076210bd017f237eaab84ea4d3d6771"
-
-DESCRIPTION="A complete 2D graphic library for drawing Text, Geometries, and Images"
-HOMEPAGE="
-	https://skia.org
-	https://github.com/google/skia
-"
-SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-KEYWORDS="~amd64"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="+ccpr debug ffmpeg +fontconfig +freetype gpu +harfbuzz +icu jit +jpeg +lottie lua opencl +opengl +pdf +png +rive svg vulkan +webp +zlib +X +xml"
-#TODO: find out how to enable and link: angle dawn piex sfntly wuffs
-
-CDEPEND="
-	media-libs/skcms:=
-
-	ffmpeg? ( media-video/ffmpeg )
-	fontconfig? ( media-libs/fontconfig )
-	freetype? ( media-libs/freetype )
-	harfbuzz? ( media-libs/harfbuzz:=[icu?] )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( media-libs/libjpeg-turbo )
-	lua? ( dev-lang/lua:* )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	webp? ( media-libs/libwebp )
-	xml? ( dev-libs/expat )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="
-	${CDEPEND}
-	opencl? ( virtual/opencl )
-"
-DEPEND="
-	${PYTHON_DEPS}
-	${CDEPEND}
-	opencl? ( dev-util/opencl-headers )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="dev-util/gn"
-
-PATCHES=(
-	"${FILESDIR}/${P}-system-skcms-headers.patch"
-	"${FILESDIR}/${P}-system-skcms.patch"
-	"${FILESDIR}/${P}-system-vulkan.patch"
-	"${FILESDIR}/${P}-questionable-flags.patch"
-	"${FILESDIR}/${P}-system-zlib.patch"
-)
-
-REQUIRED_USE="
-	X? ( opengl )
-"
-
-src_prepare() {
-	rm -r include/third_party/* || die
-	rm -r third_party/skcms || die
-
-	default
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-
-	local myconf_gn=()
-	passflags() {
-		local _f _x
-		_f=( ${1} )
-		_x="[$(printf '"%s", ' "${_f[@]}")]"
-		myconf_gn+=( extra_${2}="${_x}" )
-	}
-	passflags "${CFLAGS}" cflags_c
-	passflags "${CXXFLAGS}" cflags_cc
-	passflags "${LDFLAGS}" ldflags
-
-	# skia_qt_path = getenv("QT_PATH") #todo
-
-	myconf_gn+=(
-		ar=\"${AR}\"
-		cc=\"${CC}\"
-		cxx=\"${CXX}\"
-		is_component_build=true
-		is_official_build=true
-		is_shared_library=true
-		skia_build_fuzzers=false
-		skia_compile_processors = true
-		skia_compile_sksl_tests=false
-		skia_enable_android_utils=false #android
-		skia_enable_api_available_macro = true
-		skia_enable_flutter_defines = false
-		skia_enable_fontmgr_android=false #android
-		skia_enable_fontmgr_win_gdi=false #windows
-		skia_enable_nga=false
-		skia_enable_tools=false
-		skia_enable_winuwp = false
-		skia_generate_workarounds = false
-		skia_include_multiframe_procs = false
-		skia_lex = false
-		skia_skqp_global_error_tolerance=0
-		skia_update_fuchsia_sdk=false #fuchsia
-		skia_use_angle=false #todo
-		skia_use_dawn=false #todo
-		skia_use_direct3d=false #windows
-		skia_use_dng_sdk=false
-		skia_use_libheif=false #android only
-		skia_use_experimental_xform=false
-		skia_use_fixed_gamma_text=false #android
-		skia_use_fonthost_mac=false #mac
-		skia_use_libgifcodec=false #todo
-		skia_use_metal=false #ios
-		skia_use_ndk_images=false #android
-		skia_use_piex=false #todo
-		skia_use_sfml=false #todo
-		skia_use_sfntly=false #todo
-		skia_use_webgl=false #todo
-		skia_use_wuffs=false #todo
-		skia_use_xps=false #windows
-
-		skia_enable_ccpr=$(usex ccpr true false)
-		skia_enable_gpu=$(usex gpu true false)
-		skia_enable_gpu_debug_layers=$(usex debug true false)
-		skia_enable_pdf=$(usex pdf true false)
-		skia_enable_skottie=$(usex lottie true false)
-		skia_enable_skrive=$(usex rive true false)
-		skia_enable_skvm_jit_when_possible=$(usex jit true false)
-		skia_enable_svg=$(usex svg true false)
-		skia_pdf_subset_harfbuzz =$(usex harfbuzz true false)
-		skia_use_egl=$(usex opengl true false)
-		skia_use_expat=$(usex xml true false)
-		skia_use_ffmpeg=$(usex ffmpeg true false)
-		skia_use_fontconfig=$(usex fontconfig true false)
-		skia_use_gl=$(usex opengl true false)
-		skia_use_harfbuzz=$(usex harfbuzz true false)
-		skia_use_icu=$(usex icu true false)
-		skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
-		skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
-		skia_use_libpng_decode=$(usex png true false)
-		skia_use_libpng_encode=$(usex png true false)
-		skia_use_libwebp_decode=$(usex webp true false)
-		skia_use_libwebp_encode=$(usex webp true false)
-		skia_use_lua=$(usex lua true false)
-		skia_use_opencl=$(usex opencl true false)
-		skia_use_vma=$(usex vulkan true false)
-		skia_use_vulkan=$(usex vulkan true false)
-		skia_use_x11=$(usex X true false)
-		skia_use_zlib=$(usex zlib true false)
-	)
-
-		if use freetype; then
-			myconf_gn+=( skia_enable_fontmgr_custom_directory=true )
-			myconf_gn+=( skia_enable_fontmgr_custom_embedded=true )
-			myconf_gn+=( skia_enable_fontmgr_custom_empty=true )
-			myconf_gn+=( skia_use_freetype=true )
-			myconf_gn+=( skia_use_system_freetype2=true )
-
-			if use fontconfig; then
-				myconf_gn+=( skia_enable_fontmgr_fontconfig=true )
-				myconf_gn+=( skia_enable_fontmgr_FontConfigInterface=true )
-			fi
-		else
-			myconf_gn+=( skia_enable_fontmgr_custom_directory=false )
-			myconf_gn+=( skia_enable_fontmgr_custom_embedded=false )
-			myconf_gn+=( skia_enable_fontmgr_custom_empty=false )
-			myconf_gn+=( skia_use_freetype=false )
-			myconf_gn+=( skia_use_system_freetype2=false )
-		fi
-
-		if ! use freetype !! ! use fontconfig; then
-			myconf_gn+=( skia_enable_fontmgr_fontconfig=false )
-			myconf_gn+=( skia_enable_fontmgr_FontConfigInterface=false )
-		fi
-
-#		skia_use_angle=$(usex angle true false)
-#		skia_use_piex=$(usex piex true false)
-#		skia_use_sfntly=$(usex sfntly true false)
-#		skia_use_wuffs=$(usex wuffs true false)
-
-	use harfbuzz	&& myconf_gn+=( skia_use_system_harfbuzz=true )
-	use icu		&& myconf_gn+=( skia_use_system_icu=true )
-	use jpeg	&& myconf_gn+=( skia_use_system_libjpeg_turbo=true )
-	use lua		&& myconf_gn+=( skia_use_system_lua=true )
-	use png		&& myconf_gn+=( skia_use_system_libpng=true )
-	use webp	&& myconf_gn+=( skia_use_system_libwebp=true )
-	use zlib	&& myconf_gn+=( skia_use_system_zlib=true )
-
-	myconf_gn="${myconf_gn[@]} ${EXTRA_GN}"
-	set -- gn gen --args="${myconf_gn% }" out/Release || die
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	eninja -C out/Release
-}
-
-src_install() {
-	dolib.so out/Release/*.so
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-}
--- a/mpv-plugin/autoload/Manifest
+++ b/mpv-plugin/autoload/Manifest
@@ -1,2 +1 @@
-DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de SHA512 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
--- a/mpv-plugin/autoload/autoload-0.35.0.ebuild
+++ b/mpv-plugin/autoload/autoload-0.35.0.ebuild
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-DESCRIPTION="Loads playlist entries before and after the the currently played file"
-HOMEPAGE="https://github.com/mpv-player/mpv/tree/master/TOOLS/lua"
-
-# use the already available mpv tarball
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> mpv-${PV}.tar.gz"
-
-# since this comes from mpv, use its licenses
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT"
-KEYWORDS="~amd64"
-
-# lock mpv version
-RDEPEND="~media-video/mpv-${PV}"
-
-S="${WORKDIR}/mpv-${PV}/TOOLS/lua"
-
-MPV_PLUGIN_FILES=( ${PN}.lua )
--- a/net-client/lagrange/Manifest
+++ b/net-client/lagrange/Manifest
@@ -1,4 +1,4 @@
-DIST lagrange-1.15.6.tar.gz 9958460 BLAKE2B 4e8240b4c28839084865073d94ba5b09057277f3cbe218c8aa7c49368f69cc4ba1b662f3649fa9d7bc69c462b5cf383d566d6da5ea84f10c6d7dd0f4200a2f46 SHA512 6cd5e81284c87d756c3db84fcf077f4c05243b42f6214311b0db61f51e552673114fd3f74517c3f83aaa05d95e413eab06d1e3f0518fc47e319f24ba3e2aa0de
-DIST lagrange-1.15.6.tar.gz.sig 488 BLAKE2B 775ad1097a79720ea6cfc2b9c878e20728916024c3af938641c7d55e54e33929938b9fd7f789dc29039df35171ed46159ea97ddb8c78347f042a137640269f8c SHA512 57201914a24a5241d45a5e263f5498b3fabc524931d3688db1e33cb8dd3956c8cfadc4c21c2249386613c2caaa2e0805558a013ab163591151dae8f518cb2ae7
 DIST lagrange-1.15.7.tar.gz 9959976 BLAKE2B df62306ff70a89cb4f422a98c582feeeaea1e5e53e88463cbb73cc0357b2d136c91099ca4863f69eeaee952834efa97624c01ea44114c5b25c404f52e630ebc1 SHA512 39c2b8ec9ac2fb064d6ca4a1ebb130ba9f797f75ddd3587c068585a724cf248367f6cc4e5a4dd81dda2e54dc57557ebd3dcef602f510bb90c36dbb03908111c1
 DIST lagrange-1.15.7.tar.gz.sig 488 BLAKE2B 90375227a1010528f04b6be62cb3482c1dba18406c8cd9befa7ee44e13e1e0dd85e60fb68138c308ddae284d2db70c9cb62d86dfc06d016d91f1b356a7129c56 SHA512 bceb3c09b786f9170babd08d2f86a765cfd73886d06388f0f06d6ef10c198c0b8dbc4c038ed9172daff203bf783c5c92c46390ca24432ef969936944e1ab3da1
+DIST lagrange-1.15.8.tar.gz 9961734 BLAKE2B 764faef4a717de3219484bc7be03a5a42981b4946c9b36c2b97313500cff0e3f25d952393d1558f848ff898ab4e3bd9c12ee1b0c9ea7eaf1ab81d94910c61445 SHA512 d386bdbac133bc1dad73e0c5593875c234b567aba3706ef6c9b43d3aaa3761593beb20229182d1c00e941583d1ce81138d55941033df01112d4cc49b8ad8c9ee
+DIST lagrange-1.15.8.tar.gz.sig 488 BLAKE2B 226bc957f7cd43356c41109d287ee68b35b5577738aba6a1fd1210c521233d5ce7c622c876737d34ebc532e1801f97721f1553368612cfcb659dde971901ed76 SHA512 c5736e4f16707e5c112634dbc003fdc7747d89d5fbcc69517b514b6037d570d8ff44e48d33a259e428705191e161e6bd13eb7553ac7c9b362a3e8852734eb7db
--- a/net-client/lagrange/lagrange-1.15.8.ebuild
+++ b/net-client/lagrange/lagrange-1.15.8.ebuild
--- a/net-im/session-desktop-bin/Manifest
+++ b/net-im/session-desktop-bin/Manifest
@@ -1 +1 @@
-DIST session-desktop-linux-amd64-1.10.7.deb 67822974 BLAKE2B 4fb8290f068a360717d945fde10e0de12585d1df0c14df9edcfc3112da4b693a4d8a4aad1f859ba4ef50190b94ebe87c639a164d6f33a93de345f107edcc4d6d SHA512 7acb2ecc42161a0bb6325a068f6ba8f8464fb9c1f2fa449318e4e69a9538882a6a7a432769949629dc57d305c266d3570a3ee78be77986a8475d8fb8f1f3ef8a
+DIST session-desktop-linux-amd64-1.10.8.deb 67823156 BLAKE2B fa41b44560a22d2244ec99c96f0c50d16d5706912aebef5e5607c908f2f02e5c37255ee371472af64e7d145549de6477c16b4fe32ca4fbd3cc4a38bfb1df1caf SHA512 da5a68904c1e09885bcc880ca98bebdadfd884b7b8447208624c6f2deb469fd5e4f0e3fffd8686bc6919f96a2d06092f3e8b40839df3c565833850bc64945079
--- a/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild
+++ b/net-im/session-desktop-bin/session-desktop-bin-1.10.8.ebuild
--- a/net-misc/cve-client/Manifest
+++ b/net-misc/cve-client/Manifest
@@ -0,0 +1 @@
+DIST cve-client-1.0.4.tar.gz 5800 BLAKE2B 3b1fbe1cbbb2e227e9723eb3ca15644ec501b5061dc0c976b34ed8ea5ccdc4055b59d871261a8ee00f578889a60204ef396688acde649cabeb529ca322ba0918 SHA512 143046dab5b21fb915ce75007efeb1c70f7993fd3c5032538ee42fb0df11067779965c0e2aa569198315df687b0231b4bfdd2dbb77fd45f81ad40ed9a1e5a69f
--- a/net-misc/cve-client/cve-client-1.0.4.ebuild
+++ b/net-misc/cve-client/cve-client-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+if [[ "${PV}" = "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://hacktivis.me/git/cve-client.git"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="CLI-based client / toolbox for CVE.org"
+HOMEPAGE="https://hacktivis.me/git/cve-client/"
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-perl/JSON-MaybeXS
+	dev-perl/LWP-Protocol-https
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-perl/Test-Output )
+"
--- a/net-misc/cve-client/cve-client-9999.ebuild
+++ b/net-misc/cve-client/cve-client-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+if [[ "${PV}" = "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://hacktivis.me/git/cve-client.git"
+	EGIT_MIN_CLONE_TYPE="single+tags"
+else
+	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="CLI-based client / toolbox for CVE.org"
+HOMEPAGE="https://hacktivis.me/git/cve-client/"
+LICENSE="AGPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-perl/JSON-MaybeXS
+	dev-perl/LWP-Protocol-https
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-perl/Test-Output )
+"
--- a/net-misc/cve-client/metadata.xml
+++ b/net-misc/cve-client/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpan">App-CveClient</remote-id>
+		<remote-id type="cpan-module">App::CveClient</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-misc/gdown/Manifest
+++ b/net-misc/gdown/Manifest
@@ -0,0 +1 @@
+DIST gdown-4.7.1.gh.tar.gz 238770 BLAKE2B 3a362eaf98bcd006d02edcefb61a9c2722701c3c05f0997ed78216b630698ac1362554d40663ce1833faa66c6c42623cb119271c299a8ba1bddefd958cd4ce15 SHA512 1302fce5c920dc963d0d278c1c295821a30fb5034de3ecd6da8c49871dce85e0d4a2eba00233d3eb5214b49149bd2d5246db1a21aa68241b0ba67fddd2509019
--- a/net-misc/gdown/gdown-4.7.1.ebuild
+++ b/net-misc/gdown/gdown-4.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Google Drive direct download of big files"
+HOMEPAGE="
+	https://pypi.org/project/gdown/
+	https://github.com/wkentaro/gdown
+"
+SRC_URI="https://github.com/wkentaro/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	dev-python/requests[socks5,${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/net-misc/gdown/metadata.xml
+++ b/net-misc/gdown/metadata.xml
@@ -0,0 +1,12 @@
+<?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">wkentaro/gdown</remote-id>
+		<remote-id type="pypi">gdown</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -0,0 +1 @@
+DIST tuba-0.2.0.tar.gz 233703 BLAKE2B 8131986f481031257a59a4d2902364cec042d3d773cee0dee3b1ef8628ea1e2dbb32619c6f9054b43c88a1da51a53d1877896f0082ad482387876000b47d40ab SHA512 c5e07199c950963ac6f398d36f2da760a6fa734e247ba1defc3b98f9aa53d1626cf519988a96c5c7e16f32b79d7f5ad6bec02d6eab84cc132f2f634176fdd2f5
--- a/media-libs/skcms/metadata.xml
+++ b/media-libs/skcms/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
+    <email>laurent.morretton@gmail.com</email>
+    <name>Laurent Morretton</name>
  </maintainer>
+  <upstream>
+    <remote-id type="github">GeopJr/Tuba</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/net-misc/tuba/tuba-0.2.0.ebuild
+++ b/net-misc/tuba/tuba-0.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson vala xdg
+
+DESCRIPTION="Mastodon client, previously known as Tooth"
+HOMEPAGE="https://github.com/GeopJr/Tuba"
+MY_PN="Tuba"
+SRC_URI="https://github.com/GeopJr/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="
+	>=app-crypt/libsecret-0.20
+	>=dev-libs/glib-2.71.2
+	>=dev-libs/json-glib-1.4.4
+	>=dev-libs/libxml2-2.9.10
+	>=dev-libs/libgee-0.8.5
+	gui-libs/gtk:4
+	>=gui-libs/libadwaita-1.2
+	>=net-libs/libsoup-3
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	$(vala_depend)
+	virtual/pkgconfig
+"
+
+VALA_MIN_API_VERSION=0.48
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -6,3 +6,4 @@ DIST xmrig-mo-6.18.0-mo1.tar.gz 2445451 BLAKE2B 0234a4fb15e0271091c5700f047751b9
 DIST xmrig-mo-6.18.1-mo1.tar.gz 2452916 BLAKE2B bd52bfb1a83b5efeee713f376040cd8b897d1595cfc2a7821476c1b6c2ec243c4fa64f8c3d46306c301729178c4b3198e2ff81e6e8cb6c21111fc9cee5eecedf SHA512 28423bfd9b78f0291f0b75e7c59ac73928363a9f77d1f7be029e6f8d406f3a75bc6d4dc9db20f0be20ea13b945256d61f0901151ae7ce0f145ea6a90986e5518
 DIST xmrig-mo-6.19.0-mo1.tar.gz 2468314 BLAKE2B 612bc689b5c8c3bba63ea4fa55edad4b36aebf8e35cdd2d2ea33eab865bc9c6c923d2f770b0bc15a71dfc95781942fcb388cf1d82d78c25f03de57af8ea6427f SHA512 d1e8140530bf847f667ba89a49b1803cf6140cc2a1678a6df1f7b6a1c1f99eb966506a8d8398f65a9f829bb527e3476f427f3203a9692dd89efa7bd879b75c5c
 DIST xmrig-mo-6.19.1-mo1.tar.gz 2468434 BLAKE2B b60767cfecb25ad526b025f81d8565c97ff2e7deebcd04f3aa466782e2c85d0a52e2878e6597de688f87db7b43ef8a1c91b70053e4bceec2022db9acfc87d8c7 SHA512 33c197a37de981510d3ace619aa4d55b5cd8ad74e918cc93d0be453e2b707f6437d67e3110f16db13e98b6a345c50f50455b4be9ebbb47de30cc7e95221961c3
+DIST xmrig-mo-6.19.2-mo1.tar.gz 2468797 BLAKE2B 8918db8a82ed0d00dfe0e9c099939449b55143509f6a8f7afb814eece04286facbcf5c522a57515d6b4e711b44981e3f15347f09df5aa4d6b959a8fea76cf0ef SHA512 160aa795c97382c89e669b2753e32ef74a1ae546e531118dbfc4b3367af628aeed2f5965a587b5bc6cf3a903c31a1f73d1bc07259aaa16ab3c66083472a71f49
--- a/net-misc/xmrig-mo/xmrig-mo-6.19.2.ebuild
+++ b/net-misc/xmrig-mo/xmrig-mo-6.19.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MO_PV="mo1"
+DESCRIPTION="MoneroOcean fork of xmrig that supports algo switching"
+HOMEPAGE="https://github.com/MoneroOcean/xmrig"
+SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	newbin "${BUILD_DIR}/xmrig" xmrig-mo
+}
--- a/net-p2p/lbry/Manifest
+++ b/net-p2p/lbry/Manifest
@@ -1,3 +0,0 @@
-DIST lbry-0.50.2.deb 171020830 BLAKE2B b6c54dcbc0dd49bc615cbcea97e3d1620c2c47b7fac6e0250ed366377d3b915bceaf0e185eacd2f4241057370c048cce0f6c3041fb6d4ad051ded5d05f0a957b SHA512 034726bdc634e5fc6d7b74f1accd6976f0299a5115eb4dc34de3973071d69db317970e88a42c7246dbc417823beb71906c0b394d09b8a216f52cef1e3a83f696
-DIST lbry-0.51.2.deb 181217578 BLAKE2B b9ae7c761c2d05df84355187eec6cdaefac078e84061790cdd0e246503034a0ec0000ad717e013b31292805ca81fbdd07530fe6a2ef22bfd47bef6b2e63b73b3 SHA512 da01e022402a141caa7d627afeac52698a5b5407de9d2fc9fadc4bb82e599c8a153e7c4444f1ef22ea8bd81624aa67688cd131a1584bb90d3dcd352534158b61
-DIST lbry-0.52.0.deb 291219532 BLAKE2B a6e740f42f32863c887aa5f54037cccb1adfe3bde26a92837eb34afd7a2ae52284f8649860cb94d76351c5b3eb240459a87d959647f2e9a319528050d66e6219 SHA512 b131da951da16e2a22feb0ffc1fa022963dcbcbfb23b50d21ed697748f6d1c72e8eb9be5583204be4c8718f44f3195c0f9fab1ad63505f3d4aa40de8d20776a3
--- a/net-p2p/lbry/lbry-0.50.2.ebuild
+++ b/net-p2p/lbry/lbry-0.50.2.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A browser for the LBRY network, a digital marketplace controlled by its users."
-HOMEPAGE="https://lbry.com/"
-SRC_URI="https://github.com/lbryio/lbry-desktop/releases/download/v${PV}/LBRY_${PV}.deb -> ${P}.deb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-QA_PREBUILT="*"
-
-RDEPEND="
-	dev-libs/libappindicator
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/libnotify
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	unpack "${S}"/data.tar.xz
-	rm "${S}"/{control,data,debian}* || die
-}
-
-src_install() {
-	doins -r *
-	rm -rd "${ED}"/usr/share/doc || die
-	fperms 0755 /opt/LBRY/lbry || die
-	fperms 0755 /opt/LBRY/resources/static/daemon/lbrynet || die
-}
--- a/net-p2p/lbry/lbry-0.51.2.ebuild
+++ b/net-p2p/lbry/lbry-0.51.2.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A browser for the LBRY network, a digital marketplace controlled by its users."
-HOMEPAGE="https://lbry.com/"
-SRC_URI="https://github.com/lbryio/lbry-desktop/releases/download/v${PV}/LBRY_${PV}.deb -> ${P}.deb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-QA_PREBUILT="*"
-
-RDEPEND="
-	dev-libs/libappindicator
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/libnotify
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	unpack "${S}"/data.tar.xz
-	rm "${S}"/{control,data,debian}* || die
-}
-
-src_install() {
-	doins -r *
-	rm -rd "${ED}"/usr/share/doc || die
-	fperms 0755 /opt/LBRY/lbry || die
-	fperms 0755 /opt/LBRY/resources/static/daemon/lbrynet || die
-}
--- a/net-p2p/lbry/lbry-0.52.0.ebuild
+++ b/net-p2p/lbry/lbry-0.52.0.ebuild
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A browser for the LBRY network, a digital marketplace controlled by its users."
-HOMEPAGE="https://lbry.com/"
-SRC_URI="https://github.com/lbryio/lbry-desktop/releases/download/v${PV}/LBRY_${PV}.deb -> ${P}.deb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-QA_PREBUILT="*"
-
-RDEPEND="
-	dev-libs/libappindicator
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/libnotify
-	x11-libs/libXtst
-	x11-libs/libXScrnSaver
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	unpack "${S}"/data.tar.xz
-	rm "${S}"/{control,data,debian}* || die
-}
-
-src_install() {
-	doins -r *
-	rm -rd "${ED}"/usr/share/doc || die
-	fperms 0755 /opt/LBRY/lbry || die
-	fperms 0755 /opt/LBRY/resources/static/daemon/lbrynet || die
-}
--- a/net-p2p/lbry/metadata.xml
+++ b/net-p2p/lbry/metadata.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>coppens.matthias.abc@gmail.com</email>
-        <name>Matthias Coppens</name>
-    </maintainer>
-    <upstream>
-        <bugs-to>https://github.com/lbryio/lbry-desktop/issues</bugs-to>
-        <remote-id type="github">lbryio/lbry-desktop</remote-id>
-    </upstream>
-</pkgmetadata>
--- a/net-proxy/snowflake/Manifest
+++ b/net-proxy/snowflake/Manifest
@@ -0,0 +1 @@
+DIST snowflake-2.5.1.tar.gz 17989511 BLAKE2B 5d254e483803d0c03121acb12a188250eee79aec1af69d22bc88600ce5ffb67af09e437998a072977e6c9437b3fe5612e84663a90be66fb370eebf10f03327e2 SHA512 270eefa3cc999db36118871d23b2beebf4ef002c23e4c6a41e33bfa25a9c51c0305d2b8ad01f34863001ac5f822a9d97496249e2a4c0ae5c1a7af58cc56c26a4
--- a/net-proxy/snowflake/files/snowflake-proxy.initd
+++ b/net-proxy/snowflake/files/snowflake-proxy.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# shellcheck shell=sh
+
+command="/usr/bin/snowflake-proxy"
+command_args="${SNOWFLAKE_PROXY_OPTS}"
+command_background=1
+command_user="nobody:nobody"
+pidfile="/run/snowflake-proxy.pid"
+
+depend() {
+	need net
+}
--- a/net-proxy/snowflake/files/snowflake-proxy.service
+++ b/net-proxy/snowflake/files/snowflake-proxy.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Snowflake Proxy
+Documentation=man:snowflake-proxy
+Documentation=https://snowflake.torproject.org/
+After=network-online.target nss-lookup.target
+Wants=network-online.target
+
+[Service]
+ExecStart=/usr/bin/snowflake-proxy
+Restart=on-failure
+
+DynamicUser=true
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
--- a/net-proxy/snowflake/metadata.xml
+++ b/net-proxy/snowflake/metadata.xml
@@ -0,0 +1,16 @@
+<?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>
+		<bugs-to>https://anonticket.onionize.space/</bugs-to>
+	</upstream>
+	<use>
+		<flag name="client">Build the client application</flag>
+		<flag name="server">Build the server application</flag>
+		<flag name="proxy">Build standalone proxy application</flag>
+	</use>
+</pkgmetadata>
--- a/net-proxy/snowflake/snowflake-2.5.1.ebuild
+++ b/net-proxy/snowflake/snowflake-2.5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+JOB_ID="222736"
+DESCRIPTION="Pluggable Transport using WebRTC, inspired by Flashproxy"
+HOMEPAGE="
+	https://snowflake.torproject.org/
+	https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake
+"
+SRC_URI="https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/${PN}/-/jobs/${JOB_ID}/artifacts/raw/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMPONENTS=( broker client probetest proxy server )
+
+src_compile() {
+	for component in "${COMPONENTS[@]}"; do
+		pushd ${component} || die
+		einfo "Building ${component}"
+		ego build
+		popd || die
+	done
+}
+
+src_test() {
+	ego test ./...
+}
+
+src_install() {
+	local component
+	for component in "${COMPONENTS[@]}"; do
+		newbin ${component}/${component} snowflake-${component}
+		newdoc ${component}/README.md README_${component}.md
+	done
+
+	systemd_dounit "${FILESDIR}"/snowflake-proxy.service
+	newinitd "${FILESDIR}"/snowflake-proxy.initd snowflake-proxy
+
+	einstalldocs
+	dodoc doc/*.txt doc/*.md
+	doman doc/*.1
+}
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,6 +14,11 @@

 # New entries go on top.

+# Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-04-09)
+# Library with no consumers left.
+# Masked for removal in 30 days.
+dev-libs/boinc-zip
+
 # Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-03-31)
 # Revdeps of masked packages:
 # - dev-python/booleanOperations
@@ -68,26 +73,6 @@ dev-python/mkdocs-render-swagger-plugin
 # https://github.com/McLeopold/PythonSkills/issues/11
 dev-python/skills

-# Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-03-08)
-# Libraries with no consumers and no releases. Very hard to maintain.
-# Masked for removal in 30 days.
-media-libs/skcms
-media-libs/skia
-
-# Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-03-08)
-# Python library with no consumers left in tree.
-# Masked for removal in 30 days.
-dev-python/uhashring
-
-# Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-03-06)
-# Ancient Python library with no tests enabled and no revdeps.
-# Masked for removal in 30 days.
-dev-python/pysftp
-
-# Anna Vyalkova <cyber+gentoo@sysrq.in> (2023-03-04)
-# Depend on masked gconf.
-net-p2p/lbry
-
 # Julien Roy <julien@jroy.ca> (2023-01-25)
 # Requires <dev-python/coverage-7, which is no longer available in ::gentoo.
 # Upstream bug: https://github.com/TheKevJames/coveralls-python/issues/377
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -7,10 +7,6 @@
 # Masked due to infinite run of tests with USE="openmp"
 ~sci-physics/SU2-7.2.0 openmp

-# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2022-06-26)
-# depend on masked dev-python/python-binary-memcached
-dev-python/oslo-cache test
-
 # Alessandro Barbieri <lssndrbarbieri@gmail.com> (2022-05-22)
 # cmake failure
 # https://github.com/mfem/mfem/issues/2243
--- a/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild
+++ b/sci-mathematics/frama-c/frama-c-23.1-r1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="strip"

 RDEPEND="
 	>=dev-lang/ocaml-4.08.1[ocamlopt?]
-	>=dev-ml/ocamlgraph-1.8.5[gtk(-)?,ocamlopt?]
+	>=dev-ml/ocamlgraph-1.8.5[ocamlopt?]
 	>=dev-ml/zarith-1.5[ocamlopt?]
 	>=dev-ml/yojson-1.4.1[ocamlopt?]
 	gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] )"
--- a/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild
+++ b/sci-mathematics/frama-c/frama-c-24.0-r1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="strip"

 RDEPEND="
 	>=dev-lang/ocaml-4.08.1[ocamlopt?]
-	>=dev-ml/ocamlgraph-1.8.8[gtk(-)?,ocamlopt?]
+	>=dev-ml/ocamlgraph-1.8.8[ocamlopt?]
 	>=dev-ml/zarith-1.5[ocamlopt?]
 	>=dev-ml/yojson-1.4.1[ocamlopt?]
 	gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] )"
--- a/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild
+++ b/sci-mathematics/frama-c/frama-c-25.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -18,12 +18,12 @@ RESTRICT="strip"

 RDEPEND="
 	>=dev-lang/ocaml-4.08.1[ocamlopt?]
-	>=dev-ml/ocamlgraph-1.8.8[gtk(-)?,ocamlopt?]
+	>=dev-ml/ocamlgraph-2.0.0[ocamlopt?]
 	dev-ml/ppx_import[ocamlopt?]
 	dev-ml/ppx_deriving[ocamlopt?]
 	>=dev-ml/zarith-1.5[ocamlopt?]
 	>=dev-ml/yojson-1.4.1[ocamlopt?]
-	gtk? ( >=dev-ml/lablgtk-2.14:2=[sourceview,gnomecanvas,ocamlopt?] )"
+	gtk? ( dev-ml/lablgtk:3=[ocamlopt?,sourceview] )"
 DEPEND="${RDEPEND}
 	media-gfx/graphviz"

--- a/sci-misc/boinc-wrapper/Manifest
+++ b/sci-misc/boinc-wrapper/Manifest
@@ -1 +1 @@
-DIST boinc-7.20.2.tar.gz 46555666 BLAKE2B 4d11217739d341c5b61d86afa02eebdad80809f42caa3f6dea1d86ed53d79004d60fa362fd04d53060060472e108e0ee0aa0428e4799eb70f2e98f07dc1f39cd SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb
+DIST boinc-wrapper-26018.tar.gz 46563463 BLAKE2B 18ea79d095b45ca9baac0f5d2511fe264356175e28428ae5b5cbf6eed1bcc5cf0b8d1b99f55326ae77605b43ea7454d57cb042e2a27744dc7b96375674a7cc77 SHA512 f5aecfd79bd21ab715eb1091d0bdf34f5cc3d3d6504fccb9d88f953694d3be085b9bd087d82939f324ded5e5b76846aac425b8eec2ecb3b43e8d1db6a6a11733
--- a/sci-misc/boinc-wrapper/boinc-wrapper-26018.ebuild
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-26018.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BOINC_SUBMODULE="samples/wrapper"
+inherit boinc
+
+DESCRIPTION="Wrapper to use non-BOINC apps with BOINC"
+HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="Info-ZIP LGPL-3+ regexp-UofT"
+SLOT="0"
+
+# libboinc-api dependencies
+DEPEND="
+	dev-libs/openssl
+	media-libs/freeglut
+	media-libs/libjpeg-turbo
+"
+
+DOCS=( job.xml )
+
+boinc_require_source ${PV} wrapper
+boinc_enable_autotools
+
+src_compile() {
+	pushd "${BOINC_BUILD_DIR}" || die
+	emake
+	popd || die
+
+	emake
+}
+
+src_install() {
+	einstalldocs
+	newbin wrapper boinc-wrapper
+}
--- a/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild
+++ b/sci-misc/boinc-wrapper/boinc-wrapper-7.20.2.ebuild
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BOINC_SUBMODULE="samples/wrapper"
-inherit boinc
-
-DESCRIPTION="Wrapper to use non-BOINC apps with BOINC"
-HOMEPAGE="https://boinc.berkeley.edu/trac/wiki/WrapperApp"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-LICENSE="LGPL-3+ regexp-UofT"
-SLOT="0"
-
-# sci-misc/boinc doesn't have all necessary headers, so
-# we have to include from build root. All that said,
-# versions must not mismatch.
-RDEPEND="
-	~sci-misc/boinc-${PV}
-	dev-libs/boinc-zip
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-$(ver_cut 1-2)-makefile.patch )
-DOCS=( job.xml )
-
-boinc_require_source
-
-boinc_override_config "${FILESDIR}"/config.override.h
-
-src_install() {
-	einstalldocs
-	newbin wrapper boinc-wrapper
-}
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -1,2 +1,3 @@
 DIST limine-4.20230325.0.tar.xz 897164 BLAKE2B ce0ca350667210e0bf1fedfebee97e1763ca706b7f756e4d81fcd0ba35df436efac987bc9cb784dfc99ac770fcc5feee6145d763dc8df67f61231013262511ec SHA512 bfe6dbd9b8bc636431a6e494ce636bd29a2c6df1cd568621e980fe17f026a2bca14a1ca6d4c8d45a30f37f6ac99e62e94eccdbcebea52bc73783fbcf049a9369
 DIST limine-4.20230330.0.tar.xz 897596 BLAKE2B 3047befde6284fe3907a1e427d3f3821ca153c93fcad1e286a577ca68f5d7930ed07361c5d1042eb90fe038db081ff7fea2c09a25ad316efabc1f38e61a02ecc SHA512 04eb7335c0d493b86a0de10763a52265ef0c36c23dc7998f482ca0a47597c439b5d8e261b60cdfb851fac4778fd4ae569b970f1f0ea00e30d965b590584fcf0d
+DIST limine-4.20230408.0.tar.xz 896416 BLAKE2B c4a5d0a93082b4f9569b2af6d8b345ca7b0e00aeff42af112e2f07541b091f54451af7be969fad3d28c6108cf2106ce7d5d463f0237090bfd5b3548e50ca935f SHA512 0b3a7c907c79e8ddf0c54432ec65f4f42cce9f74a71dcf7d9c21a5a94b9957a72ed9d47216baf8cc9c03ef0e74ad883e2e2442571ff292952a60d61d379056f7
--- a/sys-boot/limine/limine-4.20230408.0.ebuild
+++ b/sys-boot/limine/limine-4.20230408.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Limine is a modern, advanced, and portable BIOS/UEFI multiprotocol bootloader"
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bios +bios-pxe +bios-cd +cd-efi +uefi32 +uefi64 +uefiaa64"
+
+MY_LLVM_TARGETS="AArch64 ARM X86"
+MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
+
+BDEPEND="
+	app-arch/gzip
+	dev-lang/nasm
+	sys-apps/findutils
+	sys-devel/clang[${MY_LLVM_FLAGS}]
+	sys-devel/lld
+	sys-devel/llvm[${MY_LLVM_FLAGS}]
+
+	cd-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+
+		"$(use_enable uefi32 uefi-ia32)"
+		"$(use_enable uefi64 uefi-x86-64)"
+		"$(use_enable uefiaa64 uefi-aarch64)"
+		"$(use_enable cd-efi uefi-cd)"
+	)
+
+	TOOLCHAIN_FOR_TARGET=llvm \
+	econf "${myconf[@]}"
+}
--- a/www-apps/mycorrhiza/Manifest
+++ b/www-apps/mycorrhiza/Manifest
@@ -1,2 +1,4 @@
 DIST mycorrhiza-1.13.0-vendor.tar.xz 619980 BLAKE2B 4a96132acd1e97105265dad263094a4be97a7ba30edf98e969a28363db2b4a11fd47f107eda7914decaa98b096e84cecbb96031ee10a1fc98b2239d9850325a9 SHA512 a8d2aaf15a9845830cac49a31c17a78b6beda2b39fcbc953111bb904bd3eee96d67411dcb5b97ff6b80005ebdb65066aa1816c8fc7d75a7525942f78a4d72e93
 DIST mycorrhiza-1.13.0.tar.gz 137249 BLAKE2B 140f161dda53e03d24f552e35afc1e489f337ef9703e1269c3a5ffac52a7f7deff97c90d4604ed0328c79cd15ece6e87240333d93d843d48844ef2af815ef0fc SHA512 ec1eda4764594af3ac36fcbb852e29e17881f656dc6e8cc6467d9a5f6c3604c24f29e3a9d882d15da1e55392f4a57fbdb27e033b7c0d273106356559617bfca4
+DIST mycorrhiza-1.14.0-vendor.tar.xz 655368 BLAKE2B 86060d537b37f37d4aa5695d74664090d517fb59e33c089fffa7103a1c79d1cb8ce42aceff198f448e223ade032d37cf836c4035456e47ed5762a26658888014 SHA512 97819fe2fa23783fec8f8249fdcd2eea25d3dafa6bbe81ecffe481a48086a591507dd341ee08a484281f8b6c6bc9a5ef31d75ad7781b3f2e4221496d44af6eaf
+DIST mycorrhiza-1.14.0.tar.gz 137956 BLAKE2B 202c0e8591b480a13e24133a7d5f76a71669b69ea70bfb86981721269ce808e07a3c0177dca19f33dadbd4ccaef25fac28134b8f44a0bc6c2b7c7e2cbee22c39 SHA512 fe40f5d382255e5439ace7218c28c1df62e368325835e48d563a52c3432e1f0a967924e4cd569d860f3094f942b94d4a6807d8fbf76db6c6b758a8c74a92b77c
--- a/www-apps/mycorrhiza/metadata.xml
+++ b/www-apps/mycorrhiza/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">bouncepaw/mycorrhiza</remote-id>
+		<remote-id type="sourcehut">~bouncepaw/mycorrhiza</remote-id>
+		<changelog>https://mycorrhiza.wiki/hypha/release</changelog>
 		<bugs-to>https://github.com/bouncepaw/mycorrhiza/issues</bugs-to>
 		<doc lang="en">https://mycorrhiza.wiki</doc>
 	</upstream>
--- a/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild
+++ b/www-apps/mycorrhiza/mycorrhiza-1.14.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Git-based wiki engine written in Go using mycomarkup"
+HOMEPAGE="https://mycorrhiza.wiki"
+
+SRC_URI="
+	https://github.com/bouncepaw/mycorrhiza/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}-vendor.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="AGPL-3 MIT Apache-2.0 BSD BSD-2 CC-BY-4.0"
+SLOT="0"
+RESTRICT="mirror"
+
+BDEPEND=">=dev-lang/go-1.19.0"
+RDEPEND="dev-vcs/git"
+
+src_compile() {
+	ego build -buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath .
+}
+
+src_install() {
+	dobin mycorrhiza
+	doman help/mycorrhiza.1
+	dodoc Boilerplate.md
+	dodoc README.md
+}
+
+pkg_postinst() {
+	elog "Quick start: mycorrhiza /your/wiki/directory"
+	elog
+	elog "It will initialize a Git repository, set useful default settings"
+	elog "And run a server on http://localhost:1737"
+	elog "More information here: https://mycorrhiza.wiki/"
+	elog "Also your wiki has built-in documentation :)"
+	elog "You can view this documentation at http://localhost:1737/help"
+}
--- a/www-apps/snac/Manifest
+++ b/www-apps/snac/Manifest
@@ -1,2 +1,2 @@
-DIST snac-2.18.tar.gz 78216 BLAKE2B c88c67dcf559e54545ab6bc2739b8c8719cd121781a53ae216dffe130cc8e95b0c932100e769e880d3a4c8648e9387730df04682f63b904e78d7e665108a117d SHA512 45e3d3a29fd2741c7d4040a05913050a45a003591630dc418a9513d40127aa0d891dd13b02fbb6ebc97feee906c9f08321aa3f5b573b7df48c4c2bd582cc5a58
 DIST snac-2.25.tar.gz 89142 BLAKE2B b42a2223730f7d4d2f2572d57a7fc2325c703f971e8e4e4a86d2b51a59cf85f079479a080a418d0dc5dabb3db630403a879629703f336dab08ec6944d49fe442 SHA512 89cf180dd16c4eb39e1b7bcaa6d5a3a062e4f9b54abe299f25a5d32b9b335bda26f80d80478fd5b68bf1275764def67f1b08378d33809d2de28554bacbb2c6f6
+DIST snac-2.26.tar.gz 89141 BLAKE2B cbc0383795432757b05b91528295cc084f86dffd0e9b0356c83da3a378c5023260a93043ff0c80af7505a5d25d1536a8a6cc4fd633dd26b50968524152e67ce6 SHA512 45c660819304c949b34e695b712e91760b8c8b8320960f5028dc05ab0c3fa05d4312be57af26ed2f0d6afd8452810d30ec77a56816d664ae5e8e405513ecdee9
--- a/www-apps/snac/snac-2.26.ebuild
+++ b/www-apps/snac/snac-2.26.ebuild
@@ -30,8 +30,12 @@ src_configure() {
 }

 src_install() {
-	mkdir -p "${ED}"/usr/bin
-	emake PREFIX="${ED}/usr" PREFIX_MAN="${ED}/usr/share/man" install
+	local mymakeflags=(
+		PREFIX="${ED}/usr"
+		PREFIX_MAN="${ED}/usr/share/man"
+	)
+
+	emake "${mymakeflags[@]}" install
 	einstalldocs

 	doinitd "${FILESDIR}"/snac
				`@@ -1 +0,0 @@`
				`DIST pysftp-0.2.9.tar.gz 25949 BLAKE2B 18a06ffb13d9c266dc03a79b982550c8fcead8588ad6f962fdae026c92dd951c963b67033548057700fe5aaed7db3c0fb91ed992e6beb7f1d04173f221a8866e SHA512 408e28c362b3f2573a6717cda811de3c88a8026d3a0c21eae8fb05156be941b16874cd8c318f3a0f533b8524831f22a90bcc208b061ee4c28fc8fda4e441173d`
				`@@ -1 +0,0 @@`
				`DIST shellingham-1.5.0.tar.gz 8974 BLAKE2B 07ae56303d046d224d84ab39816171c6c8a440182528857bbbd10075cd074882b0a984ddc6f6d9b0165b4f4461204568e088a6238129d5cf096d62898d00fd88 SHA512 1772cf807f37feb2ea9301aca9c84149b7d718b70daccfe80c8dfd90b20461ab22c11798b240c63c12861d544a99dca4671d560da68e757bf9acb02a62242afe`
				`@@ -1 +0,0 @@`
				`DIST uhashring-2.1.tar.gz 18288 BLAKE2B 95d76b1999d21b52ff33b5f76b2eee125d22fa02c51281d6b72058b9d608ea69cca11608f41f50b9348d46a26cc8931c40a6873f0fe17b72d76891b51dcaa1cb SHA512 0e3b3647f1b8b648389fa1018f5903d880947556244633e0b2b4809ccab3d14cf8e742cd14a99e2e88972a84c8fb97956dc290b023e514de63c7793a21b6c294`
				`@@ -1 +0,0 @@`
				`DIST skcms-0_pre20211006-r1.tar.gz 9986375 BLAKE2B f95ab6fb05c422e58e10aca053df670b44b98dbc0c6bf7d75ad6ff9e5fc312c0f7c0447e1d8ecf8eedfb110df232d01924227a42c178e6b09e7e9ce078f5bbe8 SHA512 cff5d835934f125373854c651f6ea50a10b212f207c6101ef2cf36ac4a27dc1e5d45a5e932595824f7385a4fe1611508f4c8861094219029aabe3d6462211fd7`
				`@@ -1 +0,0 @@`
				`DIST skia-97.gh.tar.gz 55736513 BLAKE2B a3fddcab23b395e884b64179577c0e88b22c5580c484b79ce11a598ea8822fe797248071ca638541c9146f6752d93e99d9effb7e3499cf1f1efd75e375f9d3d5 SHA512 c30cd68fd69cbe998c04db8a9d7d201fefa2e72541745a1216a51bde809152c11f53fd3ba66a5c7bfb971c090e5eecc2be50a3cf013645052c2c447bf70d5f7a`
				`@@ -0,0 +1 @@`
				`DIST cve-client-1.0.4.tar.gz 5800 BLAKE2B 3b1fbe1cbbb2e227e9723eb3ca15644ec501b5061dc0c976b34ed8ea5ccdc4055b59d871261a8ee00f578889a60204ef396688acde649cabeb529ca322ba0918 SHA512 143046dab5b21fb915ce75007efeb1c70f7993fd3c5032538ee42fb0df11067779965c0e2aa569198315df687b0231b4bfdd2dbb77fd45f81ad40ed9a1e5a69f`
				`@@ -0,0 +1 @@`
				`DIST gdown-4.7.1.gh.tar.gz 238770 BLAKE2B 3a362eaf98bcd006d02edcefb61a9c2722701c3c05f0997ed78216b630698ac1362554d40663ce1833faa66c6c42623cb119271c299a8ba1bddefd958cd4ce15 SHA512 1302fce5c920dc963d0d278c1c295821a30fb5034de3ecd6da8c49871dce85e0d4a2eba00233d3eb5214b49149bd2d5246db1a21aa68241b0ba67fddd2509019`
				`@@ -0,0 +1 @@`
				`DIST tuba-0.2.0.tar.gz 233703 BLAKE2B 8131986f481031257a59a4d2902364cec042d3d773cee0dee3b1ef8628ea1e2dbb32619c6f9054b43c88a1da51a53d1877896f0082ad482387876000b47d40ab SHA512 c5e07199c950963ac6f398d36f2da760a6fa734e247ba1defc3b98f9aa53d1626cf519988a96c5c7e16f32b79d7f5ad6bec02d6eab84cc132f2f634176fdd2f5`
				`@@ -0,0 +1 @@`
				`DIST snowflake-2.5.1.tar.gz 17989511 BLAKE2B 5d254e483803d0c03121acb12a188250eee79aec1af69d22bc88600ce5ffb67af09e437998a072977e6c9437b3fe5612e84663a90be66fb370eebf10f03327e2 SHA512 270eefa3cc999db36118871d23b2beebf4ef002c23e4c6a41e33bfa25a9c51c0305d2b8ad01f34863001ac5f822a9d97496249e2a4c0ae5c1a7af58cc56c26a4`