1 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
2 |
--- |
3 |
eclass/autotools.eclass | 14 +++++++------- |
4 |
1 file changed, 7 insertions(+), 7 deletions(-) |
5 |
|
6 |
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass |
7 |
index d6c5b7f0ec0d..caf425b9d9a5 100644 |
8 |
--- a/eclass/autotools.eclass |
9 |
+++ b/eclass/autotools.eclass |
10 |
@@ -4,7 +4,7 @@ |
11 |
# @ECLASS: autotools.eclass |
12 |
# @MAINTAINER: |
13 |
# base-system@g.o |
14 |
-# @SUPPORTED_EAPIS: 5 6 7 8 |
15 |
+# @SUPPORTED_EAPIS: 6 7 8 |
16 |
# @BLURB: Regenerates auto* build scripts |
17 |
# @DESCRIPTION: |
18 |
# This eclass is for safely handling autotooled software packages that need to |
19 |
@@ -27,7 +27,7 @@ if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then |
20 |
_AUTOTOOLS_ECLASS=1 |
21 |
|
22 |
case ${EAPI} in |
23 |
- 5|6) |
24 |
+ 6) |
25 |
# Needed for eqawarn |
26 |
inherit eutils |
27 |
;; |
28 |
@@ -130,7 +130,7 @@ RDEPEND="" |
29 |
: ${AUTOTOOLS_AUTO_DEPEND:=yes} |
30 |
if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then |
31 |
case ${EAPI} in |
32 |
- 5|6) DEPEND=${AUTOTOOLS_DEPEND} ;; |
33 |
+ 6) DEPEND=${AUTOTOOLS_DEPEND} ;; |
34 |
*) BDEPEND=${AUTOTOOLS_DEPEND} ;; |
35 |
esac |
36 |
fi |
37 |
@@ -336,7 +336,7 @@ eaclocal() { |
38 |
# - ${BROOT}/usr/share/aclocal |
39 |
# - ${ESYSROOT}/usr/share/aclocal |
40 |
# See bug #677002 |
41 |
- if [[ ${EAPI} != [56] ]] ; then |
42 |
+ if [[ ${EAPI} != 6 ]] ; then |
43 |
if [[ ! -f "${T}"/aclocal/dirlist ]] ; then |
44 |
mkdir "${T}"/aclocal || die |
45 |
cat <<- EOF > "${T}"/aclocal/dirlist || die |
46 |
@@ -394,7 +394,7 @@ eautoconf() { |
47 |
|
48 |
if [[ ${WANT_AUTOCONF} != "2.1" && -e configure.in ]] ; then |
49 |
case ${EAPI} in |
50 |
- 5|6|7) |
51 |
+ 6|7) |
52 |
eqawarn "This package has a configure.in file which has long been deprecated. Please" |
53 |
eqawarn "update it to use configure.ac instead as newer versions of autotools will die" |
54 |
eqawarn "when it finds this file. See https://bugs.gentoo.org/426262 for details." |
55 |
@@ -485,7 +485,7 @@ config_rpath_update() { |
56 |
local dst src |
57 |
|
58 |
case ${EAPI} in |
59 |
- 5|6) |
60 |
+ 6) |
61 |
src="${EPREFIX}/usr/share/gettext/config.rpath" |
62 |
;; |
63 |
*) |
64 |
@@ -516,7 +516,7 @@ autotools_env_setup() { |
65 |
# Break on first hit to respect _LATEST_AUTOMAKE order. |
66 |
local hv_args="" |
67 |
case ${EAPI} in |
68 |
- 5|6) |
69 |
+ 6) |
70 |
hv_args="--host-root" |
71 |
;; |
72 |
*) |
73 |
-- |
74 |
2.35.1 |