[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     9830d7a8c8fce333e230842433005c47062a9fe2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  5 12:19:11 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr  5 12:19:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9830d7a8

apache-2.eclass: EAPI-6 ready. Rename configure.in to configure.ac

 eclass/apache-2.eclass | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 43768dba29b..0a4fe86df5b 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