Merge updates from master

2026-07-19 03:53:22 -04:00 · 2024-08-01 10:19:06 +00:00
parent 04df51905f acdd5c3e4f
commit 538a70012f
11 changed files with 55 additions and 133 deletions
--- a/dev-cpp/simdutf/Manifest
+++ b/dev-cpp/simdutf/Manifest
@@ -1 +1 @@
-DIST simdutf-5.3.0.tar.gz 1945148 BLAKE2B ed542d2d82cbadd364e53ab53be42ef6bda66e9ad96aa379acc7995c825b53bf710ed3b8c2da41624ae16b75ac802c142ab4588add85fbd0df1e86194c91d9a7 SHA512 b4d1d50fcdb801a6c9b98869a3511ebc95bccb5b8ab08c60d8f9b27bd132b15b66c8a344d97327035c2800bab74a7889253d6e496d3d36b8f6cdab8d10ad58c6
+DIST simdutf-5.3.1.tar.gz 1945706 BLAKE2B df71b5c93e40f09a111e2ba0c895f957c782a464d7f627168abe01f0df341fe8c295b99d6bfd438afb05e79f694f4ae89f6945eeadd37854ddaf2664849aa5f4 SHA512 fed58a74bff878668cff9612143153512a029b225b06a335395117bd606e45878e0839a7fe4f7d8f3d7d98f3652b6548ab65cbe2baf2cf2df0d6899ace01f8e5
--- a/dev-cpp/simdutf/simdutf-5.3.0-r1.ebuild
+++ b/dev-cpp/simdutf/simdutf-5.3.0-r1.ebuild
--- a/dev-zig/zls/metadata.xml
+++ b/dev-zig/zls/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">zigtools/zls</remote-id>
+		<doc lang="en">https://github.com/zigtools/zls/wiki</doc>
 		<bugs-to>https://github.com/zigtools/zls/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
+++ b/media-gfx/mayo/files/mayo-0.8.0-nogit.patch
@@ -1,3 +1,4 @@
+Disable git in build system.
 --- a/version.pri
 +++ b/version.pri
@@ -1,12 +1,5 @@
--- a/net-im/discord-ptb-bin/Manifest
+++ b/net-im/discord-ptb-bin/Manifest
@@ -1,2 +1 @@
-DIST discord-ptb-0.0.29.deb 77105454 BLAKE2B 191e70c5abb8284220bbc61c312b5feba63bda5833498627abe4829798d2647252933a17b4840f32432fdef5cbd8c494a0789d2620a0853ff6d7ba8fcb78eb02 SHA512 2bfd70927f5b622043abd1e47af0c86c6b5f6adcdfd8b2170a3c47bb5a9904e84d76dd08ddbb5c8da29f0a79a774c3a2106a1d33991cd5acaf7b454e476e5a0c
 DIST discord-ptb-0.0.97.deb 103058320 BLAKE2B 5c99f18f54c6eff755d427c15aca3000829a4580c8178d1ce786cd98d1beabed9a28cc6c04940ec8e46e865f78daa436212b7335b3d93811c6a9d3e50086426f SHA512 a8b11e5f4f1f5b14c4cf67b352d3f80ac56289f2f7259c6b5a2177b74e5f14dff6d38b1368e8c1e99ecc86962ba870b1156ea3b9eb23731c1da05dd0ea1c2a73
--- a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
+++ b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.29.ebuild
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN/-bin/}
-MY_BIN="D${MY_PN/d/}"
-MY_BIN="${MY_BIN/-ptb/}PTB"
-
-inherit desktop linux-info pax-utils unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat"
-HOMEPAGE="https://discordapp.com/"
-SRC_URI="https://dl-ptb.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror bindist"
-
-# libXScrnSaver is used through dlopen (bug #825370)
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	opt/discord-ptb/${MY_BIN}
-	opt/discord-ptb/chrome-sandbox
-	opt/discord-ptb/libffmpeg.so
-	opt/discord-ptb/libvk_swiftshader.so
-	opt/discord-ptb/libvulkan.so
-	opt/discord-ptb/libEGL.so
-	opt/discord-ptb/libGLESv2.so
-	opt/discord-ptb/libVkICD_mock_icd.so
-	opt/discord-ptb/swiftshader/libEGL.so
-	opt/discord-ptb/swiftshader/libGLESv2.so
-	opt/discord-ptb/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/${MY_PN}/${MY_BIN}:/opt/${MY_PN}/${MY_BIN}:g" \
-		usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	newicon usr/share/${MY_PN}/${MY_PN//-ptb}.png ${MY_PN}.png
-	domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/share/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_BIN}
-	dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
-
-	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}
--- a/net-im/discord-ptb-bin/discord-ptb-bin-0.0.97.ebuild
+++ b/net-im/discord-ptb-bin/discord-ptb-bin-0.0.97.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 MY_PN=${PN/-bin/}
 MY_BIN="D${MY_PN/d/}"
@@ -10,7 +10,7 @@ MY_BIN="${MY_BIN/-ptb/}PTB"
 inherit desktop linux-info pax-utils unpacker xdg

 DESCRIPTION="All-in-one voice and text chat"
-HOMEPAGE="https://discordapp.com/"
+HOMEPAGE="https://discord.com/"
 SRC_URI="https://dl-ptb.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"

 S="${WORKDIR}"
@@ -22,9 +22,7 @@ RESTRICT="mirror bindist"

 # libXScrnSaver is used through dlopen (bug #825370)
 RDEPEND="
-	app-accessibility/at-spi2-atk:2
 	app-accessibility/at-spi2-core:2
-	dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -91,21 +91,21 @@ PATCHES=(
 src_unpack() {
 	default

-	mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}"
-	rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty"
-	mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty"
-	rmdir "${WORKDIR}/${P}/OMSens"
-	mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens"
-	rmdir "${WORKDIR}/${P}/OMSens_Qt"
-	mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt"
-	rmdir "${WORKDIR}/${P}/OMSens_Qt/common"
-	mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common"
-	rmdir "${WORKDIR}/${P}/OMSimulator"
-	mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator"
-	rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty"
-	mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty"
-	mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc"
-	touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz"
+	mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}" || die
+	rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+	mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+	rmdir "${WORKDIR}/${P}/OMSens" || die
+	mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens" || die
+	rmdir "${WORKDIR}/${P}/OMSens_Qt" || die
+	mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt" || die
+	rmdir "${WORKDIR}/${P}/OMSens_Qt/common" || die
+	mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common" || die
+	rmdir "${WORKDIR}/${P}/OMSimulator" || die
+	mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator" || die
+	rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+	mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+	mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die
+	touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
 }

 src_configure() {
@@ -132,16 +132,15 @@ src_compile() {
 	# [2024-07-15]
 	# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
 	# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
-	PWD=$(pwd)
-	cd "${WORKDIR}"/"${P}"/OMSens/fortran_interface
-	gfortran -fPIC -c Rutf.for Rut.for Curvif.for
+	pushd OMSens/fortran_interface > /dev/null || die
+	gfortran -fPIC -c Rutf.for Rut.for Curvif.for || die
 	# BUG: Undefined symbol curvif_ in
 	# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
 	# See with nm or objdump -tT
 	# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
 	# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
-	f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90
-	cd "${PWD}"
+	f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
+	popd || die

 	cmake_src_compile
 }
@@ -152,8 +151,8 @@ src_install() {
 	# [2024-07-15]
 	# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
 	# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
-	cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/
-	rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
+	cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die
+	rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die

 	newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
 	newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
@@ -164,15 +163,15 @@ src_install() {

 	# Fix libraries
 	if [[ $(get_libdir) != "lib" ]]; then
-		mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/
-		rmdir "${ED}"/usr/lib/omc/
+		mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/ || die
+		rmdir "${ED}"/usr/lib/omc/ || die
 		dosym -r /usr/$(get_libdir)/omc /usr/lib/omc
 	fi
 	dosym -r /usr/include/omc/ParModelica /usr/include/ParModelica

 	# Documentation housekeeping & QA
-	mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}"
-	rm -fr "${ED}"/usr/doc
+	mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${PF}" || die
+	rm -fr "${ED}"/usr/doc || die

 	ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
 }
--- a/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild
+++ b/sys-fs/fsverity-utils/fsverity-utils-1.6.ebuild
@@ -19,6 +19,8 @@ HOMEPAGE="https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git"
 LICENSE="MIT"
 SLOT="0"

+IUSE="static-libs"
+
 DEPEND="dev-libs/openssl:="

 RDEPEND="${DEPEND}"
@@ -31,4 +33,8 @@ src_compile() {
 src_install() {
 	emake install CC="$(tc-getCC)" PKGCONF="$(tc-getPKG_CONFIG)" DESTDIR="${D}" \
 		PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	if ! use static-libs ; then
+		rm "${ED}/usr/$(get_libdir)/libfsverity.a" || die
+	fi
 }
--- a/sys-power/amdfan/Manifest
+++ b/sys-power/amdfan/Manifest
@@ -1,2 +1,2 @@
 DIST amdfan-0.1.28.tar.gz 81901 BLAKE2B 84e461a2f230e560c80badd99ec658774e5b46785a78387d6906d8ebe8a855f1e421a33872246af2a96ff06790615ad47a7d3d248e97a615c78a4ff9de8f641e SHA512 214b4940e747a8c8c0083d1cd90e78a3080e6b6b56031fff42f6bdca867e47ba81defb490e7704786f6e2a2c9634d990d53cbcfbc24c2c43d4ec9691023c06d8
-DIST amdfan-0.2.1.tar.gz 83709 BLAKE2B 962598cac033e176314202ef66d2a0a1bc7f1bc6897a3d792a33dc08998c690efe5634d40fed55f5c1b959ca12782215d8521ef6721186350098ef529f093e9f SHA512 afff7abd657e44ef5ba328af10683dda90e398853427c04773634b487f83d14ab5d60cbe32c3926277c5b5b9b8fa3331c86ebdc6d7ab57ddf56b88c150e5d03c
+DIST amdfan-0.2.3.tar.gz 85434 BLAKE2B 092a0f4123bb6e81688855ec868ddad3c55eee543fd9b5c81f4e0363c3e244b16fc8f2c82d1461a8471fa3074dc6cb47a6220d6740aabfa514f849e9075dfcf2 SHA512 fa46e89df1ea26b5fc6eec7596c8fec3c7d41e602210fb1544ca468f958739a97010616f3cefc30134199d9355281a7b572252b5b360b79f0f0029d3a825d970
--- a/sys-power/amdfan/amdfan-0.2.1-r2.ebuild
+++ b/sys-power/amdfan/amdfan-0.2.1-r2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# shellcheck disable=2034

 EAPI=8

 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{11..13} )
+PYTHON_COMPAT=( python3_{11..12} )

 inherit distutils-r1 systemd autotools

-DESCRIPTION="Updated AMD Fan control utility forked from amdgpu-fan and updated. "
+DESCRIPTION="Updated AMD Fan control utility forked from amdgpu-fan and updated."
 HOMEPAGE="https://mcgillij.dev/pages/amdfan.html"
 SRC_URI="https://github.com/mcgillij/amdfan/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"

@@ -31,26 +32,31 @@ DOCS=( README.md )
 distutils_enable_tests unittest

 src_prepare() {
-	default
+	distutils-r1_src_prepare

+	# this sed isn't clean. i haven't used PATCHES for this, since we're
+	# hoping to find a better fix upstream. suggestions are welcome
+	#
+	# relevant discussion:
+	# https://github.com/mcgillij/amdfan/commit/529fd3d4#r144705633
 	sed -i '/^include = \["dist\/systemd\/amdfan.service"\]$/d' pyproject.toml || die

-	eautoreconf
+	eautoreconf -vfi
 }

 src_configure() {
-	econf
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
+	# i don't like hardcoding --bindir like this, but
+	# if i don't, i get ${exec_prefix}/bin instead of /usr/bin
+	#
+	# is there a better approach?
+	econf --bindir="${EPREFIX}"/usr/bin
 }

 src_install() {
-	default
-
 	newinitd dist/openrc/amdfan amdfan
 	systemd_dounit dist/systemd/amdfan.service
+
+	distutils-r1_src_install
 }

 python_test() {