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