Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/
Date: Sun, 10 Jul 2016 19:13:13
Message-Id: 1468177722.78e75d84d214b92117b6e3a3b301d07d36f902f7.prometheanfire@gentoo
1 commit: 78e75d84d214b92117b6e3a3b301d07d36f902f7
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 10 19:08:42 2016 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 10 19:08:42 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78e75d84
7
8 www-apps/icingaweb2: cleanup
9
10 Package-Manager: portage-2.2.28
11
12 www-apps/icingaweb2/Manifest | 2 -
13 www-apps/icingaweb2/icingaweb2-2.2.0.ebuild | 67 ----------------------------
14 www-apps/icingaweb2/icingaweb2-2.3.2.ebuild | 68 -----------------------------
15 3 files changed, 137 deletions(-)
16
17 diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
18 index 6392a00..0146040 100644
19 --- a/www-apps/icingaweb2/Manifest
20 +++ b/www-apps/icingaweb2/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST icingaweb2-2.2.0.tar.gz 9803668 SHA256 f240b35a4082b4835127608d0b11a27a4bf53bb0c88857344255225ce9611201 SHA512 e07948e284e59ac16f94191607d9da88b06e9e311af9f79b3fb19e1a7d943144515d4122dae4b01d09927b586ae4ccf15cce54e47e0e784882a422d6eb434f59 WHIRLPOOL 32734309b65e4ed0d04b060fadeef617ec9f7da7c227c563d76ede12e5839305b3a384f0b355aa8bc6a62d1220f4bf78f2299cddcbedcc7a9f2c1b1972dc5059
23 -DIST icingaweb2-2.3.2.tar.gz 9812433 SHA256 89abfec58726cadc0380897880190ece84f74f34152b1146ee7b24244337b76d SHA512 9cdea22df385e385077321ce482662b8e6529d0eef7be64880f695718431cf80de33e9dd40d480f3f284911aa58ef0d9d50a7ed52328d63612777569f9576052 WHIRLPOOL 98549205b00105e8b4516cbb3a51862eb710ef2b88506d9ff259ff9fb35c844be42efa21ad9acd657261a7e651ab386feed77295f787ca9cfc8eea2fb6f75d96
24 DIST icingaweb2-2.3.3.tar.gz 9822506 SHA256 4f315f4a2099ab9562b2076e8f3e7e14562644b6cb62c9aa24adefc76b3f8f77 SHA512 864dc6c466c77413ef1674a60edc621f68ab1c72030b832391d457a19417278f7812f6e6fb0424862ebf6bc37ff1562521987a1d05b01b090a8994a1c61907fe WHIRLPOOL 671f3e14982f1618a91d4c029ebf4133ea3fc56b8bafb3fb2350b7feb1c885aae54db06fe0de7864674a6862cc0bd63fc26bd7d3d62b62e18e2c37e07ec3df81
25 DIST icingaweb2-2.3.4.tar.gz 9822451 SHA256 31b7a4b7a40587d18f7eb743686e8b1ccaee95a0b5c58baee2ea8f29b57e64ab SHA512 abfb556f6b27982524db9a6283af4fe7d5d6c559b4d15309477721d372760723c29588214c8147288c81784af75c2254d2b90563739cd68b9c9109326f9ed128 WHIRLPOOL 384a52d5f499c5e2befee78dd26a700682297ab24eeddc634849701745dcdbc88b0421a2574d4d11fc613c72b3f5146074c6395ac99aae488f2d150e42a05d67
26
27 diff --git a/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild
28 deleted file mode 100644
29 index 1a05cde..0000000
30 --- a/www-apps/icingaweb2/icingaweb2-2.2.0.ebuild
31 +++ /dev/null
32 @@ -1,67 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI="5"
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 postgres"
47 -KEYWORDS="amd64 x86"
48 -
49 -DEPEND=">=net-analyzer/icinga2-2.1.1
50 - || (
51 - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
52 - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
53 - )
54 - dev-php/pecl-imagick
55 - apache2? ( >=www-servers/apache-2.4.0 )
56 - nginx? ( >=www-servers/nginx-1.7.0:* )"
57 -RDEPEND="${DEPEND}"
58 -
59 -want_apache2
60 -
61 -pkg_setup() {
62 - depend.apache_pkg_setup
63 -
64 - enewgroup icingaweb2
65 - enewgroup icingacmd
66 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
67 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
68 -}
69 -
70 -pkg_config() {
71 - if [[ -d /etc/icingaweb2 ]] ; then
72 - einfo "Updating existing installation ..."
73 - else
74 - einfo "Running first time setup ..."
75 - einfo "Creating configuration directory ..."
76 - /usr/share/${PN}/bin/icingacli setup config directory
77 - einfo "Creating authentication token for web setup ..."
78 - /usr/share/${PN}/bin/icingacli setup token create
79 - if use apache2 ; then
80 - einfo "The following might be useful for your Apache2 configuration:"
81 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
82 - fi
83 - if use nginx ; then
84 - einfo "The following might be useful for your NGinx configuration:"
85 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
86 - fi
87 - fi
88 - einfo "All done."
89 -}
90 -
91 -src_install() {
92 - insinto "/usr/share/${PN}"
93 - doins -r "${S}"/*
94 - fperms -R a+rX "/usr/share/${PN}/public/"
95 -}
96 -
97 -pkg_postinst() {
98 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
99 -}
100
101 diff --git a/www-apps/icingaweb2/icingaweb2-2.3.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.3.2.ebuild
102 deleted file mode 100644
103 index 227a7dc..0000000
104 --- a/www-apps/icingaweb2/icingaweb2-2.3.2.ebuild
105 +++ /dev/null
106 @@ -1,68 +0,0 @@
107 -# Copyright 1999-2016 Gentoo Foundation
108 -# Distributed under the terms of the GNU General Public License v2
109 -# $Id$
110 -
111 -EAPI="5"
112 -
113 -inherit depend.apache eutils multilib user
114 -
115 -DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
116 -HOMEPAGE="http://www.icinga.org/"
117 -SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
118 -LICENSE="GPL-2"
119 -SLOT="0"
120 -IUSE="apache2 ldap mysql nginx postgres"
121 -KEYWORDS="amd64 x86"
122 -
123 -DEPEND=">=net-analyzer/icinga2-2.1.1
124 - || (
125 - dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
126 - dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,pdo,postgres?,sockets,ssl,xslt,xml]
127 - )
128 - dev-php/pecl-imagick
129 - apache2? ( >=www-servers/apache-2.4.0 )
130 - nginx? ( >=www-servers/nginx-1.7.0:* )"
131 -RDEPEND="${DEPEND}"
132 -
133 -want_apache2
134 -
135 -pkg_setup() {
136 - depend.apache_pkg_setup
137 -
138 - enewgroup icingaweb2
139 - enewgroup icingacmd
140 - use nginx && usermod -a -G icingacmd,icingaweb2 nginx
141 - use apache2 && usermod -a -G icingacmd,icingaweb2 apache
142 -}
143 -
144 -pkg_config() {
145 - if [[ -d /etc/icingaweb2 ]] ; then
146 - einfo "Updating existing installation ..."
147 - else
148 - einfo "Running first time setup ..."
149 - einfo "Creating configuration directory ..."
150 - /usr/share/${PN}/bin/icingacli setup config directory
151 - einfo "Creating authentication token for web setup ..."
152 - /usr/share/${PN}/bin/icingacli setup token create
153 - if use apache2 ; then
154 - einfo "The following might be useful for your Apache2 configuration:"
155 - /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
156 - fi
157 - if use nginx ; then
158 - einfo "The following might be useful for your NGinx configuration:"
159 - /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
160 - fi
161 - fi
162 - einfo "All done."
163 -}
164 -
165 -src_install() {
166 - insinto "/usr/share/${PN}"
167 - doins -r "${S}"/*
168 - fperms -R a+rX "/usr/share/${PN}/public/"
169 - fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
170 -}
171 -
172 -pkg_postinst() {
173 - einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
174 -}