gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-05 14:07:27 -08:00
Code Issues Projects Releases Wiki Activity

gnuconfig.eclass: drop support for EAPI 6

Browse Source 
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert 2024-10-08 17:31:10 +02:00
parent 07292967d3
commit db33b25dcc
No known key found for this signature in database
GPG Key ID: CE36E117202E3842
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eclass/gnuconfig.eclass
View File

@ -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[@]}" | \