Merge updates from master

8 files changed, 11 insertions, 50 deletions

diff --git a/app-crypt/gpgme/gpgme-1.24.1.ebuild b/app-crypt/gpgme/gpgme-1.24.1.ebuild
index 212645cfc4d9..c2222e5090fb 100644
--- a/app-crypt/gpgme/gpgme-1.24.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.24.1.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # Bump FUDGE if a release is made which breaks ABI without changing SONAME.
 # (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
 SLOT="1/11.6.15.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index e5f5c774ba3d..97dfb1cebd19 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,2 +1 @@
-DIST aunit-23.0.0.tar.gz 131699 BLAKE2B 04ff77214ab6f4f5d59ea0609fffbc6fcfb4695d2fbbed45efa14e2b745c33868e1c134e5d00a7c3d8f11b1a8d15c6212110c78a53df4230b5862fb9b912a434 SHA512 450caa79e4808188107cd065665ca9cab599934e3934d18406b08d3ccebe26c1e95cd0c712ea3403d6082c7c5e8fd9ecf09ae3b63d231b80ad575048b3d61943
 DIST aunit-24.0.0.tar.gz 131699 BLAKE2B e43e7a94b278597475767d93f28a95a586abeaf45d141ea7035df9cb45d1be67c189a5be3d0364943b4649270f8f96d7cfd20fcba7a28917b14266c9e9424815 SHA512 25b973d1eb35e9e15ed24abe9c4ad7165d684c0e72abe619dcb9bec04cef8b28c78c1994e96e4bc29fd3b06567e15360f47ac87f49e1fa9888f55675defc226f
diff --git a/dev-ada/aunit/aunit-23.0.0-r1.ebuild b/dev-ada/aunit/aunit-23.0.0-r1.ebuild
deleted file mode 100644
index b40221d5658f..000000000000
--- a/dev-ada/aunit/aunit-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_compile() {
-	emake GPROPTS_EXTRA="-j$(makeopts_jobs) -v -cargs ${ADAFLAGS}"
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	einstalldocs
-	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
-	rmdir "${D}"/usr/share/examples || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/net-libs/nodejs/nodejs-18.20.5.ebuild b/net-libs/nodejs/nodejs-18.20.5.ebuild
index f82847e3508a..cf73513ca02b 100644
--- a/net-libs/nodejs/nodejs-18.20.5.ebuild
+++ b/net-libs/nodejs/nodejs-18.20.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.17.0.ebuild b/net-libs/nodejs/nodejs-20.17.0.ebuild
index 190648817a15..abfda469ca0a 100644
--- a/net-libs/nodejs/nodejs-20.17.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-20.18.1.ebuild b/net-libs/nodejs/nodejs-20.18.1.ebuild
index a06c32bdae99..72a3cf5fdc7d 100644
--- a/net-libs/nodejs/nodejs-20.18.1.ebuild
+++ b/net-libs/nodejs/nodejs-20.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
index 01bca3eaf966..31ac08005b1e 100644
--- a/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
+++ b/net-libs/nodejs/nodejs-22.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi
 
diff --git a/net-libs/nodejs/nodejs-22.7.0.ebuild b/net-libs/nodejs/nodejs-22.7.0.ebuild
index 51e02b2bcfe1..e1a3079e81af 100644
--- a/net-libs/nodejs/nodejs-22.7.0.ebuild
+++ b/net-libs/nodejs/nodejs-22.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="~amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi