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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01408139694 for ; Sun, 21 May 2017 13:04:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E990E0D6F; Sun, 21 May 2017 13:04:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE35BE0D6F for ; Sun, 21 May 2017 13:04:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A60323416D4 for ; Sun, 21 May 2017 13:04:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B3807460 for ; Sun, 21 May 2017 13:04:45 +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: <1495371422.5a5150066a38e68750fb2b58c49d576f45548070.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5a5150066a38e68750fb2b58c49d576f45548070 X-VCS-Branch: master Date: Sun, 21 May 2017 13:04:45 +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-Archives-Salt: 64afb1fd-6928-4172-ada5-3e77d7edfe75 X-Archives-Hash: a0c1cf9fd8885c77a10d3cda74dfea5c commit: 5a5150066a38e68750fb2b58c49d576f45548070 Author: David Seifert gentoo org> AuthorDate: Sun May 21 08:09:50 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 21 12:57:02 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a515006 cmake-utils.eclass: Remove support for EAPIs 0 - 4 Closes: https://github.com/gentoo/gentoo/pull/4528 eclass/cmake-utils.eclass | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 6ae324093b..b326ef717d 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -101,7 +101,7 @@ _CMAKE_UTILS_ECLASS=1 # Should be set by user in a per-package basis in /etc/portage/package.env. case ${EAPI} in - 2|4|5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;; + 5) : ${CMAKE_WARN_UNUSED_CLI:=no} ;; 6) : ${CMAKE_WARN_UNUSED_CLI:=yes} ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -137,7 +137,7 @@ _cmake_use_me_now() { local arg=$2 [[ ! -z $3 ]] && arg=$3 - [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1=\"\$(usex $2)\" instead" + [[ ${EAPI} == 5 ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1=\"\$(usex $2)\" instead" local uper capitalised x [[ -z $2 ]] && die "cmake-utils_use-$1 []" @@ -159,7 +159,7 @@ _cmake_use_me_now_inverted() { local arg=$2 [[ ! -z $3 ]] && arg=$3 - if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then + if [[ ${EAPI} != 5 && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1=\"\$(usex $2)\" instead" fi @@ -259,7 +259,7 @@ cmake_comment_add_subdirectory() { # Comment out an add_subdirectory call in CMakeLists.txt in the current directory # Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead. comment_add_subdirectory() { - [[ ${EAPI} == [2345] ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead" + [[ ${EAPI} == 5 ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead" cmake_comment_add_subdirectory "$@" } @@ -291,7 +291,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; } # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled. # This can be used to make find_package optional. cmake-utils_use_find_package() { - if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then + if [[ ${EAPI} != 5 && "$#" != 2 ]] ; then die "Usage: cmake-utils_use_find_package " fi @@ -432,7 +432,7 @@ enable_cmake-utils_src_prepare() { pushd "${S}" > /dev/null || die - if [[ ${EAPI} != [2345] ]]; then + if [[ ${EAPI} != 5 ]]; then default_src_prepare _cmake_cleanup_cmake else @@ -464,7 +464,7 @@ enable_cmake-utils_src_prepare() { enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" - [[ ${EAPI} == [2345] ]] && _cmake_cleanup_cmake + [[ ${EAPI} == 5 ]] && _cmake_cleanup_cmake _cmake_check_build_dir @@ -552,8 +552,6 @@ enable_cmake-utils_src_configure() { fi fi - [[ ${EAPI} == 2 ]] && ! use prefix && local EPREFIX= - if [[ ${EPREFIX} ]]; then cat >> "${build_rules}" <<- _EOF_ || die # in Prefix we need rpath and must ensure cmake gets our default linker path @@ -588,7 +586,7 @@ enable_cmake-utils_src_configure() { [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" # Wipe the default optimization flags out of CMake - if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then + if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") @@ -607,7 +605,7 @@ enable_cmake-utils_src_configure() { local mycmakeargstype=$(declare -p mycmakeargs 2>&-) if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then if [[ -n "${mycmakeargstype}" ]] ; then - if [[ ${EAPI} == [2345] ]]; then + if [[ ${EAPI} == 5 ]]; then eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead." else die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead." @@ -634,7 +632,7 @@ enable_cmake-utils_src_configure() { -DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}" "${mycmakeargs_local[@]}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" - $([[ ${EAPI} == [2345] ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF) + $([[ ${EAPI} == 5 ]] && echo -DCMAKE_INSTALL_DO_STRIP=OFF) -DCMAKE_USER_MAKE_RULES_OVERRIDE="${build_rules}" -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}" "${MYCMAKEARGS}"