Merge updates from master

app-containers/apptainer/apptainer-1.2.4.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network suid systemd"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.

app-misc/mc/mc-4.8.30-r1.ebuild

@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
 
 MY_P="${P/_/-}"
 SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 DESCRIPTION="GNU Midnight Commander is a text based file manager"
 HOMEPAGE="https://midnight-commander.org"

dev-go/delve/Manifest

@@ -1,3 +1,2 @@
 DIST delve-1.20.2.tar.gz 9198885 BLAKE2B 16cb8d5ec8c83082c6d61e0c5235597e46a3ff2e1c4f5628eb92040e663e101ed33ac903ec3c5be4eb6b338df8bc8f6017547bca73e9ade0a9e89d37b4e39318 SHA512 c48027d200257d0a979fbf2ea3a65f6dc645d1c231264023b10c216de1e3d80db86ac775cdb02f4dcd261756c8e26bbdce598cce709eb2aa4c9853f2e0cf6cf8
-DIST delve-1.8.0.tar.gz 9007735 BLAKE2B 81289ed39ecbfb118d171b56e88b7a5689671054ac906ee315d46d4e568853e1d6753f36389ea26d7a6f57e6f356ea7e4075b0a1571bebb36a51883fd2343279 SHA512 bda883bf27c5bf0c1d1bbbd58fe81757abd1beaead69906c48c2b67d2ab7ab8e202238e09f2d59a0afb2455753ad40536156d59e28657563780b7b15f121dc5a
-DIST delve-1.9.0.tar.gz 9052933 BLAKE2B 0af3c8e340aff800b5d26d5021220f92f1eb5fb25c83a23b71989a99e2ffdfb63e1f38e3bf6e3bd84788e0f1a04f8b5e2a28cc6576d81dfffd5c4cb409734a49 SHA512 7a616281eeb92d07657ed8522672648a993bb54fbe6c8bbea5979cac8f0cff37dfe183950b481a444a20ffa7c95a6a83133356a12ce2894ba0a595d5cacf4100
+DIST delve-1.21.2.tar.gz 9430716 BLAKE2B 4fe7e53791aa96284cea0ce614a066c15a9e15894c0fb84993f3405b4a5cd6abd1d88a912408912757de931fdc2ab4f73227d2bce1e58859b3336dd21698d75d SHA512 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541

dev-go/delve/delve-1.21.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

dev-go/delve/delve-1.9.0.ebuild

@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-DESCRIPTION="A source-level debugger for the Go programming language"
-HOMEPAGE="https://github.com/go-delve/delve"
-
-SRC_URI="https://github.com/go-delve/delve/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT BSD BSD-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	go build -mod vendor -ldflags="-X main.Build=${PV}" -o "${S}/dlv" ./cmd/dlv || die
-}
-
-src_test() {
-	local packages
-	readarray -t packages < <(go list ./...)
-	(( ${#packages[@]} > 0 )) || die "go list failed"
-	# The first test fails, without network since it is calling go build ...
-	# disabled for now. Future ebuilds will patch that test.
-	go test -count 1 -p 1 -v "-ldflags=-X main.Build=${PV}" ${packages[@]:1} || die
-}
-
-src_install() {
-	dobin dlv
-	dodoc README.md CHANGELOG.md
-}

media-libs/netpbm/netpbm-11.2.5.ebuild

@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}.tar.xz"
 
 LICENSE="Artistic BSD GPL-2 IJG LGPL-2.1 MIT public-domain"
 SLOT="0/stable.102"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml"
 
 # app-text/ghostscript-gpl is really needed for postscript

net-p2p/syncthing/syncthing-1.26.1.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-source-v$
 
 LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~x86"
 IUSE="selinux tools"
 
 RDEPEND="acct-group/syncthing

sys-apps/fwupd/fwupd-1.9.6.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="amdgpu amt +archive bash-completion bluetooth cbor elogind fastboot flashrom gnutls gtk-doc +gusb introspection logitech lzma minimal modemmanager nvme policykit spi +sqlite synaptics systemd test test-full tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )

sys-boot/grub/grub-2.12-r1.ebuild

@@ -120,11 +120,11 @@ DEPEND="
 	app-arch/xz-utils
 	>=sys-libs/ncurses-5.2-r5:0=
 	grub_platforms_emu? (
-		sdl? ( media-libs/libsdl )
+		sdl? ( media-libs/libsdl2 )
 	)
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
 	libzfs? ( sys-fs/zfs:= )
-	mount? ( sys-fs/fuse:0 )
+	mount? ( sys-fs/fuse:3 )
 	truetype? ( media-libs/freetype:2= )
 	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
 	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
@@ -231,7 +231,8 @@ grub_configure() {
 		$(use_enable themes grub-themes)
 		$(use_enable truetype grub-mkfont)
 		$(use_enable libzfs)
-		$(use_enable sdl grub-emu-sdl)
+		--enable-grub-emu-sdl=no
+		$(use_enable sdl grub-emu-sdl2)
 		${platform:+--with-platform=}${platform}
 
 		# Let configure detect this where supported