From: "Alexandru Campeanu" <tiotags1@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
Date: Mon, 22 Aug 2022 17:25:25 +0000 (UTC) [thread overview]
Message-ID: <1661188844.77ee3b850d6821231da9f44003346033ebd5b94a.tiotags1@gentoo> (raw)
commit: 77ee3b850d6821231da9f44003346033ebd5b94a
Author: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 22 17:20:44 2022 +0000
Commit: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
CommitDate: Mon Aug 22 17:20:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=77ee3b85
www-servers/hinsightd: added 0.9.15_p20220822
switched to meson
Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
www-servers/hinsightd/Manifest | 1 +
...99.ebuild => hinsightd-0.9.15_p20220822.ebuild} | 33 +++++++++++++++-------
www-servers/hinsightd/hinsightd-9999.ebuild | 31 +++++++++++++-------
3 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest
index ff67c26cb..ee98956b4 100644
--- a/www-servers/hinsightd/Manifest
+++ b/www-servers/hinsightd/Manifest
@@ -1 +1,2 @@
+DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000
DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
similarity index 77%
copy from www-servers/hinsightd/hinsightd-9999.ebuild
copy to www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
index 0a2fda199..d5510534f 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220822.ebuild
@@ -5,13 +5,15 @@ EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
-inherit fcaps lua-single systemd cmake linux-info
+inherit fcaps lua-single systemd meson linux-info
DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
HOMEPAGE="https://tiotags.gitlab.io/hinsightd"
LICENSE="BSD"
SLOT="0"
+mycommit="0c584cbe00c2227d4cb29675e8e2da2c6bd57371"
+
if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
@@ -31,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall"
REQUIRED_USE="${LUA_REQUIRED_USE}"
BDEPEND="
- dev-util/cmake
+ dev-util/meson
virtual/pkgconfig
"
@@ -52,19 +54,30 @@ FILECAPS=(
cap_net_bind_service usr/sbin/${PN}
)
+pkg_setup() {
+ linux-info_pkg_setup;
+ lua-single_pkg_setup
+}
+
src_configure() {
- local mycmakeargs=(
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_CGI=$(usex cgi)
- -DUSE_FCGI=$(usex fcgi)
- -DUSE_RPROXY=$(usex rproxy)
- -DUSE_FFCALL=$(usex ffcall)
+ version=$(ver_cut 1-2 $(lua_get_version))
+ if [ "$version" == "2.1" ]; then
+ version="jit"
+ fi
+ local emesonargs=(
+ $(meson_use ssl openssl)
+ $(meson_use cgi)
+ $(meson_use fcgi)
+ $(meson_use rproxy)
+ $(meson_use ffcall)
+ -Dforce-lua-version=$version
)
- cmake_src_configure
+ meson_src_configure
}
src_install() {
- cmake_src_install
+ meson_src_install
+
newinitd "${S}/external/packaging/$PN.initd.sh" $PN
newconfd "${S}/external/packaging/$PN.confd.sh" $PN
systemd_dounit "${FILESDIR}/$PN.service" # not tested
diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
index 0a2fda199..bb4f22005 100644
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
-inherit fcaps lua-single systemd cmake linux-info
+inherit fcaps lua-single systemd meson linux-info
DESCRIPTION="hinsightd a http/1.1 webserver with (hopefully) minimal goals"
HOMEPAGE="https://tiotags.gitlab.io/hinsightd"
@@ -31,7 +31,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall"
REQUIRED_USE="${LUA_REQUIRED_USE}"
BDEPEND="
- dev-util/cmake
+ dev-util/meson
virtual/pkgconfig
"
@@ -52,19 +52,30 @@ FILECAPS=(
cap_net_bind_service usr/sbin/${PN}
)
+pkg_setup() {
+ linux-info_pkg_setup;
+ lua-single_pkg_setup
+}
+
src_configure() {
- local mycmakeargs=(
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_CGI=$(usex cgi)
- -DUSE_FCGI=$(usex fcgi)
- -DUSE_RPROXY=$(usex rproxy)
- -DUSE_FFCALL=$(usex ffcall)
+ version=$(ver_cut 1-2 $(lua_get_version))
+ if [ "$version" == "2.1" ]; then
+ version="jit"
+ fi
+ local emesonargs=(
+ $(meson_use ssl openssl)
+ $(meson_use cgi)
+ $(meson_use fcgi)
+ $(meson_use rproxy)
+ $(meson_use ffcall)
+ -Dforce-lua-version=$version
)
- cmake_src_configure
+ meson_src_configure
}
src_install() {
- cmake_src_install
+ meson_src_install
+
newinitd "${S}/external/packaging/$PN.initd.sh" $PN
newconfd "${S}/external/packaging/$PN.confd.sh" $PN
systemd_dounit "${FILESDIR}/$PN.service" # not tested
next reply other threads:[~2022-08-22 17:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-22 17:25 Alexandru Campeanu [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-18 16:05 [gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/ Alexandru Campeanu
2022-11-01 14:50 Alexandru Campeanu
2022-08-28 9:28 Alexandru Campeanu
2022-08-27 6:57 Alexandru Campeanu
2022-08-24 18:52 Alexandru Campeanu
2022-08-17 8:04 Alexandru Campeanu
2022-08-04 9:52 Alexandru Campeanu
2022-07-27 16:15 Alexandru Campeanu
2022-04-26 10:06 Alexandru Campeanu
2022-04-20 19:02 Alexandru Campeanu
2021-12-16 19:32 Alexandru Campeanu
2021-09-20 16:47 Alexandru Campeanu
2021-09-20 9:41 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-09-20 9:41 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-09-10 10:09 Alexandru Campeanu
2021-08-31 9:05 Alexandru Campeanu
2021-08-30 8:22 Alexandru Campeanu
2021-08-17 10:14 Alexandru Campeanu
2021-08-11 19:18 Alexandru Campeanu
2021-07-28 11:06 Alexandru Campeanu
2021-04-29 19:05 Alexandru Campeanu
2021-04-29 7:28 Alexandru Campeanu
2021-04-23 12:25 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-04-23 12:16 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-04-23 7:23 Alexandru Campeanu
2021-04-22 18:07 Alexandru Campeanu
2021-04-22 7:35 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-04-22 7:16 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-04-21 18:55 Alexandru Campeanu
2021-04-21 9:21 Alexandru Campeanu
2021-04-21 9:21 Alexandru Campeanu
2021-04-18 7:07 Alexandru Campeanu
2021-04-17 21:10 Alexandru Campeanu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1661188844.77ee3b850d6821231da9f44003346033ebd5b94a.tiotags1@gentoo \
--to=tiotags1@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox