Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/h2o/
Date: Wed, 04 Jul 2018 13:24:11
Message-Id: 1530710626.5118d7463975feaa6c2962c31655684444123e99.hattya@gentoo
1 commit: 5118d7463975feaa6c2962c31655684444123e99
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 4 13:10:34 2018 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 4 13:23:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5118d746
7
8 www-servers/h2o: specify ruby version
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 www-servers/h2o/h2o-2.2.4.ebuild | 19 +++++++++++++++++++
13 www-servers/h2o/h2o-9999.ebuild | 19 +++++++++++++++++++
14 2 files changed, 38 insertions(+)
15
16 diff --git a/www-servers/h2o/h2o-2.2.4.ebuild b/www-servers/h2o/h2o-2.2.4.ebuild
17 index 579c8e92940..449ca5e6711 100644
18 --- a/www-servers/h2o/h2o-2.2.4.ebuild
19 +++ b/www-servers/h2o/h2o-2.2.4.ebuild
20 @@ -33,6 +33,25 @@ pkg_setup() {
21 enewuser ${PN} -1 -1 -1 ${PN}
22 }
23
24 +src_prepare() {
25 + cmake-utils_src_prepare
26 +
27 + local ruby="ruby"
28 + if use mruby; then
29 + for ruby in ${RUBY_TARGETS_PREFERENCE}; do
30 + if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
31 + break
32 + fi
33 + ruby=
34 + done
35 + [[ -z ${ruby} ]] && die "no suitable ruby version found"
36 + fi
37 +
38 + sed -i \
39 + -e "s: ruby: ${ruby}:" \
40 + CMakeLists.txt
41 +}
42 +
43 src_configure() {
44 local mycmakeargs=(
45 -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}
46
47 diff --git a/www-servers/h2o/h2o-9999.ebuild b/www-servers/h2o/h2o-9999.ebuild
48 index d6c5d65d823..0d21e4e8bee 100644
49 --- a/www-servers/h2o/h2o-9999.ebuild
50 +++ b/www-servers/h2o/h2o-9999.ebuild
51 @@ -31,6 +31,25 @@ pkg_setup() {
52 enewuser ${PN} -1 -1 -1 ${PN}
53 }
54
55 +src_prepare() {
56 + cmake-utils_src_prepare
57 +
58 + local ruby="ruby"
59 + if use mruby; then
60 + for ruby in ${RUBY_TARGETS_PREFERENCE}; do
61 + if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
62 + break
63 + fi
64 + ruby=
65 + done
66 + [[ -z ${ruby} ]] && die "no suitable ruby version found"
67 + fi
68 +
69 + sed -i \
70 + -e "s: ruby: ${ruby}:" \
71 + CMakeLists.txt
72 +}
73 +
74 src_configure() {
75 local mycmakeargs=(
76 -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc/${PN}