1 |
commit: 721f723dfa86cbbd0df5ccb004caffba9d294f64 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 22 18:11:49 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 22 18:12:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721f723d |
7 |
|
8 |
www-apps/icingaweb2: 2.5.1 stable amd64 and x86 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
www-apps/icingaweb2/Manifest | 2 - |
13 |
www-apps/icingaweb2/icingaweb2-2.4.2.ebuild | 79 ----------------------------- |
14 |
www-apps/icingaweb2/icingaweb2-2.5.0.ebuild | 79 ----------------------------- |
15 |
www-apps/icingaweb2/icingaweb2-2.5.1.ebuild | 2 +- |
16 |
4 files changed, 1 insertion(+), 161 deletions(-) |
17 |
|
18 |
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest |
19 |
index 837570c4179..07820724a8d 100644 |
20 |
--- a/www-apps/icingaweb2/Manifest |
21 |
+++ b/www-apps/icingaweb2/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST icingaweb2-2.4.2.tar.gz 7180122 BLAKE2B d3018ab2bbb9cbe501c638208d7546640b83775ef86e340b61c9a83bc8f250060c34a7dae74cc983252ff05747d951107ff5c7857aaa44dc387ce513843c503f SHA512 2a6f80561b59fde1b7ca72b8a120f93685a4741e7af036a90cdd5a1371f8e6d6caa25161f136b379255032b16b21914325a26f078121743d1299e96e7685ef53 |
24 |
-DIST icingaweb2-2.5.0.tar.gz 8032968 BLAKE2B f0fab047da90ff514f715a8ddbf51d97beb1cd052513a523c63fbb97a424ecee8ff7b2c63a6e432cda3d70bdb1283641702d3ae1ff4146d084b312009ccdbe5e SHA512 9946c74033550accdc7077b3f77ce035931c72645871808ea488113d3545f8082460c1b8a4dffcb08f01d452fab54fd425e90e77cd006a7783b426132015498f |
25 |
DIST icingaweb2-2.5.1.tar.gz 8133540 BLAKE2B f5f9d2131f87160f7df5b34cae7e9b1036e14994f3b739607b26ba676e6cd56ad95ed5688c873df3232fc9782566b0bb5c2054aa04dd272b389a1eae8501af88 SHA512 8e76347f76a2b2889fb9a61c000ef7865f40b2ea261f59bfbf24bb8d0e4e7e2977ff283d31989f6892e371f4a9a4d4682a2cac3269070b2036cc37ea74af1b11 |
26 |
|
27 |
diff --git a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild |
28 |
deleted file mode 100644 |
29 |
index 796ba177fbf..00000000000 |
30 |
--- a/www-apps/icingaweb2/icingaweb2-2.4.2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,79 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI="6" |
37 |
- |
38 |
-inherit depend.apache eutils multilib user |
39 |
- |
40 |
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2" |
41 |
-HOMEPAGE="http://www.icinga.org/" |
42 |
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
43 |
-LICENSE="GPL-2" |
44 |
-SLOT="0" |
45 |
-IUSE="apache2 ldap mysql nginx pdf postgres" |
46 |
-REQUIRED_USE="^^ ( apache2 nginx )" |
47 |
-KEYWORDS="amd64 x86" |
48 |
- |
49 |
-DEPEND=">=net-analyzer/icinga2-2.1.1 |
50 |
- dev-php/pecl-imagick |
51 |
- pdf? ( media-gfx/imagemagick[png] ) |
52 |
- apache2? ( |
53 |
- >=www-servers/apache-2.4.0 |
54 |
- || ( |
55 |
- dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
56 |
- dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
57 |
- dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
58 |
- ) |
59 |
- ) |
60 |
- nginx? ( |
61 |
- >=www-servers/nginx-1.7.0:* |
62 |
- || ( |
63 |
- dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
64 |
- dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
65 |
- dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
66 |
- ) |
67 |
- )" |
68 |
-RDEPEND="${DEPEND}" |
69 |
- |
70 |
-want_apache2 |
71 |
- |
72 |
-pkg_setup() { |
73 |
- depend.apache_pkg_setup |
74 |
- |
75 |
- enewgroup icingaweb2 |
76 |
- enewgroup icingacmd |
77 |
- use nginx && usermod -a -G icingacmd,icingaweb2 nginx |
78 |
- use apache2 && usermod -a -G icingacmd,icingaweb2 apache |
79 |
-} |
80 |
- |
81 |
-pkg_config() { |
82 |
- if [[ -d /etc/icingaweb2 ]] ; then |
83 |
- einfo "Updating existing installation ..." |
84 |
- else |
85 |
- einfo "Running first time setup ..." |
86 |
- einfo "Creating configuration directory ..." |
87 |
- /usr/share/${PN}/bin/icingacli setup config directory |
88 |
- einfo "Creating authentication token for web setup ..." |
89 |
- /usr/share/${PN}/bin/icingacli setup token create |
90 |
- if use apache2 ; then |
91 |
- einfo "The following might be useful for your Apache2 configuration:" |
92 |
- /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public |
93 |
- fi |
94 |
- if use nginx ; then |
95 |
- einfo "The following might be useful for your NGinx configuration:" |
96 |
- /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public |
97 |
- fi |
98 |
- fi |
99 |
- einfo "All done." |
100 |
-} |
101 |
- |
102 |
-src_install() { |
103 |
- insinto "/usr/share/${PN}" |
104 |
- doins -r "${S}"/* |
105 |
- fperms -R a+rX "/usr/share/${PN}/public/" |
106 |
- fperms u+x,g+x "/usr/share/${PN}/bin/icingacli" |
107 |
-} |
108 |
- |
109 |
-pkg_postinst() { |
110 |
- einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup." |
111 |
-} |
112 |
|
113 |
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.0.ebuild |
114 |
deleted file mode 100644 |
115 |
index 796ba177fbf..00000000000 |
116 |
--- a/www-apps/icingaweb2/icingaweb2-2.5.0.ebuild |
117 |
+++ /dev/null |
118 |
@@ -1,79 +0,0 @@ |
119 |
-# Copyright 1999-2017 Gentoo Foundation |
120 |
-# Distributed under the terms of the GNU General Public License v2 |
121 |
- |
122 |
-EAPI="6" |
123 |
- |
124 |
-inherit depend.apache eutils multilib user |
125 |
- |
126 |
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2" |
127 |
-HOMEPAGE="http://www.icinga.org/" |
128 |
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
129 |
-LICENSE="GPL-2" |
130 |
-SLOT="0" |
131 |
-IUSE="apache2 ldap mysql nginx pdf postgres" |
132 |
-REQUIRED_USE="^^ ( apache2 nginx )" |
133 |
-KEYWORDS="amd64 x86" |
134 |
- |
135 |
-DEPEND=">=net-analyzer/icinga2-2.1.1 |
136 |
- dev-php/pecl-imagick |
137 |
- pdf? ( media-gfx/imagemagick[png] ) |
138 |
- apache2? ( |
139 |
- >=www-servers/apache-2.4.0 |
140 |
- || ( |
141 |
- dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
142 |
- dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
143 |
- dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
144 |
- ) |
145 |
- ) |
146 |
- nginx? ( |
147 |
- >=www-servers/nginx-1.7.0:* |
148 |
- || ( |
149 |
- dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
150 |
- dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
151 |
- dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
152 |
- ) |
153 |
- )" |
154 |
-RDEPEND="${DEPEND}" |
155 |
- |
156 |
-want_apache2 |
157 |
- |
158 |
-pkg_setup() { |
159 |
- depend.apache_pkg_setup |
160 |
- |
161 |
- enewgroup icingaweb2 |
162 |
- enewgroup icingacmd |
163 |
- use nginx && usermod -a -G icingacmd,icingaweb2 nginx |
164 |
- use apache2 && usermod -a -G icingacmd,icingaweb2 apache |
165 |
-} |
166 |
- |
167 |
-pkg_config() { |
168 |
- if [[ -d /etc/icingaweb2 ]] ; then |
169 |
- einfo "Updating existing installation ..." |
170 |
- else |
171 |
- einfo "Running first time setup ..." |
172 |
- einfo "Creating configuration directory ..." |
173 |
- /usr/share/${PN}/bin/icingacli setup config directory |
174 |
- einfo "Creating authentication token for web setup ..." |
175 |
- /usr/share/${PN}/bin/icingacli setup token create |
176 |
- if use apache2 ; then |
177 |
- einfo "The following might be useful for your Apache2 configuration:" |
178 |
- /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public |
179 |
- fi |
180 |
- if use nginx ; then |
181 |
- einfo "The following might be useful for your NGinx configuration:" |
182 |
- /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public |
183 |
- fi |
184 |
- fi |
185 |
- einfo "All done." |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- insinto "/usr/share/${PN}" |
190 |
- doins -r "${S}"/* |
191 |
- fperms -R a+rX "/usr/share/${PN}/public/" |
192 |
- fperms u+x,g+x "/usr/share/${PN}/bin/icingacli" |
193 |
-} |
194 |
- |
195 |
-pkg_postinst() { |
196 |
- einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup." |
197 |
-} |
198 |
|
199 |
diff --git a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild |
200 |
index f3513d784a2..f0f9dd8f5d6 100644 |
201 |
--- a/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild |
202 |
+++ b/www-apps/icingaweb2/icingaweb2-2.5.1.ebuild |
203 |
@@ -12,7 +12,7 @@ LICENSE="GPL-2" |
204 |
SLOT="0" |
205 |
IUSE="apache2 ldap mysql nginx pdf postgres" |
206 |
REQUIRED_USE="^^ ( apache2 nginx )" |
207 |
-KEYWORDS="~amd64 ~x86" |
208 |
+KEYWORDS="amd64 x86" |
209 |
|
210 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
211 |
dev-php/pecl-imagick |