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