diff options
Diffstat (limited to 'eclass/gnuconfig.eclass')
| -rw-r--r-- | eclass/gnuconfig.eclass | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index afcb8feee04e..a7c9e1672f39 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -6,7 +6,7 @@ # Sam James <sam@gentoo.org> # @AUTHOR: # Will Woods <wwoods@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub) # @DESCRIPTION: # This eclass is used to automatically update files that typically come with @@ -20,10 +20,6 @@ if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then _GNUCONFIG_CLASS=1 case ${EAPI} in - 6) - ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" - ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." - ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -41,12 +37,7 @@ GNUCONFIG_DEPEND="sys-devel/gnuconfig" # ebuilds form conditional depends by using ${GNUCONFIG_DEPEND} in # their own DEPEND string. : "${GNUCONFIG_AUTO_DEPEND:=yes}" -if [[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] ; then - case ${EAPI} in - 6) DEPEND=${GNUCONFIG_DEPEND} ;; - *) BDEPEND=${GNUCONFIG_DEPEND} ;; - esac -fi +[[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] && BDEPEND=${GNUCONFIG_DEPEND} # @FUNCTION: gnuconfig_update # @USAGE: [file1 file2 ...] @@ -122,23 +113,11 @@ gnuconfig_do_update() { # This searches the standard locations for the newest config.{sub|guess}, and # returns the directory where they can be found. gnuconfig_findnewest() { - local locations=() - local prefix - - case ${EAPI} in - 6) - prefix="${EPREFIX}" - ;; - *) - prefix="${BROOT}" - ;; - esac - - locations+=( - "${prefix}"/usr/share/misc/config.sub - "${prefix}"/usr/share/gnuconfig/config.sub - "${prefix}"/usr/share/automake*/config.sub - "${prefix}"/usr/share/libtool/config.sub + local locations=( + "${BROOT}"/usr/share/misc/config.sub + "${BROOT}"/usr/share/gnuconfig/config.sub + "${BROOT}"/usr/share/automake*/config.sub + "${BROOT}"/usr/share/libtool/config.sub ) grep -s '^timestamp' "${locations[@]}" | \ |