gentoo (valentine's day) resync : 14.02.2021

2 files changed, 13 insertions, 7 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 91fe61f6fcb9..cd71efccdbb5 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -4,8 +4,9 @@ AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
 DIST gentoo-apache-2.4.46-r4-20201230.tar.bz2 25821 BLAKE2B 3f83b48aa36fa8b9adc75a2cbeaadddad8fb0d69d1602753e0a1978cd6136b1dbf15ad06a837f36c26244e3950bae3ecdfbcdd7668a4d2fc4f0d9f58a909e5b7 SHA512 cea71f3e40ac1409206d906df36c772d7985a79a9e713a3016a9fae67dad032e24ce124789089a4b92454bc98455a70c66515106c8f3c33e05aeaf3037ffabe8
+DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-2.4.46-r4.ebuild 7856 BLAKE2B 0ad939eb38ed96e922a93c6c2b6a7f50d8a4f357bb593327cd94afbb0565e28d39b399b46642b5d991dbcf2e3b7a3e1e15b53aa9baf0695b26707ffb57f3a242 SHA512 387d70c3b7f58e7d0228a1440b63324d23c5f2f1e8a7ba0ddfd66a1cd4eafe046f8fa46dd5f0e15af187bbf7dbe063ffdc64fb0dc85556fdabca6ae98c4602d6
 EBUILD apache-2.4.46-r5.ebuild 8034 BLAKE2B 2122bc1b9ca03744b401d91c491c79970f1617268f84e24eb7e0454aa002c3b8242f79923e237322bf8dba61d468d2fd3822752a57523b0d2d668b4247118f75 SHA512 461598cb3338aff2af550dc0310821a8aa0cc0c30faaa5945d4847bb64c1b129249e7274b2696f756ad64b9cf82699e5810a82fad7ef44ece4cffcce541425eb
+EBUILD apache-2.4.46-r6.ebuild 8034 BLAKE2B e78751a46d26cfc1d71ea4959bcddafa74697285cdc5d79df8c0caf07c3c1f3eda0f5f8eb1942a645855ca42a497830d35f9e64502c6759340829fbf39e863ed SHA512 f755b461be53638aa2c07a04b4a7d2cf766ccea6c28e75756f6aa5a98f2ef601a8886a222d2edfca865ae376001c1b390e4d88adf115c883316584bef987e258
 EBUILD apache-2.4.46.ebuild 7781 BLAKE2B d0e70858edc5aaa5ced5732d0542d8759a2b453d904ad38ebee006e70b07a3f00f179d2038c29ba44c87f535a32ed43028122153cf9fcbb3195ae69a85137bf7 SHA512 a091f71aecb5875eaa55d0a01aa86fbebfd70da549cfac97918e4147ec428135e4fd37be6b20d161d376a88626322e093b7c0ce73fca3a1e8f3076bf6ba15053
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r6.ebuild
index f3446c2754f4..c4b85183a2b3 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r6.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20201230"
+GENTOO_PATCHSTAMP="20210212"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r4"
+GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="prefork"
@@ -36,7 +36,7 @@ authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
 brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
 dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
 ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
-lbmethod_heartbeat log_config log_forensic logio macro md mime mime_magic negotiation
+lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
 proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
 proxy_http2 proxy_fcgi  proxy_wstunnel rewrite ratelimit remoteip reqtimeout
 session session_cookie session_crypto session_dbd setenvif slotmem_shm speling
@@ -102,6 +102,7 @@ MODULE_DEFINES="
 	http2:HTTP2
 	info:INFO
 	ldap:LDAP
+	lua:LUA
 	md:SSL
 	proxy:PROXY
 	proxy_ajp:PROXY
@@ -140,6 +141,10 @@ LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
 
+# FIXME! Move this to eclass once all ebuilds are EAPI-7
+RDEPEND+=" apache2_modules_lua? ( ${LUA_DEPS} )"
+REQUIRED_USE+=" apache2_modules_lua? ( ${LUA_REQUIRED_USE} )"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.41-libressl.patch" #668060
 )
@@ -183,7 +188,7 @@ src_install() {
 		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
 	)
 	for i in ${apache_tools_prune_list[@]} ; do
-		rm "${ED%/}"/${i} || die "Failed to prune apache-tools bits"
+		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
 	done
 
 	# install apxs in /usr/bin (bug #502384) and put a symlink into the
@@ -205,7 +210,7 @@ src_install() {
 	doins "${FILESDIR}"/41_mod_http2.conf
 
 	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
+	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
 }
 
 pkg_postinst() {