Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: www-servers/hinsightd/
Date: Wed, 24 Aug 2022 15:52:32
Message-Id: 1661188844.77ee3b850d6821231da9f44003346033ebd5b94a.tastytea@gentoo
1 commit: 77ee3b850d6821231da9f44003346033ebd5b94a
2 Author: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
3 AuthorDate: Mon Aug 22 17:20:44 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Mon Aug 22 17:20:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77ee3b85
7
8 www-servers/hinsightd: added 0.9.15_p20220822
9
10 switched to meson
11
12 Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
13
14 www-servers/hinsightd/Manifest | 1 +
15 ...99.ebuild => hinsightd-0.9.15_p20220822.ebuild} | 33 +++++++++++++++-------
16 www-servers/hinsightd/hinsightd-9999.ebuild | 31 +++++++++++++-------
17 3 files changed, 45 insertions(+), 20 deletions(-)
18
19 diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
20 index ff67c26cb..ee98956b4 100644
21 --- a/www-servers/hinsightd/Manifest
22 +++ b/www-servers/hinsightd/Manifest
23 @@ -1 +1,2 @@
24 +DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000
25 DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8
26
27 diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
28 similarity index 77%
29 copy from www-servers/hinsightd/hinsightd-9999.ebuild
30 copy to www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
31 index 0a2fda199..d5510534f 100644
32 --- a/www-servers/hinsightd/hinsightd-9999.ebuild
33 +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
34 @@ -5,13 +5,15 @@ EAPI=8
35
36 LUA_COMPAT=( lua5-{1..4} luajit )
37
38 -inherit fcaps lua-single systemd cmake linux-info
39 +inherit fcaps lua-single systemd meson linux-info
40
41 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
42 HOMEPAGE="https://tiotags.gitlab.io/hinsightd"
43 LICENSE="BSD"
44 SLOT="0"
45
46 +mycommit="0c584cbe00c2227d4cb29675e8e2da2c6bd57371"
47 +
48 if [[ ${PV} == *9999* ]]; then
49 inherit git-r3
50 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
51 @@ -31,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall"
52 REQUIRED_USE="${LUA_REQUIRED_USE}"
53
54 BDEPEND="
55 - dev-util/cmake
56 + dev-util/meson
57 virtual/pkgconfig
58 "
59
60 @@ -52,19 +54,30 @@ FILECAPS=(
61 cap_net_bind_service usr/sbin/${PN}
62 )
63
64 +pkg_setup() {
65 + linux-info_pkg_setup;
66 + lua-single_pkg_setup
67 +}
68 +
69 src_configure() {
70 - local mycmakeargs=(
71 - -DUSE_OPENSSL=$(usex ssl)
72 - -DUSE_CGI=$(usex cgi)
73 - -DUSE_FCGI=$(usex fcgi)
74 - -DUSE_RPROXY=$(usex rproxy)
75 - -DUSE_FFCALL=$(usex ffcall)
76 + version=$(ver_cut 1-2 $(lua_get_version))
77 + if [ "$version" == "2.1" ]; then
78 + version="jit"
79 + fi
80 + local emesonargs=(
81 + $(meson_use ssl openssl)
82 + $(meson_use cgi)
83 + $(meson_use fcgi)
84 + $(meson_use rproxy)
85 + $(meson_use ffcall)
86 + -Dforce-lua-version=$version
87 )
88 - cmake_src_configure
89 + meson_src_configure
90 }
91
92 src_install() {
93 - cmake_src_install
94 + meson_src_install
95 +
96 newinitd "${S}/external/packaging/$PN.initd.sh" $PN
97 newconfd "${S}/external/packaging/$PN.confd.sh" $PN
98 systemd_dounit "${FILESDIR}/$PN.service" # not tested
99
100 diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
101 index 0a2fda199..bb4f22005 100644
102 --- a/www-servers/hinsightd/hinsightd-9999.ebuild
103 +++ b/www-servers/hinsightd/hinsightd-9999.ebuild
104 @@ -5,7 +5,7 @@ EAPI=8
105
106 LUA_COMPAT=( lua5-{1..4} luajit )
107
108 -inherit fcaps lua-single systemd cmake linux-info
109 +inherit fcaps lua-single systemd meson linux-info
110
111 DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
112 HOMEPAGE="https://tiotags.gitlab.io/hinsightd"
113 @@ -31,7 +31,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall"
114 REQUIRED_USE="${LUA_REQUIRED_USE}"
115
116 BDEPEND="
117 - dev-util/cmake
118 + dev-util/meson
119 virtual/pkgconfig
120 "
121
122 @@ -52,19 +52,30 @@ FILECAPS=(
123 cap_net_bind_service usr/sbin/${PN}
124 )
125
126 +pkg_setup() {
127 + linux-info_pkg_setup;
128 + lua-single_pkg_setup
129 +}
130 +
131 src_configure() {
132 - local mycmakeargs=(
133 - -DUSE_OPENSSL=$(usex ssl)
134 - -DUSE_CGI=$(usex cgi)
135 - -DUSE_FCGI=$(usex fcgi)
136 - -DUSE_RPROXY=$(usex rproxy)
137 - -DUSE_FFCALL=$(usex ffcall)
138 + version=$(ver_cut 1-2 $(lua_get_version))
139 + if [ "$version" == "2.1" ]; then
140 + version="jit"
141 + fi
142 + local emesonargs=(
143 + $(meson_use ssl openssl)
144 + $(meson_use cgi)
145 + $(meson_use fcgi)
146 + $(meson_use rproxy)
147 + $(meson_use ffcall)
148 + -Dforce-lua-version=$version
149 )
150 - cmake_src_configure
151 + meson_src_configure
152 }
153
154 src_install() {
155 - cmake_src_install
156 + meson_src_install
157 +
158 newinitd "${S}/external/packaging/$PN.initd.sh" $PN
159 newconfd "${S}/external/packaging/$PN.confd.sh" $PN
160 systemd_dounit "${FILESDIR}/$PN.service" # not tested
Report Message
Find on MARC Find on Google Groups