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: Wed, 31 Aug 2022 15:38:19
Message-Id: 1661960289.991cc68a553c623919d2a5e09d54ce9c9cd2f207.prometheanfire@gentoo
1 commit: 991cc68a553c623919d2a5e09d54ce9c9cd2f207
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 15:38:09 2022 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 15:38:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991cc68a
7
8 www-apps/icingaweb2: drop 2.10.3, 2.11.0
9
10 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
11
12 www-apps/icingaweb2/Manifest | 2 -
13 www-apps/icingaweb2/icingaweb2-2.10.3.ebuild | 81 ---------------------------
14 www-apps/icingaweb2/icingaweb2-2.11.0.ebuild | 82 ----------------------------
15 3 files changed, 165 deletions(-)
16
17 diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
18 index b02485d79127..dbb1f290c5ed 100644
19 --- a/www-apps/icingaweb2/Manifest
20 +++ b/www-apps/icingaweb2/Manifest
21 @@ -1,3 +1 @@
22 -DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d SHA512 f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
23 -DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191 SHA512 e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
24 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67 SHA512 3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
25
26 diff --git a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
27 deleted file mode 100644
28 index eb5a96a535d5..000000000000
29 --- a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
30 +++ /dev/null
31 @@ -1,81 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit depend.apache multilib
38 -
39 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
40 -HOMEPAGE="http://www.icinga.org/"
41 -
42 -if [[ ${PV} == *9999 ]];then
43 - inherit git-r3
44 - EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
45 - EGIT_BRANCH="master"
46 -else
47 - SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
48 - KEYWORDS="amd64 x86"
49 -fi
50 -
51 -LICENSE="GPL-2"
52 -SLOT="0"
53 -IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
54 -REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
55 -
56 -DEPEND=">=net-analyzer/icinga2-2.1.1
57 - dev-php/pecl-imagick
58 - pdf? ( media-gfx/imagemagick[png] )
59 - apache2-server? ( >=www-servers/apache-2.4.0 )
60 - nginx? ( >=www-servers/nginx-1.7.0:* )
61 - || (
62 - dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
63 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
64 - dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
65 - )
66 - dev-libs/icinga-php-library
67 - dev-libs/icinga-php-thirdparty
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 - fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
108 -}
109 -
110 -pkg_postinst() {
111 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
112 -}
113
114 diff --git a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
115 deleted file mode 100644
116 index 427ea0f05350..000000000000
117 --- a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
118 +++ /dev/null
119 @@ -1,82 +0,0 @@
120 -# Copyright 1999-2022 Gentoo Authors
121 -# Distributed under the terms of the GNU General Public License v2
122 -
123 -EAPI=7
124 -
125 -inherit depend.apache multilib
126 -
127 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
128 -HOMEPAGE="http://www.icinga.org/"
129 -
130 -if [[ ${PV} == *9999 ]];then
131 - inherit git-r3
132 - EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
133 - EGIT_BRANCH="master"
134 -else
135 - SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
136 - KEYWORDS="amd64 x86"
137 -fi
138 -
139 -LICENSE="GPL-2"
140 -SLOT="0"
141 -IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
142 -REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
143 -
144 -DEPEND=">=net-analyzer/icinga2-2.1.1
145 - dev-php/pecl-imagick
146 - pdf? ( media-gfx/imagemagick[png] )
147 - apache2-server? ( >=www-servers/apache-2.4.0 )
148 - nginx? ( >=www-servers/nginx-1.7.0:* )
149 - || (
150 - dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
151 - dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
152 - dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
153 - dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
154 - )
155 - >=dev-libs/icinga-php-library-0.8.1
156 - >=dev-libs/icinga-php-thirdparty-0.11.0
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 - fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
197 -}
198 -
199 -pkg_postinst() {
200 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
201 -}