1 |
commit: 7bb8b3c5bb63a41a917661b12dd291260ceb397f |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 18 04:21:36 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 04:23:35 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb8b3c5 |
7 |
|
8 |
net-analyzer/icinga2: 2.8.1 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-analyzer/icinga2/Manifest | 4 - |
13 |
.../files/fix-missing-include-2.7.1-2.patch | 24 --- |
14 |
.../icinga2/files/fix-missing-include-2.7.1.patch | 22 --- |
15 |
net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild | 177 -------------------- |
16 |
net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild | 182 --------------------- |
17 |
net-analyzer/icinga2/icinga2-2.7.2.ebuild | 182 --------------------- |
18 |
net-analyzer/icinga2/icinga2-2.8.0.ebuild | 179 -------------------- |
19 |
net-analyzer/icinga2/icinga2-2.8.1.ebuild | 2 +- |
20 |
8 files changed, 1 insertion(+), 771 deletions(-) |
21 |
|
22 |
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest |
23 |
index f9713a68300..b71de2bd5a1 100644 |
24 |
--- a/net-analyzer/icinga2/Manifest |
25 |
+++ b/net-analyzer/icinga2/Manifest |
26 |
@@ -1,5 +1 @@ |
27 |
-DIST icinga2-2.7.0.tar.gz 2435398 BLAKE2B 06a717f818a7c51972d2d095ea1c588ff8d49473aaa765795d1c48ed4ffc12b2c5d560a03a2be3fe45d8d80de8df2b53edcf75d895e0f31cd4723c4883907b47 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb |
28 |
-DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd |
29 |
-DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d |
30 |
-DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6 |
31 |
DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762 |
32 |
|
33 |
diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch b/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch |
34 |
deleted file mode 100644 |
35 |
index 21779d140a4..00000000000 |
36 |
--- a/net-analyzer/icinga2/files/fix-missing-include-2.7.1-2.patch |
37 |
+++ /dev/null |
38 |
@@ -1,24 +0,0 @@ |
39 |
-From 2d036e6886fb68707e861a6e5f75a6088d149832 Mon Sep 17 00:00:00 2001 |
40 |
-From: Michael <mcktr55@×××××.com> |
41 |
-Date: Tue, 26 Sep 2017 22:01:07 +0200 |
42 |
-Subject: [PATCH] Fixed missing include statement in unit test |
43 |
- |
44 |
-This adds the missing iostream include to the notification unit test. |
45 |
- |
46 |
-refs #5613 |
47 |
---- |
48 |
- test/icinga-notification.cpp | 1 + |
49 |
- 1 file changed, 1 insertion(+) |
50 |
- |
51 |
-diff --git a/test/icinga-notification.cpp b/test/icinga-notification.cpp |
52 |
-index 8db93fa50..97f7838a1 100644 |
53 |
---- a/test/icinga-notification.cpp |
54 |
-+++ b/test/icinga-notification.cpp |
55 |
-@@ -19,6 +19,7 @@ |
56 |
- |
57 |
- #include "icinga/notification.hpp" |
58 |
- #include <BoostTestTargetConfig.h> |
59 |
-+#include <iostream> |
60 |
- |
61 |
- using namespace icinga; |
62 |
- |
63 |
|
64 |
diff --git a/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch b/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch |
65 |
deleted file mode 100644 |
66 |
index d170db478db..00000000000 |
67 |
--- a/net-analyzer/icinga2/files/fix-missing-include-2.7.1.patch |
68 |
+++ /dev/null |
69 |
@@ -1,22 +0,0 @@ |
70 |
-From 631d1e85fc2575a26c700a15f309fccd9fb9ee4d Mon Sep 17 00:00:00 2001 |
71 |
-From: Michael <mcktr55@×××××.com> |
72 |
-Date: Mon, 25 Sep 2017 01:07:50 +0200 |
73 |
-Subject: [PATCH] Fixed missing include statement in unit tests |
74 |
- |
75 |
-refs #5613 |
76 |
---- |
77 |
- test/icinga-checkresult.cpp | 1 + |
78 |
- 1 file changed, 1 insertion(+) |
79 |
- |
80 |
-diff --git a/test/icinga-checkresult.cpp b/test/icinga-checkresult.cpp |
81 |
-index 7f14dd365..a128e9519 100644 |
82 |
---- a/test/icinga-checkresult.cpp |
83 |
-+++ b/test/icinga-checkresult.cpp |
84 |
-@@ -19,6 +19,7 @@ |
85 |
- |
86 |
- #include "icinga/host.hpp" |
87 |
- #include <BoostTestTargetConfig.h> |
88 |
-+#include <iostream> |
89 |
- |
90 |
- using namespace icinga; |
91 |
- |
92 |
|
93 |
diff --git a/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild b/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild |
94 |
deleted file mode 100644 |
95 |
index 8e9f5f4f36c..00000000000 |
96 |
--- a/net-analyzer/icinga2/icinga2-2.7.0-r1.ebuild |
97 |
+++ /dev/null |
98 |
@@ -1,177 +0,0 @@ |
99 |
-# Copyright 1999-2017 Gentoo Foundation |
100 |
-# Distributed under the terms of the GNU General Public License v2 |
101 |
- |
102 |
-EAPI=6 |
103 |
-if [[ ${PV} != 9999 ]]; then |
104 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
105 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
106 |
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
107 |
-else |
108 |
- inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets |
109 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
110 |
- EGIT_BRANCH="master" |
111 |
- KEYWORDS="~ppc ~ppc64" |
112 |
-fi |
113 |
- |
114 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
115 |
-HOMEPAGE="http://icinga.org/icinga2" |
116 |
- |
117 |
-LICENSE="GPL-2" |
118 |
-SLOT="0" |
119 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
120 |
-WX_GTK_VER="3.0" |
121 |
- |
122 |
-CDEPEND=" |
123 |
- !libressl? ( dev-libs/openssl:0= ) |
124 |
- libressl? ( dev-libs/libressl:0= ) |
125 |
- >=dev-libs/boost-1.58-r1 |
126 |
- console? ( dev-libs/libedit ) |
127 |
- mysql? ( virtual/mysql ) |
128 |
- postgres? ( dev-db/postgresql:= )" |
129 |
- |
130 |
-DEPEND=" |
131 |
- ${CDEPEND} |
132 |
- sys-devel/bison |
133 |
- >=sys-devel/flex-2.5.35" |
134 |
- |
135 |
-RDEPEND=" |
136 |
- ${CDEPEND} |
137 |
- plugins? ( || ( |
138 |
- net-analyzer/monitoring-plugins |
139 |
- net-analyzer/nagios-plugins |
140 |
- ) ) |
141 |
- mail? ( virtual/mailx ) |
142 |
- classicui? ( net-analyzer/icinga[web] ) |
143 |
- studio? ( x11-libs/wxGTK:3.0 )" |
144 |
- |
145 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
146 |
- |
147 |
-want_apache2 |
148 |
- |
149 |
-pkg_setup() { |
150 |
- depend.apache_pkg_setup |
151 |
- if use studio ; then |
152 |
- setup-wxwidgets |
153 |
- fi |
154 |
- enewgroup icinga |
155 |
- enewgroup icingacmd |
156 |
- enewgroup nagios # for plugins |
157 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
158 |
-} |
159 |
- |
160 |
-src_configure() { |
161 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
162 |
- local mycmakeargs=( |
163 |
- -DICINGA2_UNITY_BUILD=FALSE |
164 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
165 |
- -DCMAKE_BUILD_TYPE=None |
166 |
- -DCMAKE_INSTALL_PREFIX=/usr |
167 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
168 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
169 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
170 |
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" |
171 |
- -DICINGA2_USER=icinga |
172 |
- -DICINGA2_GROUP=icingacmd |
173 |
- -DICINGA2_COMMAND_USER=icinga |
174 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
175 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
176 |
- -DLOGROTATE_HAS_SU=ON |
177 |
- ) |
178 |
- # default to off if minimal, allow the flags to be set otherwise |
179 |
- if use minimal; then |
180 |
- mycmakeargs+=( |
181 |
- -DICINGA2_WITH_MYSQL=OFF |
182 |
- -DICINGA2_WITH_PGSQL=OFF |
183 |
- ) |
184 |
- else |
185 |
- mycmakeargs+=( |
186 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
187 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
188 |
- ) |
189 |
- fi |
190 |
- # LTO |
191 |
- if use lto; then |
192 |
- mycmakeargs+=( |
193 |
- -DICINGA2_LTO_BUILD=ON |
194 |
- ) |
195 |
- else |
196 |
- mycmakeargs+=( |
197 |
- -DICINGA2_LTO_BUILD=OFF |
198 |
- ) |
199 |
- fi |
200 |
- # STUDIO |
201 |
- if use studio; then |
202 |
- mycmakeargs+=( |
203 |
- -DICINGA2_WITH_STUDIO=ON |
204 |
- ) |
205 |
- else |
206 |
- mycmakeargs+=( |
207 |
- -DICINGA2_WITH_STUDIO=OFF |
208 |
- ) |
209 |
- fi |
210 |
- |
211 |
- cmake-utils_src_configure |
212 |
-} |
213 |
- |
214 |
-src_install() { |
215 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
216 |
- cd "${BUILDDIR}" || die |
217 |
- |
218 |
- emake DESTDIR="${D}" install |
219 |
- |
220 |
- einstalldocs |
221 |
- |
222 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
223 |
- |
224 |
- if use mysql ; then |
225 |
- docinto schema |
226 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
227 |
- docinto schema/upgrade |
228 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
229 |
- elif use postgres ; then |
230 |
- docinto schema |
231 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
232 |
- docinto schema/upgrade |
233 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
234 |
- fi |
235 |
- |
236 |
- keepdir /etc/icinga2 |
237 |
- keepdir /var/lib/icinga2/api/zones |
238 |
- keepdir /var/lib/icinga2/api/repository |
239 |
- keepdir /var/lib/icinga2/api/log |
240 |
- keepdir /var/spool/icinga2/perfdata |
241 |
- |
242 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
243 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
244 |
- |
245 |
- fowners root:icinga /etc/icinga2 |
246 |
- fperms 0750 /etc/icinga2 |
247 |
- fowners icinga:icinga /var/lib/icinga2 |
248 |
- fowners icinga:icinga /var/spool/icinga2 |
249 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
250 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
251 |
- fowners icinga:icingacmd /var/log/icinga2 |
252 |
- |
253 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
254 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
255 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
256 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
257 |
- |
258 |
- if use vim-syntax; then |
259 |
- insinto /usr/share/vim/vimfiles |
260 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
261 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
262 |
- fi |
263 |
- |
264 |
- if use nano-syntax; then |
265 |
- insinto /usr/share/nano |
266 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
267 |
- fi |
268 |
-} |
269 |
- |
270 |
-pkg_postinst() { |
271 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
272 |
- elog "DB IDO schema upgrade may be required required. |
273 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
274 |
- fi |
275 |
-} |
276 |
|
277 |
diff --git a/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild |
278 |
deleted file mode 100644 |
279 |
index 4bd4eebcedb..00000000000 |
280 |
--- a/net-analyzer/icinga2/icinga2-2.7.1-r1.ebuild |
281 |
+++ /dev/null |
282 |
@@ -1,182 +0,0 @@ |
283 |
-# Copyright 1999-2017 Gentoo Foundation |
284 |
-# Distributed under the terms of the GNU General Public License v2 |
285 |
- |
286 |
-EAPI=6 |
287 |
-if [[ ${PV} != 9999 ]]; then |
288 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
289 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
290 |
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
291 |
-else |
292 |
- inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets |
293 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
294 |
- EGIT_BRANCH="master" |
295 |
- KEYWORDS="~ppc ~ppc64" |
296 |
-fi |
297 |
- |
298 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
299 |
-HOMEPAGE="http://icinga.org/icinga2" |
300 |
- |
301 |
-LICENSE="GPL-2" |
302 |
-SLOT="0" |
303 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
304 |
-WX_GTK_VER="3.0" |
305 |
- |
306 |
-CDEPEND=" |
307 |
- !libressl? ( dev-libs/openssl:0= ) |
308 |
- libressl? ( dev-libs/libressl:0= ) |
309 |
- >=dev-libs/boost-1.58-r1 |
310 |
- console? ( dev-libs/libedit ) |
311 |
- mysql? ( virtual/mysql ) |
312 |
- postgres? ( dev-db/postgresql:= )" |
313 |
- |
314 |
-DEPEND=" |
315 |
- ${CDEPEND} |
316 |
- sys-devel/bison |
317 |
- >=sys-devel/flex-2.5.35" |
318 |
- |
319 |
-RDEPEND=" |
320 |
- ${CDEPEND} |
321 |
- plugins? ( || ( |
322 |
- net-analyzer/monitoring-plugins |
323 |
- net-analyzer/nagios-plugins |
324 |
- ) ) |
325 |
- mail? ( virtual/mailx ) |
326 |
- classicui? ( net-analyzer/icinga[web] ) |
327 |
- studio? ( x11-libs/wxGTK:3.0 )" |
328 |
- |
329 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
330 |
- |
331 |
-PATCHES=( |
332 |
- "${FILESDIR}/fix-missing-include-2.7.1.patch" |
333 |
- "${FILESDIR}/fix-missing-include-2.7.1-2.patch" |
334 |
-) |
335 |
- |
336 |
-want_apache2 |
337 |
- |
338 |
-pkg_setup() { |
339 |
- depend.apache_pkg_setup |
340 |
- if use studio ; then |
341 |
- setup-wxwidgets |
342 |
- fi |
343 |
- enewgroup icinga |
344 |
- enewgroup icingacmd |
345 |
- enewgroup nagios # for plugins |
346 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
347 |
-} |
348 |
- |
349 |
-src_configure() { |
350 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
351 |
- local mycmakeargs=( |
352 |
- -DICINGA2_UNITY_BUILD=FALSE |
353 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
354 |
- -DCMAKE_BUILD_TYPE=None |
355 |
- -DCMAKE_INSTALL_PREFIX=/usr |
356 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
357 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
358 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
359 |
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" |
360 |
- -DICINGA2_USER=icinga |
361 |
- -DICINGA2_GROUP=icingacmd |
362 |
- -DICINGA2_COMMAND_USER=icinga |
363 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
364 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
365 |
- -DLOGROTATE_HAS_SU=ON |
366 |
- ) |
367 |
- # default to off if minimal, allow the flags to be set otherwise |
368 |
- if use minimal; then |
369 |
- mycmakeargs+=( |
370 |
- -DICINGA2_WITH_MYSQL=OFF |
371 |
- -DICINGA2_WITH_PGSQL=OFF |
372 |
- ) |
373 |
- else |
374 |
- mycmakeargs+=( |
375 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
376 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
377 |
- ) |
378 |
- fi |
379 |
- # LTO |
380 |
- if use lto; then |
381 |
- mycmakeargs+=( |
382 |
- -DICINGA2_LTO_BUILD=ON |
383 |
- ) |
384 |
- else |
385 |
- mycmakeargs+=( |
386 |
- -DICINGA2_LTO_BUILD=OFF |
387 |
- ) |
388 |
- fi |
389 |
- # STUDIO |
390 |
- if use studio; then |
391 |
- mycmakeargs+=( |
392 |
- -DICINGA2_WITH_STUDIO=ON |
393 |
- ) |
394 |
- else |
395 |
- mycmakeargs+=( |
396 |
- -DICINGA2_WITH_STUDIO=OFF |
397 |
- ) |
398 |
- fi |
399 |
- |
400 |
- cmake-utils_src_configure |
401 |
-} |
402 |
- |
403 |
-src_install() { |
404 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
405 |
- cd "${BUILDDIR}" || die |
406 |
- |
407 |
- emake DESTDIR="${D}" install |
408 |
- |
409 |
- einstalldocs |
410 |
- |
411 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
412 |
- |
413 |
- if use mysql ; then |
414 |
- docinto schema |
415 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
416 |
- docinto schema/upgrade |
417 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
418 |
- elif use postgres ; then |
419 |
- docinto schema |
420 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
421 |
- docinto schema/upgrade |
422 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
423 |
- fi |
424 |
- |
425 |
- keepdir /etc/icinga2 |
426 |
- keepdir /var/lib/icinga2/api/zones |
427 |
- keepdir /var/lib/icinga2/api/repository |
428 |
- keepdir /var/lib/icinga2/api/log |
429 |
- keepdir /var/spool/icinga2/perfdata |
430 |
- |
431 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
432 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
433 |
- |
434 |
- fowners root:icinga /etc/icinga2 |
435 |
- fperms 0750 /etc/icinga2 |
436 |
- fowners icinga:icinga /var/lib/icinga2 |
437 |
- fowners icinga:icinga /var/spool/icinga2 |
438 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
439 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
440 |
- fowners icinga:icingacmd /var/log/icinga2 |
441 |
- |
442 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
443 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
444 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
445 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
446 |
- |
447 |
- if use vim-syntax; then |
448 |
- insinto /usr/share/vim/vimfiles |
449 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
450 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
451 |
- fi |
452 |
- |
453 |
- if use nano-syntax; then |
454 |
- insinto /usr/share/nano |
455 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
456 |
- fi |
457 |
-} |
458 |
- |
459 |
-pkg_postinst() { |
460 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
461 |
- elog "DB IDO schema upgrade may be required required. |
462 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
463 |
- fi |
464 |
-} |
465 |
|
466 |
diff --git a/net-analyzer/icinga2/icinga2-2.7.2.ebuild b/net-analyzer/icinga2/icinga2-2.7.2.ebuild |
467 |
deleted file mode 100644 |
468 |
index 2f4dc84145d..00000000000 |
469 |
--- a/net-analyzer/icinga2/icinga2-2.7.2.ebuild |
470 |
+++ /dev/null |
471 |
@@ -1,182 +0,0 @@ |
472 |
-# Copyright 1999-2017 Gentoo Foundation |
473 |
-# Distributed under the terms of the GNU General Public License v2 |
474 |
- |
475 |
-EAPI=6 |
476 |
-if [[ ${PV} != 9999 ]]; then |
477 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
478 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
479 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
480 |
-else |
481 |
- inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets |
482 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
483 |
- EGIT_BRANCH="master" |
484 |
- KEYWORDS="~ppc ~ppc64" |
485 |
-fi |
486 |
- |
487 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
488 |
-HOMEPAGE="http://icinga.org/icinga2" |
489 |
- |
490 |
-LICENSE="GPL-2" |
491 |
-SLOT="0" |
492 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
493 |
-WX_GTK_VER="3.0" |
494 |
- |
495 |
-CDEPEND=" |
496 |
- !libressl? ( dev-libs/openssl:0= ) |
497 |
- libressl? ( dev-libs/libressl:0= ) |
498 |
- >=dev-libs/boost-1.58-r1 |
499 |
- console? ( dev-libs/libedit ) |
500 |
- mysql? ( virtual/mysql ) |
501 |
- postgres? ( dev-db/postgresql:= )" |
502 |
- |
503 |
-DEPEND=" |
504 |
- ${CDEPEND} |
505 |
- sys-devel/bison |
506 |
- >=sys-devel/flex-2.5.35" |
507 |
- |
508 |
-RDEPEND=" |
509 |
- ${CDEPEND} |
510 |
- plugins? ( || ( |
511 |
- net-analyzer/monitoring-plugins |
512 |
- net-analyzer/nagios-plugins |
513 |
- ) ) |
514 |
- mail? ( virtual/mailx ) |
515 |
- classicui? ( net-analyzer/icinga[web] ) |
516 |
- studio? ( x11-libs/wxGTK:3.0 )" |
517 |
- |
518 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
519 |
- |
520 |
-PATCHES=( |
521 |
- "${FILESDIR}/fix-missing-include-2.7.1.patch" |
522 |
- "${FILESDIR}/fix-missing-include-2.7.1-2.patch" |
523 |
-) |
524 |
- |
525 |
-want_apache2 |
526 |
- |
527 |
-pkg_setup() { |
528 |
- depend.apache_pkg_setup |
529 |
- if use studio ; then |
530 |
- setup-wxwidgets |
531 |
- fi |
532 |
- enewgroup icinga |
533 |
- enewgroup icingacmd |
534 |
- enewgroup nagios # for plugins |
535 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
536 |
-} |
537 |
- |
538 |
-src_configure() { |
539 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
540 |
- local mycmakeargs=( |
541 |
- -DICINGA2_UNITY_BUILD=FALSE |
542 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
543 |
- -DCMAKE_BUILD_TYPE=None |
544 |
- -DCMAKE_INSTALL_PREFIX=/usr |
545 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
546 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
547 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
548 |
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" |
549 |
- -DICINGA2_USER=icinga |
550 |
- -DICINGA2_GROUP=icingacmd |
551 |
- -DICINGA2_COMMAND_USER=icinga |
552 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
553 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
554 |
- -DLOGROTATE_HAS_SU=ON |
555 |
- ) |
556 |
- # default to off if minimal, allow the flags to be set otherwise |
557 |
- if use minimal; then |
558 |
- mycmakeargs+=( |
559 |
- -DICINGA2_WITH_MYSQL=OFF |
560 |
- -DICINGA2_WITH_PGSQL=OFF |
561 |
- ) |
562 |
- else |
563 |
- mycmakeargs+=( |
564 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
565 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
566 |
- ) |
567 |
- fi |
568 |
- # LTO |
569 |
- if use lto; then |
570 |
- mycmakeargs+=( |
571 |
- -DICINGA2_LTO_BUILD=ON |
572 |
- ) |
573 |
- else |
574 |
- mycmakeargs+=( |
575 |
- -DICINGA2_LTO_BUILD=OFF |
576 |
- ) |
577 |
- fi |
578 |
- # STUDIO |
579 |
- if use studio; then |
580 |
- mycmakeargs+=( |
581 |
- -DICINGA2_WITH_STUDIO=ON |
582 |
- ) |
583 |
- else |
584 |
- mycmakeargs+=( |
585 |
- -DICINGA2_WITH_STUDIO=OFF |
586 |
- ) |
587 |
- fi |
588 |
- |
589 |
- cmake-utils_src_configure |
590 |
-} |
591 |
- |
592 |
-src_install() { |
593 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
594 |
- cd "${BUILDDIR}" || die |
595 |
- |
596 |
- emake DESTDIR="${D}" install |
597 |
- |
598 |
- einstalldocs |
599 |
- |
600 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
601 |
- |
602 |
- if use mysql ; then |
603 |
- docinto schema |
604 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
605 |
- docinto schema/upgrade |
606 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
607 |
- elif use postgres ; then |
608 |
- docinto schema |
609 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
610 |
- docinto schema/upgrade |
611 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
612 |
- fi |
613 |
- |
614 |
- keepdir /etc/icinga2 |
615 |
- keepdir /var/lib/icinga2/api/zones |
616 |
- keepdir /var/lib/icinga2/api/repository |
617 |
- keepdir /var/lib/icinga2/api/log |
618 |
- keepdir /var/spool/icinga2/perfdata |
619 |
- |
620 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
621 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
622 |
- |
623 |
- fowners root:icinga /etc/icinga2 |
624 |
- fperms 0750 /etc/icinga2 |
625 |
- fowners icinga:icinga /var/lib/icinga2 |
626 |
- fowners icinga:icinga /var/spool/icinga2 |
627 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
628 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
629 |
- fowners icinga:icingacmd /var/log/icinga2 |
630 |
- |
631 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
632 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
633 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
634 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
635 |
- |
636 |
- if use vim-syntax; then |
637 |
- insinto /usr/share/vim/vimfiles |
638 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
639 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
640 |
- fi |
641 |
- |
642 |
- if use nano-syntax; then |
643 |
- insinto /usr/share/nano |
644 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
645 |
- fi |
646 |
-} |
647 |
- |
648 |
-pkg_postinst() { |
649 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
650 |
- elog "DB IDO schema upgrade may be required required. |
651 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
652 |
- fi |
653 |
-} |
654 |
|
655 |
diff --git a/net-analyzer/icinga2/icinga2-2.8.0.ebuild b/net-analyzer/icinga2/icinga2-2.8.0.ebuild |
656 |
deleted file mode 100644 |
657 |
index d7a19c659ca..00000000000 |
658 |
--- a/net-analyzer/icinga2/icinga2-2.8.0.ebuild |
659 |
+++ /dev/null |
660 |
@@ -1,179 +0,0 @@ |
661 |
-# Copyright 1999-2017 Gentoo Foundation |
662 |
-# Distributed under the terms of the GNU General Public License v2 |
663 |
- |
664 |
-EAPI=6 |
665 |
-if [[ ${PV} != 9999 ]]; then |
666 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
667 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
668 |
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
669 |
-else |
670 |
- inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets |
671 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
672 |
- EGIT_BRANCH="master" |
673 |
- KEYWORDS="amd64 ~ppc ~ppc64 x86" |
674 |
-fi |
675 |
- |
676 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
677 |
-HOMEPAGE="http://icinga.org/icinga2" |
678 |
- |
679 |
-LICENSE="GPL-2" |
680 |
-SLOT="0" |
681 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
682 |
-WX_GTK_VER="3.0" |
683 |
- |
684 |
-CDEPEND=" |
685 |
- !libressl? ( dev-libs/openssl:0= ) |
686 |
- libressl? ( dev-libs/libressl:0= ) |
687 |
- >=dev-libs/boost-1.58-r1 |
688 |
- console? ( dev-libs/libedit ) |
689 |
- mysql? ( virtual/mysql ) |
690 |
- postgres? ( dev-db/postgresql:= )" |
691 |
- |
692 |
-DEPEND=" |
693 |
- ${CDEPEND} |
694 |
- sys-devel/bison |
695 |
- >=sys-devel/flex-2.5.35" |
696 |
- |
697 |
-RDEPEND=" |
698 |
- ${CDEPEND} |
699 |
- plugins? ( || ( |
700 |
- net-analyzer/monitoring-plugins |
701 |
- net-analyzer/nagios-plugins |
702 |
- ) ) |
703 |
- mail? ( virtual/mailx ) |
704 |
- classicui? ( net-analyzer/icinga[web] ) |
705 |
- studio? ( x11-libs/wxGTK:3.0 )" |
706 |
- |
707 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
708 |
- |
709 |
-PATCHES=( |
710 |
-) |
711 |
- |
712 |
-want_apache2 |
713 |
- |
714 |
-pkg_setup() { |
715 |
- depend.apache_pkg_setup |
716 |
- if use studio ; then |
717 |
- setup-wxwidgets |
718 |
- fi |
719 |
- enewgroup icinga |
720 |
- enewgroup icingacmd |
721 |
- enewgroup nagios # for plugins |
722 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
723 |
-} |
724 |
- |
725 |
-src_configure() { |
726 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
727 |
- local mycmakeargs=( |
728 |
- -DICINGA2_UNITY_BUILD=FALSE |
729 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
730 |
- -DCMAKE_BUILD_TYPE=None |
731 |
- -DCMAKE_INSTALL_PREFIX=/usr |
732 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
733 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
734 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
735 |
- -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" |
736 |
- -DICINGA2_USER=icinga |
737 |
- -DICINGA2_GROUP=icingacmd |
738 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
739 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
740 |
- -DLOGROTATE_HAS_SU=ON |
741 |
- ) |
742 |
- # default to off if minimal, allow the flags to be set otherwise |
743 |
- if use minimal; then |
744 |
- mycmakeargs+=( |
745 |
- -DICINGA2_WITH_MYSQL=OFF |
746 |
- -DICINGA2_WITH_PGSQL=OFF |
747 |
- ) |
748 |
- else |
749 |
- mycmakeargs+=( |
750 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
751 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
752 |
- ) |
753 |
- fi |
754 |
- # LTO |
755 |
- if use lto; then |
756 |
- mycmakeargs+=( |
757 |
- -DICINGA2_LTO_BUILD=ON |
758 |
- ) |
759 |
- else |
760 |
- mycmakeargs+=( |
761 |
- -DICINGA2_LTO_BUILD=OFF |
762 |
- ) |
763 |
- fi |
764 |
- # STUDIO |
765 |
- if use studio; then |
766 |
- mycmakeargs+=( |
767 |
- -DICINGA2_WITH_STUDIO=ON |
768 |
- ) |
769 |
- else |
770 |
- mycmakeargs+=( |
771 |
- -DICINGA2_WITH_STUDIO=OFF |
772 |
- ) |
773 |
- fi |
774 |
- |
775 |
- cmake-utils_src_configure |
776 |
-} |
777 |
- |
778 |
-src_install() { |
779 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
780 |
- cd "${BUILDDIR}" || die |
781 |
- |
782 |
- emake DESTDIR="${D}" install |
783 |
- |
784 |
- einstalldocs |
785 |
- |
786 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
787 |
- |
788 |
- if use mysql ; then |
789 |
- docinto schema |
790 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
791 |
- docinto schema/upgrade |
792 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
793 |
- elif use postgres ; then |
794 |
- docinto schema |
795 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
796 |
- docinto schema/upgrade |
797 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
798 |
- fi |
799 |
- |
800 |
- keepdir /etc/icinga2 |
801 |
- keepdir /var/lib/icinga2/api/zones |
802 |
- keepdir /var/lib/icinga2/api/repository |
803 |
- keepdir /var/lib/icinga2/api/log |
804 |
- keepdir /var/spool/icinga2/perfdata |
805 |
- |
806 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
807 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
808 |
- |
809 |
- fowners root:icinga /etc/icinga2 |
810 |
- fperms 0750 /etc/icinga2 |
811 |
- fowners icinga:icinga /var/lib/icinga2 |
812 |
- fowners icinga:icinga /var/spool/icinga2 |
813 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
814 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
815 |
- fowners icinga:icingacmd /var/log/icinga2 |
816 |
- |
817 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
818 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
819 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
820 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
821 |
- |
822 |
- if use vim-syntax; then |
823 |
- insinto /usr/share/vim/vimfiles |
824 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
825 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
826 |
- fi |
827 |
- |
828 |
- if use nano-syntax; then |
829 |
- insinto /usr/share/nano |
830 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
831 |
- fi |
832 |
-} |
833 |
- |
834 |
-pkg_postinst() { |
835 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
836 |
- elog "DB IDO schema upgrade may be required required. |
837 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
838 |
- fi |
839 |
-} |
840 |
|
841 |
diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild |
842 |
index 81a25cd01f1..ce606b8bb30 100644 |
843 |
--- a/net-analyzer/icinga2/icinga2-2.8.1.ebuild |
844 |
+++ b/net-analyzer/icinga2/icinga2-2.8.1.ebuild |
845 |
@@ -5,7 +5,7 @@ EAPI=6 |
846 |
if [[ ${PV} != 9999 ]]; then |
847 |
inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
848 |
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
849 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
850 |
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
851 |
else |
852 |
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets |
853 |
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |