| 1 |
commit: 50241a31053044e4ab827f1f1193351891427d2c |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 9 13:16:21 2020 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 9 13:16:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50241a31 |
| 7 |
|
| 8 |
www-servers/h2o: add libh2o USE flag |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.16 |
| 11 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/h2o/h2o-2.2.5.ebuild | 9 ++++++--- |
| 14 |
www-servers/h2o/h2o-2.2.6.ebuild | 9 ++++++--- |
| 15 |
www-servers/h2o/h2o-9999.ebuild | 9 ++++++--- |
| 16 |
www-servers/h2o/metadata.xml | 1 + |
| 17 |
4 files changed, 19 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-servers/h2o/h2o-2.2.5.ebuild b/www-servers/h2o/h2o-2.2.5.ebuild |
| 20 |
index afa121fe12a..090cb8025bb 100644 |
| 21 |
--- a/www-servers/h2o/h2o-2.2.5.ebuild |
| 22 |
+++ b/www-servers/h2o/h2o-2.2.5.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI="6" |
| 29 |
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 30 |
LICENSE="MIT" |
| 31 |
SLOT="0" |
| 32 |
KEYWORDS="amd64 x86" |
| 33 |
-IUSE="libressl +mruby" |
| 34 |
+IUSE="libh2o libressl +mruby" |
| 35 |
|
| 36 |
RDEPEND="dev-lang/perl |
| 37 |
sys-libs/zlib |
| 38 |
+ libh2o? ( dev-libs/libuv ) |
| 39 |
!libressl? ( dev-libs/openssl:0= ) |
| 40 |
libressl? ( dev-libs/libressl:0= )" |
| 41 |
DEPEND="${RDEPEND} |
| 42 |
+ libh2o? ( virtual/pkgconfig ) |
| 43 |
mruby? ( |
| 44 |
${RUBY_DEPS} |
| 45 |
|| ( |
| 46 |
@@ -71,7 +73,8 @@ src_configure() { |
| 47 |
local mycmakeargs=( |
| 48 |
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} |
| 49 |
-DWITH_MRUBY=$(usex mruby) |
| 50 |
- -DWITHOUT_LIBS=ON |
| 51 |
+ -DWITHOUT_LIBS=$(usex !libh2o) |
| 52 |
+ -DBUILD_SHARED_LIBS=$(usex libh2o) |
| 53 |
) |
| 54 |
cmake-utils_src_configure |
| 55 |
} |
| 56 |
|
| 57 |
diff --git a/www-servers/h2o/h2o-2.2.6.ebuild b/www-servers/h2o/h2o-2.2.6.ebuild |
| 58 |
index 58660077497..b059185c8fb 100644 |
| 59 |
--- a/www-servers/h2o/h2o-2.2.6.ebuild |
| 60 |
+++ b/www-servers/h2o/h2o-2.2.6.ebuild |
| 61 |
@@ -1,4 +1,4 @@ |
| 62 |
-# Copyright 1999-2019 Gentoo Authors |
| 63 |
+# Copyright 1999-2020 Gentoo Authors |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
|
| 66 |
EAPI="6" |
| 67 |
@@ -15,13 +15,15 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 68 |
LICENSE="MIT" |
| 69 |
SLOT="0" |
| 70 |
KEYWORDS="~amd64 ~x86" |
| 71 |
-IUSE="libressl +mruby" |
| 72 |
+IUSE="libh2o libressl +mruby" |
| 73 |
|
| 74 |
RDEPEND="dev-lang/perl |
| 75 |
sys-libs/zlib |
| 76 |
+ libh2o? ( dev-libs/libuv ) |
| 77 |
!libressl? ( dev-libs/openssl:0= ) |
| 78 |
libressl? ( dev-libs/libressl:0= )" |
| 79 |
DEPEND="${RDEPEND} |
| 80 |
+ libh2o? ( virtual/pkgconfig ) |
| 81 |
mruby? ( |
| 82 |
${RUBY_DEPS} |
| 83 |
|| ( |
| 84 |
@@ -71,7 +73,8 @@ src_configure() { |
| 85 |
local mycmakeargs=( |
| 86 |
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} |
| 87 |
-DWITH_MRUBY=$(usex mruby) |
| 88 |
- -DWITHOUT_LIBS=ON |
| 89 |
+ -DWITHOUT_LIBS=$(usex !libh2o) |
| 90 |
+ -DBUILD_SHARED_LIBS=$(usex libh2o) |
| 91 |
) |
| 92 |
cmake-utils_src_configure |
| 93 |
} |
| 94 |
|
| 95 |
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild |
| 96 |
index 54be51dba8f..473f4d671cb 100644 |
| 97 |
--- a/www-servers/h2o/h2o-9999.ebuild |
| 98 |
+++ b/www-servers/h2o/h2o-9999.ebuild |
| 99 |
@@ -1,4 +1,4 @@ |
| 100 |
-# Copyright 1999-2019 Gentoo Authors |
| 101 |
+# Copyright 1999-2020 Gentoo Authors |
| 102 |
# Distributed under the terms of the GNU General Public License v2 |
| 103 |
|
| 104 |
EAPI="6" |
| 105 |
@@ -15,13 +15,15 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
| 106 |
LICENSE="MIT" |
| 107 |
SLOT="0" |
| 108 |
KEYWORDS="" |
| 109 |
-IUSE="libressl +mruby" |
| 110 |
+IUSE="libh2o libressl +mruby" |
| 111 |
|
| 112 |
RDEPEND="dev-lang/perl |
| 113 |
sys-libs/zlib |
| 114 |
+ libh2o? ( dev-libs/libuv ) |
| 115 |
!libressl? ( dev-libs/openssl:0= ) |
| 116 |
libressl? ( dev-libs/libressl:0= )" |
| 117 |
DEPEND="${RDEPEND} |
| 118 |
+ libh2o? ( virtual/pkgconfig ) |
| 119 |
mruby? ( |
| 120 |
${RUBY_DEPS} |
| 121 |
|| ( |
| 122 |
@@ -68,7 +70,8 @@ src_configure() { |
| 123 |
local mycmakeargs=( |
| 124 |
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN} |
| 125 |
-DWITH_MRUBY=$(usex mruby) |
| 126 |
- -DWITHOUT_LIBS=ON |
| 127 |
+ -DWITHOUT_LIBS=$(usex !libh2o) |
| 128 |
+ -DBUILD_SHARED_LIBS=$(usex libh2o) |
| 129 |
) |
| 130 |
cmake-utils_src_configure |
| 131 |
} |
| 132 |
|
| 133 |
diff --git a/www-servers/h2o/metadata.xml b/www-servers/h2o/metadata.xml |
| 134 |
index 6a34529b48f..dab1128615a 100644 |
| 135 |
--- a/www-servers/h2o/metadata.xml |
| 136 |
+++ b/www-servers/h2o/metadata.xml |
| 137 |
@@ -11,6 +11,7 @@ |
| 138 |
when compared to older generations of HTTP servers. |
| 139 |
</longdescription> |
| 140 |
<use> |
| 141 |
+ <flag name="libh2o">Build and install libh2o</flag> |
| 142 |
<flag name="mruby">Enable support for mruby</flag> |
| 143 |
</use> |
| 144 |
<upstream> |
Archives