gentoo resync : 04.05.2021

4 files changed, 10 insertions, 35 deletions

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index e1c4550dba05..e4affd5a1f94 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,4 +1,3 @@
-AUX h2o-2.2-libressl-2.7.patch 808 BLAKE2B 02873b20cbd306329c75580d0a077b35f85baec9160c650555bcab725151e5109f8db8fa212636c551dc91dbda72b34e82274a86d7c9c5ebd304c4c898b82466 SHA512 578bfdbf8708c65c56bb0e00a0b95a98bd4af722a6913eac52db35f102bc1bb9c6b135d302864614b89ebee751604c2dfe2ad2de95e4618ffbde7bcfa323e307
 AUX h2o-2.2-mruby.patch 2034 BLAKE2B 78ab2c8080c017ae03b33366aed553e8d47581bc04b274adc7a7e18bc79ddb5a95266ce13824a8286d9b52d4432b0895598301bd07aa42b1d7e4cbb4d46d98a9 SHA512 724186190756292ce9589a5aae28fd9ae089e377beccb1a2a6562d3d764777dec820413f31d820f61691a529dbdac0dcb55b2e395e46629b2656496bea9c182a
 AUX h2o-2.3-mruby.patch 2726 BLAKE2B 686cfbf806093b579b0641cfb887d7a6835ac2a3ed058d8d3a35d6e41219ab53c8484ad63ea6b2b00957ba5553d8f47318a93c6a2c56ab63895a750cf50b2323 SHA512 077f54f4e4435c64dfe7ba470d1ab42ac4a3cb1411af397e40f57253a0a3732bc7ae5a6f2023d58e15bd2a130a71142d940ffe5a356360d723cf777bdf8dfb9f
 AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e
@@ -6,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 2326 BLAKE2B c7f2e0754891a11e71ccf2fa642f2884b6a2b6d3f9e3d97f1dd9d43510c15133ae2c34333276763992be91f173eb8063686fbb7fd2eba2938aed029543c60e14 SHA512 d7a6334821963079ebd42c1ca9ff6ef8a3a04901aedd371ab97cbf1935caf37644a4e8ae5e946b3e27a3aa55a26a050b173e77fc942f3c0f6d5ab89f687f29b6
-EBUILD h2o-9999.ebuild 2252 BLAKE2B df13f53c813bf975ba667477823ae6a6c10f7e3a8065c1e2220e06e1740c6176027b12000ed0e7f51a45cb5b81d097d74dc290c0d575bd8e2fc7f1b83a345fc6 SHA512 eba716e1274e51556da2ca64e8df549b35991546734b0cd619a52b4010f5ae4da5fb1c1de95c11fff6618fa55e4bb6427b1992d53d494b4b13774b030049b86c
+EBUILD h2o-2.2.6.ebuild 2224 BLAKE2B fd17796b921cbe3d7661d472994beb73986a20601f5e8340e79aeb05bcb3e206e45f120c2fc0ef7a27ee9b8fa3aa3dc62767cd2c0206d93dc5e0a2bc6a0cf5e2 SHA512 cf53a31af03f929ebaf1636fba907e099e7ce2611ddd1095f17cd18f5f8e45a3fa58ecedd42fca031e87f0477866eac0ed2271748f5f71938191c718e996d9c7
+EBUILD h2o-9999.ebuild 2193 BLAKE2B 28f0e00c529caf8c7902e53d8a1d05d99f86c390f25b23da149049c3c09bc09a5f7b72b58bd46d27a1ec9cd30f016a09374b155d8b23aec8fe9fb218f50ab244 SHA512 34be235676dbde6a78d1be49b2d34b44d72faa85d62f3d5bcb35bf64d1992f442b8b1689aafa0197655acbdbd363b98edf6cd23145197eaf1dfb6e5b72ef5e35
 MISC metadata.xml 664 BLAKE2B 8b54065efeaf5a0506a1a2a3c0b6cfd803812c25b27fba925c5bc88c5cf5062eb7b56a6240f8461d6874f9aeff7f42c3b8b6d80561714106405ee4c7d5cc266b SHA512 171a99429df373753f72898d7b51399738e0c4b792aadec4a74ec0ca64d1651ee2947878db455bb48587b02165d6ec440a14e1c0a567c2e002e2805585086415
diff --git a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch b/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
deleted file mode 100644
index 02942b49227f..000000000000
--- a/www-servers/h2o/files/h2o-2.2-libressl-2.7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db50d885a87985310e65159a705b45de8646dc26 Mon Sep 17 00:00:00 2001
-From: AIZAWA Hina <hina@bouhime.com>
-Date: Fri, 23 Mar 2018 22:50:51 +0900
-Subject: [PATCH] Add supporting LibreSSL 2.7
-
-Signed-off-by: AIZAWA Hina <hina@bouhime.com>
----
- deps/neverbleed/neverbleed.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/neverbleed/neverbleed.c b/deps/neverbleed/neverbleed.c
-index 29b35a9..42356a6 100644
---- a/deps/neverbleed/neverbleed.c
-+++ b/deps/neverbleed/neverbleed.c
-@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *buf)
-     return 0;
- }
- 
--#if !OPENSSL_1_1_API
-+#if !OPENSSL_1_1_API && (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
- static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
- {
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 45fd96ae7e29..41caa3e517e4 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libh2o libressl +mruby"
+IUSE="libh2o +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
@@ -37,7 +37,6 @@ RDEPEND+="
 	!sci-libs/libh2o"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
 	"${FILESDIR}"/${PN}-2.2-mruby.patch
 )
 
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index e9dd787568e0..24da7a201180 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,13 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="libh2o libressl +mruby"
+IUSE="libh2o +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+"
 DEPEND="${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (