Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/
Date: Mon, 13 Sep 2021 13:55:17
Message-Id: 1631541308.73903d25af8192de597c44ff0e26405feab12c35.prometheanfire@gentoo
1 commit: 73903d25af8192de597c44ff0e26405feab12c35
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 13 13:54:52 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 13 13:55:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73903d25
7
8 www-apps/icingaweb2: 2.8.2 2.9.2 cleanup
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 www-apps/icingaweb2/Manifest | 2 -
14 www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild | 77 -------------------------
15 www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild | 80 --------------------------
16 3 files changed, 159 deletions(-)
17
18 diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
19 index 26d88dd2bf3..a53777cd1d5 100644
20 --- a/www-apps/icingaweb2/Manifest
21 +++ b/www-apps/icingaweb2/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
24 DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
25 DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
26 -DIST icingaweb2-2.9.2.tar.gz 12304718 BLAKE2B ba5d0872318a504d25b614825008e90cabd4680b30686d90ad438408e4a248f9dc2ef9410c5405da7efac949c6c41d89c64604b18c6d86f9ba479c99a8daff9a SHA512 67268544db0c267f9522b2105db52d87967835279eb621b79827b7b1b80a327b69348c849e4d3716a9cd26dfaef31a06b5ba125d30a48c3f5686dcf4c7a7a959
27 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
28
29 diff --git a/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
30 deleted file mode 100644
31 index 8ce45462266..00000000000
32 --- a/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
33 +++ /dev/null
34 @@ -1,77 +0,0 @@
35 -# Copyright 1999-2021 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -
40 -inherit depend.apache multilib
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:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
66 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
67 - )
68 - acct-group/icingacmd
69 - acct-group/icingaweb2"
70 -RDEPEND="${DEPEND}"
71 -
72 -want_apache2
73 -
74 -pkg_setup() {
75 - depend.apache_pkg_setup
76 -
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.9.2-r2.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild
114 deleted file mode 100644
115 index 977d8fee7bb..00000000000
116 --- a/www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild
117 +++ /dev/null
118 @@ -1,80 +0,0 @@
119 -# Copyright 1999-2021 Gentoo Authors
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=7
123 -
124 -inherit depend.apache multilib
125 -
126 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
127 -HOMEPAGE="http://www.icinga.org/"
128 -
129 -if [[ ${PV} == *9999 ]];then
130 - inherit git-r3
131 - EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
132 - EGIT_BRANCH="master"
133 -else
134 - SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
135 - KEYWORDS="amd64 x86"
136 -fi
137 -
138 -LICENSE="GPL-2"
139 -SLOT="0"
140 -IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
141 -REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
142 -
143 -DEPEND=">=net-analyzer/icinga2-2.1.1
144 - dev-php/pecl-imagick
145 - pdf? ( media-gfx/imagemagick[png] )
146 - apache2-server? ( >=www-servers/apache-2.4.0 )
147 - nginx? ( >=www-servers/nginx-1.7.0:* )
148 - || (
149 - dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
150 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
151 - dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
152 - )
153 - dev-libs/icinga-php-library
154 - dev-libs/icinga-php-thirdparty
155 - acct-group/icingacmd
156 - acct-group/icingaweb2"
157 -RDEPEND="${DEPEND}"
158 -
159 -want_apache2
160 -
161 -pkg_setup() {
162 - depend.apache_pkg_setup
163 -
164 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
165 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
166 -}
167 -
168 -pkg_config() {
169 - if [[ -d /etc/icingaweb2 ]] ; then
170 - einfo "Updating existing installation ..."
171 - else
172 - einfo "Running first time setup ..."
173 - einfo "Creating configuration directory ..."
174 - /usr/share/${PN}/bin/icingacli setup config directory
175 - einfo "Creating authentication token for web setup ..."
176 - /usr/share/${PN}/bin/icingacli setup token create
177 - if use apache2 ; then
178 - einfo "The following might be useful for your Apache2 configuration:"
179 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
180 - fi
181 - if use nginx ; then
182 - einfo "The following might be useful for your NGinx configuration:"
183 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
184 - fi
185 - fi
186 - einfo "All done."
187 -}
188 -
189 -src_install() {
190 - insinto "/usr/share/${PN}"
191 - doins -r "${S}"/*
192 - fperms -R a+rX "/usr/share/${PN}/public/"
193 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
194 -}
195 -
196 -pkg_postinst() {
197 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
198 -}