| 1 |
commit: fcd7b5fb1745e190b4f223df95dc88b2b1879e29 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 30 07:16:05 2021 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 30 07:16:05 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd7b5fb |
| 7 |
|
| 8 |
www-servers/h2o: update to EAPI 8 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/h2o/h2o-2.2.6-r1.ebuild | 21 +++++++++------------ |
| 14 |
www-servers/h2o/h2o-9999.ebuild | 20 +++++++------------- |
| 15 |
2 files changed, 16 insertions(+), 25 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-servers/h2o/h2o-2.2.6-r1.ebuild b/www-servers/h2o/h2o-2.2.6-r1.ebuild |
| 18 |
index a1e7854aebf..2fdec9f496f 100644 |
| 19 |
--- a/www-servers/h2o/h2o-2.2.6-r1.ebuild |
| 20 |
+++ b/www-servers/h2o/h2o-2.2.6-r1.ebuild |
| 21 |
@@ -1,8 +1,7 @@ |
| 22 |
# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=7 |
| 26 |
- |
| 27 |
+EAPI="8" |
| 28 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 29 |
SSL_DEPS_SKIP=1 |
| 30 |
USE_RUBY="ruby26 ruby27" |
| 31 |
@@ -18,28 +17,26 @@ SLOT="0" |
| 32 |
KEYWORDS="amd64 x86" |
| 33 |
IUSE="libh2o +mruby" |
| 34 |
|
| 35 |
-RDEPEND=" |
| 36 |
- acct-group/h2o |
| 37 |
+RDEPEND="acct-group/h2o |
| 38 |
acct-user/h2o |
| 39 |
dev-lang/perl |
| 40 |
+ !sci-libs/libh2o |
| 41 |
sys-libs/zlib |
| 42 |
libh2o? ( dev-libs/libuv ) |
| 43 |
- dev-libs/openssl:0= |
| 44 |
-" |
| 45 |
-DEPEND=" |
| 46 |
- ${RDEPEND} |
| 47 |
- libh2o? ( virtual/pkgconfig ) |
| 48 |
+ dev-libs/openssl:0=" |
| 49 |
+DEPEND="${RDEPEND} |
| 50 |
mruby? ( |
| 51 |
${RUBY_DEPS} |
| 52 |
|| ( |
| 53 |
dev-libs/onigmo |
| 54 |
dev-libs/oniguruma |
| 55 |
) |
| 56 |
+ )" |
| 57 |
+BDEPEND="libh2o? ( virtual/pkgconfig ) |
| 58 |
+ mruby? ( |
| 59 |
sys-devel/bison |
| 60 |
virtual/pkgconfig |
| 61 |
- ) |
| 62 |
-" |
| 63 |
-RDEPEND+="!sci-libs/libh2o" |
| 64 |
+ )" |
| 65 |
|
| 66 |
PATCHES=( "${FILESDIR}"/${PN}-2.2-mruby.patch ) |
| 67 |
|
| 68 |
|
| 69 |
diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild |
| 70 |
index 9ea1b75fb86..cd6fd817fc3 100644 |
| 71 |
--- a/www-servers/h2o/h2o-9999.ebuild |
| 72 |
+++ b/www-servers/h2o/h2o-9999.ebuild |
| 73 |
@@ -1,35 +1,30 @@ |
| 74 |
# Copyright 1999-2021 Gentoo Authors |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
-EAPI=7 |
| 78 |
- |
| 79 |
+EAPI="8" |
| 80 |
CMAKE_MAKEFILE_GENERATOR="emake" |
| 81 |
SSL_DEPS_SKIP=1 |
| 82 |
USE_RUBY="ruby26 ruby27" |
| 83 |
|
| 84 |
inherit cmake git-r3 ruby-single ssl-cert systemd toolchain-funcs |
| 85 |
|
| 86 |
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
| 87 |
- |
| 88 |
DESCRIPTION="H2O - the optimized HTTP/1, HTTP/2 server" |
| 89 |
HOMEPAGE="https://h2o.examp1e.net/" |
| 90 |
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" |
| 91 |
|
| 92 |
LICENSE="MIT" |
| 93 |
SLOT="0" |
| 94 |
KEYWORDS="" |
| 95 |
IUSE="libh2o +mruby" |
| 96 |
|
| 97 |
-RDEPEND=" |
| 98 |
- acct-group/h2o |
| 99 |
+RDEPEND="acct-group/h2o |
| 100 |
acct-user/h2o |
| 101 |
dev-lang/perl |
| 102 |
+ !sci-libs/libh2o |
| 103 |
sys-libs/zlib |
| 104 |
libh2o? ( dev-libs/libuv ) |
| 105 |
- dev-libs/openssl:0= |
| 106 |
-" |
| 107 |
-DEPEND=" |
| 108 |
- ${RDEPEND} |
| 109 |
- libh2o? ( virtual/pkgconfig ) |
| 110 |
+ dev-libs/openssl:0=" |
| 111 |
+DEPEND="${RDEPEND} |
| 112 |
mruby? ( |
| 113 |
${RUBY_DEPS} |
| 114 |
|| ( |
| 115 |
@@ -37,10 +32,9 @@ DEPEND=" |
| 116 |
dev-libs/oniguruma |
| 117 |
) |
| 118 |
sys-devel/bison |
| 119 |
- virtual/pkgconfig |
| 120 |
) |
| 121 |
" |
| 122 |
-RDEPEND+="!sci-libs/libh2o" |
| 123 |
+BDEPEND="virtual/pkgconfig" |
| 124 |
|
| 125 |
PATCHES=( "${FILESDIR}"/${PN}-2.3-mruby.patch ) |
Archives