gentoo auto-resync : 18:03:2023 - 06:30:37

5 files changed, 74 insertions, 7 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 0eb334293ebb..1a6ac9eb9651 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 08f2300e79ac..2d05b974301b 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,10 +1,11 @@
 AUX h2o-2.2-mruby.patch 2034 BLAKE2B 78ab2c8080c017ae03b33366aed553e8d47581bc04b274adc7a7e18bc79ddb5a95266ce13824a8286d9b52d4432b0895598301bd07aa42b1d7e4cbb4d46d98a9 SHA512 724186190756292ce9589a5aae28fd9ae089e377beccb1a2a6562d3d764777dec820413f31d820f61691a529dbdac0dcb55b2e395e46629b2656496bea9c182a
+AUX h2o-2.2-ruby30.patch 2452 BLAKE2B c94318a2493a6e121da571b81cd641021dea43fec30f3d9acf791e697d7daa194d2c4b8120a9281028cbb01a47b8b3ccddb6364f5e0a2004ad4a7d127276e1e1 SHA512 b44c64d5ede422a18df63dac5c9129bbc21b59179b657af09c2a6cc246247d17fee8ad1ecf4d2aec55df855bdfefcc102d07b21d8002023474df5627c9de961d
 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 a0edbc8db7f7495edec5f94f4dbdfea825b6703c0812e11b1bbea3f2e0d024617f6ca4039f41665c721b21bedd0bf8f216c98a9ca743c90556af6c74c16ba45b SHA512 7342325b5395e1c5b6e8ddbec4bc94440bb7b11b0c42bab08b3164fb2a9ac6c81c8e7948aa73560ef46742ea746ace9e4dd1a23094297aeace96c88833ddf984
-EBUILD h2o-9999.ebuild 2129 BLAKE2B f11d819665e574321c62ee32fdfebd1ffd08b8e1131e1d409ff4dbc680b6749b491b2afc7673523ff758c1977dad0551bbf4269cc041a13a9f840f507f6025d1 SHA512 e69af457c30a64f4193ed2812796f8b5b3d9772d5c306bcad11427db0485aca8d6edeab7335ac73695ff8cdaf3689b2f0da8871571446794939ba152130d6323
+EBUILD h2o-2.2.6-r1.ebuild 2209 BLAKE2B 26ea16a880e4bb5e80b9ed211258db230a12f9c1a5aa26281edfa406d8ae27056aa162a6a6b76ad455462dabc579c1a8fd09e072b7049be000ccda6eac04d449 SHA512 a491788f600a7b6d55ec0476b9d4e0927c9f52ff6b478bb0baf4f2c20666ec53068a64c5ef6bcdc53336dd65d764be33898a9d6f055c162bc792e508a290936d
+EBUILD h2o-9999.ebuild 2122 BLAKE2B 1353a3a7bd8a0bd6b52e875fffd6c480540c97a3c39d77ee0af5c2b7624f1b23d391e84e38bd9da0c3a497bfe207312f9282bf592b8c93991d56e1f78215d3fa SHA512 88e6945fee76033780c9c542cd09b8246e92dcca9d75d186fe189b5b04eefac84a22a1196a6960d001774a921589ea97ce1ee3fd37a913b5b940e080a201eddb
 MISC metadata.xml 665 BLAKE2B 8f3b7754ea54384656357283be7c0e35516579a4f0c8c9e727bef5189390d20de61c43d2c42bc1bcdc311c2670dee5c20a50b2f9354cb1986f8681f3acf86d02 SHA512 10abcf052f63ceba53b5c95a8ff79970c19fc8a094345806cd7fc461a10b1d94ec7b48925709e2fc9980fcd3630731b577e2d879981c240d9dd96cd840bb376c
diff --git a/www-servers/h2o/files/h2o-2.2-ruby30.patch b/www-servers/h2o/files/h2o-2.2-ruby30.patch
new file mode 100644
index 000000000000..47692d68bba5
--- /dev/null
+++ b/www-servers/h2o/files/h2o-2.2-ruby30.patch
@@ -0,0 +1,63 @@
+--- a/deps/mruby/Rakefile
++++ b/deps/mruby/Rakefile
+@@ -37,15 +37,15 @@
+ task :default => :all
+ 
+ bin_path = ENV['INSTALL_DIR'] || "#{MRUBY_ROOT}/bin"
+-FileUtils.mkdir_p bin_path, { :verbose => $verbose }
++FileUtils.mkdir_p bin_path, :verbose => $verbose
+ 
+ depfiles = MRuby.targets['host'].bins.map do |bin|
+   install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+   source_path = MRuby.targets['host'].exefile("#{MRuby.targets['host'].build_dir}/bin/#{bin}")
+ 
+   file install_path => source_path do |t|
+-    FileUtils.rm_f t.name, { :verbose => $verbose }
+-    FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++    FileUtils.rm_f t.name, :verbose => $verbose
++    FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+   end
+ 
+   install_path
+@@ -78,8 +78,8 @@
+         install_path = MRuby.targets['host'].exefile("#{bin_path}/#{bin}")
+ 
+         file install_path => exec do |t|
+-          FileUtils.rm_f t.name, { :verbose => $verbose }
+-          FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++          FileUtils.rm_f t.name, :verbose => $verbose
++          FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+         end
+         depfiles += [ install_path ]
+       elsif target == MRuby.targets['host-debug']
+@@ -87,8 +87,8 @@
+           install_path = MRuby.targets['host-debug'].exefile("#{bin_path}/#{bin}")
+ 
+           file install_path => exec do |t|
+-            FileUtils.rm_f t.name, { :verbose => $verbose }
+-            FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose }
++            FileUtils.rm_f t.name, :verbose => $verbose
++            FileUtils.cp t.prerequisites.first, t.name, :verbose => $verbose
+           end
+           depfiles += [ install_path ]
+         end
+@@ -127,16 +127,16 @@
+ desc "clean all built and in-repo installed artifacts"
+ task :clean do
+   MRuby.each_target do |t|
+-    FileUtils.rm_rf t.build_dir, { :verbose => $verbose }
++    FileUtils.rm_rf t.build_dir, :verbose => $verbose
+   end
+-  FileUtils.rm_f depfiles, { :verbose => $verbose }
++  FileUtils.rm_f depfiles, :verbose => $verbose
+   puts "Cleaned up target build folder"
+ end
+ 
+ desc "clean everything!"
+ task :deep_clean => ["clean"] do
+   MRuby.each_target do |t|
+-    FileUtils.rm_rf t.gem_clone_dir, { :verbose => $verbose }
++    FileUtils.rm_rf t.gem_clone_dir, :verbose => $verbose
+   end
+   puts "Cleaned up mrbgems build folder"
+ end
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 33ece8ab07b7..01434dbf32a5 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 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="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 
@@ -38,7 +38,10 @@ BDEPEND="libh2o? ( virtual/pkgconfig )
 		virtual/pkgconfig
 	)"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-mruby.patch
+	"${FILESDIR}"/${PN}-2.2-ruby30.patch
+)
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index d55ecd1ea1cf..c66917cd3a44 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs