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>

Reply via email to