From f57e008aa126ccdca95f7424e4d24a1a83a49682 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 18 Dec 2024 06:30:11 +0000 Subject: gentoo auto-resync : 18:12:2024 - 06:30:11 --- eclass/Manifest.gz | Bin 39847 -> 39850 bytes eclass/office-ext-r1.eclass | 28 +++++++++------------------ eclass/toolchain-funcs.eclass | 44 ++++++++++++++++++++++++++++++++++++++++++ eclass/toolchain.eclass | 41 +++++++++++++++++++++++++++------------ eclass/xorg-3.eclass | 9 ++++----- 5 files changed, 86 insertions(+), 36 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 87b8b55f9495..e8223df8633f 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index 7e4d894483fe..9ee4561f0c11 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: office-ext-r1.eclass @@ -6,13 +6,13 @@ # The office team # @AUTHOR: # Tomáš Chvátal -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Eclass for installing libreoffice extensions # @DESCRIPTION: # Eclass for easing maintenance of libreoffice extensions. case ${EAPI} in - 7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -70,11 +70,13 @@ fi # @CODE : "${OFFICE_EXTENSIONS_LOCATION:=${DISTDIR}}" -IUSE="" -RDEPEND="" +# Most projects actually do not provide any relevant sourcedir as they are oxt. +S="${WORKDIR}" + +IUSE="$(printf 'office_implementation_%s ' ${OFFICE_IMPLEMENTATIONS[@]})" +REQUIRED_USE="|| ( $(printf 'office_implementation_%s ' ${OFFICE_IMPLEMENTATIONS[@]}) )" for i in ${OFFICE_IMPLEMENTATIONS[@]}; do - IUSE+=" office_implementation_${i}" if [[ ${i} == "libreoffice" ]]; then RDEPEND+=" office_implementation_${i}? ( @@ -86,19 +88,7 @@ for i in ${OFFICE_IMPLEMENTATIONS[@]}; do " fi done - -REQUIRED_USE="|| ( " -for i in ${OFFICE_IMPLEMENTATIONS[@]}; do - REQUIRED_USE+=" office_implementation_${i} " -done -REQUIRED_USE+=" )" - -DEPEND="${RDEPEND} - app-arch/unzip -" - -# Most projects actually do not provide any relevant sourcedir as they are oxt. -S="${WORKDIR}" +BDEPEND="app-arch/unzip" # @FUNCTION: office-ext-r1_src_unpack # @DESCRIPTION: diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 2911ed66e63c..0abed5b8d75e 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -647,6 +647,50 @@ _tc-has-openmp() { return ${ret} } +# @FUNCTION: tc-check-min_ver +# @USAGE: +# @DESCRIPTION: +# Minimum version of active GCC or Clang to require. +# +# You should test for any necessary minimum version in pkg_pretend in order to +# warn the user of required toolchain changes. You must still check for it at +# build-time, e.g. +# @CODE +# pkg_pretend() { +# [[ ${MERGE_TYPE} != binary ]] && tc-check-min_ver gcc 13.2.0 +# } +# +# pkg_setup() { +# [[ ${MERGE_TYPE} != binary ]] && tc-check-min_ver gcc 13.2.0 +# } +# @CODE +tc-check-min_ver() { + do_check() { + debug-print "Compiler version check for ${1}" + debug-print "Detected: ${2}" + debug-print "Required: ${3}" + if ver_test ${2} -lt ${3}; then + eerror "Your current compiler is too old for this package!" + die "Active compiler is too old for this package (found ${1} ${2})." + fi + } + + case ${1} in + gcc) + tc-is-gcc || return + do_check GCC $(gcc-version) ${2} + ;; + clang) + tc-is-clang || return + do_check Clang $(clang-version) ${2} + ;; + *) + eerror "Unknown first parameter for ${FUNCNAME} - must be gcc or clang" + die "${FUNCNAME}: Parameter ${1} unknown" + ;; + esac +} + # @FUNCTION: tc-check-openmp # @DESCRIPTION: # Test for OpenMP support with the current compiler and error out with diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 8d2c04b6bf25..602f99437145 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -411,16 +411,29 @@ if tc_has_feature valgrind ; then fi if [[ ${PN} != gnat-gpl ]] && tc_has_feature ada ; then - BDEPEND+=" - ada? ( - || ( - sys-devel/gcc:${SLOT}[ada] - # Author: Donnie Berkholz # Author: Matt Turner -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @PROVIDES: multilib-minimal # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: @@ -23,7 +23,7 @@ # everything else should be automatic. case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -111,9 +111,8 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MOD # @ECLASS_VARIABLE: XORG_TARBALL_SUFFIX # @PRE_INHERIT # @DESCRIPTION: -# Most X11 projects provide tarballs as tar.bz2 or tar.xz. This eclass defaults -# to bz2. -: "${XORG_TARBALL_SUFFIX:="bz2"}" +# Most X11 projects provide tarballs as tar.xz. This eclass defaults to xz. +: "${XORG_TARBALL_SUFFIX:="xz"}" if [[ ${PV} == *9999* ]]; then : "${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}" -- cgit v1.2.3