gentoo resync : 24.07.2021

15 files changed, 94 insertions, 886 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index f71f1e48d641..c87334856e4c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 76e5acb8809c..6d6f79320826 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,13 +1,7 @@
 AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 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-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
-DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
-EBUILD apache-2.4.46-r7.ebuild 7717 BLAKE2B 7a2c274d2763e0fd67612a7c8471f9142b76ac4bc3a1cf5ce1ac74556b75b355e949d0ce825a093c4d539f7dced7ae0fe36761622574893c711d86c0d3d64bb8 SHA512 50a3104db3454f6479ef5ee96da8001dfc742b048289bfc3f2eeeeb8bbca4df89dd4a0c2f3f71d592f4524fdd52787368e95f0ffd8ed8762f0741e2e7ab06262
-EBUILD apache-2.4.46-r8.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
-EBUILD apache-2.4.47-r1.ebuild 7970 BLAKE2B 4ee72658964c0e283b676b31a9b1aa593c6f469ef6f75d7d8cfcafc3fa7c43d4485fc9dd9075c4154fb76a84adb2bf753a84dbf470d74b9e405ca0cb61962be7 SHA512 770a785f3665e5b4d84b2bb931f853addaa8d49bd71b110d8c17bdc60aae7a28227177d4b3ebb8c9c84bce11899146b0519fa676754b763ff81741d525a7527f
-EBUILD apache-2.4.48-r1.ebuild 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
+EBUILD apache-2.4.48-r2.ebuild 7993 BLAKE2B 8c32f3bb85832186986812db2135cbc920b68e0b6ecc87a4a735463fd4696a232de13d014a2b3bf160d4146ac96bd103eea0c13517b0459e8fcd09efb205a1fb SHA512 b0b4ebd398164bfaa028f2de08a36a2b80bad91b6635f67c0d456bd91544051e5dc738ee3499be56aaff9cb579df00c2b00cbdc4cbaee7981779cf1165d19e0f
 MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/apache-2.4.46-r7.ebuild b/www-servers/apache/apache-2.4.46-r7.ebuild
deleted file mode 100644
index 95d53cb994df..000000000000
--- a/www-servers/apache/apache-2.4.46-r7.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20190402"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.39"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-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
-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
-socache_shmcb status substitute unique_id userdir usertrack unixd version vhost_alias
-watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-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"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/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"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED%/}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.46-r8.ebuild b/www-servers/apache/apache-2.4.46-r8.ebuild
deleted file mode 100644
index 7343e87cea34..000000000000
--- a/www-servers/apache/apache-2.4.46-r8.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-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 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
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-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} )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/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"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.47-r1.ebuild b/www-servers/apache/apache-2.4.47-r1.ebuild
deleted file mode 100644
index 7343e87cea34..000000000000
--- a/www-servers/apache/apache-2.4.47-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20210212"
-GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
-# socache_shmcb: shared object cache provider. Default config with ssl needs it
-# unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
-authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
-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 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
-socache_memcache socache_shmcb status substitute unique_id userdir usertrack
-unixd version vhost_alias watchdog xml2enc"
-# The following are also in the source as of this version, but are not available
-# for user selection:
-# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
-# optional_fn_import optional_hook_export optional_hook_import
-
-# inter-module dependencies
-# TODO: this may still be incomplete
-MODULE_DEPENDS="
-	auth_form:session
-	brotli:filter
-	dav_fs:dav
-	dav_lock:dav
-	deflate:filter
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	cache_socache:cache
-	md:watchdog
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_balancer:slotmem_shm
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_html:proxy
-	proxy_html:xml2enc
-	proxy_http:proxy
-	proxy_http2:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	proxy_wstunnel:proxy
-	session_cookie:session
-	session_dbd:dbd
-	session_dbd:session
-	socache_memcache:cache
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	cache_socache:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	http2:HTTP2
-	info:INFO
-	ldap:LDAP
-	lua:LUA
-	md:SSL
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_html:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	proxy_scgi:PROXY
-	proxy_wstunnel:PROXY
-	socache_shmcb:SSL
-	socache_memcache:CACHE
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-inherit apache-2 systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="The Apache Web Server"
-HOMEPAGE="https://httpd.apache.org/"
-
-# some helper scripts are Apache-1.1, thus both are here
-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} )"
-
-pkg_setup() {
-	# dependend critical modules which are not allowed in global scope due
-	# to USE flag conditionals (bug #499260)
-	use ssl && MODULE_CRITICAL+=" socache_shmcb"
-	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-	apache-2_pkg_setup
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		pushd server >/dev/null
-		emake gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
-		popd >/dev/null
-	fi
-
-	default
-}
-
-src_install() {
-	apache-2_src_install
-	local i
-	local apache_tools_prune_list=(
-		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
-		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
-		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
-		/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"
-	done
-
-	# install apxs in /usr/bin (bug #502384) and put a symlink into the
-	# old location until all ebuilds and eclasses have been modified to
-	# use the new location.
-	dobin support/apxs
-	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
-
-	# Note: wait for mod_systemd to be included in some forthcoming release,
-	# Then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
-	dotmpfiles "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-
-	# Install http2 module config
-	insinto /etc/apache2/modules.d
-	doins "${FILESDIR}"/41_mod_http2.conf
-
-	# Fix path to apache libdir
-	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
-}
-
-pkg_postinst() {
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-
-	tmpfiles_process apache.conf #662544
-
-	# warnings that default config might not work out of the box
-	local mod cmod
-	for mod in ${MODULE_CRITICAL} ; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in ${MODULE_CRITICAL} ; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! ${lbset} ] ; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.48-r1.ebuild b/www-servers/apache/apache-2.4.48-r2.ebuild
index 8012fad06ea6..8012fad06ea6 100644
--- a/www-servers/apache/apache-2.4.48-r1.ebuild
+++ b/www-servers/apache/apache-2.4.48-r2.ebuild
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e4affd5a1f94..38cbd9a33d8c 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -5,6 +5,6 @@ AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88
 AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068fb9cddd8192d3e75729aaeabc89d6430eef7c075b21271918fd65b086de188f7df0c6ceb332141 SHA512 88d36e272c52c5df765d8ebac8f2acca378c8b096af7fa8eda68e1ec5597cba6096286f0ab634f128329148e65980128f0612e90a185de781c5d109653e096dd
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
-EBUILD h2o-2.2.6.ebuild 2224 BLAKE2B fd17796b921cbe3d7661d472994beb73986a20601f5e8340e79aeb05bcb3e206e45f120c2fc0ef7a27ee9b8fa3aa3dc62767cd2c0206d93dc5e0a2bc6a0cf5e2 SHA512 cf53a31af03f929ebaf1636fba907e099e7ce2611ddd1095f17cd18f5f8e45a3fa58ecedd42fca031e87f0477866eac0ed2271748f5f71938191c718e996d9c7
-EBUILD h2o-9999.ebuild 2193 BLAKE2B 28f0e00c529caf8c7902e53d8a1d05d99f86c390f25b23da149049c3c09bc09a5f7b72b58bd46d27a1ec9cd30f016a09374b155d8b23aec8fe9fb218f50ab244 SHA512 34be235676dbde6a78d1be49b2d34b44d72faa85d62f3d5bcb35bf64d1992f442b8b1689aafa0197655acbdbd363b98edf6cd23145197eaf1dfb6e5b72ef5e35
+EBUILD h2o-2.2.6-r1.ebuild 2163 BLAKE2B d6ebe88928543b55862cc873d249936a42bca48a3c346dd35854e8f953b77c935e7ac6a28262e6d81b88dfc85f6b5d607b88caae0828dcdb600db9279460d73e SHA512 a164fac23f2b3b99c7117b3d08be01d70513a364846a088199056faca628de39308bec40758953c3c91a717de5d0b969fca23b382529cebd600f05580625df2c
+EBUILD h2o-9999.ebuild 2135 BLAKE2B ff1a8e72fb4201990106aa6cbb5ab04c6b1be6953606cc527ef203ab7c91aa6fc6b07c4dfce4d8c361698fb278c0b7a8ef744a414a3cb13914e9487a4355d73f SHA512 dad92e25d6d9789143606eeb9c2aeab315979294bd2fc5958b29e2553743a3167f7c62e1e380830e13f0059ea37f54e5b1fae723db2c828dc3113b667d4aba02
 MISC metadata.xml 664 BLAKE2B 8b54065efeaf5a0506a1a2a3c0b6cfd803812c25b27fba925c5bc88c5cf5062eb7b56a6240f8461d6874f9aeff7f42c3b8b6d80561714106405ee4c7d5cc266b SHA512 171a99429df373753f72898d7b51399738e0c4b792aadec4a74ec0ca64d1651ee2947878db455bb48587b02165d6ec440a14e1c0a567c2e002e2805585086415
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 41caa3e517e4..3c0c14adba6b 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
@@ -17,12 +18,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
 	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
@@ -32,21 +37,14 @@ DEPEND="${RDEPEND}
 		)
 		sys-devel/bison
 		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-)
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	local ruby="ruby"
 	if use mruby; then
@@ -77,11 +75,11 @@ src_configure() {
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	keepdir /var/www/localhost/htdocs
 
@@ -100,8 +98,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
 		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
 	fi
 }
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 24da7a201180..d1f780ab5f1b 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
+inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
+
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="libh2o +mruby"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
@@ -32,19 +38,14 @@ DEPEND="${RDEPEND}
 		)
 		sys-devel/bison
 		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	local ruby="ruby"
 	if use mruby; then
@@ -75,11 +76,11 @@ src_configure() {
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	keepdir /var/www/localhost/htdocs
 
@@ -98,8 +99,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
 		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
 	fi
 }
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 2df446aeef2b..4de4dfdae135 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,6 +4,6 @@ AUX monkeyd.confd 172 BLAKE2B 12259f30705d5f9e20971a4966056481636b5134951a850c1a
 AUX monkeyd.initd 601 BLAKE2B 178c97cb2d8281a971c43ec78d5904238b180ad43ea47a7aaf272010fcceb9942a3b6b2089ea7b8244d265a1f4d241fb82b483073f75204356fd775769992625 SHA512 e356742c537b5bbc8d9696e5fdad0c08d93ace5085f8939fa50d97498ebe0d85712af5da675e76c642296856768081ee14d6f0d3d73a17ce4642cf46e9056a79
 AUX monkeyd.initd-r1 608 BLAKE2B c6ce981294e6e852d346166ba71493470f8ac3604cf597a35a8d38a0ab1fe4c808de018a94149832d0f647257cff42c189dbfc6ef9876a06a338c4cfdeb1c3ba SHA512 d1a30f0033d9f2a0957028a6873b71903d8051340ac272ccbaf12daba9a89bf0c2e476b8aa22a0e60697ffd10ab5c1d6a4aa0ff7b204f8b4adc76ebe91b8abaa
 DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
-EBUILD monkeyd-1.6.9-r1.ebuild 4105 BLAKE2B 8f0bfd98497958e81bec0684bf3014e3fc12b9270ca0f848f2385bb36419ad5d85b6efa1bfce4bc6926d7e596286d1157f8c67624b9761078cd6709f7e1f6b39 SHA512 a4a12ffba7f6c679dd1fa9e0a1958dacd483ca6df250d42f71b257f092d9e4abb11a1f5e5e55378dcf30254befbddb2a67e0d8c2fd862bdfac68ca764310b293
-EBUILD monkeyd-9999.ebuild 4086 BLAKE2B 7b3af0c73a8f44197e127ecec16f5cb3448a13c0cad8780d9c313713e532306ca03a7d312f1775ee83099636dd828e80e7a79de1b4419d716cdaf6a588862ab7 SHA512 3bc63c7cfc8b1dc08b0785b4dfee69e1993c5d0e4f6cf67383c25d97b04c7ee79f7b3f329432622e2b96483275af9a4597e8159a7f04d0ada9176e64ef6e4df6
+EBUILD monkeyd-1.6.9-r2.ebuild 4017 BLAKE2B c4dfcf32e3bc7bc12a552e94a9e9586e80d41cb99e3b0d8a526bd19db02328178cd8cc2cb94230cecd7934c3530a80fe1d4039adcd949349866c87fe501d6c4f SHA512 dfa2e7765f2e9d9f486fee05c15244c456214ac80c1629b1462477aa54bfe80986e87d22b1b5767902bda39f93c042ce1bda8933c90bc1f5a7f73452b4160f2d
+EBUILD monkeyd-9999.ebuild 4022 BLAKE2B 26e3870863f59b607f2c597c99361e1e2112b732fc2206c4a73f6f0aef90679c15b8f908ad15e7f66482a37578518926c267b6b0f0500c8047c5fb21b97906cf SHA512 adcfea12de7ee6195b8ef2b0cc610ca38f9babf30d1d722a22c7930a5b2b7ecc6cadf4e1539460eea35604b7126655e61168fe967ed2e3071b0515b1b0468c87
 MISC metadata.xml 394 BLAKE2B f5849f3a0f249bfcfe85c51bda735406b5d10e97bba70c0427b57994dda956c5b402e98aee9bf9359e966a8d40f72b44d04622217020a5e26dac44497ca487d6 SHA512 9431b7f6722baa7c18ab2341a35aed3978f54e92c0b2a686bef0f7dc20934a14f93b6a1f1208b47b720f11e5f901e634c3b278eb540dfcc06c3a7c668fc0a209
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
index 47ed44923c33..0be511e56215 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs user multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -37,6 +37,8 @@ DEPEND="
 	dev-util/cmake
 	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
 
@@ -44,11 +46,6 @@ S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
 pkg_setup() {
 	if use debug; then
 		ewarn
@@ -62,8 +59,9 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
 }
 
 src_configure() {
@@ -137,16 +135,13 @@ src_install() {
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
 
 	# This needs to be created at runtime
 	rm -rf "${D}"/run
 }
 
 pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
 }
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index dc3dfa6306e1..3308111d6ea3 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs user multilib
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
@@ -37,6 +37,8 @@ DEPEND="
 	dev-util/cmake
 	monkeyd_plugins_tls? ( net-libs/mbedtls:= )"
 RDEPEND="
+	acct-group/monkeyd
+	acct-user/monkeyd
 	php? ( dev-lang/php )
 	cgi? ( dev-lang/php[cgi] )"
 
@@ -44,11 +46,6 @@ S="${WORKDIR}/${MY_P}"
 
 WEBROOT="/var/www/localhost"
 
-pkg_preinst() {
-	enewgroup monkeyd
-	enewuser monkeyd -1 -1 /var/tmp/monkeyd monkeyd
-}
-
 pkg_setup() {
 	if use debug; then
 		ewarn
@@ -62,11 +59,13 @@ pkg_setup() {
 src_prepare() {
 	# Unconditionally get rid of the bundled jemalloc
 	rm -rf "${S}"/deps
-	epatch "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
-	epatch "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply "${FILESDIR}"/${PN}-1.6.9-fix-pidfile.patch
+	eapply "${FILESDIR}"/${PN}-1.6.8-system-mbedtls.patch
+	eapply_user
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local myconf=""
 
 	use elibc_uclibc && myconf+=" --uclib-mode"
@@ -136,16 +135,13 @@ src_install() {
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist || die
 
-	keepdir \
-		/var/tmp/monkeyd \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
+	keepdir /var/log/monkeyd ${WEBROOT}/htdocs
 
 	# This needs to be created at runtime
 	rm -rf "${D}"/run
 }
 
 pkg_postinst() {
-	chown monkeyd:monkeyd /var/{log,tmp}/monkeyd
-	chmod 770 /var/{log,tmp}/monkeyd
+	chown monkeyd:monkeyd /var/log/monkeyd
+	chmod 770 /var/log/monkeyd
 }
diff --git a/www-servers/thttpd/Manifest b/www-servers/thttpd/Manifest
index ba4fad0f7929..b9ce779160ea 100644
--- a/www-servers/thttpd/Manifest
+++ b/www-servers/thttpd/Manifest
@@ -4,6 +4,6 @@ AUX thttpd.confd.1 1263 BLAKE2B 69cbb0fe3675b809183d10f6418c8e4d5d9d19d9768a6440
 AUX thttpd.init.1 735 BLAKE2B c50383feccbae81c835ccb1f0803001474dec2790916634b375b958357ca02d66f933fd7f0091f9a9918220101b1150c6e39a53bc26c29d6c6329339dbe0f1ed SHA512 991b8153fa030026e3fadc0b838b26fda75ab706e4fdaf1195931ed63be15dde290e4e3653951c78f41ec70464ed2d3dd984dc10bee4551cbf069435d447bea1
 AUX thttpd.logrotate 197 BLAKE2B 8b801de472c4c7902abf133218a6df79023bf54023c0217576ef1a23a30d4905b3d7815fbcfe3c3254a9ed86d137d1bf681f2fa187325a57442dd05ac4ded7c6 SHA512 a481c8c2d3a4526b04d6c95873336e46368e32e6f254f7453f5ccefe38cb11104ecacd7829caa7881df81c0d36c1dd4f60a91bbc7696fa349ed9c2cc7ddc84cd
 DIST thttpd-2.27.1.tar.gz 96430 BLAKE2B a3b24c0345f65ddb5b6d3b1db2e2fbcad5ec3f664eb86ebfbe6eb28e50b56476f9a1467300b9ec8a2735a97fc9620a396005f3545a7760979284dd8609681e0d SHA512 5d42e32652eb2310c7379d2c4373ad8f54b33bd7c2b444f06d1756eb4ed296774ce3144d91bbba85c6ad604e575128dc7199b797dc8d1b4849b0249054ba5d24
-EBUILD thttpd-2.27.1-r1.ebuild 1934 BLAKE2B 915d05cdb713af0e5ba8ca0ec57fe926aca871a2d0f2a55ae05e4c42253eca0551b87d3f695ac2463114ca5107060c0412deeecb5a9ed85f9e50455c9375ca10 SHA512 e585083be6c6bc6818b966331adb6288d7803f5857bc1f0b96f7703cfcee952b13a85f482f208c113497fbf1f1d046c36e22194f48dc16072cd7ef2d36923b5e
-EBUILD thttpd-9999.ebuild 1940 BLAKE2B 542b9d12e6e25278dcf223f58d47abdb3c0fd23c844e037b25372f9286fdf2998ee76614fbb5dbb947a87def726d1578991ac7cc5c7649079bc3f93e5f0e8d26 SHA512 acbf7b55774926e401d7cdfa1a303c03a9b5d1749fce9c743e3a8506952da2de28dc83dededb6e6381f301c72f8cf14f5d61827c3861ff602af89e4c91244502
+EBUILD thttpd-2.27.1-r2.ebuild 1653 BLAKE2B e829a3813f6225ae16a5bffe7b3e620e474000b991ada02698617a514b5daeab65a38ded09d98f303c37ee0dc011bdc948ce7b081e57b72191437ae63695e362 SHA512 a01f8ad22d5e8b0f698fe7d9ce4c225512fcbb07635baf823c4dc7877cf51c122adb2f597caa160090c6c8a18a2aaa006355b69d6bc0b87234d9d12267c294ba
+EBUILD thttpd-9999.ebuild 1659 BLAKE2B fa6230f1d75f5b461b3885016f7a98c8b04008b4808f2f845998e4e51796b7d107e095aff57d908daf01721a858100a3d64cce7ce8d44e5c4870a73dd5fe6961 SHA512 2cc8f1ac1979fb148371ab69d7e9b40fb3ef74d7985755f75c6b5d817aec7aa97caea2231eafb7ec3f5b1be9d8c9b5cc8873079b351fc672d78fe4d5940d054d
 MISC metadata.xml 333 BLAKE2B 9613233b895b29ad968791a6273aca58fbd161fba4acf4f41cdf4fba8c4623ea1fbac2cc393ae5e4ecda30cb67a039fe2c638e73b9a277113535a0b4eb80fce1 SHA512 7e1d7ed4947be16a3954c510004c21d26f45b4a05dd05102dea5c1f4001787aea9e602862afd204d529c8abb5746c5fe2148ffb533cebbbf38747717b6bf2877
diff --git a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
index c7f0958f6ecc..bab74ced7884 100644
--- a/www-servers/thttpd/thttpd-2.27.1-r1.ebuild
+++ b/www-servers/thttpd/thttpd-2.27.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs user
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} = 9999* ]]
 then
@@ -22,23 +22,15 @@ HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
 LICENSE="BSD GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/libcrypt:="
+RDEPEND="
+	acct-group/thttpd
+	acct-user/thttpd
+	virtual/libcrypt:=
+"
 DEPEND="${RDEPEND}"
 
 WEBROOT="/var/www/localhost"
 
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
-
-DOCS=( TODO )
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-}
-
 src_prepare() {
 	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
 	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
@@ -47,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf WEBDIR=${THTTPD_DOCROOT}
+	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
 }
 
 src_install() {
@@ -62,18 +54,14 @@ src_install() {
 	insinto /etc/thttpd
 	doins "${FILESDIR}"/thttpd.conf.sample
 
-	#move htdocs to docdir, bug #429632
+	# move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"${WEBROOT}/htdocs || die
+	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"/${WEBROOT}/htdocs || die
 
 	keepdir ${WEBROOT}/htdocs
 
-	chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chown makeweb"
-	chmod 2751 "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chmod makeweb"
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
-		|| die "Failed chmod printenv"
+	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
+	chmod 2751 "${ED}/usr/sbin/makeweb" || die
+	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
 }
diff --git a/www-servers/thttpd/thttpd-9999.ebuild b/www-servers/thttpd/thttpd-9999.ebuild
index 4a0042d502cb..d26b6c0b54f5 100644
--- a/www-servers/thttpd/thttpd-9999.ebuild
+++ b/www-servers/thttpd/thttpd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs user
+inherit autotools flag-o-matic toolchain-funcs
 
 if [[ ${PV} = 9999* ]]
 then
@@ -22,23 +22,15 @@ HOMEPAGE="https://github.com/blueness/sthttpd http://opensource.dyc.edu/sthttpd"
 LICENSE="BSD GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/libcrypt:="
+RDEPEND="
+	acct-group/thttpd
+	acct-user/thttpd
+	virtual/libcrypt:=
+"
 DEPEND="${RDEPEND}"
 
 WEBROOT="/var/www/localhost"
 
-THTTPD_USER=thttpd
-THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
-
-DOCS=( TODO )
-
-pkg_setup() {
-	ebegin "Creating thttpd user and group"
-	enewgroup ${THTTPD_GROUP}
-	enewuser ${THTTPD_USER} -1 -1 -1 ${THTTPD_GROUP}
-}
-
 src_prepare() {
 	eapply "${FILESDIR}"/thttpd-renamed-htpasswd.patch
 	mv "${S}"/extras/{htpasswd.c,th_htpasswd.c} || die
@@ -47,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf WEBDIR=${THTTPD_DOCROOT}
+	econf WEBDIR="${EPREFIX}/${WEBROOT}/htdocs"
 }
 
 src_install() {
@@ -62,18 +54,14 @@ src_install() {
 	insinto /etc/thttpd
 	doins "${FILESDIR}"/thttpd.conf.sample
 
-	#move htdocs to docdir, bug #429632
+	# move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
-	mkdir "${ED}"${WEBROOT}/htdocs || die
+	mv "${ED}"/${WEBROOT}/htdocs "${ED}"/usr/share/doc/"${PF}"/htdocs.dist || die
+	mkdir "${ED}"/${WEBROOT}/htdocs || die
 
 	keepdir ${WEBROOT}/htdocs
 
-	chown root:${THTTPD_GROUP} "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chown makeweb"
-	chmod 2751 "${ED}/usr/sbin/makeweb" \
-		|| die "Failed chmod makeweb"
-	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
-		|| die "Failed chmod printenv"
+	chown root:thttpd "${ED}/usr/sbin/makeweb" || die
+	chmod 2751 "${ED}/usr/sbin/makeweb" || die
+	chmod 755 "${ED}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" || die
 }