From 287b32c46ef4a274fe2ae132f5de1af413ffc84a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 25 Dec 2023 12:55:09 -0800 Subject: [PATCH 1/8] sys-boot/grub: Use libsdl2 instead of libsdl Solves this configure error with sdl enabled: checking for SDL2... yes configure: error: SDL support for grub-emu was explicitly requested but can't be compiled (disabled by sdl2) Also fix the fuse dependency to use fuse:3. Bug: https://bugs.gentoo.org/880377 Bug: https://bugs.gentoo.org/920699 Signed-off-by: Zac Medico Closes: https://github.com/gentoo/gentoo/pull/34475 Signed-off-by: Sam James --- sys-boot/grub/{grub-2.12.ebuild => grub-2.12-r1.ebuild} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename sys-boot/grub/{grub-2.12.ebuild => grub-2.12-r1.ebuild} (98%) diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild similarity index 98% rename from sys-boot/grub/grub-2.12.ebuild rename to sys-boot/grub/grub-2.12-r1.ebuild index af2c3e716ed00..80061b9e8e2a4 100644 --- a/sys-boot/grub/grub-2.12.ebuild +++ b/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 From b170713645d6e197f6c6843a7b63c1f1d64a4df8 Mon Sep 17 00:00:00 2001 From: Alfred Persson Forsberg Date: Sun, 10 Dec 2023 20:15:04 +0100 Subject: [PATCH 2/8] dev-go/delve: add 1.21.2 Closes: https://bugs.gentoo.org/915978 Signed-off-by: Alfred Persson Forsberg Signed-off-by: Sam James --- dev-go/delve/Manifest | 1 + dev-go/delve/delve-1.21.2.ebuild | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 dev-go/delve/delve-1.21.2.ebuild diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest index 6a434f2036fe7..5e9ef16165549 100644 --- a/dev-go/delve/Manifest +++ b/dev-go/delve/Manifest @@ -1,3 +1,4 @@ DIST delve-1.20.2.tar.gz 9198885 BLAKE2B 16cb8d5ec8c83082c6d61e0c5235597e46a3ff2e1c4f5628eb92040e663e101ed33ac903ec3c5be4eb6b338df8bc8f6017547bca73e9ade0a9e89d37b4e39318 SHA512 c48027d200257d0a979fbf2ea3a65f6dc645d1c231264023b10c216de1e3d80db86ac775cdb02f4dcd261756c8e26bbdce598cce709eb2aa4c9853f2e0cf6cf8 +DIST delve-1.21.2.tar.gz 9430716 BLAKE2B 4fe7e53791aa96284cea0ce614a066c15a9e15894c0fb84993f3405b4a5cd6abd1d88a912408912757de931fdc2ab4f73227d2bce1e58859b3336dd21698d75d SHA512 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541 DIST delve-1.8.0.tar.gz 9007735 BLAKE2B 81289ed39ecbfb118d171b56e88b7a5689671054ac906ee315d46d4e568853e1d6753f36389ea26d7a6f57e6f356ea7e4075b0a1571bebb36a51883fd2343279 SHA512 bda883bf27c5bf0c1d1bbbd58fe81757abd1beaead69906c48c2b67d2ab7ab8e202238e09f2d59a0afb2455753ad40536156d59e28657563780b7b15f121dc5a DIST delve-1.9.0.tar.gz 9052933 BLAKE2B 0af3c8e340aff800b5d26d5021220f92f1eb5fb25c83a23b71989a99e2ffdfb63e1f38e3bf6e3bd84788e0f1a04f8b5e2a28cc6576d81dfffd5c4cb409734a49 SHA512 7a616281eeb92d07657ed8522672648a993bb54fbe6c8bbea5979cac8f0cff37dfe183950b481a444a20ffa7c95a6a83133356a12ce2894ba0a595d5cacf4100 diff --git a/dev-go/delve/delve-1.21.2.ebuild b/dev-go/delve/delve-1.21.2.ebuild new file mode 100644 index 0000000000000..af82268a61953 --- /dev/null +++ b/dev-go/delve/delve-1.21.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 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 +} From 63372d9aaef2b68088b8a12ef4d1af121e0a7768 Mon Sep 17 00:00:00 2001 From: Alfred Persson Forsberg Date: Mon, 11 Dec 2023 16:32:23 +0100 Subject: [PATCH 3/8] dev-go/delve: drop 1.8.0, 1.9.0 Signed-off-by: Alfred Persson Forsberg Closes: https://github.com/gentoo/gentoo/pull/34215 Signed-off-by: Sam James --- dev-go/delve/Manifest | 2 -- dev-go/delve/delve-1.8.0.ebuild | 33 --------------------------------- dev-go/delve/delve-1.9.0.ebuild | 33 --------------------------------- 3 files changed, 68 deletions(-) delete mode 100644 dev-go/delve/delve-1.8.0.ebuild delete mode 100644 dev-go/delve/delve-1.9.0.ebuild diff --git a/dev-go/delve/Manifest b/dev-go/delve/Manifest index 5e9ef16165549..138f97fed5277 100644 --- a/dev-go/delve/Manifest +++ b/dev-go/delve/Manifest @@ -1,4 +1,2 @@ DIST delve-1.20.2.tar.gz 9198885 BLAKE2B 16cb8d5ec8c83082c6d61e0c5235597e46a3ff2e1c4f5628eb92040e663e101ed33ac903ec3c5be4eb6b338df8bc8f6017547bca73e9ade0a9e89d37b4e39318 SHA512 c48027d200257d0a979fbf2ea3a65f6dc645d1c231264023b10c216de1e3d80db86ac775cdb02f4dcd261756c8e26bbdce598cce709eb2aa4c9853f2e0cf6cf8 DIST delve-1.21.2.tar.gz 9430716 BLAKE2B 4fe7e53791aa96284cea0ce614a066c15a9e15894c0fb84993f3405b4a5cd6abd1d88a912408912757de931fdc2ab4f73227d2bce1e58859b3336dd21698d75d SHA512 78953099b1ba79d04136b037d1fd45dc2f9013428a9eed77bb0bba7c43a00370d701d0576e9c1367e5e45f236ceb4bcdfc1c3366db95999dbe9e758e54225541 -DIST delve-1.8.0.tar.gz 9007735 BLAKE2B 81289ed39ecbfb118d171b56e88b7a5689671054ac906ee315d46d4e568853e1d6753f36389ea26d7a6f57e6f356ea7e4075b0a1571bebb36a51883fd2343279 SHA512 bda883bf27c5bf0c1d1bbbd58fe81757abd1beaead69906c48c2b67d2ab7ab8e202238e09f2d59a0afb2455753ad40536156d59e28657563780b7b15f121dc5a -DIST delve-1.9.0.tar.gz 9052933 BLAKE2B 0af3c8e340aff800b5d26d5021220f92f1eb5fb25c83a23b71989a99e2ffdfb63e1f38e3bf6e3bd84788e0f1a04f8b5e2a28cc6576d81dfffd5c4cb409734a49 SHA512 7a616281eeb92d07657ed8522672648a993bb54fbe6c8bbea5979cac8f0cff37dfe183950b481a444a20ffa7c95a6a83133356a12ce2894ba0a595d5cacf4100 diff --git a/dev-go/delve/delve-1.8.0.ebuild b/dev-go/delve/delve-1.8.0.ebuild deleted file mode 100644 index 476b2e0a06cff..0000000000000 --- a/dev-go/delve/delve-1.8.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 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 -} diff --git a/dev-go/delve/delve-1.9.0.ebuild b/dev-go/delve/delve-1.9.0.ebuild deleted file mode 100644 index 25e79115027eb..0000000000000 --- a/dev-go/delve/delve-1.9.0.ebuild +++ /dev/null @@ -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 -} From 700c1171320727e48a4b86585a468df8ad61bc63 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 26 Dec 2023 21:25:34 +0000 Subject: [PATCH 4/8] app-containers/apptainer: Stabilize 1.2.4 amd64, #920728 Signed-off-by: Sam James --- app-containers/apptainer/apptainer-1.2.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-containers/apptainer/apptainer-1.2.4.ebuild b/app-containers/apptainer/apptainer-1.2.4.ebuild index b5e7811c6f005..f32ad5c897517 100644 --- a/app-containers/apptainer/apptainer-1.2.4.ebuild +++ b/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. From 6d830d29cfbf65ffb9517c828ee3ae7764037b01 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 26 Dec 2023 21:25:35 +0000 Subject: [PATCH 5/8] app-misc/mc: Stabilize 4.8.30-r1 amd64, #920729 Signed-off-by: Sam James --- app-misc/mc/mc-4.8.30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/mc/mc-4.8.30-r1.ebuild b/app-misc/mc/mc-4.8.30-r1.ebuild index 07bcae0efcb74..3d911eb3acf6c 100644 --- a/app-misc/mc/mc-4.8.30-r1.ebuild +++ b/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" From 99e81e503710b18e9f439c7bc663b1553f167284 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 26 Dec 2023 21:25:37 +0000 Subject: [PATCH 6/8] sys-apps/fwupd: Stabilize 1.9.6 amd64, #920733 Signed-off-by: Sam James --- sys-apps/fwupd/fwupd-1.9.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/fwupd/fwupd-1.9.6.ebuild b/sys-apps/fwupd/fwupd-1.9.6.ebuild index 09477afb6ce6c..ffb97f6ac664d 100644 --- a/sys-apps/fwupd/fwupd-1.9.6.ebuild +++ b/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 ) From 1e00026c36949399e803a4dce5f50fab544a26ba Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 26 Dec 2023 21:25:39 +0000 Subject: [PATCH 7/8] net-p2p/syncthing: Stabilize 1.26.1 amd64, #920734 Signed-off-by: Sam James --- net-p2p/syncthing/syncthing-1.26.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/syncthing/syncthing-1.26.1.ebuild b/net-p2p/syncthing/syncthing-1.26.1.ebuild index 854da7b0bf751..3bf35f2715221 100644 --- a/net-p2p/syncthing/syncthing-1.26.1.ebuild +++ b/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 From 4dcede00ed45f71f9953338f1bf6da2158c7c5af Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 26 Dec 2023 21:25:40 +0000 Subject: [PATCH 8/8] media-libs/netpbm: Stabilize 11.2.5 ppc64, #920738 Signed-off-by: Sam James --- media-libs/netpbm/netpbm-11.2.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/netpbm/netpbm-11.2.5.ebuild b/media-libs/netpbm/netpbm-11.2.5.ebuild index e22e58d3b22ba..b64a448d7d808 100644 --- a/media-libs/netpbm/netpbm-11.2.5.ebuild +++ b/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