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 CA939158003 for ; Sun, 14 Aug 2022 21:59:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5683E0E0B; Sun, 14 Aug 2022 21:59:43 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26454E0E04 for ; Sun, 14 Aug 2022 21:59:43 +0000 (UTC) From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] cmake-multilib.eclass: Drop cmake-utils support Date: Sun, 14 Aug 2022 23:59:30 +0200 Message-ID: <2066039.9o76ZdvQCi@tuxbrain> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2605976.vuYhMxLoTh"; micalg="pgp-sha512"; protocol="application/pgp-signature" X-Archives-Salt: ab9619fe-a041-4f87-b3f8-1d642b8f02b2 X-Archives-Hash: d6df88f6bec85ef7324a0e22590bfbd5 --nextPart2605976.vuYhMxLoTh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8"; protected-headers="v1" From: Andreas Sturmlechner To: gentoo-dev@lists.gentoo.org Subject: [PATCH] cmake-multilib.eclass: Drop cmake-utils support Date: Sun, 14 Aug 2022 23:59:30 +0200 Message-ID: <2066039.9o76ZdvQCi@tuxbrain> MIME-Version: 1.0 cmake-utils.eclass was dropped on 2022-08-01 in commit 3e744f5a. See also: https://github.com/gentoo/gentoo/pull/26858 =2D-- eclass/cmake-multilib.eclass | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 61bacd3d60e3..7e4a86d56756 100644 =2D-- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -1,4 +1,4 @@ =2D# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 =20 # @ECLASS: cmake-multilib.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Micha=C5=82 G=C3=B3rny # @SUPPORTED_EAPIS: 7 8 =2D# @PROVIDES: cmake cmake-utils multilib-minimal +# @PROVIDES: cmake multilib-minimal # @BLURB: cmake wrapper for multilib builds # @DESCRIPTION: # The cmake-multilib.eclass provides a glue between cmake.eclass(5) @@ -20,31 +20,21 @@ # in multilib-minimal, yet they ought to call appropriate cmake # phase rather than 'default'. =20 =2D[[ ${EAPI} =3D=3D 7 ]] && : ${CMAKE_ECLASS:=3Dcmake-utils} # @ECLASS_VARIABLE: CMAKE_ECLASS =2D# @PRE_INHERIT +# @DEPRECATED # @DESCRIPTION: =2D# Only "cmake" is supported in EAPI-8 and later. =2D# In EAPI-7, default is "cmake-utils" for compatibility. Specify "cmake"= for =2D# ebuilds that ported to cmake.eclass already. +# Only "cmake" is supported. : ${CMAKE_ECLASS:=3Dcmake} =20 =2D# @ECLASS_VARIABLE: _CMAKE_ECLASS_IMPL =2D# @INTERNAL =2D# @DESCRIPTION: =2D# TODO: Cleanup once EAPI-7 support is gone. =2D_CMAKE_ECLASS_IMPL=3Dcmake =2D case ${EAPI} in 7|8) case ${CMAKE_ECLASS} in =2D cmake-utils|cmake) ;; + cmake) ;; *) eerror "Unknown value for \$ {CMAKE_ECLASS}" die "Value ${CMAKE_ECLASS} is not=20 supported" ;; esac =2D _CMAKE_ECLASS_IMPL=3D${CMAKE_ECLASS} ;; *) die "${ECLASS}: EAPI=3D${EAPI:-0} is not supported" ;; esac @@ -56,7 +46,7 @@ fi if [[ -z ${_CMAKE_MULTILIB_ECLASS} ]]; then _CMAKE_MULTILIB_ECLASS=3D1 =20 =2Dinherit ${_CMAKE_ECLASS_IMPL} multilib-minimal +inherit cmake multilib-minimal =20 cmake-multilib_src_configure() { local _cmake_args=3D( "${@}" ) @@ -65,7 +55,7 @@ cmake-multilib_src_configure() { } =20 multilib_src_configure() { =2D ${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}" + cmake_src_configure "${_cmake_args[@]}" } =20 cmake-multilib_src_compile() { @@ -75,7 +65,7 @@ cmake-multilib_src_compile() { } =20 multilib_src_compile() { =2D ${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}" + cmake_src_compile "${_cmake_args[@]}" } =20 cmake-multilib_src_test() { @@ -85,7 +75,7 @@ cmake-multilib_src_test() { } =20 multilib_src_test() { =2D ${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}" + cmake_src_test "${_cmake_args[@]}" } =20 cmake-multilib_src_install() { @@ -95,7 +85,7 @@ cmake-multilib_src_install() { } =20 multilib_src_install() { =2D ${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}" + cmake_src_install "${_cmake_args[@]}" } =20 fi =2D-=20 2.37.2 --nextPart2605976.vuYhMxLoTh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQITBAABCgB9FiEExUUNW3lKCBLqZd6hFGRLzdFTUQkFAmL5cEJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM1 NDUwRDVCNzk0QTA4MTJFQTY1REVBMTE0NjQ0QkNERDE1MzUxMDkACgkQFGRLzdFT UQm9Vgv/XIfFDc+KxP0H0xDzSli3nxK+Mu0VlGVg6J7Q3m3eeBO0AyQjA7Z7NK5y Ds5NE5u3fTkNGvj3eGcSSBAaDtRZhZnd03WAGzKwr1h8Fk+nk0+xBNSo8+bba6kd CQKyaeJ2hjszAoMvd63dVJLU3+P7etryKCqbYIcS8zBIBkr5iXyU+TiICSJwWfcN zbR2jEe871ptJSJGe/322HjfyxRl9PHJJfLP1Hxdo7KLxB4FC/N4O73WGEBUl+16 AHw9y1bgizPMCmvAd44aqbibAWSN7boaZ36ZT84HkBk3+MXKb1JA2ScJ3jyTH+aG WSDkU2Q5VYqVn5grZYDgcj3ha+AGANrBKiRHNX3mGfMYZPa4TmlJEv5xLYkL1w7F V3+qNEPv4Z/IpJm42oB2lp62WPuZhz4baFhEDUpyKJhmorcnK4bTyQXvWxubcsAc TnDdIl/L4fHtdIYylVBCpCWnKx022COmpDOK7o0F7fTFxv22Zm9aBBytC6mJG6tS CIrcHU7G =tkZo -----END PGP SIGNATURE----- --nextPart2605976.vuYhMxLoTh--