diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37336 -> 37338 bytes | |||
| -rw-r--r-- | eclass/mate-desktop.org.eclass | 10 | ||||
| -rw-r--r-- | eclass/mate.eclass | 18 | ||||
| -rw-r--r-- | eclass/plocale.eclass | 6 |
4 files changed, 13 insertions, 21 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 6343a048ec0d..967e0d06aaba 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass index dfa66155936b..2e45d864dd74 100644 --- a/eclass/mate-desktop.org.eclass +++ b/eclass/mate-desktop.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mate-desktop.org.eclass @@ -6,15 +6,15 @@ # mate@gentoo.org # @AUTHOR: # Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome.org eclass. -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 # @BLURB: Helper eclass for mate-desktop.org hosted archives # @DESCRIPTION: # Provide a default SRC_URI and EGIT_REPO_URI for MATE packages as well as # exporting some useful values like the MATE_BRANCH -# EAPIs < 6 are banned. +# EAPIs < 7 are banned. case "${EAPI:-0}" in - 6|7) ;; + 7) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -22,8 +22,6 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 fi -[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver - # @ECLASS_VARIABLE: MATE_TARBALL_SUFFIX # @INTERNAL # @DESCRIPTION: diff --git a/eclass/mate.eclass b/eclass/mate.eclass index a734b4c4dc7e..66b4cf446249 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mate.eclass @@ -7,7 +7,8 @@ # @AUTHOR: # Authors: NP-Hardass <NP-Hardass@gentoo.org> based upon the gnome2 # and autotools-utils eclasses -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 +# @PROVIDES: mate-desktop.org # @BLURB: Provides phases for MATE based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the @@ -16,7 +17,7 @@ # Check EAPI only case "${EAPI:-0}" in - 6|7) ;; + 7) ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -26,10 +27,6 @@ esac # @DESCRIPTION: # Available values for MATE_LA_PUNT: # - "no": will not clean any .la files -# - In EAPI < 7: -# - "yes": will run prune_libtool_files --modules -# - If it is not set, it will run prune_libtool_files -# - In EAPI 7: # - Any non-"no" value will run # find "${ED}" -name '*.la' -delete || die # MATE_LA_PUNT is a stub to GNOME2_LA_PUNT @@ -38,11 +35,6 @@ GNOME2_LA_PUNT="${MATE_LA_PUNT}" inherit gnome2 autotools mate-desktop.org -case "${EAPI:-0}" in - 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; -esac - # Autotools requires our MATE m4 files DEPEND=">=mate-base/mate-common-${MATE_BRANCH}" @@ -164,3 +156,5 @@ mate_pkg_postinst() { mate_pkg_postrm() { gnome2_pkg_postrm "$@" } + +EXPORT_FUNCTIONS src_prepare src_configure src_install pkg_preinst pkg_postinst pkg_postrm diff --git a/eclass/plocale.eclass b/eclass/plocale.eclass index 979b1dca09b4..954b06585746 100644 --- a/eclass/plocale.eclass +++ b/eclass/plocale.eclass @@ -1,4 +1,4 @@ -# Copyright 2012-2021 Gentoo Authors +# Copyright 2012-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: plocale.eclass @@ -6,7 +6,7 @@ # Ulrich Müller <ulm@gentoo.org> # @AUTHOR: # Ben de Groot <yngwin@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: convenience functions to handle localizations # @DESCRIPTION: # The plocale (localization) eclass offers a number of functions to more @@ -52,7 +52,7 @@ # translations and check if the ebuild's PLOCALES are still up to date. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac |