1 |
commit: c612e3db6df52d6981a75ed9a6c002befeaa417f |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 18 02:48:01 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 02:48:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c612e3db |
7 |
|
8 |
www-apps/icingaweb2: 2.6.1 stable amd64 and x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
11 |
|
12 |
www-apps/icingaweb2/Manifest | 1 - |
13 |
www-apps/icingaweb2/icingaweb2-2.6.0.ebuild | 81 ----------------------------- |
14 |
www-apps/icingaweb2/icingaweb2-2.6.1.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 83 deletions(-) |
16 |
|
17 |
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest |
18 |
index 3e19855ba7e..557d01d063d 100644 |
19 |
--- a/www-apps/icingaweb2/Manifest |
20 |
+++ b/www-apps/icingaweb2/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST icingaweb2-2.5.3.tar.gz 8124667 BLAKE2B 43f9e47d670aaeffb15a8dbca6794d72436b195d4a19491d31f548a57ef9d2d0c411f16276be5355700e8dc863b8ef84821c68759d65ef2e97688a88d92605ca SHA512 d11d4f90f0cb54ab6fc5412151d412fc7827c895e81f6c91806090c364b3df4f2999bbc5f65cd4007406a3e7a7c9e0d48fb8f8362f3d7780681ac8702cfcb572 |
23 |
-DIST icingaweb2-2.6.0.tar.gz 8165659 BLAKE2B 9e66a583cdec58b8eb2be7c86363d0154786eb7289ffbbc2b8c2978907537f56ef345313b9b916b3029793812431842ce88c525b29ed226f43bdeefc4af59c97 SHA512 a4788a40e87fa5a388acd6d87890cd5066c1622ba13ddb161beacf16d0765fd224c551c37ed83ef0a6059dd277a63c5c62427a411ccaae9b9deb7c7c88db8cb9 |
24 |
DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffc7777ad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392 SHA512 f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7 |
25 |
|
26 |
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild |
27 |
deleted file mode 100644 |
28 |
index d4db7e02c01..00000000000 |
29 |
--- a/www-apps/icingaweb2/icingaweb2-2.6.0.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,81 +0,0 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI="6" |
36 |
- |
37 |
-inherit depend.apache eutils multilib user |
38 |
- |
39 |
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2" |
40 |
-HOMEPAGE="http://www.icinga.org/" |
41 |
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
42 |
-LICENSE="GPL-2" |
43 |
-SLOT="0" |
44 |
-IUSE="apache2 ldap mysql nginx pdf postgres" |
45 |
-REQUIRED_USE="^^ ( apache2 nginx )" |
46 |
-KEYWORDS="~amd64 ~x86" |
47 |
- |
48 |
-DEPEND=">=net-analyzer/icinga2-2.1.1 |
49 |
- dev-php/pecl-imagick |
50 |
- pdf? ( media-gfx/imagemagick[png] ) |
51 |
- apache2? ( |
52 |
- >=www-servers/apache-2.4.0 |
53 |
- || ( |
54 |
- dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
55 |
- dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
56 |
- dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
57 |
- dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
58 |
- ) |
59 |
- ) |
60 |
- nginx? ( |
61 |
- >=www-servers/nginx-1.7.0:* |
62 |
- || ( |
63 |
- dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
64 |
- dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
65 |
- dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
66 |
- dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
67 |
- ) |
68 |
- )" |
69 |
-RDEPEND="${DEPEND}" |
70 |
- |
71 |
-want_apache2 |
72 |
- |
73 |
-pkg_setup() { |
74 |
- depend.apache_pkg_setup |
75 |
- |
76 |
- enewgroup icingaweb2 |
77 |
- enewgroup icingacmd |
78 |
- use nginx && usermod -a -G icingacmd,icingaweb2 nginx |
79 |
- use apache2 && usermod -a -G icingacmd,icingaweb2 apache |
80 |
-} |
81 |
- |
82 |
-pkg_config() { |
83 |
- if [[ -d /etc/icingaweb2 ]] ; then |
84 |
- einfo "Updating existing installation ..." |
85 |
- else |
86 |
- einfo "Running first time setup ..." |
87 |
- einfo "Creating configuration directory ..." |
88 |
- /usr/share/${PN}/bin/icingacli setup config directory |
89 |
- einfo "Creating authentication token for web setup ..." |
90 |
- /usr/share/${PN}/bin/icingacli setup token create |
91 |
- if use apache2 ; then |
92 |
- einfo "The following might be useful for your Apache2 configuration:" |
93 |
- /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public |
94 |
- fi |
95 |
- if use nginx ; then |
96 |
- einfo "The following might be useful for your NGinx configuration:" |
97 |
- /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public |
98 |
- fi |
99 |
- fi |
100 |
- einfo "All done." |
101 |
-} |
102 |
- |
103 |
-src_install() { |
104 |
- insinto "/usr/share/${PN}" |
105 |
- doins -r "${S}"/* |
106 |
- fperms -R a+rX "/usr/share/${PN}/public/" |
107 |
- fperms u+x,g+x "/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.6.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild |
115 |
index d4db7e02c01..0bf5ea9d946 100644 |
116 |
--- a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild |
117 |
+++ b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild |
118 |
@@ -12,7 +12,7 @@ LICENSE="GPL-2" |
119 |
SLOT="0" |
120 |
IUSE="apache2 ldap mysql nginx pdf postgres" |
121 |
REQUIRED_USE="^^ ( apache2 nginx )" |
122 |
-KEYWORDS="~amd64 ~x86" |
123 |
+KEYWORDS="amd64 x86" |
124 |
|
125 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
126 |
dev-php/pecl-imagick |