Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/
Date: Wed, 15 Feb 2017 16:31:10
Message-Id: 1487176251.43fcaa8ae245a4b00a057c91a1d3f77020aa5c61.prometheanfire@gentoo
1 commit: 43fcaa8ae245a4b00a057c91a1d3f77020aa5c61
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 16:30:51 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 15 16:30:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fcaa8a
7
8 www-apps/icingaweb2: cleanup
9
10 Package-Manager: portage-2.3.3
11
12 www-apps/icingaweb2/Manifest | 2 -
13 www-apps/icingaweb2/icingaweb2-2.3.3.ebuild | 68 ----------------------
14 www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild | 77 -------------------------
15 www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild | 79 --------------------------
16 4 files changed, 226 deletions(-)
17
18 diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
19 index 705f2c19c1..e811157ea9 100644
20 --- a/www-apps/icingaweb2/Manifest
21 +++ b/www-apps/icingaweb2/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST icingaweb2-2.3.3.tar.gz 9822506 SHA256 4f315f4a2099ab9562b2076e8f3e7e14562644b6cb62c9aa24adefc76b3f8f77 SHA512 864dc6c466c77413ef1674a60edc621f68ab1c72030b832391d457a19417278f7812f6e6fb0424862ebf6bc37ff1562521987a1d05b01b090a8994a1c61907fe WHIRLPOOL 671f3e14982f1618a91d4c029ebf4133ea3fc56b8bafb3fb2350b7feb1c885aae54db06fe0de7864674a6862cc0bd63fc26bd7d3d62b62e18e2c37e07ec3df81
24 -DIST icingaweb2-2.3.4.tar.gz 9822451 SHA256 31b7a4b7a40587d18f7eb743686e8b1ccaee95a0b5c58baee2ea8f29b57e64ab SHA512 abfb556f6b27982524db9a6283af4fe7d5d6c559b4d15309477721d372760723c29588214c8147288c81784af75c2254d2b90563739cd68b9c9109326f9ed128 WHIRLPOOL 384a52d5f499c5e2befee78dd26a700682297ab24eeddc634849701745dcdbc88b0421a2574d4d11fc613c72b3f5146074c6395ac99aae488f2d150e42a05d67
25 DIST icingaweb2-2.4.0.tar.gz 7177228 SHA256 aa8c1b2a0e655aa646045cb39c9db054fcb59bd0cac6751934f5b246aa067696 SHA512 f2c22e268d7920bccb1be0bb4d177fefebbb4aa87d4e50ba4e80f9f475b2e52b9c6f5fe0624f812eec89d3e5e6a0f77f41d237b8badf52b074571397ff77dc8d WHIRLPOOL 223aa88ce9a91eecb7430ba91bb0511f90578436f4b9f640a01857f0946d95e5e8e2b67bb0672914f96d269160c81bc986bb8c9b2d3bb574622b82c531a419fc
26 DIST icingaweb2-2.4.1.tar.gz 7176640 SHA256 27150d96a2172d0fa0c77389970052a1bf7aa6553494e80837f6699e96e24bc6 SHA512 21ac8faea3e339cfc668407cef826cf4a8f01c964ad102e2c9bc9716e20c3177cea10ec575b99a5a4bb0a9681032b83427c250c5288b037a70d27dc919d0f641 WHIRLPOOL 40c5e48f0c7b6b32cb1eb02c1a447512bdba397eda8c20110a1e4d0c0b794265fe413c2c3a1a56d3f009e4245e211322a5b97a16449af4a1ff90bb4831f781fb
27
28 diff --git a/www-apps/icingaweb2/icingaweb2-2.3.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.3.ebuild
29 deleted file mode 100644
30 index 227a7dcb81..0000000000
31 --- a/www-apps/icingaweb2/icingaweb2-2.3.3.ebuild
32 +++ /dev/null
33 @@ -1,68 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI="5"
39 -
40 -inherit depend.apache eutils multilib user
41 -
42 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
43 -HOMEPAGE="http://www.icinga.org/"
44 -SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -IUSE="apache2 ldap mysql nginx postgres"
48 -KEYWORDS="amd64 x86"
49 -
50 -DEPEND=">=net-analyzer/icinga2-2.1.1
51 - || (
52 - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
53 - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
54 - )
55 - dev-php/pecl-imagick
56 - apache2? ( >=www-servers/apache-2.4.0 )
57 - nginx? ( >=www-servers/nginx-1.7.0:* )"
58 -RDEPEND="${DEPEND}"
59 -
60 -want_apache2
61 -
62 -pkg_setup() {
63 - depend.apache_pkg_setup
64 -
65 - enewgroup icingaweb2
66 - enewgroup icingacmd
67 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
68 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
69 -}
70 -
71 -pkg_config() {
72 - if [[ -d /etc/icingaweb2 ]] ; then
73 - einfo "Updating existing installation ..."
74 - else
75 - einfo "Running first time setup ..."
76 - einfo "Creating configuration directory ..."
77 - /usr/share/${PN}/bin/icingacli setup config directory
78 - einfo "Creating authentication token for web setup ..."
79 - /usr/share/${PN}/bin/icingacli setup token create
80 - if use apache2 ; then
81 - einfo "The following might be useful for your Apache2 configuration:"
82 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
83 - fi
84 - if use nginx ; then
85 - einfo "The following might be useful for your NGinx configuration:"
86 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
87 - fi
88 - fi
89 - einfo "All done."
90 -}
91 -
92 -src_install() {
93 - insinto "/usr/share/${PN}"
94 - doins -r "${S}"/*
95 - fperms -R a+rX "/usr/share/${PN}/public/"
96 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
97 -}
98 -
99 -pkg_postinst() {
100 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
101 -}
102
103 diff --git a/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild
104 deleted file mode 100644
105 index 3a20691994..0000000000
106 --- a/www-apps/icingaweb2/icingaweb2-2.3.4-r1.ebuild
107 +++ /dev/null
108 @@ -1,77 +0,0 @@
109 -# Copyright 1999-2016 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -# $Id$
112 -
113 -EAPI="5"
114 -
115 -inherit depend.apache eutils multilib user
116 -
117 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
118 -HOMEPAGE="http://www.icinga.org/"
119 -SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
120 -LICENSE="GPL-2"
121 -SLOT="0"
122 -IUSE="apache2 ldap mysql nginx postgres"
123 -REQUIRED_USE="^^ ( apache2 nginx )"
124 -KEYWORDS="amd64 x86"
125 -
126 -DEPEND=">=net-analyzer/icinga2-2.1.1
127 - dev-php/pecl-imagick
128 - apache2? (
129 - >=www-servers/apache-2.4.0
130 - || (
131 - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
132 - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
133 - )
134 - )
135 - nginx? (
136 - >=www-servers/nginx-1.7.0:*
137 - || (
138 - dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
139 - dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
140 - )
141 - )"
142 -RDEPEND="${DEPEND}"
143 -
144 -want_apache2
145 -
146 -pkg_setup() {
147 - depend.apache_pkg_setup
148 -
149 - enewgroup icingaweb2
150 - enewgroup icingacmd
151 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
152 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
153 -}
154 -
155 -pkg_config() {
156 - if [[ -d /etc/icingaweb2 ]] ; then
157 - einfo "Updating existing installation ..."
158 - else
159 - einfo "Running first time setup ..."
160 - einfo "Creating configuration directory ..."
161 - /usr/share/${PN}/bin/icingacli setup config directory
162 - einfo "Creating authentication token for web setup ..."
163 - /usr/share/${PN}/bin/icingacli setup token create
164 - if use apache2 ; then
165 - einfo "The following might be useful for your Apache2 configuration:"
166 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
167 - fi
168 - if use nginx ; then
169 - einfo "The following might be useful for your NGinx configuration:"
170 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
171 - fi
172 - fi
173 - einfo "All done."
174 -}
175 -
176 -src_install() {
177 - insinto "/usr/share/${PN}"
178 - doins -r "${S}"/*
179 - fperms -R a+rX "/usr/share/${PN}/public/"
180 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
181 -}
182 -
183 -pkg_postinst() {
184 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
185 -}
186
187 diff --git a/www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild
188 deleted file mode 100644
189 index 0da8152fa3..0000000000
190 --- a/www-apps/icingaweb2/icingaweb2-2.3.4-r2.ebuild
191 +++ /dev/null
192 @@ -1,79 +0,0 @@
193 -# Copyright 1999-2016 Gentoo Foundation
194 -# Distributed under the terms of the GNU General Public License v2
195 -# $Id$
196 -
197 -EAPI="5"
198 -
199 -inherit depend.apache eutils multilib user
200 -
201 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
202 -HOMEPAGE="http://www.icinga.org/"
203 -SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
204 -LICENSE="GPL-2"
205 -SLOT="0"
206 -IUSE="apache2 ldap mysql nginx postgres"
207 -REQUIRED_USE="^^ ( apache2 nginx )"
208 -KEYWORDS="~amd64 ~x86"
209 -
210 -DEPEND=">=net-analyzer/icinga2-2.1.1
211 - dev-php/pecl-imagick
212 - apache2? (
213 - >=www-servers/apache-2.4.0
214 - || (
215 - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
216 - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
217 - dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
218 - )
219 - )
220 - nginx? (
221 - >=www-servers/nginx-1.7.0:*
222 - || (
223 - dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
224 - dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
225 - dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
226 - )
227 - )"
228 -RDEPEND="${DEPEND}"
229 -
230 -want_apache2
231 -
232 -pkg_setup() {
233 - depend.apache_pkg_setup
234 -
235 - enewgroup icingaweb2
236 - enewgroup icingacmd
237 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
238 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
239 -}
240 -
241 -pkg_config() {
242 - if [[ -d /etc/icingaweb2 ]] ; then
243 - einfo "Updating existing installation ..."
244 - else
245 - einfo "Running first time setup ..."
246 - einfo "Creating configuration directory ..."
247 - /usr/share/${PN}/bin/icingacli setup config directory
248 - einfo "Creating authentication token for web setup ..."
249 - /usr/share/${PN}/bin/icingacli setup token create
250 - if use apache2 ; then
251 - einfo "The following might be useful for your Apache2 configuration:"
252 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
253 - fi
254 - if use nginx ; then
255 - einfo "The following might be useful for your NGinx configuration:"
256 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
257 - fi
258 - fi
259 - einfo "All done."
260 -}
261 -
262 -src_install() {
263 - insinto "/usr/share/${PN}"
264 - doins -r "${S}"/*
265 - fperms -R a+rX "/usr/share/${PN}/public/"
266 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
267 -}
268 -
269 -pkg_postinst() {
270 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
271 -}