6 files changed, 113 insertions, 6 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 301184d7d138..63710fb57a51 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index f881c3dd429b..84b50459e9cc 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,3 +1,3 @@
 DIST gunicorn-23.0.0.gh.tar.gz 373550 BLAKE2B 5f7e74e3554e68863ac32225a95e2e83b69902013bb39f72dbcd150cb30b0698d4fbd2109d1b6e8858fe93b32f4a8aa52fa79cc7346ece769db5426c9caae840 SHA512 1304f348270134a5d9da0d6598f4878a25b3dd7ff96dc9eee1c07ec1031c03cd8bb3de42b6dedf63702588c7e482b18f88a3115e73005bbc4eaaad147d9674ba
-EBUILD gunicorn-23.0.0.ebuild 1101 BLAKE2B ee7ef3bdab1ec3582a3708c35af1307d6561201930bc8a25f0370f91d4204f6205505d1b7446b7505e3060953551fec23a8acd060a5ea162ecf69c4e03fe7c97 SHA512 045a37710ffa0965a8d9d44a18ab59ab18ee445b962a9dd70272e5a8cc57ce055d1eec207a2ec4b16f7f047d15807db4dea41ddc51d56d92148d2b4709f5f65a
+EBUILD gunicorn-23.0.0.ebuild 1110 BLAKE2B c4318f824366ebc773478dced782f45b46420b8384a38781cc8cefa3ece229afa92b53ad51a5560b34eb322e1069bd5aac602212e3ec09ed89a6b5a7d1a4f925 SHA512 09943eaa2a11d33d18889c4f768d175394b33847bf1f83938c4ec4a68d31b6a1c3dadaf81c5298a8d2116c58fa6d3e6095b5c986d622fab1d552553ccde029c7
 MISC metadata.xml 715 BLAKE2B 4d0e3c4d2940ee439c3e65bd475421afe9e1eaecc0c3fcb8c543418e78af1c0ab6b0064aff27c95b1006e587a17a40bec6f5314f598cd271a9f456dbcf791b61 SHA512 6bb8ba00899f478cfbda4862f8c86edf272f68f4ce9a48c59297722068e53535805c18b5f5b839e3538e83fb6549ad835f5f900eb5ee4dd06612504a9831c0f9
diff --git a/www-servers/gunicorn/gunicorn-23.0.0.ebuild b/www-servers/gunicorn/gunicorn-23.0.0.ebuild
index 981f6a578c70..94891d96eecd 100644
--- a/www-servers/gunicorn/gunicorn-23.0.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-23.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( pypy3 pypy3_11 python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 3ddf57d8986e..5e0393a6fcbc 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -9,7 +9,9 @@ AUX h2o.logrotate 230 BLAKE2B 44eeaf3b0e60104d4f87c7110815a30f907a6fd676e75a2068
 AUX h2o.service 364 BLAKE2B 9995cde4d79e5998624a2cadfc6ec3e954d4609458cc267628c2fbcb44dccd78277bddc032a784a00445c6b399fafc1ee629920355bf7aa84d26b1010bd103b0 SHA512 475b1e7b616eae335e094451532b0de5aa9cf9abc4999aaa44a9a35c43def4fb060ee5e728409bc33960f8ad3a81e6f549783906ac7ebad5b72cb7422ffb96a2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20
 DIST h2o-2.3.0_pre20241014.tar.gz 30845679 BLAKE2B 9c0d21f31770dd0591690ab8b2fc5e08052cf0aa40046e9bb03158907c05cfd8121bdb140f175172da3a0c8653a09d2729581017f6cc20a53c0bbb534db6263b SHA512 d4d3cdf8553f8583fe3dd7fe9f34e055f0cef39a8c0fa370e837afbe11a7ff9fa0e907a2edf014ec494b663a6216f643daca19a1c23ff163a4c2514a45ccc706
+DIST h2o-2.3.0_pre20250130.tar.gz 30811885 BLAKE2B e40c59c9fc010412e613bd8059108f88b554131afd64a832c6e2db3ee0a9aa01b14451abee680d91b430a47550f32897dde367b86ee48397029d4b7890258e0e SHA512 3d855ed1571e11fb6b0ed3b0f85cd26a015448347423eb0b994f8803b23c73bf7b773b0d84b6a2b70f08c314496488ad02f358a2269478e86da18fc983c26ae1
 EBUILD h2o-2.2.6-r2.ebuild 2302 BLAKE2B a8278b2a88bddffb1b364673b5c01cbf842b3eec5f5c3c11cd453537bb1e0995858f97c436a41a9661655fae62d804d2d99d6d403651f3edd1b901a0d7f54d2b SHA512 4654d98e8827aecb84b48fb5278640292f34b2d82406bb21cc55a26d6936aa0b166b2405aee3c817e4362b0fc1c7a3ffd1d7ec1a45eb583a32f086377c73c377
-EBUILD h2o-2.3.0_pre20241014.ebuild 2245 BLAKE2B 5dbf84eee41a9d114c19b6f062f6d8d193e767bdb818d41b7ce540f1b311345d01c59806c2f816f49d458ed0f9fabf4707c1f3bd9f63b7671af671c0416cd2e1 SHA512 1ece68359ad8b710d0aa8d7e18bab5254b30f9538a633d252b8214a1af44b96aa3da630f087a46f2461bbdf8e6b9ea00fb2693d65dc2b9cfd087af3150656b3f
+EBUILD h2o-2.3.0_pre20241014.ebuild 2243 BLAKE2B 9aa1c6ea2fe73c3a8a7a425f9e318e51921840b8f4be03dc48b07a9bf5a7f8241142ad6533910f73dff79212513f8cb1d54a9b8993d1f67c0df54fb62e9a91d3 SHA512 e61d16bbe15733deb69658bef4243fc9e6b0b25380bb0ba6d2a4da81d582e04cf7dae1c77a788cd8c7fa9bbcee52bab886c5d2f1d05c35b67147c8a1e24d5e90
+EBUILD h2o-2.3.0_pre20250130.ebuild 2245 BLAKE2B 4ac97b208d6f061347beeebe3767a5da3a6f658a0082dd209d873af159fdac8a7564e63ac8b6dede966f648063dc4ad7856287150f79fa578f43ec099ff41288 SHA512 769478c3bedb46a235960b2df9e193e98ca455489a709c5f01117fb592c9eb4f8c006dc630e0b37fb31372101687e2d6ad5394eeecd042d1fb462d7ae9648581
 EBUILD h2o-9999.ebuild 2137 BLAKE2B d20fb05da90ccbb376837fede3218ed8a97461f6da9cd740acb53ac2709bdcfb6e59da643bbe54bd04762223803c56c92fa9221f615370457f3b4d51b98dce7f SHA512 6e9cca2c835988010fa73f5a655ac1358871c8962b93737a204e67527fcd143827670b97b4897bd9b214f4c765fa4734be9bb428fc5eb75ad7053fdbb0f29d00
 MISC metadata.xml 665 BLAKE2B 8f3b7754ea54384656357283be7c0e35516579a4f0c8c9e727bef5189390d20de61c43d2c42bc1bcdc311c2670dee5c20a50b2f9354cb1986f8681f3acf86d02 SHA512 10abcf052f63ceba53b5c95a8ff79970c19fc8a094345806cd7fc461a10b1d94ec7b48925709e2fc9980fcd3630731b577e2d879981c240d9dd96cd840bb376c
diff --git a/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
index 7b41203ca8d6..c64baf9727a8 100644
--- a/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
+++ b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
 RDEPEND="acct-group/h2o
diff --git a/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild b/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild
new file mode 100644
index 000000000000..ac9c4437e2c7
--- /dev/null
+++ b/www-servers/h2o/h2o-2.3.0_pre20250130.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby31 ruby32 ruby33"
+
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs vcs-snapshot
+
+EGIT_COMMIT="26b116e9536be8cf07036185e3edf9d721c9bac2"
+
+DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
+HOMEPAGE="https://h2o.examp1e.net/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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? (
+		app-arch/brotli
+		dev-libs/libuv
+	)"
+DEPEND="${RDEPEND}
+	mruby? (
+		${RUBY_DEPS}
+		|| (
+			dev-libs/onigmo
+			dev-libs/oniguruma
+		)
+	)"
+BDEPEND="virtual/pkgconfig
+	mruby? ( app-alternatives/yacc )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
+
+src_prepare() {
+	cmake_src_prepare
+
+	local ruby="ruby"
+	if use mruby; then
+		for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+			if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
+				break
+			fi
+			ruby=
+		done
+		[[ -z ${ruby} ]] && die "no suitable ruby version found"
+	fi
+
+	sed -i \
+		-e "/INSTALL/s:\(/doc/${PN}\) :\1/html :" \
+		-e "/INSTALL/s:\(/doc\)/${PN}:\1/${PF}:" \
+		-e "s: ruby: ${ruby}:" \
+		CMakeLists.txt
+
+	sed -i "s:pkg-config:$(tc-getPKG_CONFIG):g" deps/mruby/lib/mruby/gem.rb
+	tc-export CC
+	export LD="$(tc-getCC)"
+}
+
+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)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/${PN}
+	doins "${FILESDIR}"/${PN}.conf
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 0750 /var/log/${PN}
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
+		install_cert /etc/ssl/${PN}/server
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
+	fi
+}