Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/
Date: Wed, 04 Mar 2020 17:11:31
Message-Id: 1583341863.475a0b267898fbfe225bd246e8642f2e19f6963b.prometheanfire@gentoo
1 commit: 475a0b267898fbfe225bd246e8642f2e19f6963b
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 4 16:53:40 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 4 17:11:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475a0b26
7
8 net-analyzer/icinga2: 2.11.3 bump
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 net-analyzer/icinga2/Manifest | 1 +
14 .../{icinga2-9999.ebuild => icinga2-2.11.3.ebuild} | 21 ++++++++++-----------
15 net-analyzer/icinga2/icinga2-9999.ebuild | 14 +++++++-------
16 3 files changed, 18 insertions(+), 18 deletions(-)
17
18 diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
19 index 7b7205bdb68..9de32456b1a 100644
20 --- a/net-analyzer/icinga2/Manifest
21 +++ b/net-analyzer/icinga2/Manifest
22 @@ -1,3 +1,4 @@
23 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
24 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
25 DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
26 +DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c SHA512 616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1
27
28 diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
29 similarity index 92%
30 copy from net-analyzer/icinga2/icinga2-9999.ebuild
31 copy to net-analyzer/icinga2/icinga2-2.11.3.ebuild
32 index 92b7c65b3f1..42ebd83d611 100644
33 --- a/net-analyzer/icinga2/icinga2-9999.ebuild
34 +++ b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
35 @@ -3,11 +3,11 @@
36
37 EAPI=6
38 if [[ ${PV} != 9999 ]]; then
39 - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
40 + inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
41 SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
42 - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
43 + KEYWORDS="~amd64 ~arm64 ~x86"
44 else
45 - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
46 + inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
47 EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
48 EGIT_BRANCH="master"
49 fi
50 @@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
51 CDEPEND="
52 !libressl? ( dev-libs/openssl:0= )
53 libressl? ( dev-libs/libressl:0= )
54 - >=dev-libs/boost-1.66:=[context]
55 + >=dev-libs/boost-1.66.0:=[context]
56 console? ( dev-libs/libedit )
57 mariadb? ( dev-db/mariadb-connector-c:= )
58 mysql? ( dev-db/mysql-connector-c:= )
59 @@ -41,7 +41,11 @@ RDEPEND="
60 net-analyzer/monitoring-plugins
61 net-analyzer/nagios-plugins
62 ) )
63 - mail? ( virtual/mailx )"
64 + mail? ( virtual/mailx )
65 + acct-user/icinga
66 + acct-group/icinga
67 + acct-group/icingacmd
68 + acct-group/nagios"
69
70 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
71
72 @@ -49,10 +53,6 @@ want_apache2
73
74 pkg_setup() {
75 depend.apache_pkg_setup
76 - enewgroup icinga
77 - enewgroup icingacmd
78 - enewgroup nagios # for plugins
79 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
80 }
81
82 src_configure() {
83 @@ -68,7 +68,6 @@ src_configure() {
84 -DICINGA2_USER=icinga
85 -DICINGA2_GROUP=icingacmd
86 -DICINGA2_COMMAND_GROUP=icingacmd
87 - -DICINGA2_RUNDIR=/run
88 -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
89 -DUSE_SYSTEMD=$(usex systemd ON OFF)
90 -DLOGROTATE_HAS_SU=ON
91 @@ -134,7 +133,7 @@ src_install() {
92 keepdir /var/lib/icinga2/api/log
93 keepdir /var/spool/icinga2/perfdata
94
95 - rm -r "${D}/run" || die "failed to remove /run"
96 + rm -r "${D}/var/run" || die "failed to remove /var/run"
97 rm -r "${D}/var/cache" || die "failed to remove /var/cache"
98
99 fowners root:icinga /etc/icinga2
100
101 diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
102 index 92b7c65b3f1..7243f8baa7c 100644
103 --- a/net-analyzer/icinga2/icinga2-9999.ebuild
104 +++ b/net-analyzer/icinga2/icinga2-9999.ebuild
105 @@ -3,11 +3,11 @@
106
107 EAPI=6
108 if [[ ${PV} != 9999 ]]; then
109 - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
110 + inherit cmake-utils depend.apache eutils systemd toolchain-funcs wxwidgets
111 SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
112 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
113 else
114 - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
115 + inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs wxwidgets
116 EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
117 EGIT_BRANCH="master"
118 fi
119 @@ -41,7 +41,11 @@ RDEPEND="
120 net-analyzer/monitoring-plugins
121 net-analyzer/nagios-plugins
122 ) )
123 - mail? ( virtual/mailx )"
124 + mail? ( virtual/mailx )
125 + acct-user/icinga
126 + acct-group/icinga
127 + acct-group/icingacmd
128 + acct-group/nagios"
129
130 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
131
132 @@ -49,10 +53,6 @@ want_apache2
133
134 pkg_setup() {
135 depend.apache_pkg_setup
136 - enewgroup icinga
137 - enewgroup icingacmd
138 - enewgroup nagios # for plugins
139 - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
140 }
141
142 src_configure() {