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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16B6A138350 for ; Thu, 9 Jan 2020 13:16:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 359B4E085D; Thu, 9 Jan 2020 13:16:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 098F8E085D for ; Thu, 9 Jan 2020 13:16:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F0BD34DE8E for ; Thu, 9 Jan 2020 13:16:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBB4F38 for ; Thu, 9 Jan 2020 13:16:49 +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: <1578575781.50241a31053044e4ab827f1f1193351891427d2c.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.5.ebuild www-servers/h2o/h2o-2.2.6.ebuild www-servers/h2o/h2o-9999.ebuild www-servers/h2o/metadata.xml X-VCS-Directories: www-servers/h2o/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 50241a31053044e4ab827f1f1193351891427d2c X-VCS-Branch: master Date: Thu, 9 Jan 2020 13:16:49 +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: e58aa516-1801-4114-b571-9360f5e04cde X-Archives-Hash: 89751902b1355bea25e69bfc33658942 commit: 50241a31053044e4ab827f1f1193351891427d2c Author: Akinori Hattori gentoo org> AuthorDate: Thu Jan 9 13:16:21 2020 +0000 Commit: Akinori Hattori gentoo 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 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. + Build and install libh2o Enable support for mruby