From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C942158086 for ; Sat, 30 Oct 2021 07:16:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81798E081B; Sat, 30 Oct 2021 07:16:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A575E081B for ; Sat, 30 Oct 2021 07:16:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B5D3343126 for ; Sat, 30 Oct 2021 07:16:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 999DD177 for ; Sat, 30 Oct 2021 07:16:50 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1635578165.fcd7b5fb1745e190b4f223df95dc88b2b1879e29.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/h2o/h2o-2.2.6-r1.ebuild www-servers/h2o/h2o-9999.ebuild X-VCS-Directories: www-servers/h2o/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: fcd7b5fb1745e190b4f223df95dc88b2b1879e29 X-VCS-Branch: master Date: Sat, 30 Oct 2021 07:16:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5a247b6d-ba75-4ee9-a31e-34afb99ec265 X-Archives-Hash: 7197b7db30dd8077b4c5db17ecc9fdd9 commit: fcd7b5fb1745e190b4f223df95dc88b2b1879e29 Author: Akinori Hattori gentoo org> AuthorDate: Sat Oct 30 07:16:05 2021 +0000 Commit: Akinori Hattori gentoo 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 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 )