1 |
commit: d9276430ea2cef1875829bccaf60761eb5b00bb3 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 28 02:10:14 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 28 02:11:14 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9276430 |
7 |
|
8 |
net-analyzer/icinga2: 2.7.0 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
net-analyzer/icinga2/Manifest | 1 - |
13 |
net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild | 176 --------------------------- |
14 |
net-analyzer/icinga2/icinga2-2.7.0.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 178 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest |
18 |
index 40628adac7d..e51208d8bbc 100644 |
19 |
--- a/net-analyzer/icinga2/Manifest |
20 |
+++ b/net-analyzer/icinga2/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST icinga2-2.5.4.tar.gz 2493864 SHA256 f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc SHA512 0fca05d3eb6722cedecaba1da78ebb7268482257f28e37831f6356c618cbd059304a9e27e1f786799f253940e3dcf8ffa7399060f3e0e15765594796657b3be4 WHIRLPOOL a2a4af45a15cc4ed197151cc4e3355fa5f28ba227269990704f2cce47fe1990fb38932aa0bfefa8034492b379e04213d1eb514437e13aca3fe751592aff99afd |
23 |
DIST icinga2-2.6.2.tar.gz 2357220 SHA256 c2058c0e6c39860c52a57b8ce79224729f34b48bc96fb7b1ae2b742909e9b71b SHA512 733370fb120b79bbe3bdbf3d4b640083ff26d2a872c545f4efcd23be3462435f75e0b43b269b770296cb6de4a0529f2369fb766e06444d3fdb56f04db6a3dd03 WHIRLPOOL 0d28a429e5068a490a85ebced3b102780327519968f0cdc7eb3d939d91b6199ee285e0ca524d8596681b2c82832d8fc1909974f5f7e2ecbf0b7fe2ffc908327d |
24 |
DIST icinga2-2.6.3.tar.gz 2360602 SHA256 83d44871a70d1b368b1af717873ff9b1b185344d23fc79b83118e47a85da6d90 SHA512 c6512411689951611b19a5e80bf360b4cf5ddbf95dcb47cb393f90798e36c052c68b79a5a33a72cd6205ab58d4bb3ac44ec4cd82f9d1d17dc3c0e550723272b3 WHIRLPOOL 9e2c116be306cce35d780387cd2487a7a33b5819166308b83bb26d17cb856094f67d80ea110370b13e7fa19d84463b73da1a65fbf0de60663f2ad53e25c19108 |
25 |
DIST icinga2-2.7.0.tar.gz 2435398 SHA256 8f06d23e5d922ba7a74f92dbb9af792be063d06d3aea9011aba39370935c6980 SHA512 470dd4ffa4ef608a018ede5c25b41f16213bf18c679eed8aaeed155fe6adc74a70abcc2e8be42ca20bf60f9b4b620c971ebbc96d608de2a90e480d72b93111bb WHIRLPOOL c926086c296affaafc7d55471ea5c1414b2d2cb8545657215a53bb9744c3147c32f8398317ad670e0d12fb95c83b54f0712f061e5e93bab868c4f04d833c3b47 |
26 |
|
27 |
diff --git a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 12bfa48676c..00000000000 |
30 |
--- a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,176 +0,0 @@ |
33 |
-# Copyright 1999-2016 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
-if [[ ${PV} != 9999 ]]; then |
38 |
- inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
39 |
- SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
40 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
41 |
-else |
42 |
- inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets |
43 |
- EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |
44 |
- EGIT_BRANCH="master" |
45 |
- KEYWORDS="" |
46 |
-fi |
47 |
- |
48 |
-DESCRIPTION="Distributed, general purpose, network monitoring engine" |
49 |
-HOMEPAGE="http://icinga.org/icinga2" |
50 |
- |
51 |
-LICENSE="GPL-2" |
52 |
-SLOT="0" |
53 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
54 |
-WX_GTK_VER="3.0" |
55 |
- |
56 |
-CDEPEND=" |
57 |
- !libressl? ( dev-libs/openssl:0= ) |
58 |
- libressl? ( dev-libs/libressl:0= ) |
59 |
- >=dev-libs/boost-1.41 |
60 |
- console? ( dev-libs/libedit ) |
61 |
- mysql? ( virtual/mysql ) |
62 |
- postgres? ( dev-db/postgresql:= )" |
63 |
- |
64 |
-DEPEND=" |
65 |
- ${CDEPEND} |
66 |
- sys-devel/bison |
67 |
- >=sys-devel/flex-2.5.35" |
68 |
- |
69 |
-RDEPEND=" |
70 |
- ${CDEPEND} |
71 |
- plugins? ( || ( |
72 |
- net-analyzer/monitoring-plugins |
73 |
- net-analyzer/nagios-plugins |
74 |
- ) ) |
75 |
- mail? ( virtual/mailx ) |
76 |
- classicui? ( net-analyzer/icinga[web] ) |
77 |
- studio? ( x11-libs/wxGTK:3.0 )" |
78 |
- |
79 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
80 |
- |
81 |
-want_apache2 |
82 |
- |
83 |
-pkg_setup() { |
84 |
- depend.apache_pkg_setup |
85 |
- if use studio ; then |
86 |
- setup-wxwidgets |
87 |
- fi |
88 |
- enewgroup icinga |
89 |
- enewgroup icingacmd |
90 |
- enewgroup nagios # for plugins |
91 |
- enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" |
92 |
-} |
93 |
- |
94 |
-src_configure() { |
95 |
- sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die |
96 |
- local mycmakeargs=( |
97 |
- -DICINGA2_UNITY_BUILD=FALSE |
98 |
- -DCMAKE_VERBOSE_MAKEFILE=ON |
99 |
- -DCMAKE_BUILD_TYPE=None |
100 |
- -DCMAKE_INSTALL_PREFIX=/usr |
101 |
- -DCMAKE_INSTALL_SYSCONFDIR=/etc |
102 |
- -DCMAKE_INSTALL_LOCALSTATEDIR=/var |
103 |
- -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 |
104 |
- -DICINGA2_USER=icinga |
105 |
- -DICINGA2_GROUP=icingacmd |
106 |
- -DICINGA2_COMMAND_USER=icinga |
107 |
- -DICINGA2_COMMAND_GROUP=icingacmd |
108 |
- -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
109 |
- -DLOGROTATE_HAS_SU=ON |
110 |
- ) |
111 |
- # default to off if minimal, allow the flags to be set otherwise |
112 |
- if use minimal; then |
113 |
- mycmakeargs+=( |
114 |
- -DICINGA2_WITH_MYSQL=OFF |
115 |
- -DICINGA2_WITH_PGSQL=OFF |
116 |
- ) |
117 |
- else |
118 |
- mycmakeargs+=( |
119 |
- -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) |
120 |
- -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) |
121 |
- ) |
122 |
- fi |
123 |
- # LTO |
124 |
- if use lto; then |
125 |
- mycmakeargs+=( |
126 |
- -DICINGA2_LTO_BUILD=ON |
127 |
- ) |
128 |
- else |
129 |
- mycmakeargs+=( |
130 |
- -DICINGA2_LTO_BUILD=OFF |
131 |
- ) |
132 |
- fi |
133 |
- # STUDIO |
134 |
- if use studio; then |
135 |
- mycmakeargs+=( |
136 |
- -DICINGA2_WITH_STUDIO=ON |
137 |
- ) |
138 |
- else |
139 |
- mycmakeargs+=( |
140 |
- -DICINGA2_WITH_STUDIO=OFF |
141 |
- ) |
142 |
- fi |
143 |
- |
144 |
- cmake-utils_src_configure |
145 |
-} |
146 |
- |
147 |
-src_install() { |
148 |
- BUILDDIR="${WORKDIR}"/icinga2-${PV}_build |
149 |
- cd "${BUILDDIR}" || die |
150 |
- |
151 |
- emake DESTDIR="${D}" install |
152 |
- |
153 |
- einstalldocs |
154 |
- |
155 |
- newinitd "${FILESDIR}"/icinga2.initd icinga2 |
156 |
- newconfd "${FILESDIR}"/icinga2.confd icinga2 |
157 |
- |
158 |
- if use mysql ; then |
159 |
- docinto schema |
160 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
161 |
- docinto schema/upgrade |
162 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
163 |
- elif use postgres ; then |
164 |
- docinto schema |
165 |
- newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
166 |
- docinto schema/upgrade |
167 |
- dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* |
168 |
- fi |
169 |
- |
170 |
- keepdir /etc/icinga2 |
171 |
- keepdir /var/lib/icinga2/api/zones |
172 |
- keepdir /var/lib/icinga2/api/repository |
173 |
- keepdir /var/lib/icinga2/api/log |
174 |
- keepdir /var/spool/icinga2/perfdata |
175 |
- |
176 |
- rm -r "${D}/var/run" || die "failed to remove /var/run" |
177 |
- rm -r "${D}/var/cache" || die "failed to remove /var/cache" |
178 |
- |
179 |
- fowners icinga:icinga /etc/icinga2 |
180 |
- fowners icinga:icinga /var/lib/icinga2 |
181 |
- fowners icinga:icinga /var/spool/icinga2 |
182 |
- fowners -R icinga:icingacmd /var/lib/icinga2/api |
183 |
- fowners icinga:icinga /var/spool/icinga2/perfdata |
184 |
- fowners icinga:icingacmd /var/log/icinga2 |
185 |
- |
186 |
- fperms ug+rwX,o-rwx /etc/icinga2 |
187 |
- fperms ug+rwX,o-rwx /var/lib/icinga2 |
188 |
- fperms ug+rwX,o-rwx /var/spool/icinga2 |
189 |
- fperms ug+rwX,o-rwx /var/log/icinga2 |
190 |
- |
191 |
- if use vim-syntax; then |
192 |
- insinto /usr/share/vim/vimfiles |
193 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect |
194 |
- doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax |
195 |
- fi |
196 |
- |
197 |
- if use nano-syntax; then |
198 |
- insinto /usr/share/nano |
199 |
- doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc |
200 |
- fi |
201 |
-} |
202 |
- |
203 |
-pkg_postinst() { |
204 |
- if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then |
205 |
- elog "DB IDO schema upgrade may be required required. |
206 |
- http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" |
207 |
- fi |
208 |
-} |
209 |
|
210 |
diff --git a/net-analyzer/icinga2/icinga2-2.7.0.ebuild b/net-analyzer/icinga2/icinga2-2.7.0.ebuild |
211 |
index 91fbbba6115..35df65d8c19 100644 |
212 |
--- a/net-analyzer/icinga2/icinga2-2.7.0.ebuild |
213 |
+++ b/net-analyzer/icinga2/icinga2-2.7.0.ebuild |
214 |
@@ -5,7 +5,7 @@ EAPI=6 |
215 |
if [[ ${PV} != 9999 ]]; then |
216 |
inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets |
217 |
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
218 |
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" |
219 |
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
220 |
else |
221 |
inherit cmake-utils depend.apache eutils git-2 systemd toolchain-funcs user wxwidgets |
222 |
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" |