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