gentoo auto-resync : 17:11:2024 - 03:03:09

5 files changed, 26 insertions, 27 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 3f8ae0dda59f..db7b7bdebcad 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index f1943558fce5..3ddf57d8986e 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -2,13 +2,14 @@ AUX h2o-2.2-CVE-2023-44487.patch 10281 BLAKE2B 8de372faab97f790623e3b4c72519b684
 AUX h2o-2.2-libressl.patch 2098 BLAKE2B 18bd0375a4c44ab7d744899cfaaa983ec2d494a9d58f5d358fb2157fc3b919a977a216e22c26aaa9908d8addda27871832f97093bffd4b4faf10e9d95ae51a6d SHA512 0970aa90e07c762ba586f7d071dc5b4183336adb2602c95dcff568124a9bd737aefc9ecc812f6b006edc6e4c4f9cbc664e6af96c7d6f09681f65e8eac552ac7a
 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 3312 BLAKE2B 987e09948ea80ca09759081f9abf84f90af0ae0593f5fe067404c5c55b066f7cdb4912431e253a3771094c62bf129059d002f6204876169a34b04a040c82341d SHA512 931ac8c43e25e6ee3c4fb5f76eae33415938eefce2220cc30edaa2f43b71fb3d8664c81cd83c718123ca3b5c5611d3719bf520d7536965ed3e38f50bd34e4cae
+AUX h2o-2.3-mruby.patch 3326 BLAKE2B 4fece07444b396e99be9ac80635ca60aa420fe1a74a26bcb1117fb5c941c433d8d059560fbdc216134c072fd0f3d3dc8271e111036ff23a8df6d69ac0cc16d51 SHA512 dc071bc111e543c552d67f9d11069b370329f92224d8a570be78b8a1d559471257065a81b26bc8cae655f68d2b63c02dbca0a7d32605a1249959b87f82e2bcdb
 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 2263 BLAKE2B 005c6542d0187ce53da0d9f4e54a2e3b8a0917ed0cc7a01baaed11f50eb93ba564e0184c83563ed9c3c7fefb98a5fa95ed15bd0ab7d9ffc02b562f9048081596 SHA512 6469baaa4cdc0b3ef074c7147f1a010d547028bae913cbc8ac3edd4416a721075edc12a904db22b4138ad90196fed4cbb83a7809cb4b319197db2bdef77d8e47
+DIST h2o-2.3.0_pre20241014.tar.gz 30845679 BLAKE2B 9c0d21f31770dd0591690ab8b2fc5e08052cf0aa40046e9bb03158907c05cfd8121bdb140f175172da3a0c8653a09d2729581017f6cc20a53c0bbb534db6263b SHA512 d4d3cdf8553f8583fe3dd7fe9f34e055f0cef39a8c0fa370e837afbe11a7ff9fa0e907a2edf014ec494b663a6216f643daca19a1c23ff163a4c2514a45ccc706
 EBUILD h2o-2.2.6-r2.ebuild 2302 BLAKE2B a8278b2a88bddffb1b364673b5c01cbf842b3eec5f5c3c11cd453537bb1e0995858f97c436a41a9661655fae62d804d2d99d6d403651f3edd1b901a0d7f54d2b SHA512 4654d98e8827aecb84b48fb5278640292f34b2d82406bb21cc55a26d6936aa0b166b2405aee3c817e4362b0fc1c7a3ffd1d7ec1a45eb583a32f086377c73c377
-EBUILD h2o-9999.ebuild 2121 BLAKE2B e1733a69fc5bd2eefb52c17d17eaa66a4f6238e8b49c29289b618192b7f9fc4a16f62c20b4a482644f3b3e83fff0448a3c0c801ea45b0ced1d05ffce26cb4e2f SHA512 51d00792bbc4e421c9b16e438ee847af86426020d7063b37969ce0dd6e6fe2e6faed9c51fffc866f525fb392d1acb3bf6922497af882470ec81f08a4dc2d782c
+EBUILD h2o-2.3.0_pre20241014.ebuild 2245 BLAKE2B 5dbf84eee41a9d114c19b6f062f6d8d193e767bdb818d41b7ce540f1b311345d01c59806c2f816f49d458ed0f9fabf4707c1f3bd9f63b7671af671c0416cd2e1 SHA512 1ece68359ad8b710d0aa8d7e18bab5254b30f9538a633d252b8214a1af44b96aa3da630f087a46f2461bbdf8e6b9ea00fb2693d65dc2b9cfd087af3150656b3f
+EBUILD h2o-9999.ebuild 2137 BLAKE2B d20fb05da90ccbb376837fede3218ed8a97461f6da9cd740acb53ac2709bdcfb6e59da643bbe54bd04762223803c56c92fa9221f615370457f3b4d51b98dce7f SHA512 6e9cca2c835988010fa73f5a655ac1358871c8962b93737a204e67527fcd143827670b97b4897bd9b214f4c765fa4734be9bb428fc5eb75ad7053fdbb0f29d00
 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 353af46a3af7..a0e9f12b935b 100644
--- a/www-servers/h2o/files/h2o-2.3-mruby.patch
+++ b/www-servers/h2o/files/h2o-2.3-mruby.patch
@@ -7,7 +7,7 @@
 +IF (PKG_CONFIG_FOUND)
 +    PKG_CHECK_MODULES(ONIG onigmo)
 +    IF (NOT ONIG_FOUND)
-+	PKG_CHECK_MODULES(ONIG oniguruma)
++        PKG_CHECK_MODULES(ONIG oniguruma)
 +    ENDIF (NOT ONIG_FOUND)
 +    IF (ONIG_FOUND)
 +        LINK_DIRECTORIES(${ONIG_LIBRARY_DIRS})
@@ -25,7 +25,7 @@
          # 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} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin 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} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin ruby minirake -v
++        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} INSTALL_DIR=${CMAKE_CURRENT_BINARY_DIR}/mruby-bin 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"
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
index 0f59051f8e65..7b41203ca8d6 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
@@ -2,28 +2,33 @@
 # 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 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
-inherit cmake ruby-single ssl-cert systemd toolchain-funcs
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs vcs-snapshot
+
+EGIT_COMMIT="1bafd5e6f2638d4967a464ddbc828d40f69cb322"
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 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}
@@ -32,17 +37,10 @@ DEPEND="${RDEPEND}
 			dev-libs/oniguruma
 		)
 	)"
-BDEPEND="libh2o? ( virtual/pkgconfig )
-	mruby? (
-		app-alternatives/yacc
-		virtual/pkgconfig
-	)"
+BDEPEND="virtual/pkgconfig
+	mruby? ( app-alternatives/yacc )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-libressl.patch #903001
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-	"${FILESDIR}"/${PN}-2.2-ruby30.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 
 src_prepare() {
 	cmake_src_prepare
@@ -72,6 +70,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)
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 79636317600f..c2052d1e15e2 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 
@@ -34,10 +34,9 @@ DEPEND="${RDEPEND}
 			dev-libs/onigmo
 			dev-libs/oniguruma
 		)
-		app-alternatives/yacc
-	)
-"
-BDEPEND="virtual/pkgconfig"
+	)"
+BDEPEND="virtual/pkgconfig
+	mruby? ( app-alternatives/yacc )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )