| 1 |
commit: d16ccc65a2d379ee6e829c007bbed2a10c291cd8 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 1 14:06:30 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 14:07:35 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d16ccc65 |
| 7 |
|
| 8 |
apache-2.eclass: Removed EAPI-5 support |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/apache-2.eclass | 29 ++++++----------------------- |
| 13 |
1 file changed, 6 insertions(+), 23 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
| 16 |
index 17301c36f8b..07f2cd6af87 100644 |
| 17 |
--- a/eclass/apache-2.eclass |
| 18 |
+++ b/eclass/apache-2.eclass |
| 19 |
@@ -4,7 +4,7 @@ |
| 20 |
# @ECLASS: apache-2.eclass |
| 21 |
# @MAINTAINER: |
| 22 |
# polynomial-c@g.o |
| 23 |
-# @SUPPORTED_EAPIS: 5 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 6 7 |
| 25 |
# @BLURB: Provides a common set of functions for apache-2.x ebuilds |
| 26 |
# @DESCRIPTION: |
| 27 |
# This eclass handles apache-2.x ebuild functions such as LoadModule generation |
| 28 |
@@ -16,8 +16,8 @@ inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs eapi7-ver |
| 29 |
&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!" |
| 30 |
|
| 31 |
case ${EAPI:-0} in |
| 32 |
- 0|1|2|3|4) |
| 33 |
- die "This eclass is banned for EAPI<5" |
| 34 |
+ 0|1|2|3|4|5) |
| 35 |
+ die "This eclass is banned for EAPI<6" |
| 36 |
;; |
| 37 |
esac |
| 38 |
|
| 39 |
@@ -452,29 +452,12 @@ apache-2_src_prepare() { |
| 40 |
"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ |
| 41 |
|| die "libdir sed failed" |
| 42 |
|
| 43 |
- if [[ "${EAPI}" -ge 6 ]] ; then |
| 44 |
- default |
| 45 |
- eapply "${GENTOO_PATCHDIR}"/patches/*.patch |
| 46 |
- else |
| 47 |
- epatch "${GENTOO_PATCHDIR}"/patches/*.patch |
| 48 |
- fi |
| 49 |
- |
| 50 |
- if [[ ${EAPI} = 5 ]] ; then |
| 51 |
- # Handle patches from ebuild's PATCHES array if one is given |
| 52 |
- if [[ -n "${PATCHES}" ]] ; then |
| 53 |
- local patchestype=$(declare -p PATCHES 2>&-) |
| 54 |
- if [[ "${patchestype}" != "declare -a PATCHES="* ]] ; then |
| 55 |
- die "Declaring PATCHES as a variable is forbidden. Please use an array instead." |
| 56 |
- fi |
| 57 |
- epatch "${PATCHES[@]}" |
| 58 |
- fi |
| 59 |
- |
| 60 |
- # Handle user patches |
| 61 |
- epatch_user |
| 62 |
- fi |
| 63 |
+ eapply "${GENTOO_PATCHDIR}"/patches/*.patch |
| 64 |
+ default |
| 65 |
|
| 66 |
# Don't rename configure.in _before_ any possible user patches! |
| 67 |
if [[ -f "configure.in" ]] ; then |
| 68 |
+ elog "Renaming configure.in to configure.ac" |
| 69 |
mv configure.{in,ac} || die |
| 70 |
fi |
Archives