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, 11 Oct 2021 14:27:52
Message-Id: 1633962464.45c94b1f058575827bef6696f93ec8d6bdc33404.prometheanfire@gentoo
1 commit: 45c94b1f058575827bef6696f93ec8d6bdc33404
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 11 14:27:29 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 11 14:27:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c94b1f
7
8 www-apps/icingaweb2: 2.8.3 / 2.8.4 clean up
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.3.ebuild | 77 -----------------------------
15 www-apps/icingaweb2/icingaweb2-2.8.4.ebuild | 77 -----------------------------
16 3 files changed, 156 deletions(-)
17
18 diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
19 index a53777cd1d5..321c373425f 100644
20 --- a/www-apps/icingaweb2/Manifest
21 +++ b/www-apps/icingaweb2/Manifest
22 @@ -1,3 +1 @@
23 -DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
24 -DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
25 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
26
27 diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
28 deleted file mode 100644
29 index 8ce45462266..00000000000
30 --- a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
31 +++ /dev/null
32 @@ -1,77 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -inherit depend.apache multilib
39 -
40 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
41 -HOMEPAGE="http://www.icinga.org/"
42 -
43 -if [[ ${PV} == *9999 ]];then
44 - inherit git-r3
45 - EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
46 - EGIT_BRANCH="master"
47 -else
48 - SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
49 - KEYWORDS="amd64 x86"
50 -fi
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
55 -REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
56 -
57 -DEPEND=">=net-analyzer/icinga2-2.1.1
58 - dev-php/pecl-imagick
59 - pdf? ( media-gfx/imagemagick[png] )
60 - apache2-server? ( >=www-servers/apache-2.4.0 )
61 - nginx? ( >=www-servers/nginx-1.7.0:* )
62 - || (
63 - dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
64 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
65 - )
66 - acct-group/icingacmd
67 - acct-group/icingaweb2"
68 -RDEPEND="${DEPEND}"
69 -
70 -want_apache2
71 -
72 -pkg_setup() {
73 - depend.apache_pkg_setup
74 -
75 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
76 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
77 -}
78 -
79 -pkg_config() {
80 - if [[ -d /etc/icingaweb2 ]] ; then
81 - einfo "Updating existing installation ..."
82 - else
83 - einfo "Running first time setup ..."
84 - einfo "Creating configuration directory ..."
85 - /usr/share/${PN}/bin/icingacli setup config directory
86 - einfo "Creating authentication token for web setup ..."
87 - /usr/share/${PN}/bin/icingacli setup token create
88 - if use apache2 ; then
89 - einfo "The following might be useful for your Apache2 configuration:"
90 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
91 - fi
92 - if use nginx ; then
93 - einfo "The following might be useful for your NGinx configuration:"
94 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
95 - fi
96 - fi
97 - einfo "All done."
98 -}
99 -
100 -src_install() {
101 - insinto "/usr/share/${PN}"
102 - doins -r "${S}"/*
103 - fperms -R a+rX "/usr/share/${PN}/public/"
104 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
105 -}
106 -
107 -pkg_postinst() {
108 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
109 -}
110
111 diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
112 deleted file mode 100644
113 index c5f119e375d..00000000000
114 --- a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
115 +++ /dev/null
116 @@ -1,77 +0,0 @@
117 -# Copyright 1999-2021 Gentoo Authors
118 -# Distributed under the terms of the GNU General Public License v2
119 -
120 -EAPI=7
121 -
122 -inherit depend.apache multilib
123 -
124 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
125 -HOMEPAGE="http://www.icinga.org/"
126 -
127 -if [[ ${PV} == *9999 ]];then
128 - inherit git-r3
129 - EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
130 - EGIT_BRANCH="master"
131 -else
132 - SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
133 - KEYWORDS="~amd64 ~x86"
134 -fi
135 -
136 -LICENSE="GPL-2"
137 -SLOT="0"
138 -IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
139 -REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
140 -
141 -DEPEND=">=net-analyzer/icinga2-2.1.1
142 - dev-php/pecl-imagick
143 - pdf? ( media-gfx/imagemagick[png] )
144 - apache2-server? ( >=www-servers/apache-2.4.0 )
145 - nginx? ( >=www-servers/nginx-1.7.0:* )
146 - || (
147 - dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
148 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
149 - )
150 - acct-group/icingacmd
151 - acct-group/icingaweb2"
152 -RDEPEND="${DEPEND}"
153 -
154 -want_apache2
155 -
156 -pkg_setup() {
157 - depend.apache_pkg_setup
158 -
159 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
160 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
161 -}
162 -
163 -pkg_config() {
164 - if [[ -d /etc/icingaweb2 ]] ; then
165 - einfo "Updating existing installation ..."
166 - else
167 - einfo "Running first time setup ..."
168 - einfo "Creating configuration directory ..."
169 - /usr/share/${PN}/bin/icingacli setup config directory
170 - einfo "Creating authentication token for web setup ..."
171 - /usr/share/${PN}/bin/icingacli setup token create
172 - if use apache2 ; then
173 - einfo "The following might be useful for your Apache2 configuration:"
174 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
175 - fi
176 - if use nginx ; then
177 - einfo "The following might be useful for your NGinx configuration:"
178 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
179 - fi
180 - fi
181 - einfo "All done."
182 -}
183 -
184 -src_install() {
185 - insinto "/usr/share/${PN}"
186 - doins -r "${S}"/*
187 - fperms -R a+rX "/usr/share/${PN}/public/"
188 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
189 -}
190 -
191 -pkg_postinst() {
192 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
193 -}