commit: fb693d546eed37211f64b428a7244912d26d7c63 Author: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com> AuthorDate: Fri Aug 26 10:11:43 2022 +0000 Commit: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com> CommitDate: Fri Aug 26 10:14:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb693d54
www-servers/hinsightd: add 0.9.15_p20220826, drop old Closes: https://bugs.gentoo.org/866458 Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com> www-servers/hinsightd/Manifest | 2 +- .../hinsightd/files/hinsightd-defines-v4.patch | 18 ------------ ...17.ebuild => hinsightd-0.9.15_p20220826.ebuild} | 33 ++++++++++++++-------- www-servers/hinsightd/hinsightd-9999.ebuild | 2 +- 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index ee98956b4..9d5f3af9b 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1,2 +1,2 @@ DIST hin9-0c584cbe00c2227d4cb29675e8e2da2c6bd57371.tar.gz 116295 BLAKE2B 69c6a9593fa721e113172696523beb39c63385e8fe319687b2e12c9eb8ff91bb63e45e3c33429026e45522d535c6acb305af1dcc8f120d552dab5fcda3d7734c SHA512 9d66c58545b64c66365c74935be8e3988022b1f3902af5bec7996df86f37bf2fdd54fb913826a0bcf5f9f4ba07e30abc5e6573cf8b4c2f11ec67c1917ed7f000 -DIST hin9-af60390e3ade1e617ef76c5ab778934acd76a16e.tar.gz 115019 BLAKE2B a8f15d07dfa7adea3665cc4f8189bb9dc4afa9e9ebd457f78fd0975dad65b4741c1e14b9f701b9bfedafc8d138c96022895b17b9628a8569d60818f46ca791fd SHA512 fb125099500b049e5f371ae1d84b2e07f77b28358d5ad7ff8a655baa86bc77a940a9d9321fbbcd6b1d7ac54e14aa214aeb792ade24cb7140fdb494799686efa8 +DIST hin9-60ff105ba76746ac8f669616ed3658f7c03c3ab3.tar.gz 116619 BLAKE2B 9e7777c584cc31c853f210e3c4b9306e675fb2501c99239b86fc8b5d925532fba8402b40b9ff43eebafec70457f67f11174e36a7c49aa59483606e19ebdf936e SHA512 e4e6e62b618e0fa845d94a723b4723e230fa03415ad4831bddc0a99f8c262fdca495a8ea6bdb7019e3a97bcf03554fae6f09a2a673e2f3db3e535c5fdc490f4e diff --git a/www-servers/hinsightd/files/hinsightd-defines-v4.patch b/www-servers/hinsightd/files/hinsightd-defines-v4.patch deleted file mode 100644 index bd0a2b563..000000000 --- a/www-servers/hinsightd/files/hinsightd-defines-v4.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/hin/conf.h b/src/hin/conf.h -index 9edb801..1deefd5 100644 ---- a/src/hin/conf.h -+++ b/src/hin/conf.h -@@ -2,10 +2,10 @@ - #ifndef HIN_CONF_H - #define HIN_CONF_H - --#define HIN_CONF_PATH "workdir/main.lua" --#define HIN_LOGDIR_PATH "workdir/logs/" -+#define HIN_CONF_PATH "/etc/hinsightd/main.lua" -+#define HIN_LOGDIR_PATH "/var/log/hinsightd/" - #define HIN_WORKDIR_PATH "./" --#define HIN_TEMP_PATH "/tmp/" -+#define HIN_TEMP_PATH "/var/tmp/hinsightd/" - #define HIN_DEBUG_MASK 0x20007 - - #define HIN_URING_QUEUE_DEPTH 256 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild similarity index 77% rename from www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild rename to www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild index 427d8a07b..e4732875c 100644 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220817.ebuild +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild @@ -5,14 +5,14 @@ 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="af60390e3ade1e617ef76c5ab778934acd76a16e" +mycommit="60ff105ba76746ac8f669616ed3658f7c03c3ab3" if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -33,7 +33,7 @@ IUSE="+ssl cgi +fcgi +rproxy +ffcall" REQUIRED_USE="${LUA_REQUIRED_USE}" BDEPEND=" - dev-util/cmake + dev-util/meson virtual/pkgconfig " @@ -54,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 9b9d8695b..60ce5a5ee 100644 --- a/www-servers/hinsightd/hinsightd-9999.ebuild +++ b/www-servers/hinsightd/hinsightd-9999.ebuild @@ -60,7 +60,7 @@ pkg_setup() { src_configure() { version=$(ver_cut 1-2 $(lua_get_version)) if [ "$version" == "2.1" ]; then - version="jit" + version="jit" fi local emesonargs=( $(meson_use ssl openssl)
