From 1871f38ccdada30fcaef31fff8953a7de7cbb043 Mon Sep 17 00:00:00 2001 From: "Sv. Lockal" Date: Sun, 11 Jan 2026 18:00:13 +0800 Subject: [PATCH] dev-build/cmake: prevent accidental removal of none.cmake in tests (no functional changes, tests still pass with/without this file) Bug: https://bugs.gentoo.org/968511 Signed-off-by: Sv. Lockal Part-of: https://github.com/gentoo/gentoo/pull/45330 Signed-off-by: Sam James --- dev-build/cmake/cmake-3.31.10.ebuild | 4 ++-- dev-build/cmake/cmake-3.31.9-r1.ebuild | 4 ++-- dev-build/cmake/cmake-4.1.2-r1.ebuild | 2 +- dev-build/cmake/cmake-4.1.3.ebuild | 4 ++-- dev-build/cmake/cmake-4.1.4.ebuild | 2 +- dev-build/cmake/cmake-4.2.1-r1.ebuild | 2 +- dev-build/cmake/cmake-9999.ebuild | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-build/cmake/cmake-3.31.10.ebuild b/dev-build/cmake/cmake-3.31.10.ebuild index 7ad596d0cf37b..1a4175d323e66 100644 --- a/dev-build/cmake/cmake-3.31.10.ebuild +++ b/dev-build/cmake/cmake-3.31.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-3.31.9-r1.ebuild b/dev-build/cmake/cmake-3.31.9-r1.ebuild index c3b31535ab741..0eea8fdda4d29 100644 --- a/dev-build/cmake/cmake-3.31.9-r1.ebuild +++ b/dev-build/cmake/cmake-3.31.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-4.1.2-r1.ebuild b/dev-build/cmake/cmake-4.1.2-r1.ebuild index 738f678a4623c..aadcc889f5c36 100644 --- a/dev-build/cmake/cmake-4.1.2-r1.ebuild +++ b/dev-build/cmake/cmake-4.1.2-r1.ebuild @@ -22,7 +22,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-4.1.3.ebuild b/dev-build/cmake/cmake-4.1.3.ebuild index 0467e0f8e2a66..0d6efc533ee7c 100644 --- a/dev-build/cmake/cmake-4.1.3.ebuild +++ b/dev-build/cmake/cmake-4.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-4.1.4.ebuild b/dev-build/cmake/cmake-4.1.4.ebuild index 42718e80e0f60..ed81b01d7054e 100644 --- a/dev-build/cmake/cmake-4.1.4.ebuild +++ b/dev-build/cmake/cmake-4.1.4.ebuild @@ -22,7 +22,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-4.2.1-r1.ebuild b/dev-build/cmake/cmake-4.2.1-r1.ebuild index 069903b7b61c8..f9c756e86b3e6 100644 --- a/dev-build/cmake/cmake-4.2.1-r1.ebuild +++ b/dev-build/cmake/cmake-4.2.1-r1.ebuild @@ -22,7 +22,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild index 069903b7b61c8..f9c756e86b3e6 100644 --- a/dev-build/cmake/cmake-9999.ebuild +++ b/dev-build/cmake/cmake-9999.ebuild @@ -22,7 +22,7 @@ CMAKE_QA_COMPAT_SKIP=1 # bug #964514; cmake itself is the last pkg we worry abou # ... but seems fine as of 3.22.3? # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) +CMAKE_REMOVE_MODULES_LIST=() inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ toolchain-funcs xdg-utils