6 files changed, 20 insertions, 29 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5f8399e62655..c2800d0da42e 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/bozohttpd/files/bozohttpd.initscript b/www-servers/bozohttpd/files/bozohttpd.initscript
index 9f05c4184178..9f05c4184178 100755..100644
--- a/www-servers/bozohttpd/files/bozohttpd.initscript
+++ b/www-servers/bozohttpd/files/bozohttpd.initscript
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 656bba0e03ad..ff5e1de8722c 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-r1.ebuild 2163 BLAKE2B d6ebe88928543b55862cc873d249936a42bca48a3c346dd35854e8f953b77c935e7ac6a28262e6d81b88dfc85f6b5d607b88caae0828dcdb600db9279460d73e SHA512 a164fac23f2b3b99c7117b3d08be01d70513a364846a088199056faca628de39308bec40758953c3c91a717de5d0b969fca23b382529cebd600f05580625df2c
-EBUILD h2o-9999.ebuild 2135 BLAKE2B ff1a8e72fb4201990106aa6cbb5ab04c6b1be6953606cc527ef203ab7c91aa6fc6b07c4dfce4d8c361698fb278c0b7a8ef744a414a3cb13914e9487a4355d73f SHA512 dad92e25d6d9789143606eeb9c2aeab315979294bd2fc5958b29e2553743a3167f7c62e1e380830e13f0059ea37f54e5b1fae723db2c828dc3113b667d4aba02
+EBUILD h2o-2.2.6-r1.ebuild 2163 BLAKE2B fe0349d5c0bd25d1093424fdb166c6fd50cdb9eadb100e1b645d9249bdfc83c16d90b1233c808c47279a65143af950298d65b0376fe8dc22619345a1f6d26ece SHA512 33f1170ee01868e5699fe9549da4d7e0d8dd933b9475f1a2d46824817f64857aaddcbdbe59b23e8f194335463cf8a115a1d4353c8b8832b3c45cf97ecb11b8ee
+EBUILD h2o-9999.ebuild 2090 BLAKE2B df5ef6e9c098d59cea7ace121d49425f7f41598a2c61343083e33342c487d5207be7a91ea7d60c48a458fcf3859121c3a0994dd17cd429bd83dff6e053a418ce SHA512 b3257fc463beb9b712e7f1317ba6ae397b1d45da542f64323bb498a364f764f3c1f959b798d83a038a93e1cfc8a7d4650e8243fe9cb810c5bb02b709f9a4568a
 MISC metadata.xml 665 BLAKE2B 8f3b7754ea54384656357283be7c0e35516579a4f0c8c9e727bef5189390d20de61c43d2c42bc1bcdc311c2670dee5c20a50b2f9354cb1986f8681f3acf86d02 SHA512 10abcf052f63ceba53b5c95a8ff79970c19fc8a094345806cd7fc461a10b1d94ec7b48925709e2fc9980fcd3630731b577e2d879981c240d9dd96cd840bb376c
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 3c0c14adba6b..2fdec9f496f3 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 
@@ -18,28 +17,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
-RDEPEND="
-	acct-group/h2o
+RDEPEND="acct-group/h2o
 	acct-user/h2o
 	dev-lang/perl
+	!sci-libs/libh2o
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-"
-DEPEND="
-	${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
 	mruby? (
 		${RUBY_DEPS}
 		|| (
 			dev-libs/onigmo
 			dev-libs/oniguruma
 		)
+	)"
+BDEPEND="libh2o? ( virtual/pkgconfig )
+	mruby? (
 		sys-devel/bison
 		virtual/pkgconfig
-	)
-"
-RDEPEND+="!sci-libs/libh2o"
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
 
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index d1f780ab5f1b..cd6fd817fc38 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,35 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 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="
-	acct-group/h2o
+RDEPEND="acct-group/h2o
 	acct-user/h2o
 	dev-lang/perl
+	!sci-libs/libh2o
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-"
-DEPEND="
-	${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -37,10 +32,9 @@ DEPEND="
 			dev-libs/oniguruma
 		)
 		sys-devel/bison
-		virtual/pkgconfig
 	)
 "
-RDEPEND+="!sci-libs/libh2o"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
index f7bd33af9334..f7bd33af9334 100755..100644
--- a/www-servers/nginx-unit/files/nginx-unit.initd
+++ b/www-servers/nginx-unit/files/nginx-unit.initd