diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39222 -> 39237 bytes | |||
| -rw-r--r-- | eclass/autotools.eclass | 2 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 13 | ||||
| -rw-r--r-- | eclass/kernel-build.eclass | 2 | ||||
| -rw-r--r-- | eclass/vcs-snapshot.eclass | 16 |
5 files changed, 12 insertions, 21 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 68038e5a31d7..d0bdc9652098 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index a456e9b9f589..3c9e89bda90e 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -94,7 +94,7 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 ) # Do NOT change this variable in your ebuilds! # If you want to force a newer minor version, you can specify the correct # WANT value by using a colon: <PV>:<WANT_AUTOMAKE> -_LATEST_AUTOMAKE=( 1.16.5:1.16 ) +_LATEST_AUTOMAKE=( 1.17-r1:1.17 1.16.5:1.16 ) _automake_atom="dev-build/automake" _autoconf_atom="dev-build/autoconf" diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 565f6ada8382..35ad6afe8e88 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -4,7 +4,7 @@ # @ECLASS: git-r3.eclass # @MAINTAINER: # Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Eclass for fetching and unpacking git repositories. # @DESCRIPTION: # Third generation eclass for easing maintenance of live ebuilds using @@ -26,7 +26,7 @@ # If non-empty, then the repo likely needs EGIT_LFS to clone properly. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -35,13 +35,8 @@ _GIT_R3_ECLASS=1 PROPERTIES+=" live" -if [[ ${EAPI} != 6 ]]; then - BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" - [[ ${EGIT_LFS} ]] && BDEPEND+=" dev-vcs/git-lfs" -else - DEPEND=">=dev-vcs/git-1.8.2.1[curl]" - [[ ${EGIT_LFS} ]] && DEPEND+=" dev-vcs/git-lfs" -fi +BDEPEND=">=dev-vcs/git-1.8.2.1[curl]" +[[ ${EGIT_LFS} ]] && BDEPEND+=" dev-vcs/git-lfs" # @ECLASS_VARIABLE: EGIT_CLONE_TYPE # @USER_VARIABLE diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 86c7cd4a172d..1f0b07fdc3f9 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -28,7 +28,7 @@ esac if [[ ! ${_KERNEL_BUILD_ECLASS} ]]; then _KERNEL_BUILD_ECLASS=1 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) if [[ ${KERNEL_IUSE_MODULES_SIGN} ]]; then inherit secureboot fi diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass index 1b7299b92a3b..0279e89ec3ab 100644 --- a/eclass/vcs-snapshot.eclass +++ b/eclass/vcs-snapshot.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vcs-snapshot.eclass # @MAINTAINER: # mgorny@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: support eclass for unpacking VCS snapshot tarballs # @DESCRIPTION: # THIS ECLASS IS NOT NECESSARY FOR MODERN GITHUB AND GITLAB SNAPSHOTS. @@ -43,7 +43,6 @@ # in ${WORKDIR}/${P} and ${WORKDIR}/${P}-otherstuff respectively. case ${EAPI} in - 6) inherit eqawarn ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -103,13 +102,10 @@ vcs-snapshot_src_unpack() { done if [[ ! ${renamed_any} ]]; then - local w=eerror - [[ ${EAPI} == 6 ]] && w=eqawarn - "${w}" "${FUNCNAME} did not find any archives that needed renaming." - "${w}" "Please verify that its usage is really necessary, and remove" - "${w}" "the inherit if it is not." - - [[ ${w} == eerror ]] && die "${FUNCNAME}: Unnecessary usage detected" + eerror "${FUNCNAME} did not find any archives that needed renaming." + eerror "Please verify that its usage is really necessary, and remove" + eerror "the inherit if it is not." + die "${FUNCNAME}: Unnecessary usage detected" fi } |