Gentoo Archives: gentoo-commits

From: Alexandru Campeanu <tiotags1@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-servers/hinsightd/
Date: Sat, 27 Aug 2022 23:11:40
Message-Id: 1661583344.a714e34286de0c8cae9cf4445f4403a5b791d56f.tiotags1@gentoo
1 commit: a714e34286de0c8cae9cf4445f4403a5b791d56f
2 Author: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 27 06:50:47 2022 +0000
4 Commit: Alexandru Campeanu <tiotags1 <AT> gmail <DOT> com>
5 CommitDate: Sat Aug 27 06:55:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a714e342
7
8 www-servers/hinsightd: fixed qa issues
9
10 Signed-off-by: Alexandru Campeanu <tiotags1 <AT> gmail.com>
11
12 .../hinsightd/hinsightd-0.9.15_p20220826.ebuild | 18 +++++++++---------
13 www-servers/hinsightd/hinsightd-9999.ebuild | 18 +++++++++---------
14 2 files changed, 18 insertions(+), 18 deletions(-)
15
16 diff --git a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
17 index e4732875c..4417c15a7 100644
18 --- a/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
19 +++ b/www-servers/hinsightd/hinsightd-0.9.15_p20220826.ebuild
20 @@ -17,7 +17,7 @@ mycommit="60ff105ba76746ac8f669616ed3658f7c03c3ab3"
21 if [[ ${PV} == *9999* ]]; then
22 inherit git-r3
23 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
24 -elif [[ ! -z "$mycommit" ]]; then
25 +elif [[ ! -z "${mycommit}" ]]; then
26 SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
27 S="${WORKDIR}/hin9-${mycommit}"
28 else
29 @@ -55,13 +55,13 @@ FILECAPS=(
30 )
31
32 pkg_setup() {
33 - linux-info_pkg_setup;
34 + linux-info_pkg_setup
35 lua-single_pkg_setup
36 }
37
38 src_configure() {
39 version=$(ver_cut 1-2 $(lua_get_version))
40 - if [ "$version" == "2.1" ]; then
41 + if [[ "${version}" == "2.1" ]]; then
42 version="jit"
43 fi
44 local emesonargs=(
45 @@ -70,7 +70,7 @@ src_configure() {
46 $(meson_use fcgi)
47 $(meson_use rproxy)
48 $(meson_use ffcall)
49 - -Dforce-lua-version=$version
50 + -Dforce-lua-version=${version}
51 )
52 meson_src_configure
53 }
54 @@ -78,19 +78,19 @@ src_configure() {
55 src_install() {
56 meson_src_install
57
58 - newinitd "${S}/external/packaging/$PN.initd.sh" $PN
59 - newconfd "${S}/external/packaging/$PN.confd.sh" $PN
60 - systemd_dounit "${FILESDIR}/$PN.service" # not tested
61 + newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN}
62 + newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN}
63 + systemd_dounit "${FILESDIR}/${PN}.service" # not tested
64
65 # config
66 - insinto /etc/$PN
67 + insinto /etc/${PN}
68 doins "${S}/workdir/main.lua"
69 doins "${S}/workdir/lib.lua"
70 doins -r "${S}/workdir/config/"
71
72 # logrotate
73 insinto /etc/logrotate.d
74 - newins "${S}/external/packaging/$PN.logrotate.sh" $PN
75 + newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN}
76 }
77
78 pkg_postinst() {
79
80 diff --git a/www-servers/hinsightd/hinsightd-9999.ebuild b/www-servers/hinsightd/hinsightd-9999.ebuild
81 index 60ce5a5ee..2f6e9c8e9 100644
82 --- a/www-servers/hinsightd/hinsightd-9999.ebuild
83 +++ b/www-servers/hinsightd/hinsightd-9999.ebuild
84 @@ -15,7 +15,7 @@ SLOT="0"
85 if [[ ${PV} == *9999* ]]; then
86 inherit git-r3
87 EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
88 -elif [[ ! -z "$mycommit" ]]; then
89 +elif [[ ! -z "${mycommit}" ]]; then
90 SRC_URI="https://gitlab.com/tiotags/hin9/-/archive/${mycommit}/hin9-${mycommit}.tar.gz"
91 S="${WORKDIR}/hin9-${mycommit}"
92 else
93 @@ -53,13 +53,13 @@ FILECAPS=(
94 )
95
96 pkg_setup() {
97 - linux-info_pkg_setup;
98 + linux-info_pkg_setup
99 lua-single_pkg_setup
100 }
101
102 src_configure() {
103 version=$(ver_cut 1-2 $(lua_get_version))
104 - if [ "$version" == "2.1" ]; then
105 + if [[ "${version}" == "2.1" ]]; then
106 version="jit"
107 fi
108 local emesonargs=(
109 @@ -68,7 +68,7 @@ src_configure() {
110 $(meson_use fcgi)
111 $(meson_use rproxy)
112 $(meson_use ffcall)
113 - -Dforce-lua-version=$version
114 + -Dforce-lua-version=${version}
115 )
116 meson_src_configure
117 }
118 @@ -76,19 +76,19 @@ src_configure() {
119 src_install() {
120 meson_src_install
121
122 - newinitd "${S}/external/packaging/$PN.initd.sh" $PN
123 - newconfd "${S}/external/packaging/$PN.confd.sh" $PN
124 - systemd_dounit "${FILESDIR}/$PN.service" # not tested
125 + newinitd "${S}/external/packaging/${PN}.initd.sh" ${PN}
126 + newconfd "${S}/external/packaging/${PN}.confd.sh" ${PN}
127 + systemd_dounit "${FILESDIR}/${PN}.service" # not tested
128
129 # config
130 - insinto /etc/$PN
131 + insinto /etc/${PN}
132 doins "${S}/workdir/main.lua"
133 doins "${S}/workdir/lib.lua"
134 doins -r "${S}/workdir/config/"
135
136 # logrotate
137 insinto /etc/logrotate.d
138 - newins "${S}/external/packaging/$PN.logrotate.sh" $PN
139 + newins "${S}/external/packaging/${PN}.logrotate.sh" ${PN}
140 }
141
142 pkg_postinst() {