diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-16 18:17:21 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-16 18:17:21 +0000 |
| commit | 23fb33e496e744587981f7b47350cb38abeb7522 (patch) | |
| tree | c039e2a4ad09f70caf4e43d0d8dd7c165d29f7e9 | |
| parent | 2023-06-16 18:02:02 UTC (diff) | |
| parent | dev-util/android-udev-rules: Stabilize 20230303 x86, #908529 (diff) | |
| download | gentoo-23fb33e496e744587981f7b47350cb38abeb7522.tar.gz gentoo-23fb33e496e744587981f7b47350cb38abeb7522.tar.bz2 gentoo-23fb33e496e744587981f7b47350cb38abeb7522.zip | |
Merge updates from master
| -rw-r--r-- | dev-util/android-udev-rules/android-udev-rules-20230303.ebuild | 2 | ||||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 2 | ||||
| -rw-r--r-- | eclass/mercurial.eclass | 10 | ||||
| -rw-r--r-- | eclass/rpm.eclass | 13 |
4 files changed, 9 insertions, 18 deletions
diff --git a/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild index 3f18e677567e..cd857f96ca8c 100644 --- a/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild +++ b/dev-util/android-udev-rules/android-udev-rules-20230303.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.ta LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" # No tests RESTRICT="test" diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index bef3abf69dde..0558e639b981 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -20,7 +20,7 @@ _FLAG_O_MATIC_ECLASS=1 inherit toolchain-funcs -[[ ${EAPI} == [67] ]] && inherit eutils +[[ ${EAPI} == 6 ]] && inherit eutils # @FUNCTION: all-flag-vars # @DESCRIPTION: diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index 27fb525bcbd6..16d9fc87cb0a 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -3,7 +3,7 @@ # @ECLASS: mercurial.eclass # @MAINTAINER: -# No maintainer <maintainer-needed@gentoo.org. +# No maintainer <maintainer-needed@gentoo.org> # @AUTHOR: # Next gen author: Krzysztof Pawlik <nelchael@gentoo.org> # Original author: Aron Griffis <agriffis@gentoo.org> @@ -25,14 +25,6 @@ _MERCURIAL_ECLASS=1 PROPERTIES+=" live" -case ${EAPI:-0} in - 7) - # For compatibiilty only (indirect inherits). - # Eclass itself doesn't need it. - inherit eutils - ;; -esac - BDEPEND="dev-vcs/mercurial" # @ECLASS_VARIABLE: EHG_REPO_URI diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index c97e23144c2b..d8bb0ad2814d 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -1,16 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rpm.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: convenience class for extracting RPMs case ${EAPI} in - 5|6) inherit epatch eutils ;; # eutils for eqawarn - 7) inherit eutils ;; # not needed, but ebuilds may still rely on it - 8) ;; + 6) inherit epatch eutils ;; # eutils for eqawarn + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -20,7 +19,7 @@ _RPM_ECLASS=1 inherit estack case ${EAPI} in - 5|6) DEPEND="app-arch/rpm2targz" ;; + 6) DEPEND="app-arch/rpm2targz" ;; *) BDEPEND="app-arch/rpm2targz" ;; esac @@ -98,7 +97,7 @@ rpm_src_unpack() { # files around, well this won't handle that. rpm_spec_epatch() { # no epatch in EAPI 7 and later - [[ ${EAPI} == [56] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" + [[ ${EAPI} == 6 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" local p spec=$1 local dir |