From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BCD515806E for ; Fri, 19 May 2023 19:33:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FEA5E088A; Fri, 19 May 2023 19:33:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B371E088A for ; Fri, 19 May 2023 19:33:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23B08340824 for ; Fri, 19 May 2023 19:33:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BA8BA65 for ; Fri, 19 May 2023 19:33:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1684440455.5bd2c28df8f44f5515fd621919568cb6ab5b5e83.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5bd2c28df8f44f5515fd621919568cb6ab5b5e83 X-VCS-Branch: master Date: Fri, 19 May 2023 19:33:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3969b28-1a64-4589-a526-68db15f7743e X-Archives-Hash: b8226691f4bc92f0e52b2c163b5e4c82 commit: 5bd2c28df8f44f5515fd621919568cb6ab5b5e83 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 18 20:07:35 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 18 20:07:35 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5bd2c28d cmake.eclass: Cleanup fatal banned functions and meta variables All of this was ported away from long ago, cmake-utils.eclass was removed almost a year ago. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 91 ----------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 485ecbb7a9..b7db941bfb 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -131,13 +131,6 @@ fi # @DESCRIPTION: # Array of tests that should be skipped when running CTest. -[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly" -[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR" -[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST array instead" -[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY instead" -[[ ${WANT_CMAKE} ]] && die "WANT_CMAKE has been removed and is a no-op" -[[ ${PREFIX} ]] && die "PREFIX has been removed and is a no-op" - case ${CMAKE_MAKEFILE_GENERATOR} in emake) BDEPEND="sys-devel/make" @@ -190,14 +183,6 @@ cmake_comment_add_subdirectory() { done } -# @FUNCTION: comment_add_subdirectory -# @INTERNAL -# @DESCRIPTION: -# Banned. Use cmake_comment_add_subdirectory instead. -comment_add_subdirectory() { - die "comment_add_subdirectory is banned. Use cmake_comment_add_subdirectory instead" -} - # @FUNCTION: cmake_use_find_package # @USAGE: # @DESCRIPTION: @@ -216,74 +201,6 @@ cmake_use_find_package() { echo "-DCMAKE_DISABLE_FIND_PACKAGE_$2=$(use $1 && echo OFF || echo ON)" } -# @FUNCTION: _cmake_banned_func -# @INTERNAL -# @DESCRIPTION: -# Banned functions are banned. -_cmake_banned_func() { - die "${FUNCNAME[1]} is banned. use -D$1=\"\$(usex $2)\" instead" -} - -# @FUNCTION: cmake-utils_use_with -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DWITH_FOO=$(usex foo) instead. -cmake-utils_use_with() { _cmake_banned_func WITH_ "$@" ; } - -# @FUNCTION: cmake-utils_use_enable -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DENABLE_FOO=$(usex foo) instead. -cmake-utils_use_enable() { _cmake_banned_func ENABLE_ "$@" ; } - -# @FUNCTION: cmake-utils_use_disable -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DDISABLE_FOO=$(usex !foo) instead. -cmake-utils_use_disable() { _cmake_banned_func DISABLE_ "$@" ; } - -# @FUNCTION: cmake-utils_use_no -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DNO_FOO=$(usex !foo) instead. -cmake-utils_use_no() { _cmake_banned_func NO_ "$@" ; } - -# @FUNCTION: cmake-utils_use_want -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DWANT_FOO=$(usex foo) instead. -cmake-utils_use_want() { _cmake_banned_func WANT_ "$@" ; } - -# @FUNCTION: cmake-utils_use_build -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DBUILD_FOO=$(usex foo) instead. -cmake-utils_use_build() { _cmake_banned_func BUILD_ "$@" ; } - -# @FUNCTION: cmake-utils_use_has -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DHAVE_FOO=$(usex foo) instead. -cmake-utils_use_has() { _cmake_banned_func HAVE_ "$@" ; } - -# @FUNCTION: cmake-utils_use_use -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DUSE_FOO=$(usex foo) instead. -cmake-utils_use_use() { _cmake_banned_func USE_ "$@" ; } - -# @FUNCTION: cmake-utils_use -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DFOO=$(usex foo) instead. -cmake-utils_use() { _cmake_banned_func "" "$@" ; } - -# @FUNCTION: cmake-utils_useno -# @INTERNAL -# @DESCRIPTION: -# Banned. Use -DNOFOO=$(usex !foo) instead. -cmake-utils_useno() { _cmake_banned_func "" "$@" ; } - # @FUNCTION: _cmake_check_build_dir # @INTERNAL # @DESCRIPTION: @@ -655,14 +572,6 @@ cmake_build() { popd > /dev/null || die } -# @FUNCTION: cmake-utils_src_make -# @INTERNAL -# @DESCRIPTION: -# Banned. Use cmake_build instead. -cmake-utils_src_make() { - die "cmake-utils_src_make is banned. Use cmake_build instead" -} - # @FUNCTION: cmake_src_test # @DESCRIPTION: # Function for testing the package. Automatically detects the build type.