Merge updates from master

2026-07-18 03:23:20 -04:00 · 2023-12-30 16:01:53 +00:00
parent f88e43d142 17459d22ae
commit 0a3347bd0c
39 changed files with 358 additions and 215 deletions
--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,3 +1,3 @@
-DIST pulumi-v3.94.2-linux-x64.tar.gz 154811460 BLAKE2B 0250c9c9606e12fe28abca61417796c47075b3991c426dac6eff3e8b13904e9fa487e7ccd994680a5b400692cd3259b63093e6f27f45f7dd1c6ccc1b597f5b05 SHA512 42886c8ea8c3f0ffeed62bb853b6130ac57de6ef66fafccd766277acea88f4edea3f5bff4f93f1887b5da28bbfa6d7b08e27bdf9102333b94d3faae7fab776ab
 DIST pulumi-v3.95.0-linux-x64.tar.gz 155087539 BLAKE2B 1ae3cfd36366241b1602b034a9665b1ede963b8e8074ce1b034b559b407ca1df7177530255475ac3c8f884792c511b5b11b1fcd225ba805bd052772764d6553b SHA512 5e086e89f04436ae14f802fca5771186390c91156c66e8815577363c7c532aa091176964556198b8d5e50f761d7da13f519c783545747e163813ca120c24a498
 DIST pulumi-v3.97.0-linux-x64.tar.gz 154553521 BLAKE2B b7fa33b910ebce31c65602888fbc2e7567d8d773015615e1dfc9b7302bcd00860055bcbc66bca5e8e30037f0272fc20b30a4803923b9d4c61fcfd1c128aea7ee SHA512 26c305cf75b8b105a75e6b6255b8b7df742069a92e12617962a1d0234db32a41b021f6f851db095238f1dbafc84a5d0249189ff42bd2aa7eafba0a006da615f3
+DIST pulumi-v3.99.0-linux-x64.tar.gz 154602565 BLAKE2B 5df405da6aa7d6ccf7137e91cca3c32cbe0cfd34f45256a422962c31371d5b0b8dfdf537163113095528a39ff0beb41bbee84ff5ef2e206eac47cd7d7c11b419 SHA512 3d94c42de637574e8b68062fbe34c07ee45cb1072af140f6b9eec288b577df6028d09d4c4bc3f08e6eebba9cbf7c59346aeee6dbbe298b0f1d8f28b3cf6075f4
--- a/app-admin/pulumi-bin/pulumi-bin-3.99.0.ebuild
+++ b/app-admin/pulumi-bin/pulumi-bin-3.99.0.ebuild
--- a/app-crypt/intel-ipsec-mb/Manifest
+++ b/app-crypt/intel-ipsec-mb/Manifest
@@ -1,3 +1,4 @@
 DIST intel-ipsec-mb-1.1.tar.gz 1227915 BLAKE2B 56d104c2bcebd4a8125d64362c14603b7005c8ef0978d4039da3128f06fbba7f469ac8df23e3315b9f3fe33c392804fd718a533edd34e4a545f767a1c2e2fd60 SHA512 aca5863d36b333c4c896549074242fb4c2c0a4d6598b27baa794944436527bdd6e1a5dbca9d39e0c3a89e61d7d175adcf5bf6c6cbdffd0a43bca1fea0be42ebe
 DIST intel-ipsec-mb-1.2.tar.gz 1251965 BLAKE2B f92172ea727f8c0a5beff6e8fe6bb1630b5e83ddffa7384b998ebb6dfe09fd2657203ab53358296ade0106240278f659c297c0897e2de364b434032a58f417b3 SHA512 dc566ea433f7c85109e833d1debb3c8dc3686b4c0562a00872dd9801ba3530bf87b7b382e167e7d5cec17c3b3535834cc5bdc78f349f501bdfe8920ee51532ac
 DIST intel-ipsec-mb-1.3.tar.gz 2139105 BLAKE2B f7ae09cb2721a0193879ee4a3a04fa6d190ebcd70c681a1f885554dbd644d39511cd0832eb22edc5566d72f0fcaba955450d2208b17a040f053aef6134e174b0 SHA512 4b91bffcd62f69245da90b70586df425fa6f17fa63d530b0cd09b990fb1ac4c85c2ebc8ed5d8952bd4b8a20e82c3b418e9ef4d61cfe1811af04f1ee16630ec67
+DIST intel-ipsec-mb-1.5.tar.gz 2214942 BLAKE2B b4a2ac6b5671721ec79c100be86270c1b4344be731c40bafda58d4f718169e37d5bd1c6b3a14a1917dedb151daa3f732a01961255a94e9628efb0c4e588d47e1 SHA512 1fca0797d73fc2edbd9edecfc5628c4926512dc414a6fa832602d3d7abd6d86b1305013d1b433a21b77f4bc2b215d5f947553791925f2698fb30f90f9e7086ef
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.5.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Multi-Buffer Crypto for IPSec from Intel"
+HOMEPAGE="https://github.com/intel/intel-ipsec-mb"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/intel-ipsec-mb.git"
+else
+	SRC_URI="https://github.com/intel/intel-ipsec-mb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+safe-data +safe-lookup +safe-param test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-lang/nasm-2.13.03
+"
+
+src_configure(){
+	local mycmakeargs=(
+		-DSAFE_DATA=$(usex safe-data)
+		-DSAFE_LOOKUP=$(usex safe-lookup)
+		-DSAFE_PARAM=$(usex safe-param)
+	)
+	cmake_src_configure
+}
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
@@ -25,31 +25,11 @@ BDEPEND="
 	>=dev-lang/nasm-2.13.03
 "

-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" )
-
 src_configure(){
-	tc-export CC LD AR
-}
-
-src_compile() {
-	local myconf=(
-		SAFE_DATA=$(usex safe-data y n)
-		SAFE_LOOKUP=$(usex safe-lookup y n)
-		SAFE_PARAM=$(usex safe-param y n)
+	local mycmakeargs=(
+		-DSAFE_DATA=$(usex safe-data)
+		-DSAFE_LOOKUP=$(usex safe-lookup)
+		-DSAFE_PARAM=$(usex safe-param)
 	)
-	emake "${myconf[@]}" EXTRA_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		NOLDCONFIG=y \
-		LIB_INSTALL_DIR="${ED}/usr/$(get_libdir)" \
-		MAN_DIR="${ED}/usr/share/man/man7" \
-		install
-}
-
-src_test() {
-	cd "${S}/test"
-	LD_LIBRARY_PATH=../lib ./ipsec_MB_testapp -v
-	LD_LIBRARY_PATH=../lib ./ipsec_xvalid_test -v
+	cmake_src_configure
 }
--- a/app-office/drawio-desktop-bin/Manifest
+++ b/app-office/drawio-desktop-bin/Manifest
@@ -1 +1,3 @@
+DIST drawio-desktop-bin-22.1.15.tar.gz 454755 BLAKE2B 3fcdb54bd397919f21145d6912091d84baa5d55731babcc70a3d9a7a7c4db67eed2ff7fd62660e1915721e856d09244ef05bf6135bb00039f8b998f94986ae75 SHA512 164d18b723c65aa095dc71dab75b886cf99ef6a462dce1440c8547063658c3063cc0951dad6552fd01edaa3c1a41002b184d4e2fe7ec87f0c31dfc6fd25643c9
 DIST drawio-x86_64-21.6.5.AppImage 163718032 BLAKE2B 04a9a0b0a19442110eecf199bb92d3f4f98d218abc6873c59fa2539c3c661de1e78137edab614a198d36f93e4f09ba47c185e8bb3b859d1d37f71f9cdefb2048 SHA512 eb3e998d7ef430fd38d9f6aaa3c625766637615bec5f735e2e9740c16dcbbcd6d671c619f7dac8ae5cd2ee9a4618c23d00bdf34c6d8a21b463c4fdcb95b5b7f2
+DIST drawio-x86_64-22.1.15.AppImage 199610803 BLAKE2B aa443e2177c7230d322f9db50a2e5315ae43ae4f44fd5e9bbcfd372288276716222fc24e2f513cbbc9180d44871c654dd75016672ef64e602ecfbfc1c5d0865a SHA512 2ee285ad6ac6295f319b8dc5503610a6965a230d5f8d7348811b1d81319fdc784db974d31ccb4253061ba9474659ac1fb6a39f6e6784dc58bb4908027b329c8f
--- a/app-office/drawio-desktop-bin/drawio-desktop-bin-22.1.15.ebuild
+++ b/app-office/drawio-desktop-bin/drawio-desktop-bin-22.1.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+MY_PN="${PN/-bin/}"
+
+DESCRIPTION="Diagram drawing application built on web technologies"
+HOMEPAGE="https://github.com/jgraph/drawio-desktop"
+
+SRC_URI="
+	https://github.com/jgraph/${MY_PN}/releases/download/v${PV}/drawio-x86_64-${PV}.AppImage
+	https://github.com/jgraph/drawio-desktop/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+KEYWORDS="-* ~amd64"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="strip"
+
+RDEPEND="sys-fs/fuse:0"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="*"
+
+src_install() {
+	newbin "${DISTDIR}/drawio-x86_64-${PV}.AppImage" drawio-appimage
+
+	pushd "${MY_PN}-${PV}/build" || die
+	for f in *x*.png; do
+		case "${f}" in
+			# not all icon sizes are supported
+			720x720.png)
+				continue
+				;;
+			*)
+				newicon -s "${f%.png}" "${f}" "drawio.png"
+				;;
+		esac
+	done
+	popd || die
+
+	make_desktop_entry \
+		"/usr/bin/drawio-appimage" \
+		"draw.io" \
+		"drawio" \
+		"Graphics;Office"
+}
--- a/dev-libs/libcli/files/libcli-1.10.7-makefile.patch
+++ b/dev-libs/libcli/files/libcli-1.10.7-makefile.patch
@@ -1,4 +1,4 @@
-From 2e86f55dd594dd176c1ade2ce58918900e011391 Mon Sep 17 00:00:00 2001
+From 08cc1bf7558e3ba24149d4452677abcc7caf270a Mon Sep 17 00:00:00 2001
 From: YiFei Zhu <zhuyifei1999@gmail.com>
 Date: Mon, 25 Dec 2023 08:40:21 -0800
 Subject: [PATCH] Gentoo Makefile changes
@@ -7,12 +7,15 @@ Subject: [PATCH] Gentoo Makefile changes
 - Use env vars for $(CC) $(AR) and $(PREFIX)
 - Delete $(DEBUG) $(OPTIM); we don't want package to override CFLAGS
  in make.conf
+- Remove -Werror [1]
+
+[1] https://bugs.gentoo.org/920891
 ---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

 diff --git a/Makefile b/Makefile
-index d365952..951fc85 100644
+index d365952..ce393fd 100644
 --- a/Makefile
 +++ b/Makefile
@@ -7,7 +7,8 @@ TESTS ?= 1
@@ -37,7 +40,7 @@ index d365952..951fc85 100644
 -DEBUG = -g
 -OPTIM = -O3
 -override CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
-+override CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
+override CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
 override LDFLAGS += -shared
 override LIBPATH += -L.
 
--- a/dev-python/itemadapter/Manifest
+++ b/dev-python/itemadapter/Manifest
@@ -1,2 +1 @@
-DIST itemadapter-0.6.0.tar.gz 16325 BLAKE2B 75fa4c520de2c8fef8bf84ca416c2603d3237d86a994d4c083d6ad3469b03d8398ecd5828a3a3d18f742462002294c1872a493f4b29983907eaadb2b8af8f1fa SHA512 faa6170ea72d29f15c0332f38b288d8a4f1e2bb7229d3eb61227b52231c4d16d52bed09eda52acaf8653093afbc59ba2ec9ef8a2a4d408502f70704cea82c9ec
-DIST itemadapter-0.7.0.tar.gz 16849 BLAKE2B 1efd7251c50f17e8e3e52d3544b24ccdc5e5fcae90ad46f010959e3d5e6b2703271e310a37762b087a873a1ae0c0c9249ca19229cd062d974a05119d2e7ec221 SHA512 7402650f82fa16c2976821c5033a156c0994ad059581a714cb9a920235b1d2d4bbba60fbb186374377fb5dfc16ec59c5d432987e5c7906655c4e20d27f5e65cd
+DIST itemadapter-0.8.0.tar.gz 17140 BLAKE2B 8dc2fa0fd08236a41c6671793781ee113f3382c9bfeb3e9a528293e7725408a47a40ad650d80f24dbae8047f72f742b2bd99f142b342190acb2db33b6e68c7f8 SHA512 86c688bef2d0add3f5ea2bd119689b076c5bc9f92edefb6f5d8faaf88023355e7d2ba5d683ce8f6acd24a2954c5a798902b30d0a70ca31dc32eb5245ad57953f
--- a/dev-python/itemadapter/itemadapter-0.6.0.ebuild
+++ b/dev-python/itemadapter/itemadapter-0.6.0.ebuild
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-DESCRIPTION="Common interface for scrapy data container classes"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/itemadapter/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="${DEPEND}
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/pydantic[${PYTHON_USEDEP}]
-		dev-python/scrapy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
--- a/dev-python/itemadapter/itemadapter-0.8.0.ebuild
+++ b/dev-python/itemadapter/itemadapter-0.8.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1

 DESCRIPTION="Common interface for scrapy data container classes"
--- a/dev-python/itemloaders/Manifest
+++ b/dev-python/itemloaders/Manifest
@@ -1,2 +1 @@
-DIST itemloaders-1.0.4.tar.gz 26673 BLAKE2B a582a80a8a74be05c3e4770dc6fa017e43d20c496da79c5bb7ae9b02bdb282183347849e7a83b6174821fcc46d4021414b354537dc14291b6be82e774ffefd4e SHA512 b3f59c99db8dbf9757a304c55bd6b333347fdddc984edbeacd8314baaf8e319897b33801bc481d192330a573e75a6aa586d3da5bb11318287709723221bcbde6
-DIST itemloaders-1.0.6.tar.gz 26912 BLAKE2B b3925a4e06cc35d70fada0b43823fffc6cb37b16cea15438183adc728d08a47ab0d5bf721fcc7de18a60380faf2a17d38425eea3b2000209a5369dab21433106 SHA512 60f81dcaca51b9050c2a4a3abcedc9328943eda353a26c1ad28e489c338ea9d18d9ce76333d3d832746ce636571a1e49965f897bba7c4081d805684bb2ec2682
+DIST itemloaders-1.1.0.tar.gz 27962 BLAKE2B 960134a1fcd52e06db9f251297aec504ff37b1d90892d31c1726b31b0f028f65771b02762822c7be55e1dd7297e837c430e036b0ebf21b192f2156bbb4aa9727 SHA512 4a52e75405409124a3c1f7e7079fedf36e34a76877b04d754006743a2f403602de9b463e1f338bead3a68a0c1cf32f2a50b4cbe4cc57a10539ec529a93b81607
--- a/dev-python/itemloaders/itemloaders-1.0.4.ebuild
+++ b/dev-python/itemloaders/itemloaders-1.0.4.ebuild
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1
-
-DESCRIPTION="Library to populate items using XPath and CSS with a convenient API"
-HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/itemloaders/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/itemadapter[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/parsel[${PYTHON_USEDEP}]
-	dev-python/w3lib[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
--- a/dev-python/itemloaders/itemloaders-1.1.0.ebuild
+++ b/dev-python/itemloaders/itemloaders-1.1.0.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1

 DESCRIPTION="Library to populate items using XPath and CSS with a convenient API"
@@ -18,7 +18,7 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	dev-python/itemadapter[${PYTHON_USEDEP}]
 	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/parsel[${PYTHON_USEDEP}]
+	>=dev-python/parsel-1.8.1[${PYTHON_USEDEP}]
 	dev-python/w3lib[${PYTHON_USEDEP}]
 "

--- a/dev-python/parsel/Manifest
+++ b/dev-python/parsel/Manifest
@@ -1 +1 @@
-DIST parsel-1.7.0.tar.gz 46036 BLAKE2B e83b5f7f5a7a4274632a38586641be761482c6978670f6c747249d4063f5596bacc42d698d294da1aa9fb972bbaf21cbe3247e49560f1b9c29a3d79eee4dd00a SHA512 850784cfb32fbf619dbcd53152edb569b199965e59f3ec088892a8d432aaf08c1a61f3562499c5c592d9578fb28f871d519e3d7b344e3b7a12fbaaca57909f89
+DIST parsel-1.8.1.tar.gz 50881 BLAKE2B 8d81045e064105d344125e2baf1c769d9a7bddd011c4d544eb7ee0122fc360d74aa8e828bb51ae41fe70fc110f8d449bd1be957372e11ac426427ad85b522b64 SHA512 02101df4e36c704bce8fc24fac4c11beb6f72b6e7196d48c4472acb644620c3672bd6ef9166bac349ba01a4c3e75f5b166ca6f567294f1e3cf4b325a7883dd63
--- a/dev-python/parsel/parsel-1.8.1.ebuild
+++ b/dev-python/parsel/parsel-1.8.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi

@@ -20,6 +20,7 @@ KEYWORDS="~amd64"

 RDEPEND="
 	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/w3lib[${PYTHON_USEDEP}]
--- a/dev-python/protego/Manifest
+++ b/dev-python/protego/Manifest
@@ -1 +1 @@
-DIST protego-0.2.1.tar.gz 3188678 BLAKE2B 2874ffbc7f185946aa4e520ace1c49bea8de9e686ea45b2e70780919f411030d7f3411e8176997c2da2c0d15c8aae563a994acde0c6128deaa26649a138c8e57 SHA512 ef8a8196d8ece577eec90cc2e2cca2899625bd777c18f01c8e72a6130d4c2c13f71fa6e32a3e8e43b749f7556f4e3dbb1662e5e94ae18e6c8a7eef950779be1b
+DIST protego-0.3.0.tar.gz 3189825 BLAKE2B 79981352f9916f448416ebfabba2b96eb72ff2ac56065161a4a7e852bbb202e0ec56943ac4276bc808c3cd8f4efb41bbb3b7ab500b674f798024ae7568d99388 SHA512 79f3e20dd33120f67d1790b0faa29762b7f81b03c5f2501bd53be020c59b8dbe6536c952da41df60499344487a2db2f442e0d41510df975f14834724d974b34a
--- a/dev-python/protego/protego-0.2.1-r1.ebuild
+++ b/dev-python/protego/protego-0.2.1-r1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1 +1,2 @@
+DIST scrapy-2.11.0.tar.gz 1373184 BLAKE2B 7fc758a729d9e9f88c89e30c503ff8bf4c2e111bc00cbd003d5f8785dc818e5ef69ae3774013c4fe27db623c1246a57d57db097cf5220b257a9632bdd29b7023 SHA512 08da9684f4312e4149929f3785cc516207070fdd0eb99d8b7ed3276095378cc71d18534d0535fd1107af442aed42d6c91792ad7749d631b5f54522c3912ce073
 DIST scrapy-2.8.0.tar.gz 1345516 BLAKE2B 9a02d50cfde6c829e6c9064f29b75de4fb97139759b7822e20914ad3edfae104df3b4d65452f58bae6f4b7af4407ed87c6dc59000e5285e823637e54f1412102 SHA512 c758e8aad459aad5f447e6e721afd3c8e8f5743c8a0961d7562ecea9735444a2a2b7fd1b4c443fd3623fcb9bd3db5fdd108aa6fe7fa629a36229a3175eabac7d
--- a/dev-python/scrapy/scrapy-2.11.0.ebuild
+++ b/dev-python/scrapy/scrapy-2.11.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A high-level Web Crawling and Web Scraping framework"
+HOMEPAGE="https://scrapy.org/"
+SRC_URI="https://github.com/scrapy/scrapy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64"
+
+# The 'PyDispatcher>=2.0.5' distribution was not found and is required by Scrapy
+# https://bugs.gentoo.org/684734
+RDEPEND="${PYTHON_DEPS}
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	<dev-python/priority-2.0.0[${PYTHON_USEDEP}]
+	dev-python/h2[${PYTHON_USEDEP}]
+	dev-python/itemadapter[${PYTHON_USEDEP}]
+	dev-python/itemloaders[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/parsel[${PYTHON_USEDEP}]
+	dev-python/protego[${PYTHON_USEDEP}]
+	>=dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/queuelib[${PYTHON_USEDEP}]
+	dev-python/service-identity[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	<=dev-python/twisted-22.10.0[${PYTHON_USEDEP}]
+	dev-python/w3lib[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+		dev-python/uvloop[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	py.test -vv --ignore=docs \
+		--ignore="tests/test_proxy_connect.py" \
+		--ignore="tests/test_utils_display.py" \
+		--ignore="tests/test_command_check.py" \
+		--ignore="tests/test_feedexport.py" \
+		--ignore="tests/test_pipeline_files.py" \
+		--ignore="tests/test_pipeline_images.py" \
+		--ignore="tests/test_squeues.py" || die
+}
--- a/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
+++ b/dev-python/scrapy/scrapy-2.8.0-r1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

@@ -34,6 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tldextract[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	<=dev-python/twisted-22.10.0[${PYTHON_USEDEP}]
 	dev-python/w3lib[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 "
--- a/dev-python/w3lib/Manifest
+++ b/dev-python/w3lib/Manifest
@@ -1,2 +1 @@
-DIST w3lib-2.0.1.tar.gz 43324 BLAKE2B cb3b16da08b37ff224a94c37987fab3da752490eec081dece6c9576067590e0012585f9c26d0af2bb86c99fc6ba0cf47213cb32d51847513ee1d35bf48bdb66b SHA512 6d271d1d2858f2aef843cb3e99ca46cadef3d866f920a55696d7189c8b7da3ca3f9adbb066272301c9b5332a414ff4554222a044efa58ec622be8a3da79c04e3
-DIST w3lib-2.1.1.tar.gz 48471 BLAKE2B f510cb66c19c56260d7c196d46a2d44a5f8eb3e0204869f9ccd68b84dbdfdd5f4a8ec731b1c4c3f8d2e0549fba4dac3877200c9018b55ae6f454a2c2518df872 SHA512 f720ec4ded534474ef8f18df388fdaad56ccd48de797c0ec6145737479bc3d589a0e376316aab08c5f4ffe5f0fa07a383d655e3feedc1d1ba51c4cf9ee9639ac
+DIST w3lib-2.1.2.tar.gz 48715 BLAKE2B 8ec3514351634430b348d19a87e21fc95fbb230bac51b59801f692c4d2dc8426bd9740db49949efb2df80eda69026fb202ea0ae80fba45506a366c0b66bc8b29 SHA512 cfff2520cab24b84c93223125de3fb813e4d40d23a022f7fc34196c3033adb5dfc01358d62566dcc4b763d40b271e1428eba0250ba997228d07f35cd3721e37e
--- a/dev-python/w3lib/w3lib-2.0.1.ebuild
+++ b/dev-python/w3lib/w3lib-2.0.1.ebuild
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library of web-related functions"
-HOMEPAGE="
-	https://scrapy.org/
-	https://pypi.org/project/w3lib/
-	https://github.com/scrapy/w3lib
-"
-
-LICENSE="BSD"
-SLOT=0
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-hoverxref \
-	dev-python/sphinx-notfound-page
-
-EPYTEST_DESELECT=(
-	# https://github.com/scrapy/w3lib/issues/164
-	tests/test_url.py::UrlTests::test_add_or_replace_parameter
-)
--- a/dev-python/w3lib/w3lib-2.1.2.ebuild
+++ b/dev-python/w3lib/w3lib-2.1.2.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi

--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1 +1,2 @@
 DIST zenlib-1.2.0.tar.gz 12766 BLAKE2B 9366beb9496d136cbf0efc9fd97c6d430b442eae4ede87d85c32e1bee9a17315cab04e0b8f97ad8b8e2b599d2965dc2cd3c57ebe4830ba9abe53adc13825f634 SHA512 e5630a0869cdcbd909ea829f5876057ad1787ae1b63f80f9b1db7deeb80799eef9deac56027291dac55efd1e974b82a737b236189a1d7a8657a215bb866bca91
+DIST zenlib-1.3.1.tar.gz 13470 BLAKE2B 03bd8dce7a46641e60646173607ea6cd574fed58cbfa5d81c4c7f1deabf863a3acd12bdfd3b59fd5fc853762d7320d57613e40d72407216cc3ae1d82f7744789 SHA512 50a6ac2cb26fd74b6e92e3691463ec707259fe27e37af2f2c68a9a1e0c247b789cdf17d5b1f882e02dbca5f0653a4137caab39f3f0380d0b5391efaf41f1312d
--- a/dev-python/zenlib/zenlib-1.3.1.ebuild
+++ b/dev-python/zenlib/zenlib-1.3.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1
+
+DESCRIPTION="Useful python decorators and utilities"
+HOMEPAGE="https://github.com/desultory/zenlib"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/dev-util/rye/Manifest
+++ b/dev-util/rye/Manifest
@@ -45,7 +45,7 @@ DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e
 DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b SHA512 adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
 DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f
 DIST curl-0.4.44.crate 91415 BLAKE2B 0193d51d0ebca5a9ac87a3a2537d573a15d8f0c47e0dba5ad3c0401dfe4a96e63c43a1be054433eb782f90ec61dbc60a12ba035e4fdb033eefe53860d41c3494 SHA512 499c3496cb019856773da10c5dcdf539c3fb7542a5e5dde4923d36e0f9274515b43a68bd31fc18a9adbfa9061d752fa698dfc2fbb6a6b1c1347001b3d112b3e5
-DIST curl-sys-0.4.61+curl-8.0.1.crate 3101374 BLAKE2B 5a5b50ed58e0a010aeb6fe1f5c05d6a8eaa73e3c2c89462d6a37eb3de8fdced213a52c710765fbec5261b7ae77af30378a0872720073edf65939b327cf6261dc SHA512 ac8ca9a748392a213873047f91b247fb22231138ad417354c248f497020d850ce19b4c6f037d35cabd0d60e31dfaa044d1a901d344ab7c2785cc7f97a72e19e5
+DIST curl-sys-0.4.67+curl-8.3.0.crate 3206009 BLAKE2B a733b8c36aed7442f7bd1ca649a471c3ea8e736ce59d3e66095fb0ace99ed8b67c5d41fd54f35451d5dbbd9fbe85c6c3b38d36a95c35d44568602f2cbf0e8a06 SHA512 97350b27a565d4e6acce54beea676b5cf51280ebadb2d11c6213966c6022da6b8c45d4e029ccb268fa7c6112d2a46a8ea2e677b8fc6feb9cb486c64468651210
 DIST curve25519-dalek-3.2.0.crate 517530 BLAKE2B 568ca1e1f159e62682eebe93860802c6873c5675e83ecff747ab859ff7eae52eefa40e6311ef7b0429de1d0b8dc79ebfd80f8162d466ba8822b1cf64b758b0d4 SHA512 376242559e8956bb7260d7db82ed748f18107210a12fb744a741825448e63663f4cfc7e4df62ba79defbbd1ec9732174faa84592d0f84742d3ce1ce69aec7154
 DIST darling-0.14.4.crate 25168 BLAKE2B bc48b27823a1a85a01a5daea47d87c2ac4b3ea48079249606aec912a4f417b72516004f17765e38f06048543708b758bf68afa63dc5e7415906de7940f02726d SHA512 1f236976cd291502229a49c2317fbcad94df54e2d7fbedebd9ac3173f9e51620ce8f2e37c78e86a63db8d9cd089e3eaedb990e58cc97847baa2cbaae58526aa6
 DIST darling_core-0.14.4.crate 57485 BLAKE2B 3d284d6a5100f45228aef5e42f9de63b6cfe2b5d42f1224bb19ff5d262b0c293931ee99f3aaf1f0eb24e55bb7e04ae790389d73c624c5f00f17a280a4a496ebc SHA512 6df7e911a543e9cadd0810cd8bf6563e2f000b52bab875f7a34d229bb6c4fb7beb6ebbc4fb0e12b97f23616280a20f306210abdfd1dd094c53da35f97be27b96
@@ -179,7 +179,7 @@ DIST rust-embed-utils-7.5.0.crate 3321 BLAKE2B f2761c85ebae5991a8ff55d7140bd489a
 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247
 DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544
 DIST rustix-0.37.19.crate 323809 BLAKE2B 6a01e5128910c4b1333359efdacd5d0c1f0cf0ac4f2615e6891c10e7de3ce8df5ca50955a3e5c27f3b85d3ffee9fe28105aac3baa4fadd05172645e9f7ddb853 SHA512 e1c00f97414313580dfb7a616cd0e9a64d87950b4d4e6b536b5eaea93b8741f769ef62d4ee1461af8266758f9bdc136a445abbb05c8355a11d338a166b498722
-DIST rye-0.15.2.tar.gz 1393247 BLAKE2B 90e3f36e9b7ef4125316d3af000116c6971f9966b9a0de661c7ee1f9b9d6849bc5c95a890ebdbdf8fbddfabed6fc5dc3035b657045117ebac40f36f01c55a5d9 SHA512 448a07aaf8a17e47d83e5eeffb676d14bea4afa552f58063c617400142a2e68d0982c9b452c84c68e02951a0aa67ed472e6ee3d88e8b33fcbbd9e2bf67022d85
+DIST rye-0.16.0.tar.gz 1402992 BLAKE2B 84c219b19faf2b727b1e373783ca956828cefd9cfc58bbcfee85660ce8f2784a30d2158cf138c6fa57f6aad1790b85af5c92b19f1c4fdab20a670f63ecb014c0 SHA512 17d00f666b75f31ba0c96ade72407de2d7fff7f9924c35a66132e41831dd3b7356d2be97693c575a18fba65d6a9c3e5416bbbe98c777e6df66cb79e9f0770339
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
 DIST salsa20-0.10.2.crate 12780 BLAKE2B 9627985a2b5583e91cdbefff2a71af02009b1905b05d58ced99eac357c27c3b363ef9dc40afd3d19c39a6fd5b19fab7f7149b1fcd85f3e2f63edf7cb1e8990ee SHA512 9066143f6f503fbd6e85434e9dcbe0f0ed4e71e363c599d90968f6f9517dc749798f3e4cae6ed45e4ec429495a103ff4fc9ec564397c947ea63a6c32773c90f0
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
--- a/dev-util/rye/rye-0.15.2-r1.ebuild
+++ b/dev-util/rye/rye-0.15.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Autogenerated by pycargoebuild 0.10
+# Autogenerated by pycargoebuild 0.12.1

 EAPI=8

@@ -52,7 +52,7 @@ CRATES="
 	crossbeam-epoch@0.9.15
 	crossbeam-utils@0.8.15
 	crypto-common@0.1.6
-	curl-sys@0.4.61+curl-8.0.1
+	curl-sys@0.4.67+curl-8.3.0
 	curl@0.4.44
 	curve25519-dalek@3.2.0
 	darling@0.14.4
--- a/games-util/r2modman-bin/Manifest
+++ b/games-util/r2modman-bin/Manifest
@@ -1,9 +1,9 @@
-DIST r2modman-128x128.png 4729 BLAKE2B bf7050ad2f512634331f4fd993a19f985835d6f63a0afe51b8e66bc205edf7401faccd03ada8cc898cee099d6a31c7086252425755acc6129dad101bbdb1fe7e SHA512 8dd26f80dd682c8be63af237062337c43e99fdc70497056aa709d37a106ef49862e3017348b6facd65eb480696c628c575e3aecb1ff054523bee119d4db63ab9
-DIST r2modman-16x16.png 630 BLAKE2B babe2fd2e48f18b5584fcfba4453b4cfee3c45c81ff4c54058d20752e392d1f09c0df5d111ec9f8daae871fd9ec322a64ee2a0a236abfd478364aa833c71a954 SHA512 e89f06ab89ffec2899c49115329ae43c6a12338bbc15c8e786d66287fd224e2d478f70076878591b4ea5f3c18dd6779011ab21bd64d3bd2b697ca933e4081fc9
-DIST r2modman-192x192.png 7319 BLAKE2B 378899c12ce58942539c354b652a302d1fd3c91387e2645892b161f035cef8396f0d92c753918d945112a96da5daa4ccfbed2144fc7edfbdf56ba7e72121c6c0 SHA512 c6392c415034c61545f401287a4b445a116211edefb5f55e5cf5ccfaf6ca5f9be535a5b8bd781ddeeed44e7097e774cc8c2f294ba5a4713ab506b037e99dd212
-DIST r2modman-256x256.png 6690 BLAKE2B c0e62dc9d3bc7b261751a46e1fef35d2b6cf0ca06ee6c5b6f6ed61c3fe91e9f82b9d67a7641cf40f5724f5a0b6f109e370c9d2330728be3ff35ccc0a3b2f0f90 SHA512 bc67772e00d404816ab5d737b7d5dfbd093f1f457ca72863356dd5a3da8625535e7ed3f724275bc74356073f9d35b3b56bc392479561e33c8cc63a583762f2a1
-DIST r2modman-32x32.png 1262 BLAKE2B 76f1205935009b55afe63812ef8bb2b9a3a307c16343359c5a15de70745f587f50834dba73cf98b06b9d2a11ec3e1b58617168ce67a19b9e13d5a19aac65af66 SHA512 9778da7bd19d569fe65f4f44984bf1213f8161013f9820be577154559a8dfff4cc165d494e303d4f6595f9eafd2d502a1088e522cbba4993aaaa58ebac3bf29d
-DIST r2modman-48x48.png 1837 BLAKE2B 5956f438170d3ba3d30ebc7d7cf57b21d5b7d3ee7552b7beb51a59ac4619dc1b721a57a18b7798c64f35238dcd23ffeabfb12bafde02b45a67126236b5755325 SHA512 265bc260f4eefb2fc7b0e770999b5932b84200d76b5ca2afa97f5d5b446dab5dfa0a744e0585ccbef93703441300817c61159f9adff420784bfad95ae3557947
-DIST r2modman-64x64.png 2439 BLAKE2B 2d44448882fb73db2b503cf41593531e856b3b2280a79fc0c8722338c25d4b92dd8fb7d21aa37a544156edf96185cc46ca53eb653a8e1d904c3531470f27d1ef SHA512 0f8bee1b874531e57889889d0f230d91a1a3c0a2f158b40d3d12c6f1891bd9982f850b69ea6cdcafe878df58b3e36c00c80c0ff9457584d6f1e14564afc2541c
-DIST r2modman-96x96.png 3607 BLAKE2B 1e86a115e2f90ea3a39e3f2dfb61036b47f20c67897bbc268c512910433f04ee3dac505b0dd4f97f07ca11568e65df4c58b497fc9eef04ea3597665e56656cc1 SHA512 5ca72dc1069660f7deb92e7046f56e2ac216b8e3bce77fb68b67e0f8d79849ce3521ea0afff5702726c4f709a9d006e5d90ec8aab8b26782b57e2564f3fba231
+DIST r2modman-bin-3.1.45-128x128.png 4729 BLAKE2B bf7050ad2f512634331f4fd993a19f985835d6f63a0afe51b8e66bc205edf7401faccd03ada8cc898cee099d6a31c7086252425755acc6129dad101bbdb1fe7e SHA512 8dd26f80dd682c8be63af237062337c43e99fdc70497056aa709d37a106ef49862e3017348b6facd65eb480696c628c575e3aecb1ff054523bee119d4db63ab9
+DIST r2modman-bin-3.1.45-16x16.png 630 BLAKE2B babe2fd2e48f18b5584fcfba4453b4cfee3c45c81ff4c54058d20752e392d1f09c0df5d111ec9f8daae871fd9ec322a64ee2a0a236abfd478364aa833c71a954 SHA512 e89f06ab89ffec2899c49115329ae43c6a12338bbc15c8e786d66287fd224e2d478f70076878591b4ea5f3c18dd6779011ab21bd64d3bd2b697ca933e4081fc9
+DIST r2modman-bin-3.1.45-192x192.png 7319 BLAKE2B 378899c12ce58942539c354b652a302d1fd3c91387e2645892b161f035cef8396f0d92c753918d945112a96da5daa4ccfbed2144fc7edfbdf56ba7e72121c6c0 SHA512 c6392c415034c61545f401287a4b445a116211edefb5f55e5cf5ccfaf6ca5f9be535a5b8bd781ddeeed44e7097e774cc8c2f294ba5a4713ab506b037e99dd212
+DIST r2modman-bin-3.1.45-256x256.png 6690 BLAKE2B c0e62dc9d3bc7b261751a46e1fef35d2b6cf0ca06ee6c5b6f6ed61c3fe91e9f82b9d67a7641cf40f5724f5a0b6f109e370c9d2330728be3ff35ccc0a3b2f0f90 SHA512 bc67772e00d404816ab5d737b7d5dfbd093f1f457ca72863356dd5a3da8625535e7ed3f724275bc74356073f9d35b3b56bc392479561e33c8cc63a583762f2a1
+DIST r2modman-bin-3.1.45-32x32.png 1262 BLAKE2B 76f1205935009b55afe63812ef8bb2b9a3a307c16343359c5a15de70745f587f50834dba73cf98b06b9d2a11ec3e1b58617168ce67a19b9e13d5a19aac65af66 SHA512 9778da7bd19d569fe65f4f44984bf1213f8161013f9820be577154559a8dfff4cc165d494e303d4f6595f9eafd2d502a1088e522cbba4993aaaa58ebac3bf29d
+DIST r2modman-bin-3.1.45-48x48.png 1837 BLAKE2B 5956f438170d3ba3d30ebc7d7cf57b21d5b7d3ee7552b7beb51a59ac4619dc1b721a57a18b7798c64f35238dcd23ffeabfb12bafde02b45a67126236b5755325 SHA512 265bc260f4eefb2fc7b0e770999b5932b84200d76b5ca2afa97f5d5b446dab5dfa0a744e0585ccbef93703441300817c61159f9adff420784bfad95ae3557947
+DIST r2modman-bin-3.1.45-64x64.png 2439 BLAKE2B 2d44448882fb73db2b503cf41593531e856b3b2280a79fc0c8722338c25d4b92dd8fb7d21aa37a544156edf96185cc46ca53eb653a8e1d904c3531470f27d1ef SHA512 0f8bee1b874531e57889889d0f230d91a1a3c0a2f158b40d3d12c6f1891bd9982f850b69ea6cdcafe878df58b3e36c00c80c0ff9457584d6f1e14564afc2541c
+DIST r2modman-bin-3.1.45-96x96.png 3607 BLAKE2B 1e86a115e2f90ea3a39e3f2dfb61036b47f20c67897bbc268c512910433f04ee3dac505b0dd4f97f07ca11568e65df4c58b497fc9eef04ea3597665e56656cc1 SHA512 5ca72dc1069660f7deb92e7046f56e2ac216b8e3bce77fb68b67e0f8d79849ce3521ea0afff5702726c4f709a9d006e5d90ec8aab8b26782b57e2564f3fba231
 DIST r2modman-bin-3.1.45.tar.gz 113307930 BLAKE2B 9986a264b1feae0bb3189c866734e193a4cfb674681e6f1b4c3c002a963d784aa02bada90598d386ea0a3a2dbbf1dcc0c838780605e8b9d3f3557648320c4920 SHA512 15703a27066f33f6f3945df06cbbd922e13f8eae018ca6dc94068fee4ecdb492472add5f53bc037fef404c8c10dc15de13e2e0de52338b2d33fd4490ad85ed53
--- a/games-util/r2modman-bin/r2modman-bin-3.1.45.ebuild
+++ b/games-util/r2modman-bin/r2modman-bin-3.1.45.ebuild
@@ -8,14 +8,14 @@ M_PN=r2modman
 inherit desktop xdg
 SRC_URI="
 	https://github.com/ebkr/${M_PN}Plus/releases/download/v${PV}/${M_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/16x16.png -> "${M_PN}"-16x16.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/32x32.png -> "${M_PN}"-32x32.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/48x48.png -> "${M_PN}"-48x48.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/64x64.png -> "${M_PN}"-64x64.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/96x96.png -> "${M_PN}"-96x96.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/128x128.png -> "${M_PN}"-128x128.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/192x192.png -> "${M_PN}"-192x192.png
-	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/256x256.png -> "${M_PN}"-256x256.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/16x16.png -> ${P}-16x16.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/32x32.png -> ${P}-32x32.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/48x48.png -> ${P}-48x48.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/64x64.png -> ${P}-64x64.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/96x96.png -> ${P}-96x96.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/128x128.png -> ${P}-128x128.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/192x192.png -> ${P}-192x192.png
+	https://raw.githubusercontent.com/ebkr/r2modmanPlus/v${PV}/src/assets/icon/256x256.png -> ${P}-256x256.png
 "
 DESCRIPTION="A simple and easy to use mod manager for several games using Thunderstore"
 HOMEPAGE="https://github.com/ebkr/r2modmanPlus"
@@ -33,6 +33,7 @@ src_install() {
 	insinto /opt
 	doins -r "${M_PN}"
 	fperms 755 "/opt/${M_PN}/r2modman"
+	dosym -r /opt/r2modman/r2modman /usr/bin/r2modman

 	#Install License file in proper location
 	find "${ED}" -name "LICENSE*" -delete || die
@@ -41,12 +42,7 @@ src_install() {
 	domenu "${FILESDIR}/${M_PN}".desktop

 	# Install icons
-	newicon -s 16 "${DISTDIR}/${M_PN}"-16x16.png "${M_PN}".png
-	newicon -s 32 "${DISTDIR}/${M_PN}"-32x32.png "${M_PN}".png
-	newicon -s 48 "${DISTDIR}/${M_PN}"-48x48.png "${M_PN}".png
-	newicon -s 64 "${DISTDIR}/${M_PN}"-64x64.png "${M_PN}".png
-	newicon -s 96 "${DISTDIR}/${M_PN}"-96x96.png "${M_PN}".png
-	newicon -s 128 "${DISTDIR}/${M_PN}"-128x128.png "${M_PN}".png
-	newicon -s 192 "${DISTDIR}/${M_PN}"-192x192.png "${M_PN}".png
-	newicon -s 256 "${DISTDIR}/${M_PN}"-256x256.png "${M_PN}".png
+	for size in 16 32 48 64 96 128 192 256; do
+		newicon -s ${size} "${DISTDIR}"/${P}-${size}x${size}.png ${M_PN}.png
+	done
 }
--- a/media-video/wl-screenrec/wl-screenrec-0.1.2.ebuild
+++ b/media-video/wl-screenrec/wl-screenrec-0.1.2.ebuild
@@ -108,7 +108,11 @@ LICENSE="Apache-2.0 BSD Boost-1.0 ISC MIT Unicode-DFS-2016 Unlicense WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64"

-BDEPEND="media-video/ffmpeg"
+BDEPEND="
+	media-video/ffmpeg
+	sys-devel/clang
+	x11-libs/libdrm
+"
 RDEPEND="${BDEPEND}"
 DEPEND="${RDEPEND}"

--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.8-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/flex
+	app-alternatives/lex
 	sys-devel/bison
 	dev-libs/libsodium
 	virtual/pkgconfig
@@ -41,14 +41,9 @@ BDEPEND="
 src_prepare() {
 	default

-	sed -e '/CFLAGS/s:?=:+=:' \
-		-e '/CPPFLAGS/s:?=:+=:' \
-		-e '/CFLAGS/s:\(-g\|-O2\|-O3\|-m\(arch\|tune\)=native\)::g' \
-		-i Makefile || die
-
-	if ! grep -Fq nacl-20110221 curvetun/nacl_build.sh ; then
-		die "have nacl-20110221, expected $(grep ${MY_NACL_P} curvetun/nacl_build.sh)"
-	fi
+	# force mausezahn to respect CFLAGS
+	sed -e '/CFLAGS/s:=:+=:' -i Extra || die
+	sed -e 's/ -O2//' -i mausezahn/Makefile || die

 	export NACL_INC_DIR="${EPREFIX}/usr/include/nacl"
 	export NACL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/nacl"
@@ -77,9 +72,7 @@ src_configure() {
 }

 src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" \
-		LEX=lex YAAC=bison STRIP=true \
-		Q= HARDENING=1
+	emake CC="$(tc-getCC)" LD="$(tc-getCC)" CCACHE="" Q=
 }

 src_install() {
--- a/net-libs/kcgi/Manifest
+++ b/net-libs/kcgi/Manifest
@@ -1,2 +1,3 @@
 DIST kcgi-0.12.5.tgz 247454 BLAKE2B 1aebd9d62977e22a6a6538b591c40efab53282fd6f28809330c34bfb825798b837003cf0b492f3c3bc79c2ebf3054b466b9e290c156aceee553ef8af6e0a7f07 SHA512 61c28f165b0c1024e4b22fd4e725d79c4e2800b0c6a7fae1473e33608b3299b5ad8630d87ccccaab3e12358dfb6d1c3cd0eb0ed20fa0da1bcc35cc6df8106440
 DIST kcgi-0.13.0.tgz 243127 BLAKE2B e3f4f42450cf3ba5b7f3199e11d1ee57bd2b16f55d662c6989f486811fb49fb1dcba62864320ee1962db5b0cde026db832d6935c14a79f43d4b19383a630f392 SHA512 b07168d87ad55a403120bfe79ac37e29803047bf663bb50ead0a758a1636b9fc77fd3aba45eb52b2f80cd103f1878e861d99e22bc6eefd2dd742ac82f4dbc969
+DIST kcgi-0.13.3.tgz 249621 BLAKE2B a503031e8d0cd87eaab7920d1392f51276af723e59baee85a7fd02abfd294d151cc2ccf633207d7e40704fe9d71779d5d8c5582fc28fba02b41b62a924ce7003 SHA512 272ffec2fa31dc465b66c0c67ed5f5e1d9e5ebafbe17e84586299f4a266c1344d127ef04fda284b91a596fc4c6bc06f6e50a784b62bf198c9d3d06c210ae2282
--- a/net-libs/kcgi/kcgi-0.13.3.ebuild
+++ b/net-libs/kcgi/kcgi-0.13.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib multiprocessing toolchain-funcs
+
+DESCRIPTION="Minimal CGI library for web applications"
+HOMEPAGE="https://kristaps.bsd.lv/kcgi/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kristapsdz/${PN}"
+else
+	SRC_URI="https://kristaps.bsd.lv/${PN}/snapshots/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-devel/bmake"
+RDEPEND="
+	app-crypt/libmd
+	virtual/libcrypt
+"
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl[static-libs(-)] )
+"
+
+src_prepare() {
+	default
+
+	# ld: multiple definition of `dummy'
+	local deselect=( sandbox-{capsicum,darwin,pledge,seccomp-filter}.o )
+	case ${CHOST} in
+		*-linux-*)
+			deselect=( "${deselect[@]/sandbox-seccomp-filter.o}" )
+			;;
+		*-darwin*)
+			deselect=( "${deselect[@]/sandbox-darwin.o}" )
+			;;
+		*-freebsd*)
+			deselect=( "${deselect[@]/sandbox-capsicum.o}" )
+			;;
+		*-openbsd*)
+			deselect=( "${deselect[@]/sandbox-pledge.o}" )
+			;;
+	esac
+
+	for obj in "${deselect[@]}"; do
+		# elements are not deleted completely from the array
+		if [[ -n "${obj}" ]]; then
+			sed "/${obj}/d" -i Makefile || die
+		fi
+	done
+}
+
+src_configure() {
+	tc-export CC AR
+	append-cflags -fPIC
+
+	append-cppflags -DENABLE_SECCOMP_FILTER=1
+	append-cppflags -DSANDBOX_SECCOMP_DEBUG  # seccomp may cause problems
+
+	# note: not an autoconf configure script
+	conf_args=(
+		CPPFLAGS="${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		PREFIX="${EPREFIX}"/usr
+		MANDIR="${EPREFIX}"/usr/share/man
+		LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		SBINDIR="${EPREFIX}"/usr/sbin
+	)
+
+	./configure "${conf_args[@]}" || die
+}
+
+src_compile() {
+	bmake || die
+}
+
+src_test() {
+	# TODO: add `afl` tests
+	bmake regress || die
+}
+
+src_install() {
+	bmake DESTDIR="${D}" \
+	    DATADIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+	    install || die
+
+	einstalldocs
+}
--- a/sys-apps/qemu-openrc/Manifest
+++ b/sys-apps/qemu-openrc/Manifest
@@ -1 +1,2 @@
 DIST qemu-openrc-0.10.0.tar.gz 8367 BLAKE2B 34447e04c1a81fa13bddf2f4a742059beea6eeb0025ec32219ef3718a0ff62b98a3d0c39083068f52362eb6fe3eb105338febdd36ea696f144a6b2ce583b3441 SHA512 cdcf51dc59dbca96102c1b73032a726a44cb62c0c93a42adb9b6806609a0fa24bf8dde4814ed5010de63d54fde75f661bb9f5245d85e28de08cdba08d538c959
+DIST qemu-openrc-0.11.1.tar.gz 8626 BLAKE2B 75436b7b280e197f1211d04d7f9c731f5246394fa861382e892f26ac61c314dc812950f2a73df568f2d11af3261c0952d7126ce2b5e3e0a992ed048e8eb3b15f SHA512 aae6eb14a22f3a452e8bc523609e52b0d41af0e4ea5abf1faaf5f78a53dd4ca8905ded3a0cdbe8835a37c3b8218e20f407f80ef050d35cf2e6eb380ada26db67
--- a/sys-apps/qemu-openrc/qemu-openrc-0.11.1.ebuild
+++ b/sys-apps/qemu-openrc/qemu-openrc-0.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenRC init script for QEMU/KVM"
+HOMEPAGE="https://github.com/jirutka/qemu-openrc"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jirutka/qemu-openrc"
+else
+	SRC_URI="https://github.com/jirutka/qemu-openrc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="net-misc/socat"
+
+PATCHES=( "${FILESDIR}/qemu-openrc-0.10.0-guest-agent.patch")
+
+src_compile() {
+	:
+}
+
+src_install() {
+	newinitd qemu.initd qemu
+	newconfd qemu.confd qemu
+	dobin qemush
+}
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,3 +1,2 @@
 DIST ugrd-0.12.1.tar.gz 39929 BLAKE2B d4d2788c0d23907b87ea6c98607f3d36e25c895618668123089c2cb96dc8895be411c7c5865522b58a53a90c51e77f874ee13324c5602bceb325bb680dccf63b SHA512 3dec60f8535bb63525a0da07583d35c539de27e0d4ab2c79c033ce49a1b745b262a245e58224f5fabb1450af76d750578e47d60eb0961ac842eaed6e5f212c7d
-DIST ugrd-0.15.4.tar.gz 42064 BLAKE2B ceaa6ac8f0dc992eb32ad027989701e9f2fccb61d167ccf7c7fd645c4e43b843905b5c80729ebf88a6a0f74535fe399884e1f03a27276e259f3a37f1067422db SHA512 584a2b64a98b3ef5179692d20f4d79fb36462a5882b25eb88af9211fd9f4c9107aefa395673290e67470b8a9724c1a226c13fb1f70e457d00e83254be1837f11
-DIST ugrd-0.18.0.tar.gz 43965 BLAKE2B a646ca8f3bd2d0e7c44692a0ef8783974ccdd6e37beabaf978aff0164d7803d14192429a887b439590d1e4e4087e2a979b1aefa736a6c1144084b25b916bcecd SHA512 04e72461a67a35893866119a53db0732dd8b7015e131d7b225244a517901b3da3bf5c203f7d36c941c5ca45e370eb26631f1dd9b2ff4c322e7a8847e49d8c121
+DIST ugrd-0.19.1.tar.gz 44713 BLAKE2B e22d8c6df5cffb6c903badf6b45f693a319215791d2fae6d45e163a1a191823130b4a1bdb541a20760154796e16f5e6e0bb10ce47f4d5c59279a71f37bc53362 SHA512 56383aca3bd52a734ae35ae51aec0aa12d849484466d58832324dc441fed3e955085119ba44d3248948033167e163be5d747fa27c71c999e78e7fa6357853e25
--- a/sys-kernel/ugrd/ugrd-0.15.4.ebuild
+++ b/sys-kernel/ugrd/ugrd-0.15.4.ebuild
@@ -1,43 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python based initramfs generator with TOML defintions"
-HOMEPAGE="https://github.com/desultory/ugrd"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-misc/pax-utils"
-DEPEND=">=dev-python/zenlib-1.2.0
-	>=dev-python/pycpio-0.6.1
-	sys-apps/pciutils"
-
-src_install() {
-	# Call the distutils-r1_src_install function to install the package
-	distutils-r1_src_install
-	# Create the ugrd config directory
-	keepdir /etc/ugrd
-	# Install the example config into /etc/ugrd/config.toml
-	# Do not overwrite an existing config
-	insinto /etc/ugrd
-	newins examples/config_kmod.toml config.toml
-	# Create the kernel preinst.d directory if it doesn't exist
-	# Install the kernel preinst.d hook
-	keepdir /etc/kernel/preinst.d
-	exeinto /etc/kernel/preinst.d
-	doexe hooks/51-ugrd.install
-}
-
-pkg_postinst() {
-	optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
-	optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
-	optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
-}
--- a/sys-kernel/ugrd/ugrd-0.19.1.ebuild
+++ b/sys-kernel/ugrd/ugrd-0.19.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"

 RDEPEND="app-misc/pax-utils"
-DEPEND=">=dev-python/zenlib-1.2.0
+DEPEND=">=dev-python/zenlib-1.3.0
 	>=dev-python/pycpio-0.7.0
 	sys-apps/pciutils"