gentoo auto-resync : 06:08:2022 - 08:09:34

3 files changed, 25 insertions, 21 deletions

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index ff5e1de8722c..94771bada7d2 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,10 +1,10 @@
 AUX h2o-2.2-mruby.patch 2034 BLAKE2B 78ab2c8080c017ae03b33366aed553e8d47581bc04b274adc7a7e18bc79ddb5a95266ce13824a8286d9b52d4432b0895598301bd07aa42b1d7e4cbb4d46d98a9 SHA512 724186190756292ce9589a5aae28fd9ae089e377beccb1a2a6562d3d764777dec820413f31d820f61691a529dbdac0dcb55b2e395e46629b2656496bea9c182a
-AUX h2o-2.3-mruby.patch 2726 BLAKE2B 686cfbf806093b579b0641cfb887d7a6835ac2a3ed058d8d3a35d6e41219ab53c8484ad63ea6b2b00957ba5553d8f47318a93c6a2c56ab63895a750cf50b2323 SHA512 077f54f4e4435c64dfe7ba470d1ab42ac4a3cb1411af397e40f57253a0a3732bc7ae5a6f2023d58e15bd2a130a71142d940ffe5a356360d723cf777bdf8dfb9f
+AUX h2o-2.3-mruby.patch 3078 BLAKE2B 57e7bd26056f5dade50798609ebbd8818b1277ffdfd5c62c999c41d484967640ce1a35b36b1fb04cf4bcb0d358a8676fe4e98550dda93ff06b5adf651216fbcf SHA512 3f509f6437a2e942934fab0681c889cc4dc0d6c058bf804b33d92b25d4aaa7f08ee4d9d59cba82ad5502000318b10fe55408cda0a0bbf1f3b8795fa159714051
 AUX h2o.conf 350 BLAKE2B 948c90451fd76cb55f3b42eaa9ddc01564b2bd2c46437649fb639d6cee89c5adfac780e533c13793133e6798d847c1c87c631979162af9a1b7c5caebb8963b3b SHA512 b2ba08c3bcd15c3c7631913dc64006870487773f952421aec624f82dcbe836137a2b8357cbd0b8e26626f9c6f108c8aee46beb61e8649fe78fac0e31ef585b6e
 AUX h2o.initd 845 BLAKE2B f420962962517051c695f00e11a3b6edb899a672d0984db3d68b88545064767e7059cd9b3ec60b7cb70469b403e0927dbaea4e9f7b7a00979b4f036f945585d5 SHA512 9fdfde2857d97937939b1dd591b94f26f77b6fd6061d385c807738be508f1df740acf36c38ca95c22a36f13caed5d537b6fc1f6cceaf1beda8f8f48ef452c177
 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 fe0349d5c0bd25d1093424fdb166c6fd50cdb9eadb100e1b645d9249bdfc83c16d90b1233c808c47279a65143af950298d65b0376fe8dc22619345a1f6d26ece SHA512 33f1170ee01868e5699fe9549da4d7e0d8dd933b9475f1a2d46824817f64857aaddcbdbe59b23e8f194335463cf8a115a1d4353c8b8832b3c45cf97ecb11b8ee
-EBUILD h2o-9999.ebuild 2090 BLAKE2B df5ef6e9c098d59cea7ace121d49425f7f41598a2c61343083e33342c487d5207be7a91ea7d60c48a458fcf3859121c3a0994dd17cd429bd83dff6e053a418ce SHA512 b3257fc463beb9b712e7f1317ba6ae397b1d45da542f64323bb498a364f764f3c1f959b798d83a038a93e1cfc8a7d4650e8243fe9cb810c5bb02b709f9a4568a
+EBUILD h2o-9999.ebuild 2129 BLAKE2B f11d819665e574321c62ee32fdfebd1ffd08b8e1131e1d409ff4dbc680b6749b491b2afc7673523ff758c1977dad0551bbf4269cc041a13a9f840f507f6025d1 SHA512 e69af457c30a64f4193ed2812796f8b5b3d9772d5c306bcad11427db0485aca8d6edeab7335ac73695ff8cdaf3689b2f0da8871571446794939ba152130d6323
 MISC metadata.xml 665 BLAKE2B 8f3b7754ea54384656357283be7c0e35516579a4f0c8c9e727bef5189390d20de61c43d2c42bc1bcdc311c2670dee5c20a50b2f9354cb1986f8681f3acf86d02 SHA512 10abcf052f63ceba53b5c95a8ff79970c19fc8a094345806cd7fc461a10b1d94ec7b48925709e2fc9980fcd3630731b577e2d879981c240d9dd96cd840bb376c
diff --git a/www-servers/h2o/files/h2o-2.3-mruby.patch b/www-servers/h2o/files/h2o-2.3-mruby.patch
index 3db3ebae8806..4f64565a675a 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -174,6 +174,19 @@
+@@ -237,6 +237,19 @@
      SET(WSLAY_LIBRARIES -lwslay)
  ENDIF (NOT WSLAY_FOUND)
  
@@ -20,31 +20,31 @@
  IF (ZLIB_FOUND)
      INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
      LINK_DIRECTORIES(${ZLIB_LIBRARY_DIRS})
-@@ -533,7 +546,7 @@
-     ELSE ()
-         SET(MRUBY_TOOLCHAIN "gcc")
-     ENDIF ()
--    ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake
-+    ADD_CUSTOM_TARGET(mruby MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake -v
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby)
-     LIST(APPEND STANDALONE_SOURCE_FILES
-         lib/handler/mruby.c
-@@ -560,7 +573,7 @@
+@@ -743,7 +756,7 @@
+     ADD_CUSTOM_TARGET(mruby
+         # deps/mruby/tasks/toolchains/clang.rake looks for CC, CXX and LD.
+         # There are no C++ files in deps/mruby, use the C compiler for linking.
+-        MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake
++        MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} LD=${CMAKE_C_COMPILER} MRUBY_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/misc/mruby_config.rb MRUBY_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby MRUBY_ADDITIONAL_CONFIG=${MRUBY_ADDITIONAL_CONFIG} ruby minirake -v
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mruby
+         BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a"
+                    "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a"
+@@ -777,7 +790,7 @@
      # note: the paths need to be determined before libmruby.flags.mak is generated
      TARGET_LINK_LIBRARIES(h2o
          "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/lib/libmruby.a"
--        "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.1.2/.libs/libonigmo.a"
+-        "${CMAKE_CURRENT_BINARY_DIR}/mruby/host/mrbgems/mruby-onig-regexp/onigmo-6.2.0/.libs/libonigmo.a"
 +        ${ONIG_LIBRARIES}
          "m")
      ADD_DEPENDENCIES(h2o mruby)
  ENDIF (WITH_MRUBY)
 --- a/deps/mruby-onig-regexp/mrbgem.rake
 +++ b/deps/mruby-onig-regexp/mrbgem.rake
-@@ -103,10 +103,8 @@
+@@ -108,10 +108,8 @@
  
    if spec.respond_to? :search_package and spec.search_package 'onigmo'
      spec.cc.defines += ['HAVE_ONIGMO_H']
--    spec.linker.libraries << 'onig'
+-    spec.linker.libraries << 'onigmo'
    elsif spec.respond_to? :search_package and spec.search_package 'oniguruma'
      spec.cc.defines += ['HAVE_ONIGURUMA_H']
 -    spec.linker.libraries << 'onig'
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index cd6fd817fc38..d55ecd1ea1cf 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
-CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 
@@ -20,10 +19,14 @@ IUSE="libh2o +mruby"
 RDEPEND="acct-group/h2o
 	acct-user/h2o
 	dev-lang/perl
+	dev-libs/openssl:0=
 	!sci-libs/libh2o
+	sys-libs/libcap
 	sys-libs/zlib
-	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0="
+	libh2o? (
+		app-arch/brotli
+		dev-libs/libuv
+	)"
 DEPEND="${RDEPEND}
 	mruby? (
 		${RUBY_DEPS}
@@ -66,6 +69,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
+		-DWITH_CCACHE=OFF
 		-DWITH_MRUBY=$(usex mruby)
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)