[gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2021-07-23 20:37 Conrad Kostecki
  0 siblings, 0 replies; 39+ messages in thread
From: Conrad Kostecki @ 2021-07-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     6c4f427ab246a5cf8d2d562a0fb069a5720e02cf
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 20:32:36 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 20:37:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4f427a

www-servers/h2o: migrate to GLEP 81

Bug: https://bugs.gentoo.org/781539
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../h2o/{h2o-9999.ebuild => h2o-2.2.6-r1.ebuild}   | 40 +++++++++++-----------
 www-servers/h2o/h2o-9999.ebuild                    | 37 ++++++++++----------
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
similarity index 76%
copy from www-servers/h2o/h2o-9999.ebuild
copy to www-servers/h2o/h2o-2.2.6-r1.ebuild
index 24da7a20118..3c0c14adba6 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,28 +1,33 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
+inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
@@ -32,19 +37,14 @@ DEPEND="${RDEPEND}
 		)
 		sys-devel/bison
 		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	local ruby="ruby"
 	if use mruby; then
@@ -75,11 +75,11 @@ src_configure() {
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	keepdir /var/www/localhost/htdocs
 
@@ -98,8 +98,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
 		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
 	fi
 }

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 24da7a20118..d1f780ab5f1 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,28 +1,34 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
+inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
+
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="libh2o +mruby"
 
-RDEPEND="dev-lang/perl
+RDEPEND="
+	acct-group/h2o
+	acct-user/h2o
+	dev-lang/perl
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
 	dev-libs/openssl:0=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
@@ -32,19 +38,14 @@ DEPEND="${RDEPEND}
 		)
 		sys-devel/bison
 		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
+	)
+"
+RDEPEND+="!sci-libs/libh2o"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	local ruby="ruby"
 	if use mruby; then
@@ -75,11 +76,11 @@ src_configure() {
 		-DWITHOUT_LIBS=$(usex !libh2o)
 		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	keepdir /var/www/localhost/htdocs
 
@@ -98,8 +99,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -f "${EROOT}"etc/ssl/${PN}/server.key ]]; then
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/server.key ]]; then
 		install_cert /etc/ssl/${PN}/server
-		chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/server.*
+		chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/server.*
 	fi
 }


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-11-16 14:02 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2024-11-16 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     cff47c35ef3ec2833db89f3f30777c391bc379bf
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 13:51:57 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 14:01:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff47c35

www-servers/h2o: update USE_RUBY

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 79636317600f..d23c024f17a0 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
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-11-16 14:02 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2024-11-16 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     abd0bfd71ef191a04cfb2c86ba495208d3966efc
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 13:56:32 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 14:01:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd0bfd7

www-servers/h2o: new snapshot

Bug: https://bugs.gentoo.org/915567
Bug: https://bugs.gentoo.org/919882
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/Manifest                     |   1 +
 www-servers/h2o/h2o-2.3.0_pre20241014.ebuild | 105 +++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 710248b421ac..17b7ff330ad5 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1 +1,2 @@
 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

diff --git a/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
new file mode 100644
index 000000000000..7b41203ca8d6
--- /dev/null
+++ b/www-servers/h2o/h2o-2.3.0_pre20241014.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2024 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="1bafd5e6f2638d4967a464ddbc828d40f69cb322"
+
+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
+}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-11-16 14:02 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2024-11-16 14:02 UTC (permalink / raw
  To: gentoo-commits

commit:     41f668d2ff7697b4e676264ef297b009bf5a6ab0
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 13:48:20 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 14:01:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f668d2

www-servers/h2o: drop old

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 106 ------------------------------------
 1 file changed, 106 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
deleted file mode 100644
index 0f59051f8e65..000000000000
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 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 ruby31"
-
-inherit cmake ruby-single ssl-cert systemd toolchain-funcs
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libh2o +mruby"
-
-RDEPEND="acct-group/h2o
-	acct-user/h2o
-	dev-lang/perl
-	!sci-libs/libh2o
-	sys-libs/zlib
-	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	mruby? (
-		${RUBY_DEPS}
-		|| (
-			dev-libs/onigmo
-			dev-libs/oniguruma
-		)
-	)"
-BDEPEND="libh2o? ( virtual/pkgconfig )
-	mruby? (
-		app-alternatives/yacc
-		virtual/pkgconfig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-libressl.patch #903001
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-	"${FILESDIR}"/${PN}-2.2-ruby30.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_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
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-06-05 19:59 Arthur Zamarin
  0 siblings, 0 replies; 39+ messages in thread
From: Arthur Zamarin @ 2024-06-05 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     0916a64f258f4cf9a9d31ed280fac603161febaa
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 19:58:59 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 19:58:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0916a64f

www-servers/h2o: Stabilize 2.2.6-r2 amd64, #920513

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r2.ebuild b/www-servers/h2o/h2o-2.2.6-r2.ebuild
index c4e26fb1736d..24a1d9836a24 100644
--- a/www-servers/h2o/h2o-2.2.6-r2.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="libh2o +mruby"
 
 RDEPEND="acct-group/h2o


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-06-05 19:59 Arthur Zamarin
  0 siblings, 0 replies; 39+ messages in thread
From: Arthur Zamarin @ 2024-06-05 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     0e1e744c9f85477e2eef0f7ff2fe2697eb93acba
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 19:59:00 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 19:59:00 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e1e744c

www-servers/h2o: Stabilize 2.2.6-r2 x86, #920513

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r2.ebuild b/www-servers/h2o/h2o-2.2.6-r2.ebuild
index 24a1d9836a24..45ad42c87a40 100644
--- a/www-servers/h2o/h2o-2.2.6-r2.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
 RDEPEND="acct-group/h2o


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2024-01-08 12:28 Sam James
  0 siblings, 0 replies; 39+ messages in thread
From: Sam James @ 2024-01-08 12:28 UTC (permalink / raw
  To: gentoo-commits

commit:     ef2e96a83433ce0cb5c498a2a6d949faadd3e899
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 12:09:47 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 12:25:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef2e96a8

www-servers/h2o: sys-devel/bison -> app-alternatives/yacc

All of these will be using app-alternatives/yacc anyway as they're not unsetting

YACC or LEX, so make the dep reflect reality.

(Included both YACC and LEX out of conservatism.)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 4 ++--
 www-servers/h2o/h2o-2.2.6-r2.ebuild | 4 ++--
 www-servers/h2o/h2o-9999.ebuild     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 4e38eec82228..0f59051f8e65 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 	)"
 BDEPEND="libh2o? ( virtual/pkgconfig )
 	mruby? (
-		sys-devel/bison
+		app-alternatives/yacc
 		virtual/pkgconfig
 	)"
 

diff --git a/www-servers/h2o/h2o-2.2.6-r2.ebuild b/www-servers/h2o/h2o-2.2.6-r2.ebuild
index 36b649162128..c4e26fb1736d 100644
--- a/www-servers/h2o/h2o-2.2.6-r2.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 	)"
 BDEPEND="libh2o? ( virtual/pkgconfig )
 	mruby? (
-		sys-devel/bison
+		app-alternatives/yacc
 		virtual/pkgconfig
 	)"
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 5d8a81f064f1..79636317600f 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 			dev-libs/onigmo
 			dev-libs/oniguruma
 		)
-		sys-devel/bison
+		app-alternatives/yacc
 	)
 "
 BDEPEND="virtual/pkgconfig"


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2023-10-22 13:44 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2023-10-22 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3e2a0d9aa388b7dade5e7e4d899f44d9e52cb52b
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 13:42:03 2023 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 13:42:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2a0d9a

www-servers/h2o: update USE_RUBY

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index c66917cd3a44..5d8a81f064f1 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="ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2023-03-18  2:21 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2023-03-18  2:21 UTC (permalink / raw
  To: gentoo-commits

commit:     0e027e2901f99830fc690abfd88d46521394122a
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 02:17:57 2023 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 02:17:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e027e29

www-servers/h2o: update USE_RUBY

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 2871e3f8b93b..01434dbf32a5 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -4,7 +4,7 @@
 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
 

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
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2022-12-07 17:57 Hans de Graaff
  0 siblings, 0 replies; 39+ messages in thread
From: Hans de Graaff @ 2022-12-07 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9816b156006b28e6495cb2199f0a9ce2128fa237
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 17:54:41 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 17:57:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9816b156

www-servers/h2o: enable ruby30 and disable ruby26

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 2fdec9f496f3..33ece8ab07b7 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-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="ruby27 ruby30"
 
 inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2022-08-06  0:45 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2022-08-06  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     185362a11cd0a0de8b7c23a63254206f0147f59a
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 00:45:14 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 00:45:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185362a1

www-servers/h2o: update USE_RUBY

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index fc47d03e7abb..d55ecd1ea1cf 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="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2021-10-30  7:16 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2021-10-30  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     62ba47f8904f0c93e2afa550875d44541172d522
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 07:13:21 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 07:13:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ba47f8

www-servers/h2o: update USE_RUBY

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index 3c0c14adba6..a1e7854aebf 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit cmake ruby-single ssl-cert systemd toolchain-funcs
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index d1f780ab5f1..9ea1b75fb86 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2021-10-30  7:16 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2021-10-30  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     fcd7b5fb1745e190b4f223df95dc88b2b1879e29
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 07:16:05 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 07:16:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd7b5fb

www-servers/h2o: update to EAPI 8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6-r1.ebuild | 21 +++++++++------------
 www-servers/h2o/h2o-9999.ebuild     | 20 +++++++-------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild
index a1e7854aebf..2fdec9f496f 100644
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby26 ruby27"
@@ -18,28 +17,26 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="libh2o +mruby"
 
-RDEPEND="
-	acct-group/h2o
+RDEPEND="acct-group/h2o
 	acct-user/h2o
 	dev-lang/perl
+	!sci-libs/libh2o
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-"
-DEPEND="
-	${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
 	mruby? (
 		${RUBY_DEPS}
 		|| (
 			dev-libs/onigmo
 			dev-libs/oniguruma
 		)
+	)"
+BDEPEND="libh2o? ( virtual/pkgconfig )
+	mruby? (
 		sys-devel/bison
 		virtual/pkgconfig
-	)
-"
-RDEPEND+="!sci-libs/libh2o"
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 9ea1b75fb86..cd6fd817fc3 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,35 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
 USE_RUBY="ruby26 ruby27"
 
 inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs
 
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-
 DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server"
 HOMEPAGE="https://h2o.examp1e.net/"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="libh2o +mruby"
 
-RDEPEND="
-	acct-group/h2o
+RDEPEND="acct-group/h2o
 	acct-user/h2o
 	dev-lang/perl
+	!sci-libs/libh2o
 	sys-libs/zlib
 	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-"
-DEPEND="
-	${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -37,10 +32,9 @@ DEPEND="
 			dev-libs/oniguruma
 		)
 		sys-devel/bison
-		virtual/pkgconfig
 	)
 "
-RDEPEND+="!sci-libs/libh2o"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2021-07-23 20:37 Conrad Kostecki
  0 siblings, 0 replies; 39+ messages in thread
From: Conrad Kostecki @ 2021-07-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c409b27799e4d50b493c5b57f68f30b04cadcbad
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 20:33:29 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 20:37:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c409b277

www-servers/h2o: drop old version

Closes: https://bugs.gentoo.org/781539
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6.ebuild | 107 ---------------------------------------
 1 file changed, 107 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
deleted file mode 100644
index 41caa3e517e..00000000000
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libh2o +mruby"
-
-RDEPEND="dev-lang/perl
-	sys-libs/zlib
-	libh2o? ( dev-libs/libuv )
-	dev-libs/openssl:0=
-	"
-DEPEND="${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
-	mruby? (
-		${RUBY_DEPS}
-		|| (
-			dev-libs/onigmo
-			dev-libs/oniguruma
-		)
-		sys-devel/bison
-		virtual/pkgconfig
-	)"
-RDEPEND+="
-	!sci-libs/libh2o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_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_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=$(usex !libh2o)
-		-DBUILD_SHARED_LIBS=$(usex libh2o)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2021-05-02 20:26 Mikle Kolyada
  0 siblings, 0 replies; 39+ messages in thread
From: Mikle Kolyada @ 2021-05-02 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d7dbb30d7693cbc9901339fbff2435f0d7f1fb9f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 20:25:10 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 20:26:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7dbb30d

www-servers/h2o: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6.ebuild | 9 ++++-----
 www-servers/h2o/h2o-9999.ebuild  | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 45fd96ae7e2..41caa3e517e 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 e9dd787568e..24da7a20118 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? (


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2020-09-20  8:35 Michał Górny
  0 siblings, 0 replies; 39+ messages in thread
From: Michał Górny @ 2020-09-20  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     0fe2d9263b38b329a4b3d7bc3bf49acedabbaf19
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 08:33:33 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 08:34:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe2d926

www-servers/h2o: Add a blocker on sci-libs/libh2o

Closes: https://bugs.gentoo.org/743718
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6.ebuild | 2 ++
 www-servers/h2o/h2o-9999.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 090cb8025bb..45fd96ae7e2 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 		sys-devel/bison
 		virtual/pkgconfig
 	)"
+RDEPEND+="
+	!sci-libs/libh2o"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 473f4d671cb..e9dd787568e 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
 		sys-devel/bison
 		virtual/pkgconfig
 	)"
+RDEPEND+="
+	!sci-libs/libh2o"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch )
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2020-04-30 13:07 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2020-04-30 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     00fbe838b896037e6aec6b8d1dc83003dc7960e0
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 13:05:11 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 13:05:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00fbe838

www-servers/h2o: amd64/x86 stable

Bug: https://bugs.gentoo.org/718952
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index b059185c8fb..090cb8025bb 100644
--- a/www-servers/h2o/h2o-2.2.6.ebuild
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2020-04-30 13:07 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2020-04-30 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e458c40a76090011313d131dd7ad35dca540902e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 13:07:04 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 13:07:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e458c40a

www-servers/h2o: drop old

Bug: https://bugs.gentoo.org/718952
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/Manifest         |   1 -
 www-servers/h2o/h2o-2.2.5.ebuild | 106 ---------------------------------------
 2 files changed, 107 deletions(-)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index b6f7c241492..710248b421a 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,2 +1 @@
-DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
 DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
deleted file mode 100644
index 090cb8025bb..00000000000
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libh2o libressl +mruby"
-
-RDEPEND="dev-lang/perl
-	sys-libs/zlib
-	libh2o? ( dev-libs/libuv )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	libh2o? ( virtual/pkgconfig )
-	mruby? (
-		${RUBY_DEPS}
-		|| (
-			dev-libs/onigmo
-			dev-libs/oniguruma
-		)
-		sys-devel/bison
-		virtual/pkgconfig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_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_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=$(usex !libh2o)
-		-DBUILD_SHARED_LIBS=$(usex libh2o)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2020-01-09 13:16 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2020-01-09 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     50241a31053044e4ab827f1f1193351891427d2c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 13:16:21 2020 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 13:16:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50241a31

www-servers/h2o: add libh2o USE flag

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.5.ebuild | 9 ++++++---
 www-servers/h2o/h2o-2.2.6.ebuild | 9 ++++++---
 www-servers/h2o/h2o-9999.ebuild  | 9 ++++++---
 www-servers/h2o/metadata.xml     | 1 +
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index afa121fe12a..090cb8025bb 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -71,7 +73,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
index 58660077497..b059185c8fb 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -71,7 +73,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 54be51dba8f..473f4d671cb 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,13 +15,15 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl +mruby"
+IUSE="libh2o libressl +mruby"
 
 RDEPEND="dev-lang/perl
 	sys-libs/zlib
+	libh2o? ( dev-libs/libuv )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
+	libh2o? ( virtual/pkgconfig )
 	mruby? (
 		${RUBY_DEPS}
 		|| (
@@ -68,7 +70,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
 		-DWITH_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
+		-DWITHOUT_LIBS=$(usex !libh2o)
+		-DBUILD_SHARED_LIBS=$(usex libh2o)
 	)
 	cmake-utils_src_configure
 }

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 6a34529b48f..dab1128615a 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -11,6 +11,7 @@
 		when compared to older generations of HTTP servers.
 	</longdescription>
 	<use>
+		<flag name="libh2o">Build and install libh2o</flag>
 		<flag name="mruby">Enable support for mruby</flag>
 	</use>
 	<upstream>


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2019-10-03 12:19 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2019-10-03 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     eb59cf7388afc61db52947ccf091a565e46d2608
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 12:18:39 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 12:18:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb59cf73

www-servers/h2o: amd64/x86 stable

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index 58660077497..afa121fe12a 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +mruby"
 
 RDEPEND="dev-lang/perl


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2019-10-03 12:19 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2019-10-03 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     df25e2f009880085df4e2e61f91b5c2a4e2fd803
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 12:15:16 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 12:15:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df25e2f0

www-servers/h2o: update USE_RUBY

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/h2o-2.2.5.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
index de3a311b755..58660077497 100644
--- a/www-servers/h2o/h2o-2.2.5.ebuild
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index b43017863ba..54be51dba8f 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 CMAKE_MAKEFILE_GENERATOR="emake"
 SSL_DEPS_SKIP=1
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit cmake-utils git-r3 ruby-single ssl-cert systemd toolchain-funcs user
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2019-10-03 12:19 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2019-10-03 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     bc673827475cbd91f15b5700e1c7f16a86fdd9b1
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  3 12:12:37 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct  3 12:12:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc673827

www-servers/h2o: new upstream release

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 www-servers/h2o/Manifest         |   1 +
 www-servers/h2o/h2o-2.2.6.ebuild | 103 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index ddfd2ff20f2..b6f7c241492 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1 +1,2 @@
 DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2
+DIST h2o-2.2.6.tar.gz 16257760 BLAKE2B 8474751ca9832ddae2022710654ca58a93ebf9ca01afe934950209b04357b7548b05c598c49fe92684b2910fd6309d6fc3923a0b01cdeeb4b0dc65b08842255f SHA512 f2f28905c01782a0432c9dfdb2f21054e0a4741ac4c5f26802d4b439d0172840aa215aba5dc7c9af62275dcc24de105674a3819384dc38246e43ce3e8263eb20

diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild
new file mode 100644
index 00000000000..58660077497
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.6.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="dev-lang/perl
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		${RUBY_DEPS}
+		|| (
+			dev-libs/onigmo
+			dev-libs/oniguruma
+		)
+		sys-devel/bison
+		virtual/pkgconfig
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2-libressl-2.7.patch
+	"${FILESDIR}"/${PN}-2.2-mruby.patch
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_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_MRUBY=$(usex mruby)
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-07-13 14:14 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2018-07-13 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9c05fa02f959044396492add74ad885002f19035
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 14:13:34 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 14:14:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c05fa02

www-servers/h2o: drop old

Bug: https://bugs.gentoo.org/659298
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/Manifest         |   1 -
 www-servers/h2o/h2o-2.2.4.ebuild | 100 ---------------------------------------
 2 files changed, 101 deletions(-)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 7cce81ca860..ddfd2ff20f2 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,2 +1 @@
-DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
 DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
deleted file mode 100644
index 63228398d26..00000000000
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-CMAKE_MAKEFILE_GENERATOR="emake"
-SSL_DEPS_SKIP=1
-USE_RUBY="ruby23 ruby24"
-
-inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
-
-RDEPEND="dev-lang/perl
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	mruby? (
-		${RUBY_DEPS}
-		dev-libs/oniguruma
-		sys-devel/bison
-		virtual/pkgconfig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-mruby.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_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_MRUBY=$(usex mruby)
-		-DWITHOUT_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-07-11 13:24 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2018-07-11 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f754d8bb8a58b21a609c792c82613300cabcda4a
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 13:22:43 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 13:23:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f754d8bb

www-servers/h2o: new upstream release

Bug: https://bugs.gentoo.org/659298
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/Manifest         |  1 +
 www-servers/h2o/h2o-2.2.5.ebuild | 97 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index b487dd622c1..7cce81ca860 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1 +1,2 @@
 DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5
+DIST h2o-2.2.5.tar.gz 16257295 BLAKE2B 3c13796eaf9a0aca29bbff7c35fb36d0b5ef47da91f39f71614a89f2d4fea5b1ebbc8f4e3e50bf37a02a84c0fcd96d5ac0be20c83add274157af966134b2d185 SHA512 24b07140d24fbb7796038aab44f44be5ffabc6f2841954273e2ad9f1a864e5482051dd7abfa6446297a46b6868763114695fa4f123ee3175bdac53b4c1868bc2

diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild
new file mode 100644
index 00000000000..91c20bba627
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+CMAKE_MAKEFILE_GENERATOR="emake"
+SSL_DEPS_SKIP=1
+USE_RUBY="ruby23 ruby24"
+
+inherit cmake-utils ruby-single ssl-cert systemd toolchain-funcs user
+
+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"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="dev-lang/perl
+	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		${RUBY_DEPS}
+		dev-libs/oniguruma
+		sys-devel/bison
+		virtual/pkgconfig
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	cmake-utils_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_MRUBY=$(usex mruby)
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-07-04 13:24 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2018-07-04 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     5118d7463975feaa6c2962c31655684444123e99
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 13:10:34 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 13:23:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5118d746

www-servers/h2o: specify ruby version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/h2o-2.2.4.ebuild | 19 +++++++++++++++++++
 www-servers/h2o/h2o-9999.ebuild  | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 579c8e92940..449ca5e6711 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -33,6 +33,25 @@ pkg_setup() {
 	enewuser ${PN} -1 -1 -1 ${PN}
 }
 
+src_prepare() {
+	cmake-utils_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 "s: ruby: ${ruby}:" \
+		CMakeLists.txt
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index d6c5d65d823..0d21e4e8bee 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -31,6 +31,25 @@ pkg_setup() {
 	enewuser ${PN} -1 -1 -1 ${PN}
 }
 
+src_prepare() {
+	cmake-utils_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 "s: ruby: ${ruby}:" \
+		CMakeLists.txt
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-07-04 13:24 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2018-07-04 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     1237f284593875131e7411d1df52e71ace297d5d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 12:40:27 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 13:23:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1237f284

www-servers/h2o: build with make

Closes: https://bugs.gentoo.org/655460
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/h2o-2.2.4.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index ab022fd4783..10c508037d7 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
+CMAKE_MAKEFILE_GENERATOR="emake"
 USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils ruby-single systemd user

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 292131941a9..b0583fd8855 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
+CMAKE_MAKEFILE_GENERATOR="emake"
 USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils git-r3 ruby-single systemd user


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-06-30  2:36 Akinori Hattori
  0 siblings, 0 replies; 39+ messages in thread
From: Akinori Hattori @ 2018-06-30  2:36 UTC (permalink / raw
  To: gentoo-commits

commit:     7a36837fd5b012060bcda82520a6b76354fcfdb7
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 02:35:14 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 02:35:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a36837f

www-servers/h2o: take over maintainership

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 www-servers/h2o/metadata.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 9a0b02bb8b6..af6fee5b3de 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		H2O is a new generation HTTP server. Not only is it very fast,
 		it also provides much quicker response to end-users


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-06-27 21:59 Patrice Clement
  0 siblings, 0 replies; 39+ messages in thread
From: Patrice Clement @ 2018-06-27 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     0e61e0eeb2b8c67c6efa8fc72aff04c23896c72e
Author:     Ian Moone <ianmoone <AT> chaoslab <DOT> org>
AuthorDate: Wed Jun 27 19:04:22 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 21:59:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e61e0ee

www-servers/h2o: remove proxied maintainer.

Bug: https://bugs.gentoo.org/633284
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8992

 www-servers/h2o/metadata.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 2ae01bc9733..9a0b02bb8b6 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@chaoslab.org</email>
-		<name>Ian Moone</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		H2O is a new generation HTTP server. Not only is it very fast,
 		it also provides much quicker response to end-users


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-05-24  5:20 Michał Górny
  0 siblings, 0 replies; 39+ messages in thread
From: Michał Górny @ 2018-05-24  5:20 UTC (permalink / raw
  To: gentoo-commits

commit:     cdef18fe9aae1dbec8f0de3dad395fbfa83628ce
Author:     Ian Moone <gentoo <AT> chaoslab <DOT> org>
AuthorDate: Thu May 24 02:01:35 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 24 05:20:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdef18fe

www-servers/h2o: update maintainer's email address

Closes: https://github.com/gentoo/gentoo/pull/8540
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 www-servers/h2o/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index 8603b597848..2ae01bc9733 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>csmk+gentoo@chaoslab.org</email>
+		<email>gentoo@chaoslab.org</email>
 		<name>Ian Moone</name>
 	</maintainer>
 	<maintainer type="project">


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2018-04-29  7:35 Michał Górny
  0 siblings, 0 replies; 39+ messages in thread
From: Michał Górny @ 2018-04-29  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     f10de6467735c17c8c47a62a0f021ff764b40711
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Sat Apr 28 02:11:14 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 07:35:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10de646

www-servers/h2o: drop support for Ruby 2.2 (masked for removal)

Closes: https://github.com/gentoo/gentoo/pull/8177
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 www-servers/h2o/h2o-2.2.4.ebuild | 4 ++--
 www-servers/h2o/h2o-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
index 1ad16970758..d33e39efe54 100644
--- a/www-servers/h2o/h2o-2.2.4.ebuild
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils ruby-single systemd user
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 0db4fc4f8f7..292131941a9 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 inherit cmake-utils git-r3 ruby-single systemd user
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-12-20 19:31 Craig Andrews
  0 siblings, 0 replies; 39+ messages in thread
From: Craig Andrews @ 2017-12-20 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     516e3b23e8bf92e06452e31fb8906ec1fbb7c0b5
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Sat Dec 16 00:43:51 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 19:31:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516e3b23

www-servers/h2o: drop insecure version (2.2.3)

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 www-servers/h2o/Manifest         |  1 -
 www-servers/h2o/h2o-2.2.3.ebuild | 66 ----------------------------------------
 2 files changed, 67 deletions(-)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index dd98073bcb8..b487dd622c1 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,2 +1 @@
-DIST h2o-2.2.3.tar.gz 16207150 BLAKE2B 847f515efe0b73b49502cad64ac8f02316c35bfb84f3613180a7747a0ae61d7ad45f166200e7d603c1a3016389aa290410d3475bf248f65014e7eadba8c1d43c SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1
 DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5

diff --git a/www-servers/h2o/h2o-2.2.3.ebuild b/www-servers/h2o/h2o-2.2.3.ebuild
deleted file mode 100644
index 1ad16970758..00000000000
--- a/www-servers/h2o/h2o-2.2.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit cmake-utils ruby-single systemd user
-
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
-HOMEPAGE="https://h2o.examp1e.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	mruby? (
-		sys-devel/bison
-		${RUBY_DEPS}
-	)"
-
-pkg_setup() {
-	enewgroup h2o
-	enewuser h2o -1 -1 -1 h2o
-}
-
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
-		-DWITH_MRUBY="$(usex mruby)"
-		-DWITHOUT_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/h2o.initd h2o
-	systemd_dounit "${FILESDIR}"/h2o.service
-
-	insinto /etc/h2o
-	doins "${FILESDIR}"/h2o.conf
-
-	keepdir /var/log/h2o
-	fperms 0700 /var/log/h2o
-
-	keepdir /var/www/localhost/htdocs
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/h2o.logrotate h2o
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-12-20 19:31 Craig Andrews
  0 siblings, 0 replies; 39+ messages in thread
From: Craig Andrews @ 2017-12-20 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     a57146b18b6129e6b45d0674784c4cf607b71fd6
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Sat Dec 16 00:43:12 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 19:31:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57146b1

www-servers/h2o: security bump to 2.2.4

CVE-2017-10872
CVE-2017-10908

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 www-servers/h2o/Manifest         |  1 +
 www-servers/h2o/h2o-2.2.4.ebuild | 66 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 731d0a20d1d..dd98073bcb8 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1 +1,2 @@
 DIST h2o-2.2.3.tar.gz 16207150 BLAKE2B 847f515efe0b73b49502cad64ac8f02316c35bfb84f3613180a7747a0ae61d7ad45f166200e7d603c1a3016389aa290410d3475bf248f65014e7eadba8c1d43c SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1
+DIST h2o-2.2.4.tar.gz 16212596 BLAKE2B 0c2702fb3c7e85e7eae107294794f80cee02b6b2488bbc2e880ea356d8362f0de8f08c3c3d686512cbf9ae1558aed23354f44e27edaf449e43d5876940248296 SHA512 508ebe93b890f573e735d9b1f9c91a669144be3523e34fb7455227fd10b38e04a5db73e706fe8d05849fea3019e792754097871c073715c9eef4eae7c33560b5

diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
new file mode 100644
index 00000000000..1ad16970758
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils ruby-single systemd user
+
+DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
+HOMEPAGE="https://h2o.examp1e.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		sys-devel/bison
+		${RUBY_DEPS}
+	)"
+
+pkg_setup() {
+	enewgroup h2o
+	enewuser h2o -1 -1 -1 h2o
+}
+
+src_prepare() {
+	# Leave optimization level to user CFLAGS
+	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
+		|| die "sed fix failed!"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
+		-DWITH_MRUBY="$(usex mruby)"
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/h2o.initd h2o
+	systemd_dounit "${FILESDIR}"/h2o.service
+
+	insinto /etc/h2o
+	doins "${FILESDIR}"/h2o.conf
+
+	keepdir /var/log/h2o
+	fperms 0700 /var/log/h2o
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/h2o.logrotate h2o
+}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-10-27 21:02 Patrice Clement
  0 siblings, 0 replies; 39+ messages in thread
From: Patrice Clement @ 2017-10-27 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9d676aea5fedb02ec5da7e65c51bf5f830545c6a
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Thu Oct 19 19:40:57 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 21:02:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d676aea

www-servers/h2o: drop insecure version.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/h2o/Manifest         |  1 -
 www-servers/h2o/h2o-2.2.2.ebuild | 68 ----------------------------------------
 2 files changed, 69 deletions(-)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index cd6850d1455..e73da6cfa39 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1,2 +1 @@
-DIST h2o-2.2.2.tar.gz 16192602 SHA256 cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433 SHA512 b5cc08f2be7056bbac4370f9b6ccb1ba0ad4ea61ce67e946a4f26b8f9c0a575f603c899b1a88f17d1065e0e72e1d1094199200ed24b4f3644a3c7df34aa04b51 WHIRLPOOL d9aff2d3e7caa0334efbac86a807fe8ecd5f146ae56315a5194b8de653ae4f91d33cad754714cd38fadd1c59d87cafe30c1f5f6cb2102362a7647ebd3f18dc84
 DIST h2o-2.2.3.tar.gz 16207150 SHA256 d40401ca714d00ca5204e8d22148dbaa9cae3407e3b4b6b62bd208543901ea51 SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1 WHIRLPOOL 0a5b498c7568b07af9e475eec00fd8db0122608843c5918616857ec96479a180a89d7a4274c98107129efa784b0d3714dd687a9f1463606be65e12987dc89303

diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.2.ebuild
deleted file mode 100644
index fef33e05d6f..00000000000
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
-HOMEPAGE="https://h2o.examp1e.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +mruby"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	mruby? (
-		sys-devel/bison
-		|| (
-			dev-lang/ruby:2.4
-			dev-lang/ruby:2.3
-			dev-lang/ruby:2.2
-		)
-	)"
-
-pkg_setup() {
-	enewgroup h2o
-	enewuser h2o -1 -1 -1 h2o
-}
-
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
-		-DWITH_MRUBY="$(usex mruby)"
-		-DWITHOUT_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/h2o.initd h2o
-	systemd_dounit "${FILESDIR}"/h2o.service
-
-	insinto /etc/h2o
-	doins "${FILESDIR}"/h2o.conf
-
-	keepdir /var/log/h2o
-	fperms 0700 /var/log/h2o
-
-	keepdir /var/www/localhost/htdocs
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/h2o.logrotate h2o
-}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-10-27 21:02 Patrice Clement
  0 siblings, 0 replies; 39+ messages in thread
From: Patrice Clement @ 2017-10-27 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     f9d412e232fc0b9402452e771beab2f50da95327
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Thu Oct 19 19:42:51 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 21:02:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d412e2

www-servers/h2o: update live ebuild to make use of ruby-single eclass.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 www-servers/h2o/h2o-9999.ebuild | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 761de2c20b0..0db4fc4f8f7 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=6
 
-inherit cmake-utils git-r3 systemd user
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils git-r3 ruby-single systemd user
 
 DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
 HOMEPAGE="https://h2o.examp1e.net"
@@ -20,11 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	mruby? (
 		sys-devel/bison
-		|| (
-			dev-lang/ruby:2.4
-			dev-lang/ruby:2.3
-			dev-lang/ruby:2.2
-		)
+		${RUBY_DEPS}
 	)"
 
 pkg_setup() {
@@ -32,14 +30,6 @@ pkg_setup() {
 	enewuser h2o -1 -1 -1 h2o
 }
 
-src_prepare() {
-	# Leave optimization level to user CFLAGS
-	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
-		|| die "sed fix failed!"
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-10-27 21:02 Patrice Clement
  0 siblings, 0 replies; 39+ messages in thread
From: Patrice Clement @ 2017-10-27 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     5a782f487ad73a23ca622332d3564a53146918b8
Author:     Ian Moone <csmk+gentoo <AT> chaoslab <DOT> org>
AuthorDate: Thu Oct 19 19:39:45 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 21:02:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a782f48

www-servers/h2o: security bump to 2.2.3.

CVE-2017-10868
CVE-2017-10869

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5989

 www-servers/h2o/Manifest         |  1 +
 www-servers/h2o/h2o-2.2.3.ebuild | 66 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/www-servers/h2o/Manifest b/www-servers/h2o/Manifest
index 21a5c58c1c4..cd6850d1455 100644
--- a/www-servers/h2o/Manifest
+++ b/www-servers/h2o/Manifest
@@ -1 +1,2 @@
 DIST h2o-2.2.2.tar.gz 16192602 SHA256 cf45780058566bd63d90ad0b52b1d15f8515519090753398b9bcf770162a0433 SHA512 b5cc08f2be7056bbac4370f9b6ccb1ba0ad4ea61ce67e946a4f26b8f9c0a575f603c899b1a88f17d1065e0e72e1d1094199200ed24b4f3644a3c7df34aa04b51 WHIRLPOOL d9aff2d3e7caa0334efbac86a807fe8ecd5f146ae56315a5194b8de653ae4f91d33cad754714cd38fadd1c59d87cafe30c1f5f6cb2102362a7647ebd3f18dc84
+DIST h2o-2.2.3.tar.gz 16207150 SHA256 d40401ca714d00ca5204e8d22148dbaa9cae3407e3b4b6b62bd208543901ea51 SHA512 f138667e8e4370102028da469e09e8b2ee2e5dc92f4513b35467aa2a2fb7b02bbda2b2d158bbf3198b26faeea48d5ec07a7ebab1d0cb3032c532d4e6323630f1 WHIRLPOOL 0a5b498c7568b07af9e475eec00fd8db0122608843c5918616857ec96479a180a89d7a4274c98107129efa784b0d3714dd687a9f1463606be65e12987dc89303

diff --git a/www-servers/h2o/h2o-2.2.3.ebuild b/www-servers/h2o/h2o-2.2.3.ebuild
new file mode 100644
index 00000000000..1ad16970758
--- /dev/null
+++ b/www-servers/h2o/h2o-2.2.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit cmake-utils ruby-single systemd user
+
+DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
+HOMEPAGE="https://h2o.examp1e.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +mruby"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	mruby? (
+		sys-devel/bison
+		${RUBY_DEPS}
+	)"
+
+pkg_setup() {
+	enewgroup h2o
+	enewuser h2o -1 -1 -1 h2o
+}
+
+src_prepare() {
+	# Leave optimization level to user CFLAGS
+	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
+		|| die "sed fix failed!"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/h2o
+		-DWITH_MRUBY="$(usex mruby)"
+		-DWITHOUT_LIBS=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/h2o.initd h2o
+	systemd_dounit "${FILESDIR}"/h2o.service
+
+	insinto /etc/h2o
+	doins "${FILESDIR}"/h2o.conf
+
+	keepdir /var/log/h2o
+	fperms 0700 /var/log/h2o
+
+	keepdir /var/www/localhost/htdocs
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/h2o.logrotate h2o
+}


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-10-16  3:34 David Seifert
  0 siblings, 0 replies; 39+ messages in thread
From: David Seifert @ 2017-10-16  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     eeef0116a38e7a8e35b0d9ba96cf2fef626e1563
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 03:28:03 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 03:28:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeef0116

www-servers/h2o: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 www-servers/h2o/h2o-2.2.2.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.2.ebuild
index 428e789f69a..fef33e05d6f 100644
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ b/www-servers/h2o/h2o-2.2.2.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
 		|| die "sed fix failed!"
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index fb30d888bf1..761de2c20b0 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -37,7 +37,7 @@ src_prepare() {
 	sed -i 's/-O2 -g ${CC_WARNING_FLAGS} //g' ./CMakeLists.txt \
 		|| die "sed fix failed!"
 
-	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-08-27 15:36 Michael Palimaka
  0 siblings, 0 replies; 39+ messages in thread
From: Michael Palimaka @ 2017-08-27 15:36 UTC (permalink / raw
  To: gentoo-commits

commit:     63078d11f0ef29f75647a9f5fada6d9bade6fe99
Author:     Ian Moone <csmk <AT> chaoslab <DOT> org>
AuthorDate: Fri Aug 25 11:49:14 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 15:36:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63078d11

www-servers/h2o: remove the optional dependency on ruby:2.1

As Ruby 2.1.x has now been masked for removal.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 www-servers/h2o/h2o-2.2.2.ebuild | 1 -
 www-servers/h2o/h2o-9999.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.2.ebuild
index 329ac9bdbfe..428e789f69a 100644
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ b/www-servers/h2o/h2o-2.2.2.ebuild
@@ -24,7 +24,6 @@ DEPEND="${RDEPEND}
 			dev-lang/ruby:2.4
 			dev-lang/ruby:2.3
 			dev-lang/ruby:2.2
-			dev-lang/ruby:2.1
 		)
 	)"
 

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 7e33820b1f9..fb30d888bf1 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -24,7 +24,6 @@ DEPEND="${RDEPEND}
 			dev-lang/ruby:2.4
 			dev-lang/ruby:2.3
 			dev-lang/ruby:2.2
-			dev-lang/ruby:2.1
 		)
 	)"
 


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-07-30  9:44 Michał Górny
  0 siblings, 0 replies; 39+ messages in thread
From: Michał Górny @ 2017-07-30  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     ea52a14791a1dfed64835a7bcc36984f78bc117e
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 17:43:59 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 09:44:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea52a147

www-servers/h2o: Use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 www-servers/h2o/h2o-2.2.2.ebuild | 2 +-
 www-servers/h2o/h2o-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/h2o/h2o-2.2.2.ebuild b/www-servers/h2o/h2o-2.2.2.ebuild
index d0735cc9677..329ac9bdbfe 100644
--- a/www-servers/h2o/h2o-2.2.2.ebuild
+++ b/www-servers/h2o/h2o-2.2.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils systemd user
 
 DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
 HOMEPAGE="https://h2o.examp1e.net"
-SRC_URI="https://github.com/h2o/h2o/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
index 6171018d54c..7e33820b1f9 100644
--- a/www-servers/h2o/h2o-9999.ebuild
+++ b/www-servers/h2o/h2o-9999.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils git-r3 systemd user
 
 DESCRIPTION="An optimized HTTP server with support for HTTP/1.x and HTTP/2"
 HOMEPAGE="https://h2o.examp1e.net"
-EGIT_REPO_URI=( {https,git}://github.com/h2o/h2o.git )
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 LICENSE="MIT"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 39+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
@ 2017-07-20 21:43 Patrice Clement
  0 siblings, 0 replies; 39+ messages in thread
From: Patrice Clement @ 2017-07-20 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     949b111533e2b3b563e879a64cd4b2cb2142c8a3
Author:     csmk <csmk <AT> chaoslab <DOT> org>
AuthorDate: Thu Jul 20 12:57:01 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 21:43:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=949b1115

www-servers/h2o: update maintainer email address.

Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5148

 www-servers/h2o/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml
index a6705b14e84..8603b597848 100644
--- a/www-servers/h2o/metadata.xml
+++ b/www-servers/h2o/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>csmk@chaoslab.org</email>
+		<email>csmk+gentoo@chaoslab.org</email>
 		<name>Ian Moone</name>
 	</maintainer>
 	<maintainer type="project">


^ permalink raw reply related	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2024-11-16 14:02 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-23 20:37 [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2024-11-16 14:02 Akinori Hattori
2024-11-16 14:02 Akinori Hattori
2024-11-16 14:02 Akinori Hattori
2024-06-05 19:59 Arthur Zamarin
2024-06-05 19:59 Arthur Zamarin
2024-01-08 12:28 Sam James
2023-10-22 13:44 Akinori Hattori
2023-03-18  2:21 Akinori Hattori
2022-12-07 17:57 Hans de Graaff
2022-08-06  0:45 Akinori Hattori
2021-10-30  7:16 Akinori Hattori
2021-10-30  7:16 Akinori Hattori
2021-07-23 20:37 Conrad Kostecki
2021-05-02 20:26 Mikle Kolyada
2020-09-20  8:35 Michał Górny
2020-04-30 13:07 Akinori Hattori
2020-04-30 13:07 Akinori Hattori
2020-01-09 13:16 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2019-10-03 12:19 Akinori Hattori
2018-07-13 14:14 Akinori Hattori
2018-07-11 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-07-04 13:24 Akinori Hattori
2018-06-30  2:36 Akinori Hattori
2018-06-27 21:59 Patrice Clement
2018-05-24  5:20 Michał Górny
2018-04-29  7:35 Michał Górny
2017-12-20 19:31 Craig Andrews
2017-12-20 19:31 Craig Andrews
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-27 21:02 Patrice Clement
2017-10-16  3:34 David Seifert
2017-08-27 15:36 Michael Palimaka
2017-07-30  9:44 Michał Górny
2017-07-20 21:43 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox