Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
Date: Mon, 28 Sep 2015 17:35:29
Message-Id: 1443461695.ef879b4bd3fd2c18942a43769bed60f5800786ae.prometheanfire@gentoo
1 commit: ef879b4bd3fd2c18942a43769bed60f5800786ae
2 Author: Matthew Thode <mthode <AT> mthode <DOT> org>
3 AuthorDate: Mon Sep 28 17:31:06 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 28 17:34:55 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef879b4b
7
8 cleaning up non-stable and updating git ebuild
9
10 net-analyzer/icinga2/icinga2-2.3.10.ebuild | 163 -----------------------------
11 net-analyzer/icinga2/icinga2-2.3.5.ebuild | 158 ----------------------------
12 net-analyzer/icinga2/icinga2-2.3.6.ebuild | 157 ---------------------------
13 net-analyzer/icinga2/icinga2-2.3.7.ebuild | 157 ---------------------------
14 net-analyzer/icinga2/icinga2-2.3.8.ebuild | 157 ---------------------------
15 net-analyzer/icinga2/icinga2-2.3.9.ebuild | 163 -----------------------------
16 net-analyzer/icinga2/icinga2-9999.ebuild | 60 ++++-------
17 7 files changed, 18 insertions(+), 997 deletions(-)
18
19 diff --git a/net-analyzer/icinga2/icinga2-2.3.10.ebuild b/net-analyzer/icinga2/icinga2-2.3.10.ebuild
20 deleted file mode 100644
21 index ac3a260..0000000
22 --- a/net-analyzer/icinga2/icinga2-2.3.10.ebuild
23 +++ /dev/null
24 @@ -1,163 +0,0 @@
25 -# Copyright 1999-2015 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -# $Id$
28 -
29 -EAPI=5
30 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
31 -
32 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
33 -HOMEPAGE="http://icinga.org/icinga2"
34 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
35 -
36 -LICENSE="GPL-2"
37 -SLOT="0"
38 -KEYWORDS="~amd64 ~x86"
39 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
40 -
41 -DEPEND="
42 - dev-libs/openssl:=
43 - >=dev-libs/boost-1.41
44 - sys-devel/bison
45 - >=sys-devel/flex-2.5.35
46 - mysql? ( virtual/mysql )
47 - postgres? ( dev-db/postgresql:= )"
48 -
49 -RDEPEND="
50 - ${DEPEND}
51 - plugins? ( || (
52 - net-analyzer/monitoring-plugins
53 - net-analyzer/nagios-plugins
54 - ) )
55 - classicui? ( net-analyzer/icinga[web] )"
56 -
57 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
58 -
59 -want_apache2
60 -
61 -pkg_setup() {
62 - enewgroup icinga
63 - enewgroup icingacmd
64 - enewgroup nagios # for plugins
65 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
66 -}
67 -
68 -src_prepare() {
69 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
70 - epatch_user
71 -}
72 -
73 -src_configure() {
74 - local mycmakeargs=(
75 - -DICINGA2_UNITY_BUILD=FALSE
76 - -DCMAKE_VERBOSE_MAKEFILE=ON
77 - -DCMAKE_BUILD_TYPE=None
78 - -DCMAKE_INSTALL_PREFIX=/usr
79 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
80 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
81 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
82 - -DICINGA2_USER=icinga
83 - -DICINGA2_GROUP=icingacmd
84 - -DICINGA2_COMMAND_USER=icinga
85 - -DICINGA2_COMMAND_GROUP=icingacmd
86 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
87 - )
88 - if use minimal; then
89 - mycmakeargs+=(
90 - -DICINGA2_WITH_MYSQL=OFF
91 - -DICINGA2_WITH_PGSQL=OFF
92 - )
93 - fi
94 - if use postgres; then
95 - mycmakeargs+=(
96 - -DICINGA2_WITH_PGSQL=ON
97 - )
98 - else
99 - mycmakeargs+=(
100 - -DICINGA2_WITH_PGSQL=OFF
101 - )
102 - fi
103 - if use mysql; then
104 - mycmakeargs+=(
105 - -DICINGA2_WITH_MYSQL=ON
106 - )
107 - else
108 - mycmakeargs+=(
109 - -DICINGA2_WITH_MYSQL=OFF
110 - )
111 - fi
112 - cmake-utils_src_configure
113 -}
114 -
115 -src_install() {
116 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
117 - cd $BUILDDIR
118 -
119 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
120 -
121 - emake DESTDIR="${D}" install
122 - #fi
123 -
124 - cd "${WORKDIR}"/icinga2-${PV}
125 - if ! declare -p DOCS >/dev/null 2>&1 ; then
126 - local d
127 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
128 - FAQ CREDITS CHANGELOG ; do
129 - [[ -s "${d}" ]] && dodoc "${d}"
130 - done
131 - elif declare -p DOCS | grep -q "^declare -a " ; then
132 - dodoc "${DOCS[@]}"
133 - else
134 - dodoc ${DOCS}
135 - fi
136 -
137 - newinitd "${FILESDIR}"/icinga2.initd icinga2
138 - newconfd "${FILESDIR}"/icinga2.confd icinga2
139 -
140 - if use mysql ; then
141 - docinto schema
142 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
143 - docinto schema/upgrade
144 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
145 - elif use postgres ; then
146 - docinto schema
147 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
148 - docinto schema/upgrade
149 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
150 - fi
151 -
152 - keepdir /etc/icinga2
153 - keepdir /var/lib/icinga2/api/zones
154 - keepdir /var/lib/icinga2/api/repository
155 - keepdir /var/lib/icinga2/api/log
156 - keepdir /var/spool/icinga2/perfdata
157 -
158 - rm -r "${D}var/run" || die "failed to remove /var/run"
159 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
160 -
161 - fowners icinga:icinga /etc/icinga2
162 - fowners icinga:icinga /var/lib/icinga2
163 - fowners icinga:icinga /var/spool/icinga2
164 - fowners icinga:icinga /var/spool/icinga2/perfdata
165 - fowners icinga:icingacmd /var/log/icinga2
166 -
167 - fperms ug+rwX,o-rwx /etc/icinga2
168 - fperms ug+rwX,o-rwx /var/lib/icinga2
169 - fperms ug+rwX,o-rwx /var/spool/icinga2
170 - fperms ug+rwX,o-rwx /var/log/icinga2
171 -
172 - if use vim-syntax; then
173 - insinto /usr/share/vim/vimfiles
174 - doins -r tools/syntax/vim/ftdetect
175 - doins -r tools/syntax/vim/syntax
176 - fi
177 -
178 - if use nano-syntax; then
179 - insinto /usr/share/nano
180 - doins tools/syntax/nano/icinga2.nanorc
181 - fi
182 -}
183 -
184 -pkg_postinst() {
185 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
186 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
187 -}
188
189 diff --git a/net-analyzer/icinga2/icinga2-2.3.5.ebuild b/net-analyzer/icinga2/icinga2-2.3.5.ebuild
190 deleted file mode 100644
191 index bffb07c..0000000
192 --- a/net-analyzer/icinga2/icinga2-2.3.5.ebuild
193 +++ /dev/null
194 @@ -1,158 +0,0 @@
195 -# Copyright 1999-2015 Gentoo Foundation
196 -# Distributed under the terms of the GNU General Public License v2
197 -# $Id$
198 -
199 -EAPI=5
200 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
201 -
202 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
203 -HOMEPAGE="http://icinga.org/icinga2"
204 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
205 -
206 -LICENSE="GPL-2"
207 -SLOT="0"
208 -KEYWORDS="amd64 x86"
209 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
210 -
211 -DEPEND="
212 - dev-util/cmake
213 - dev-libs/openssl:=
214 - >=dev-libs/boost-1.41
215 - sys-devel/bison
216 - >=sys-devel/flex-2.5.35
217 - mysql? ( virtual/mysql )
218 - postgres? ( dev-db/postgresql:* )"
219 -
220 -RDEPEND="
221 - ${DEPEND}
222 - plugins? ( || (
223 - net-analyzer/monitoring-plugins
224 - net-analyzer/nagios-plugins
225 - ) )
226 - classicui? ( net-analyzer/icinga[web] )"
227 -
228 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
229 -
230 -want_apache2
231 -
232 -pkg_setup() {
233 - enewgroup icinga
234 - enewgroup icingacmd
235 - enewgroup nagios # for plugins
236 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
237 -}
238 -
239 -src_prepare() {
240 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
241 - epatch_user
242 -}
243 -
244 -src_configure() {
245 - local mycmakeargs=(
246 - -DICINGA2_UNITY_BUILD=FALSE
247 - -DCMAKE_VERBOSE_MAKEFILE=ON
248 - -DCMAKE_BUILD_TYPE=None
249 - -DCMAKE_INSTALL_PREFIX=/usr
250 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
251 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
252 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
253 - -DICINGA2_USER=icinga
254 - -DICINGA2_GROUP=icingacmd
255 - -DICINGA2_COMMAND_USER=icinga
256 - -DICINGA2_COMMAND_GROUP=icingacmd
257 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
258 - )
259 - if use postgres; then
260 - mycmakeargs+=(
261 - -DICINGA2_WITH_PGSQL=ON
262 - )
263 - else
264 - mycmakeargs+=(
265 - -DICINGA2_WITH_PGSQL=OFF
266 - )
267 - fi
268 - if use mysql; then
269 - mycmakeargs+=(
270 - -DICINGA2_WITH_MYSQL=ON
271 - )
272 - else
273 - mycmakeargs+=(
274 - -DICINGA2_WITH_MYSQL=OFF
275 - )
276 - fi
277 - cmake-utils_src_configure
278 -}
279 -
280 -src_install() {
281 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
282 - cd $BUILDDIR
283 -
284 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
285 -
286 - emake DESTDIR="${D}" install
287 - #fi
288 -
289 - cd "${WORKDIR}"/icinga2-${PV}
290 - if ! declare -p DOCS >/dev/null 2>&1 ; then
291 - local d
292 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
293 - FAQ CREDITS CHANGELOG ; do
294 - [[ -s "${d}" ]] && dodoc "${d}"
295 - done
296 - elif declare -p DOCS | grep -q "^declare -a " ; then
297 - dodoc "${DOCS[@]}"
298 - else
299 - dodoc ${DOCS}
300 - fi
301 -
302 - newinitd "${FILESDIR}"/icinga2.initd icinga2
303 - newconfd "${FILESDIR}"/icinga2.confd icinga2
304 -
305 - if use mysql ; then
306 - docinto schema
307 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
308 - docinto schema/upgrade
309 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
310 - elif use postgres ; then
311 - docinto schema
312 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
313 - docinto schema/upgrade
314 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
315 - fi
316 -
317 - keepdir /etc/icinga2
318 - keepdir /var/lib/icinga2/api/zones
319 - keepdir /var/lib/icinga2/api/repository
320 - keepdir /var/lib/icinga2/api/log
321 - keepdir /var/spool/icinga2/perfdata
322 -
323 - rm -r "${D}var/run" || die "failed to remove /var/run"
324 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
325 -
326 - fowners icinga:icinga /etc/icinga2
327 - fowners icinga:icinga /var/lib/icinga2
328 - fowners icinga:icinga /var/spool/icinga2
329 - fowners icinga:icinga /var/spool/icinga2/perfdata
330 - fowners icinga:icingacmd /var/log/icinga2
331 -
332 - fperms ug+rwX,o-rwx /etc/icinga2
333 - fperms ug+rwX,o-rwx /var/lib/icinga2
334 - fperms ug+rwX,o-rwx /var/spool/icinga2
335 - fperms ug+rwX,o-rwx /var/log/icinga2
336 -
337 - if use vim-syntax; then
338 - insinto /usr/share/vim/vimfiles
339 - doins -r tools/syntax/vim/ftdetect
340 - doins -r tools/syntax/vim/syntax
341 - fi
342 -
343 - if use nano-syntax; then
344 - insinto /usr/share/nano
345 - doins tools/syntax/nano/icinga2.nanorc
346 - fi
347 -}
348 -
349 -pkg_postinst() {
350 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
351 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
352 -}
353
354 diff --git a/net-analyzer/icinga2/icinga2-2.3.6.ebuild b/net-analyzer/icinga2/icinga2-2.3.6.ebuild
355 deleted file mode 100644
356 index c996c27..0000000
357 --- a/net-analyzer/icinga2/icinga2-2.3.6.ebuild
358 +++ /dev/null
359 @@ -1,157 +0,0 @@
360 -# Copyright 1999-2015 Gentoo Foundation
361 -# Distributed under the terms of the GNU General Public License v2
362 -# $Id$
363 -
364 -EAPI=5
365 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
366 -
367 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
368 -HOMEPAGE="http://icinga.org/icinga2"
369 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
370 -
371 -LICENSE="GPL-2"
372 -SLOT="0"
373 -KEYWORDS="~amd64 ~x86"
374 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
375 -
376 -DEPEND="
377 - dev-libs/openssl:=
378 - >=dev-libs/boost-1.41
379 - sys-devel/bison
380 - >=sys-devel/flex-2.5.35
381 - mysql? ( virtual/mysql )
382 - postgres? ( dev-db/postgresql:= )"
383 -
384 -RDEPEND="
385 - ${DEPEND}
386 - plugins? ( || (
387 - net-analyzer/monitoring-plugins
388 - net-analyzer/nagios-plugins
389 - ) )
390 - classicui? ( net-analyzer/icinga[web] )"
391 -
392 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
393 -
394 -want_apache2
395 -
396 -pkg_setup() {
397 - enewgroup icinga
398 - enewgroup icingacmd
399 - enewgroup nagios # for plugins
400 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
401 -}
402 -
403 -src_prepare() {
404 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
405 - epatch_user
406 -}
407 -
408 -src_configure() {
409 - local mycmakeargs=(
410 - -DICINGA2_UNITY_BUILD=FALSE
411 - -DCMAKE_VERBOSE_MAKEFILE=ON
412 - -DCMAKE_BUILD_TYPE=None
413 - -DCMAKE_INSTALL_PREFIX=/usr
414 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
415 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
416 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
417 - -DICINGA2_USER=icinga
418 - -DICINGA2_GROUP=icingacmd
419 - -DICINGA2_COMMAND_USER=icinga
420 - -DICINGA2_COMMAND_GROUP=icingacmd
421 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
422 - )
423 - if use postgres; then
424 - mycmakeargs+=(
425 - -DICINGA2_WITH_PGSQL=ON
426 - )
427 - else
428 - mycmakeargs+=(
429 - -DICINGA2_WITH_PGSQL=OFF
430 - )
431 - fi
432 - if use mysql; then
433 - mycmakeargs+=(
434 - -DICINGA2_WITH_MYSQL=ON
435 - )
436 - else
437 - mycmakeargs+=(
438 - -DICINGA2_WITH_MYSQL=OFF
439 - )
440 - fi
441 - cmake-utils_src_configure
442 -}
443 -
444 -src_install() {
445 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
446 - cd $BUILDDIR
447 -
448 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
449 -
450 - emake DESTDIR="${D}" install
451 - #fi
452 -
453 - cd "${WORKDIR}"/icinga2-${PV}
454 - if ! declare -p DOCS >/dev/null 2>&1 ; then
455 - local d
456 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
457 - FAQ CREDITS CHANGELOG ; do
458 - [[ -s "${d}" ]] && dodoc "${d}"
459 - done
460 - elif declare -p DOCS | grep -q "^declare -a " ; then
461 - dodoc "${DOCS[@]}"
462 - else
463 - dodoc ${DOCS}
464 - fi
465 -
466 - newinitd "${FILESDIR}"/icinga2.initd icinga2
467 - newconfd "${FILESDIR}"/icinga2.confd icinga2
468 -
469 - if use mysql ; then
470 - docinto schema
471 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
472 - docinto schema/upgrade
473 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
474 - elif use postgres ; then
475 - docinto schema
476 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
477 - docinto schema/upgrade
478 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
479 - fi
480 -
481 - keepdir /etc/icinga2
482 - keepdir /var/lib/icinga2/api/zones
483 - keepdir /var/lib/icinga2/api/repository
484 - keepdir /var/lib/icinga2/api/log
485 - keepdir /var/spool/icinga2/perfdata
486 -
487 - rm -r "${D}var/run" || die "failed to remove /var/run"
488 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
489 -
490 - fowners icinga:icinga /etc/icinga2
491 - fowners icinga:icinga /var/lib/icinga2
492 - fowners icinga:icinga /var/spool/icinga2
493 - fowners icinga:icinga /var/spool/icinga2/perfdata
494 - fowners icinga:icingacmd /var/log/icinga2
495 -
496 - fperms ug+rwX,o-rwx /etc/icinga2
497 - fperms ug+rwX,o-rwx /var/lib/icinga2
498 - fperms ug+rwX,o-rwx /var/spool/icinga2
499 - fperms ug+rwX,o-rwx /var/log/icinga2
500 -
501 - if use vim-syntax; then
502 - insinto /usr/share/vim/vimfiles
503 - doins -r tools/syntax/vim/ftdetect
504 - doins -r tools/syntax/vim/syntax
505 - fi
506 -
507 - if use nano-syntax; then
508 - insinto /usr/share/nano
509 - doins tools/syntax/nano/icinga2.nanorc
510 - fi
511 -}
512 -
513 -pkg_postinst() {
514 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
515 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
516 -}
517
518 diff --git a/net-analyzer/icinga2/icinga2-2.3.7.ebuild b/net-analyzer/icinga2/icinga2-2.3.7.ebuild
519 deleted file mode 100644
520 index c996c27..0000000
521 --- a/net-analyzer/icinga2/icinga2-2.3.7.ebuild
522 +++ /dev/null
523 @@ -1,157 +0,0 @@
524 -# Copyright 1999-2015 Gentoo Foundation
525 -# Distributed under the terms of the GNU General Public License v2
526 -# $Id$
527 -
528 -EAPI=5
529 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
530 -
531 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
532 -HOMEPAGE="http://icinga.org/icinga2"
533 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
534 -
535 -LICENSE="GPL-2"
536 -SLOT="0"
537 -KEYWORDS="~amd64 ~x86"
538 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
539 -
540 -DEPEND="
541 - dev-libs/openssl:=
542 - >=dev-libs/boost-1.41
543 - sys-devel/bison
544 - >=sys-devel/flex-2.5.35
545 - mysql? ( virtual/mysql )
546 - postgres? ( dev-db/postgresql:= )"
547 -
548 -RDEPEND="
549 - ${DEPEND}
550 - plugins? ( || (
551 - net-analyzer/monitoring-plugins
552 - net-analyzer/nagios-plugins
553 - ) )
554 - classicui? ( net-analyzer/icinga[web] )"
555 -
556 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
557 -
558 -want_apache2
559 -
560 -pkg_setup() {
561 - enewgroup icinga
562 - enewgroup icingacmd
563 - enewgroup nagios # for plugins
564 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
565 -}
566 -
567 -src_prepare() {
568 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
569 - epatch_user
570 -}
571 -
572 -src_configure() {
573 - local mycmakeargs=(
574 - -DICINGA2_UNITY_BUILD=FALSE
575 - -DCMAKE_VERBOSE_MAKEFILE=ON
576 - -DCMAKE_BUILD_TYPE=None
577 - -DCMAKE_INSTALL_PREFIX=/usr
578 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
579 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
580 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
581 - -DICINGA2_USER=icinga
582 - -DICINGA2_GROUP=icingacmd
583 - -DICINGA2_COMMAND_USER=icinga
584 - -DICINGA2_COMMAND_GROUP=icingacmd
585 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
586 - )
587 - if use postgres; then
588 - mycmakeargs+=(
589 - -DICINGA2_WITH_PGSQL=ON
590 - )
591 - else
592 - mycmakeargs+=(
593 - -DICINGA2_WITH_PGSQL=OFF
594 - )
595 - fi
596 - if use mysql; then
597 - mycmakeargs+=(
598 - -DICINGA2_WITH_MYSQL=ON
599 - )
600 - else
601 - mycmakeargs+=(
602 - -DICINGA2_WITH_MYSQL=OFF
603 - )
604 - fi
605 - cmake-utils_src_configure
606 -}
607 -
608 -src_install() {
609 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
610 - cd $BUILDDIR
611 -
612 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
613 -
614 - emake DESTDIR="${D}" install
615 - #fi
616 -
617 - cd "${WORKDIR}"/icinga2-${PV}
618 - if ! declare -p DOCS >/dev/null 2>&1 ; then
619 - local d
620 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
621 - FAQ CREDITS CHANGELOG ; do
622 - [[ -s "${d}" ]] && dodoc "${d}"
623 - done
624 - elif declare -p DOCS | grep -q "^declare -a " ; then
625 - dodoc "${DOCS[@]}"
626 - else
627 - dodoc ${DOCS}
628 - fi
629 -
630 - newinitd "${FILESDIR}"/icinga2.initd icinga2
631 - newconfd "${FILESDIR}"/icinga2.confd icinga2
632 -
633 - if use mysql ; then
634 - docinto schema
635 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
636 - docinto schema/upgrade
637 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
638 - elif use postgres ; then
639 - docinto schema
640 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
641 - docinto schema/upgrade
642 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
643 - fi
644 -
645 - keepdir /etc/icinga2
646 - keepdir /var/lib/icinga2/api/zones
647 - keepdir /var/lib/icinga2/api/repository
648 - keepdir /var/lib/icinga2/api/log
649 - keepdir /var/spool/icinga2/perfdata
650 -
651 - rm -r "${D}var/run" || die "failed to remove /var/run"
652 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
653 -
654 - fowners icinga:icinga /etc/icinga2
655 - fowners icinga:icinga /var/lib/icinga2
656 - fowners icinga:icinga /var/spool/icinga2
657 - fowners icinga:icinga /var/spool/icinga2/perfdata
658 - fowners icinga:icingacmd /var/log/icinga2
659 -
660 - fperms ug+rwX,o-rwx /etc/icinga2
661 - fperms ug+rwX,o-rwx /var/lib/icinga2
662 - fperms ug+rwX,o-rwx /var/spool/icinga2
663 - fperms ug+rwX,o-rwx /var/log/icinga2
664 -
665 - if use vim-syntax; then
666 - insinto /usr/share/vim/vimfiles
667 - doins -r tools/syntax/vim/ftdetect
668 - doins -r tools/syntax/vim/syntax
669 - fi
670 -
671 - if use nano-syntax; then
672 - insinto /usr/share/nano
673 - doins tools/syntax/nano/icinga2.nanorc
674 - fi
675 -}
676 -
677 -pkg_postinst() {
678 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
679 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
680 -}
681
682 diff --git a/net-analyzer/icinga2/icinga2-2.3.8.ebuild b/net-analyzer/icinga2/icinga2-2.3.8.ebuild
683 deleted file mode 100644
684 index c996c27..0000000
685 --- a/net-analyzer/icinga2/icinga2-2.3.8.ebuild
686 +++ /dev/null
687 @@ -1,157 +0,0 @@
688 -# Copyright 1999-2015 Gentoo Foundation
689 -# Distributed under the terms of the GNU General Public License v2
690 -# $Id$
691 -
692 -EAPI=5
693 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
694 -
695 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
696 -HOMEPAGE="http://icinga.org/icinga2"
697 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
698 -
699 -LICENSE="GPL-2"
700 -SLOT="0"
701 -KEYWORDS="~amd64 ~x86"
702 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
703 -
704 -DEPEND="
705 - dev-libs/openssl:=
706 - >=dev-libs/boost-1.41
707 - sys-devel/bison
708 - >=sys-devel/flex-2.5.35
709 - mysql? ( virtual/mysql )
710 - postgres? ( dev-db/postgresql:= )"
711 -
712 -RDEPEND="
713 - ${DEPEND}
714 - plugins? ( || (
715 - net-analyzer/monitoring-plugins
716 - net-analyzer/nagios-plugins
717 - ) )
718 - classicui? ( net-analyzer/icinga[web] )"
719 -
720 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
721 -
722 -want_apache2
723 -
724 -pkg_setup() {
725 - enewgroup icinga
726 - enewgroup icingacmd
727 - enewgroup nagios # for plugins
728 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
729 -}
730 -
731 -src_prepare() {
732 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
733 - epatch_user
734 -}
735 -
736 -src_configure() {
737 - local mycmakeargs=(
738 - -DICINGA2_UNITY_BUILD=FALSE
739 - -DCMAKE_VERBOSE_MAKEFILE=ON
740 - -DCMAKE_BUILD_TYPE=None
741 - -DCMAKE_INSTALL_PREFIX=/usr
742 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
743 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
744 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
745 - -DICINGA2_USER=icinga
746 - -DICINGA2_GROUP=icingacmd
747 - -DICINGA2_COMMAND_USER=icinga
748 - -DICINGA2_COMMAND_GROUP=icingacmd
749 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
750 - )
751 - if use postgres; then
752 - mycmakeargs+=(
753 - -DICINGA2_WITH_PGSQL=ON
754 - )
755 - else
756 - mycmakeargs+=(
757 - -DICINGA2_WITH_PGSQL=OFF
758 - )
759 - fi
760 - if use mysql; then
761 - mycmakeargs+=(
762 - -DICINGA2_WITH_MYSQL=ON
763 - )
764 - else
765 - mycmakeargs+=(
766 - -DICINGA2_WITH_MYSQL=OFF
767 - )
768 - fi
769 - cmake-utils_src_configure
770 -}
771 -
772 -src_install() {
773 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
774 - cd $BUILDDIR
775 -
776 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
777 -
778 - emake DESTDIR="${D}" install
779 - #fi
780 -
781 - cd "${WORKDIR}"/icinga2-${PV}
782 - if ! declare -p DOCS >/dev/null 2>&1 ; then
783 - local d
784 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
785 - FAQ CREDITS CHANGELOG ; do
786 - [[ -s "${d}" ]] && dodoc "${d}"
787 - done
788 - elif declare -p DOCS | grep -q "^declare -a " ; then
789 - dodoc "${DOCS[@]}"
790 - else
791 - dodoc ${DOCS}
792 - fi
793 -
794 - newinitd "${FILESDIR}"/icinga2.initd icinga2
795 - newconfd "${FILESDIR}"/icinga2.confd icinga2
796 -
797 - if use mysql ; then
798 - docinto schema
799 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
800 - docinto schema/upgrade
801 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
802 - elif use postgres ; then
803 - docinto schema
804 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
805 - docinto schema/upgrade
806 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
807 - fi
808 -
809 - keepdir /etc/icinga2
810 - keepdir /var/lib/icinga2/api/zones
811 - keepdir /var/lib/icinga2/api/repository
812 - keepdir /var/lib/icinga2/api/log
813 - keepdir /var/spool/icinga2/perfdata
814 -
815 - rm -r "${D}var/run" || die "failed to remove /var/run"
816 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
817 -
818 - fowners icinga:icinga /etc/icinga2
819 - fowners icinga:icinga /var/lib/icinga2
820 - fowners icinga:icinga /var/spool/icinga2
821 - fowners icinga:icinga /var/spool/icinga2/perfdata
822 - fowners icinga:icingacmd /var/log/icinga2
823 -
824 - fperms ug+rwX,o-rwx /etc/icinga2
825 - fperms ug+rwX,o-rwx /var/lib/icinga2
826 - fperms ug+rwX,o-rwx /var/spool/icinga2
827 - fperms ug+rwX,o-rwx /var/log/icinga2
828 -
829 - if use vim-syntax; then
830 - insinto /usr/share/vim/vimfiles
831 - doins -r tools/syntax/vim/ftdetect
832 - doins -r tools/syntax/vim/syntax
833 - fi
834 -
835 - if use nano-syntax; then
836 - insinto /usr/share/nano
837 - doins tools/syntax/nano/icinga2.nanorc
838 - fi
839 -}
840 -
841 -pkg_postinst() {
842 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
843 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
844 -}
845
846 diff --git a/net-analyzer/icinga2/icinga2-2.3.9.ebuild b/net-analyzer/icinga2/icinga2-2.3.9.ebuild
847 deleted file mode 100644
848 index ac3a260..0000000
849 --- a/net-analyzer/icinga2/icinga2-2.3.9.ebuild
850 +++ /dev/null
851 @@ -1,163 +0,0 @@
852 -# Copyright 1999-2015 Gentoo Foundation
853 -# Distributed under the terms of the GNU General Public License v2
854 -# $Id$
855 -
856 -EAPI=5
857 -inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
858 -
859 -DESCRIPTION="Distributed, general purpose, network monitoring engine"
860 -HOMEPAGE="http://icinga.org/icinga2"
861 -SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
862 -
863 -LICENSE="GPL-2"
864 -SLOT="0"
865 -KEYWORDS="~amd64 ~x86"
866 -IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
867 -
868 -DEPEND="
869 - dev-libs/openssl:=
870 - >=dev-libs/boost-1.41
871 - sys-devel/bison
872 - >=sys-devel/flex-2.5.35
873 - mysql? ( virtual/mysql )
874 - postgres? ( dev-db/postgresql:= )"
875 -
876 -RDEPEND="
877 - ${DEPEND}
878 - plugins? ( || (
879 - net-analyzer/monitoring-plugins
880 - net-analyzer/nagios-plugins
881 - ) )
882 - classicui? ( net-analyzer/icinga[web] )"
883 -
884 -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
885 -
886 -want_apache2
887 -
888 -pkg_setup() {
889 - enewgroup icinga
890 - enewgroup icingacmd
891 - enewgroup nagios # for plugins
892 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
893 -}
894 -
895 -src_prepare() {
896 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
897 - epatch_user
898 -}
899 -
900 -src_configure() {
901 - local mycmakeargs=(
902 - -DICINGA2_UNITY_BUILD=FALSE
903 - -DCMAKE_VERBOSE_MAKEFILE=ON
904 - -DCMAKE_BUILD_TYPE=None
905 - -DCMAKE_INSTALL_PREFIX=/usr
906 - -DCMAKE_INSTALL_SYSCONFDIR=/etc
907 - -DCMAKE_INSTALL_LOCALSTATEDIR=/var
908 - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
909 - -DICINGA2_USER=icinga
910 - -DICINGA2_GROUP=icingacmd
911 - -DICINGA2_COMMAND_USER=icinga
912 - -DICINGA2_COMMAND_GROUP=icingacmd
913 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
914 - )
915 - if use minimal; then
916 - mycmakeargs+=(
917 - -DICINGA2_WITH_MYSQL=OFF
918 - -DICINGA2_WITH_PGSQL=OFF
919 - )
920 - fi
921 - if use postgres; then
922 - mycmakeargs+=(
923 - -DICINGA2_WITH_PGSQL=ON
924 - )
925 - else
926 - mycmakeargs+=(
927 - -DICINGA2_WITH_PGSQL=OFF
928 - )
929 - fi
930 - if use mysql; then
931 - mycmakeargs+=(
932 - -DICINGA2_WITH_MYSQL=ON
933 - )
934 - else
935 - mycmakeargs+=(
936 - -DICINGA2_WITH_MYSQL=OFF
937 - )
938 - fi
939 - cmake-utils_src_configure
940 -}
941 -
942 -src_install() {
943 - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
944 - cd $BUILDDIR
945 -
946 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
947 -
948 - emake DESTDIR="${D}" install
949 - #fi
950 -
951 - cd "${WORKDIR}"/icinga2-${PV}
952 - if ! declare -p DOCS >/dev/null 2>&1 ; then
953 - local d
954 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
955 - FAQ CREDITS CHANGELOG ; do
956 - [[ -s "${d}" ]] && dodoc "${d}"
957 - done
958 - elif declare -p DOCS | grep -q "^declare -a " ; then
959 - dodoc "${DOCS[@]}"
960 - else
961 - dodoc ${DOCS}
962 - fi
963 -
964 - newinitd "${FILESDIR}"/icinga2.initd icinga2
965 - newconfd "${FILESDIR}"/icinga2.confd icinga2
966 -
967 - if use mysql ; then
968 - docinto schema
969 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
970 - docinto schema/upgrade
971 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
972 - elif use postgres ; then
973 - docinto schema
974 - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
975 - docinto schema/upgrade
976 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
977 - fi
978 -
979 - keepdir /etc/icinga2
980 - keepdir /var/lib/icinga2/api/zones
981 - keepdir /var/lib/icinga2/api/repository
982 - keepdir /var/lib/icinga2/api/log
983 - keepdir /var/spool/icinga2/perfdata
984 -
985 - rm -r "${D}var/run" || die "failed to remove /var/run"
986 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
987 -
988 - fowners icinga:icinga /etc/icinga2
989 - fowners icinga:icinga /var/lib/icinga2
990 - fowners icinga:icinga /var/spool/icinga2
991 - fowners icinga:icinga /var/spool/icinga2/perfdata
992 - fowners icinga:icingacmd /var/log/icinga2
993 -
994 - fperms ug+rwX,o-rwx /etc/icinga2
995 - fperms ug+rwX,o-rwx /var/lib/icinga2
996 - fperms ug+rwX,o-rwx /var/spool/icinga2
997 - fperms ug+rwX,o-rwx /var/log/icinga2
998 -
999 - if use vim-syntax; then
1000 - insinto /usr/share/vim/vimfiles
1001 - doins -r tools/syntax/vim/ftdetect
1002 - doins -r tools/syntax/vim/syntax
1003 - fi
1004 -
1005 - if use nano-syntax; then
1006 - insinto /usr/share/nano
1007 - doins tools/syntax/nano/icinga2.nanorc
1008 - fi
1009 -}
1010 -
1011 -pkg_postinst() {
1012 - elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
1013 - elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
1014 -}
1015
1016 diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
1017 index 3e3a162..14453a2 100644
1018 --- a/net-analyzer/icinga2/icinga2-9999.ebuild
1019 +++ b/net-analyzer/icinga2/icinga2-9999.ebuild
1020 @@ -3,7 +3,7 @@
1021 # $Id$
1022
1023 EAPI=5
1024 -inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user versionator
1025 +inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user
1026
1027 DESCRIPTION="Distributed, general purpose, network monitoring engine"
1028 HOMEPAGE="http://icinga.org/icinga2"
1029 @@ -12,11 +12,11 @@ EGIT_BRANCH="master"
1030
1031 LICENSE="GPL-2"
1032 SLOT="0"
1033 -KEYWORDS=""
1034 +KEYWORDS="amd64 x86"
1035 IUSE="+mysql postgres classicui minimal nano-syntax +plugins +vim-syntax"
1036
1037 DEPEND="
1038 - dev-libs/openssl:=
1039 + dev-libs/openssl:0
1040 >=dev-libs/boost-1.41
1041 sys-devel/bison
1042 >=sys-devel/flex-2.5.35
1043 @@ -36,17 +36,13 @@ REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
1044 want_apache2
1045
1046 pkg_setup() {
1047 + depend.apache_pkg_setup
1048 enewgroup icinga
1049 enewgroup icingacmd
1050 enewgroup nagios # for plugins
1051 enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
1052 }
1053
1054 -src_prepare() {
1055 -# epatch "${FILESDIR}/${P}-create_var_cache.patch"
1056 - epatch_user
1057 -}
1058 -
1059 src_configure() {
1060 local mycmakeargs=(
1061 -DICINGA2_UNITY_BUILD=FALSE
1062 @@ -62,22 +58,16 @@ src_configure() {
1063 -DICINGA2_COMMAND_GROUP=icingacmd
1064 -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
1065 )
1066 - if use postgres; then
1067 - mycmakeargs+=(
1068 - -DICINGA2_WITH_PGSQL=ON
1069 - )
1070 - else
1071 + # default to off if minimal, allow the flags to be set otherwise
1072 + if use minimal; then
1073 mycmakeargs+=(
1074 + -DICINGA2_WITH_MYSQL=OFF
1075 -DICINGA2_WITH_PGSQL=OFF
1076 )
1077 - fi
1078 - if use mysql; then
1079 - mycmakeargs+=(
1080 - -DICINGA2_WITH_MYSQL=ON
1081 - )
1082 else
1083 mycmakeargs+=(
1084 - -DICINGA2_WITH_MYSQL=OFF
1085 + -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
1086 + -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
1087 )
1088 fi
1089 cmake-utils_src_configure
1090 @@ -87,23 +77,9 @@ src_install() {
1091 BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
1092 cd $BUILDDIR
1093
1094 - #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
1095 + emake DESTDIR="${D}" install
1096
1097 - emake DESTDIR="${D}" install
1098 - #fi
1099 -
1100 - cd "${WORKDIR}"/icinga2-${PV}
1101 - if ! declare -p DOCS >/dev/null 2>&1 ; then
1102 - local d
1103 - for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
1104 - FAQ CREDITS CHANGELOG ; do
1105 - [[ -s "${d}" ]] && dodoc "${d}"
1106 - done
1107 - elif declare -p DOCS | grep -q "^declare -a " ; then
1108 - dodoc "${DOCS[@]}"
1109 - else
1110 - dodoc ${DOCS}
1111 - fi
1112 + einstalldocs
1113
1114 newinitd "${FILESDIR}"/icinga2.initd icinga2
1115 newconfd "${FILESDIR}"/icinga2.confd icinga2
1116 @@ -112,12 +88,12 @@ src_install() {
1117 docinto schema
1118 newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
1119 docinto schema/upgrade
1120 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
1121 + dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
1122 elif use postgres ; then
1123 docinto schema
1124 newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
1125 docinto schema/upgrade
1126 - #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
1127 + dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
1128 fi
1129
1130 keepdir /etc/icinga2
1131 @@ -126,8 +102,8 @@ src_install() {
1132 keepdir /var/lib/icinga2/api/log
1133 keepdir /var/spool/icinga2/perfdata
1134
1135 - rm -r "${D}var/run" || die "failed to remove /var/run"
1136 - rm -r "${D}var/cache" || die "failed to remove /var/cache"
1137 + rm -r "${D}/var/run" || die "failed to remove /var/run"
1138 + rm -r "${D}/var/cache" || die "failed to remove /var/cache"
1139
1140 fowners icinga:icinga /etc/icinga2
1141 fowners icinga:icinga /var/lib/icinga2
1142 @@ -142,13 +118,13 @@ src_install() {
1143
1144 if use vim-syntax; then
1145 insinto /usr/share/vim/vimfiles
1146 - doins -r tools/syntax/vim/ftdetect
1147 - doins -r tools/syntax/vim/syntax
1148 + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
1149 + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
1150 fi
1151
1152 if use nano-syntax; then
1153 insinto /usr/share/nano
1154 - doins tools/syntax/nano/icinga2.nanorc
1155 + doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
1156 fi
1157 }