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