Merge updates from master

2026-07-18 03:23:20 -04:00 · 2024-05-07 04:05:23 +00:00
parent 8ac75aedd0 41efd23fa7
commit b1a5d88592
17 changed files with 132 additions and 114 deletions
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -7,3 +7,4 @@ DIST zenlib-1.7.3.tar.gz 16924 BLAKE2B 20bab075d9a09062e2d596238237a2684c206cc16
 DIST zenlib-1.7.4.tar.gz 16949 BLAKE2B 6bc770d55207e3f532106b2511a3cd1c2161a7228e6be5161115f59d95213d6328da2347a9f19402c422651cdf1af3977c70828028c898f701218e50ef7217a9 SHA512 1b4d41da207cdc819c85a568a3f13555b7271bde066a7bf89ad11077ed42d5fd1b1227d1d789ed583e6b2aa2de4aae26a0da0be9ea6f59d0a262bdebae423104
 DIST zenlib-2.0.0.tar.gz 16921 BLAKE2B a9bedfd8bd28e2f50bbc11dbab21ba6c0f35b60e4e1438b1ad7666ed3b8688a6b9c611f88d8fbf915f69ebddc5420315080a6a0a8ed2983d14125bb28d091749 SHA512 2e4fa3d299d8da79930ea3a0f948472d49fb430727f100bb6b9f9e28d4792a229d2dc33ecaabd20d9e790a783acecb1ccb00381b97dcc02f8c5353abef74fb31
 DIST zenlib-2.0.4.tar.gz 16971 BLAKE2B e5e58aa86742914c67a58e072c312c92db94b96947cdffdf3adbfc50d8efe6dde1fae88965ccf5685d2225bbf7b745f717529b1f0ed41857260199a0f3d8d2d2 SHA512 12ffef2e2ab23136bdc24cdac5eb3a031bb581d346a107306455aa5dc5a66757599596770cf7b7e6ecde73fbec39b4276efcd3a191a2d29f64e75e5a01ed25d1
+DIST zenlib-2.1.1.tar.gz 17139 BLAKE2B f9ff56b120d72786bd43cf60120f65c4b8b6d2ed47eb6656bc0c377e3b35ba60d6b1f348dce12b1096ebb752f073dd7113cb6765da98de279818bb7062ca8522 SHA512 f5db26e895e07266334b788530186cfa8f8ac9c239f65b8ee253d250cb47bd5a57ba6605b0b78f07b744f53cc5b3f9ab2ff229d098c6604d7d2d46e97ba34629
--- a/dev-python/zenlib/zenlib-2.1.1.ebuild
+++ b/dev-python/zenlib/zenlib-2.1.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/fortls/Manifest
+++ b/dev-util/fortls/Manifest
@@ -1,3 +1,4 @@
 DIST fortls-2.13.0.tar.gz 6897238 BLAKE2B 000bf8d68394c1ce2d4bca044ba3c395b22da9a8e026d9f8e74890ec2fbb894c4097f634f83352fcb21ff6e7e6f4af78bf9f8abdf00ab068d270fb93b9a6574d SHA512 dc5d51fea92d1b00722ee4a33901939fe38fd379260e1edc7a97939cd5c9204e5c27a7f4c57122a0bdf7a36f2f59d0d8f71a50448b6cdc98b1bb2d349511580e
 DIST fortls-3.0.0rc2.tar.gz 7061084 BLAKE2B 1f4b818368e7de4d1de2d9c397f37723b26f9f23f18fd971147e35fcbcd95e26dc4a03f7481300a8b7af82da9305371340ee51fc1ac7374786878c7e6dfae526 SHA512 e54596bc079ec3e278621011b15d8d3c74b1e32e152071d11dd34c9cea4c6bf57881f91c018dd41239a7bec263df8d6e91cc4ae6ba1a24e601985c735f3e713d
 DIST fortls-3.0.0rc3.tar.gz 7063929 BLAKE2B 13342b02343b78585cc8598fc019a396704c6eb74d447ccc001ac1e7d049e0c2984e3b8c740af500434b5de44f4e3ed637e0bab43bb32ce2e6ed06d4043398df SHA512 cf378edff0e25edd69dc2fa444eedcb62799821986103fdbe1af6efa3b88fb380f26f5adfb8eef2f24d93dde427b5f2038b98ad9a3d9f43e85c060410714a5c0
+DIST fortls-3.0.0rc4.tar.gz 7064199 BLAKE2B 5de77546c39a0b39647e59a829f9b54bae5410a6bb71e95f7c25db73461485ce05c0c1ce046558a4942d2b93d1d96874b70bd849cf9dd9c42bb53fa59f3551be SHA512 9fd06fd80f1f3f15a205936faf6ff400a3df4ab38228e6662869cc42849989d8bc49243bbf241e7736f5eddaa908f7fcb928523ab02251669aede305a2f3d156
--- a/dev-util/fortls/fortls-3.0.0_rc4.ebuild
+++ b/dev-util/fortls/fortls-3.0.0_rc4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fortran Language Server (fortls)"
+HOMEPAGE="https://fortls.fortran-lang.org"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/json5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+# Disable test that requires pypi.org connection
+EPYTEST_DESELECT=(
+	test/test_interface.py::test_version_update_pypi
+)
+
+src_prepare() {
+	# Drop some additional coverage tests
+	sed -i -e 's/ --cov=fortls --cov-report=html --cov-report=xml --cov-context=test//' pyproject.toml || die
+	# Disable autoupdate check during tests run
+	sed -i -e 's/"--incremental_sync",/"--incremental_sync", "--disable_autoupdate",/' test/setup_tests.py || die
+	# Fix setuptools warnings
+	sed -i -e 's|include = \["fortls"\]|include = \["fortls\*"\]|' pyproject.toml || die
+
+	distutils-r1_src_prepare
+}
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,3 +1,2 @@
-DIST lazygit-0.39.4.tar.gz 3882422 BLAKE2B 7d1c94f1340e9eb56f84174196539db0cb716808c723045daeee7c037c3cab04e566edfab8a30b1771d441928a81d56f96eb468ba070ad73cf847e89a2800493 SHA512 b3d29abfe168590ea63c46ac461e4862a86b861f77a89e6be9d2b207f24c4da10b95512349b1158ff92c1443a16468d4d0026d27b0b87c2315b15ede447dbf05
 DIST lazygit-0.40.2.tar.gz 4468039 BLAKE2B efea794795af283dc286166427fe5aae4ce8473a4933f2373501d0f3ac0a4d16df7aa20cb20b25738707c30356db4fad647de4cfa2e6abde024a613f5e036b7f SHA512 201bd09705ad48c41ed62ac061b31e62ce51a351eff5dae36a3bf5654d62fdef5d2a93e3f4ad56c0b02c70fb0e323319ed38d64c3bfef36900423983284b52c1
 DIST lazygit-0.41.0.tar.gz 4685555 BLAKE2B 2df9686e279c428276c846ccbbcc77ac0037e0383062c17df9425d90dda86767e6dddd16d2efeaea85d2f1bdf4849b36d82d4ccfef4acc7c0261a8480f2174b3 SHA512 ef1d8e2394eb3230c0489e0b0c6726536649697943fa8a7cbf95e9eb600c8fe3429e72539897f04ffd3ee35905b96600c5a79174856c4e49a22fbeada668bf4e
--- a/dev-vcs/lazygit/lazygit-0.39.4-r1.ebuild
+++ b/dev-vcs/lazygit/lazygit-0.39.4-r1.ebuild
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="Simple terminal UI for git commands"
-HOMEPAGE="https://github.com/jesseduffield/lazygit"
-SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-vcs/git"
-
-DOCS=( {CODE-OF-CONDUCT,CONTRIBUTING,README}.md docs )
-
-src_compile() {
-	ego build -o bin/lazygit \
-		-ldflags "-X main.version=${PV}"
-}
-
-src_install() {
-	dobin bin/lazygit
-	einstalldocs
-}
--- a/gui-apps/grimshot/grimshot-9999.ebuild
+++ b/gui-apps/grimshot/grimshot-9999.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	gui-apps/grim
 	gui-apps/slurp
 	gui-apps/wl-clipboard
-	gui-wm/sway
+	|| ( gui-wm/sway gui-wm/swayfx )
 	!!<=gui-wm/sway-1.8.1[grimshot]
 	libnotify? ( x11-libs/libnotify )
 "
--- a/media-plugins/qt-heif-image-plugin/Manifest
+++ b/media-plugins/qt-heif-image-plugin/Manifest
@@ -1,2 +1 @@
-DIST qt-heif-image-plugin-0.3.3.tar.gz 16449 BLAKE2B f304e26ff60d0fbe840a40c3782543f9db17e7f8fd429b93b0de6663d85110cceff1b67bab996ae63cad12ee06608c74ce9c5e180f154e3df8fee2ccdcd849a9 SHA512 ba617d11e73d73dee5220b668918e313b6d856cabc1567b9221ddb2b3d35c4bfefadcd9e4485bdc7c280be104d09c3580e245d9a8f72c9fac397ebe84fe55e2f
 DIST qt-heif-image-plugin-0.3.4.tar.gz 16736 BLAKE2B c2b923d543390c1c7cade8c435367bc7533066e6860e2242ea041592262d6d777e63284ba340580366f862921e7bbb53025998dd09cb3facd434a90722e57c3c SHA512 bdb2cf797d897408c31ffb4b84cd29ce5755a633ec38bbf8ce307f1ed0cc274203d11f3450450536ddc7f4ff4621f73d2c84fd7133dd00c16775f538133c03f5
--- a/media-plugins/qt-heif-image-plugin/files/qt-heif-image-plugin-0.3.3_RGB88.patch
+++ b/media-plugins/qt-heif-image-plugin/files/qt-heif-image-plugin-0.3.3_RGB88.patch
@@ -1,49 +0,0 @@
-From 3288ae60b96efa404fbeb40598a8567bc8c75761 Mon Sep 17 00:00:00 2001
-From: Markus Diem <diemmarkus@gmail.com>
-Date: Mon, 22 Jun 2020 11:12:12 +0200
-Subject: [PATCH] maps color format from HEIF to Qt (i.e. RGB88)
-
- this patch is needed to load RGB888 heif images with libheif 1.7.0
- maps heif_chroma_interleaved_RGB to QImage::Format_RGB888
- other conversions are not added because I don't have test images
---
- src/qheifhandler.cpp | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/qheifhandler.cpp b/src/qheifhandler.cpp
-index e1b9933..822c45d 100644
--- a/src/qheifhandler.cpp
-+++ b/src/qheifhandler.cpp
-@@ -288,13 +288,31 @@ bool QHeifHandler::read(QImage* destImage)
-         qWarning("QHeifHandler::read() invalid stride: %d", stride);
-         return false;
-     }
-+    
-+    // map image format
-+    heif_chroma heifFormat = heif_image_get_chroma_format(srcImage.get());
-+    QImage::Format qtFormat;
- 
-+    switch (heifFormat) {
-+    case heif_chroma_interleaved_RGB: {
-+        qtFormat = QImage::Format_RGB888;
-+        break;
-+    }
-+    case heif_chroma_interleaved_RGBA: {
-+        qtFormat = QImage::Format_RGBA8888;
-+        break;
-+    }
-+    // TODO: add other formats i.e. heif_chroma_monochrome  here
-+    default:
-+        qtFormat = QImage::Format_RGBA8888;
-+    }
-+    
-     // move data ownership to QImage
-     heif_image* dataImage = srcImage.release();
- 
-     *destImage = QImage(
-         data, imgSize.width(), imgSize.height(),
-        stride, QImage::Format_RGBA8888,
-+        stride, qtFormat,
-         [](void* img) { heif_image_release(static_cast<heif_image*>(img)); },
-         dataImage
-     );
--- a/media-plugins/qt-heif-image-plugin/qt-heif-image-plugin-0.3.3-r3.ebuild
+++ b/media-plugins/qt-heif-image-plugin/qt-heif-image-plugin-0.3.3-r3.ebuild
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt plugin for HEIF images"
-HOMEPAGE="https://github.com/jakar/qt-heif-image-plugin"
-SRC_URI="https://github.com/jakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	>=media-libs/libheif-1.12.0:0=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}_RGB88.patch" )
--- a/sci-electronics/yosys/yosys-0.40-r1.ebuild
+++ b/sci-electronics/yosys/yosys-0.40-r1.ebuild
@@ -25,16 +25,15 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-vcs/git"

-QA_PRESTRIPPED="
-	/usr/bin/yosys-filterlib
-	/usr/bin/yosys-abc
-"
-
 src_prepare() {
 	mv "${WORKDIR}/abc-${ABC_GIT_COMMIT}" "${S}"/abc || die
 	default
 }

-src_install() {
-	emake DESTDIR="${D}" PREFIX='/usr' install
+src_configure() {
+	cat <<-__EOF__ >> Makefile.conf || die
+		PREFIX := ${EPREFIX}/usr
+		STRIP := @echo "skipping strip"
+	__EOF__
+	default
 }
--- a/sys-boot/limine/Manifest
+++ b/sys-boot/limine/Manifest
@@ -2,3 +2,4 @@ DIST limine-7.0.0.tar.xz 1318064 BLAKE2B 7986d948fe84c80b338e5cc66edca5f511d277d
 DIST limine-7.0.3.tar.xz 371416 BLAKE2B 7450784d53ef86993f53c84da4f51ee8a1beb826153da8fa2cef1a0669688de370a53ced321a92276e4b53fb7c9c1081f71b4a4c7adf432b271d395e96f00595 SHA512 d8d92f237f56249555fa54b5608ad2bdeff7c7b53e055f925acb3a7feeb783407c4c5d7ce092dba0b9a93441cfd1d0dcc4ec01a9e94c14e1742119a50f63aa06
 DIST limine-7.0.5.tar.xz 371612 BLAKE2B 029953e1a5adeac2b1cd92bfff3b3a893b8ad1f458f1560b194ad0607638a3cc77d4927f1f4376a958d7ae513400ec615ab092ef97cbb220e5866821e83f7fdc SHA512 149bc59785d06b293a9a9d18722afee66301e698fdd349bc5bd211720873213239617af0de665e22dc43299e7a580359d4d407c9eb6ffd6ac85c1de484124055
 DIST limine-7.3.0.tar.gz 523910 BLAKE2B aabe52c9013f17e61520aa8df0886339d6be16e3dea0b13b13160ed61b811355880e93b2928c0d73fdf8a7f80132569a7cd783dd720915235f5e78deecd4048d SHA512 fc25375f86c18ae991f6f6d11fa127b47d1fdfa81059ed663a82202f9de95b9774516e1bf5a648abaedde8e04fe004c296666b6ec3a1eeaf5cf3472aca87c0c5
+DIST limine-7.5.0.tar.gz 518804 BLAKE2B 745929606cf5e5e297f55690573e26bea8b63f8c9d6acffc890c265e48450a678442612f917bf0806520a939504bc21606be4f768237c238527d430820cd2cdc SHA512 927cba6eecc8b01ee0af7f3dc24392fc50bce28b06e36c50d44ab995f3a5f7ab17f804116e00fac3c7a92749340802a2643f20a54ebf8fb9ec44f13fa03dbe5a
--- a/sys-boot/limine/limine-7.5.0.ebuild
+++ b/sys-boot/limine/limine-7.5.0.ebuild
@@ -0,0 +1,44 @@
+# 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.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bios +bios-pxe +bios-cd +cd-efi +uefi32 +uefi64 +uefiaa64 +uefirv64"
+
+MY_LLVM_TARGETS="AArch64 ARM X86 RISCV"
+MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
+
+BDEPEND="
+	app-alternatives/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 uefirv64 uefi-riscv64)"
+		"$(use_enable cd-efi uefi-cd)"
+	)
+
+	TOOLCHAIN_FOR_TARGET=llvm \
+	econf "${myconf[@]}"
+}
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,3 +1,3 @@
 DIST ugrd-0.22.0.tar.gz 44444 BLAKE2B 01c4cc36ea778c12478b3b2f6db76180f9b7ef8d214b7cb2ab7579826f67d9166ac889ba17ae59819a3870cd2847b6ba4f8fff373dc670a4cde2a85dc60e2b67 SHA512 498b65070a83a810ec2c84bb58ca380f0836654f5ac2676bc358b5e80ea48057156102b3e1983695decdcffa64bd5bfe05df963d98342171c3e9c2906d9370da
 DIST ugrd-1.2.2.tar.gz 49312 BLAKE2B 819457ae44cb278b93ef24af5e0aa2e23bf2d31d07fccec86e597f658a5cb13aad7838b08df644090417719402673b63087d27b6edbdb46dea04b98b48d26fb0 SHA512 6348458708406408973534ac5f15f8f9f6d9427bbac48443f7ff362bb97627be6288ba2d138355f92fc1c79a4eb5e51081485adb051cadf523a58f1ef618667e
-DIST ugrd-1.3.4.tar.gz 50197 BLAKE2B f97db06f5642a354e14bcca1681d1d42ccac31f2669dab8b3c659ed4b378a7a9e39c4cf7a4f73268fe7cc1312e21b33bb53420eb235988f67da0a3a21a34f934 SHA512 0a2ee91e82db91f1b2fc990da846a8a46a4c70e578e419409bf61c9cf34c1de499e7f9b8b1b78d8cf85d924243e444fe7b2dfaeed78778a0422ba88851a74522
+DIST ugrd-1.3.7.tar.gz 50109 BLAKE2B dfdbab40338c2765d8503a2fa3e1fd484a087dbe85c9933d77c31853eef201835642b55d8f170d6f5b4d214e26e4c06f24448d30807ec8da834fc1beb9443c7d SHA512 490feb45bb74b8e324657e6984347cdae3a4f954865488c0df83b23e4f7b18577e953654a41473989197a3ed1b9e237744fad80dd5f36ef3e9c53715837a57c3
--- a/sys-kernel/ugrd/ugrd-1.3.7.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.3.7.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"

 RDEPEND="
 	app-misc/pax-utils
-	>=dev-python/zenlib-2.0.4[${PYTHON_USEDEP}]
+	>=dev-python/zenlib-2.1.1[${PYTHON_USEDEP}]
 	>=dev-python/pycpio-1.0.0[${PYTHON_USEDEP}]
 	sys-apps/pciutils
 "
--- a/sys-process/forkstat/files/musl-prio.patch
+++ b/sys-process/forkstat/files/musl-prio.patch
@@ -0,0 +1,21 @@
+diff --git a/forkstat.c b/forkstat.c
+index 57dc9c8..4b22c42 100644
+--- a/forkstat.c
+++ b/forkstat.c
+@@ -40,6 +40,7 @@
+ #include <time.h>
+ #include <getopt.h>
+ #include <sched.h>
+#include <pthread.h>
+ #include <pwd.h>
+ 
+ #include <sys/ioctl.h>
+@@ -2022,7 +2023,7 @@ int main(int argc, char * const argv[])
+ 
+ 		(void)memset(&param, 0, sizeof(param));
+ 		param.sched_priority = max_prio;
+-		if (sched_setscheduler(getpid(), policy, &param) < 0) {
+		if (pthread_setschedparam(pthread_self(), policy, &param) < 0) {
+ 			(void)fprintf(stderr, "sched_setscheduler failed: errno=%d (%s)\n",
+ 				errno, strerror(errno));
+ 			goto abort_sock;
--- a/sys-process/forkstat/forkstat-0.03.02-r2.ebuild
+++ b/sys-process/forkstat/forkstat-0.03.02-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-
+PATCHES=( "${FILESDIR}/musl-prio.patch" )
 src_prepare() {
 	default
 	sed -i 's/8.gz/8/g' Makefile