diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-04-05 14:19:11 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-04-05 14:19:57 +0200 |
| commit | 9830d7a8c8fce333e230842433005c47062a9fe2 (patch) | |
| tree | 18febc43c617b535b707cdc66315d9de3f7c1480 /eclass/apache-2.eclass | |
| parent | dev-perl/Parse-RecDescent: Bump to version 1.967.15 (diff) | |
| download | gentoo-9830d7a8c8fce333e230842433005c47062a9fe2.tar.gz gentoo-9830d7a8c8fce333e230842433005c47062a9fe2.tar.bz2 gentoo-9830d7a8c8fce333e230842433005c47062a9fe2.zip | |
apache-2.eclass: EAPI-6 ready. Rename configure.in to configure.ac
Diffstat (limited to 'eclass/apache-2.eclass')
| -rw-r--r-- | eclass/apache-2.eclass | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 43768dba29b9..0a4fe86df5b6 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -18,12 +18,6 @@ case ${EAPI:-0} in 0|1|2|3|4) die "This eclass is banned for EAPI<5" ;; - 5) - :; - ;; - 6) - die "This eclass is not yet ready for EAPI-6. Please help porting it!" - ;; esac # settings which are version specific go in here: @@ -33,10 +27,13 @@ case $(get_version_component_range 1-2) in RDEPEND=">=dev-libs/apr-1.5.1 !www-apache/mod_macro" #492578 #477702 ;; - *) + 2.2) DEFAULT_MPM_THREADED="worker" RDEPEND=">=dev-libs/apr-1.4.5" #368651 ;; + *) + die "Unknown MAJOR.MINOR apache version." + ;; esac # ============================================================================== @@ -450,7 +447,12 @@ apache-2_src_prepare() { "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ || die "libdir sed failed" - epatch "${GENTOO_PATCHDIR}"/patches/*.patch + if [[ "${EAPI}" -ge 6 ]] ; then + default + eapply "${GENTOO_PATCHDIR}"/patches/*.patch + else + epatch "${GENTOO_PATCHDIR}"/patches/*.patch + fi if [[ ${EAPI} = 5 ]] ; then # Handle patches from ebuild's PATCHES array if one is given @@ -466,6 +468,11 @@ apache-2_src_prepare() { epatch_user fi + # Don't rename configure.in _before_ any possible user patches! + if [[ -f "configure.in" ]] ; then + mv configure.{in,ac} || die + fi + # setup the filesystem layout config cat "${GENTOO_PATCHDIR}"/patches/config.layout >> "${S}"/config.layout || \ die "Failed preparing config.layout!" @@ -476,7 +483,7 @@ apache-2_src_prepare() { sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in # patched-in MPMs need the build environment rebuilt - sed -i -e '/sinclude/d' configure.in + sed -i -e '/sinclude/d' configure.ac AT_M4DIR=build eautoreconf # ${T} must be not group-writable, else grsec TPE will block it |