1 |
commit: 32d8ebde3f01f441f6d6b28191b9288c7334f9e2 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 18 15:23:13 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 18 15:28:48 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d8ebde |
7 |
|
8 |
www-apps/icingaweb2: 2.7.3 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.18 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
www-apps/icingaweb2/Manifest | 1 - |
14 |
www-apps/icingaweb2/icingaweb2-2.6.3.ebuild | 79 ----------------------------- |
15 |
www-apps/icingaweb2/icingaweb2-2.7.3.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 81 deletions(-) |
17 |
|
18 |
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest |
19 |
index ad6384a490d..2de5e7cba50 100644 |
20 |
--- a/www-apps/icingaweb2/Manifest |
21 |
+++ b/www-apps/icingaweb2/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
-DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb SHA512 f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710 |
24 |
DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d SHA512 0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6 |
25 |
DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359 SHA512 eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb |
26 |
|
27 |
diff --git a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild |
28 |
deleted file mode 100644 |
29 |
index 4d66e260c40..00000000000 |
30 |
--- a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,79 +0,0 @@ |
33 |
-# Copyright 1999-2019 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI="6" |
37 |
- |
38 |
-inherit depend.apache eutils multilib user |
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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
64 |
- dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
65 |
- dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
66 |
- dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
67 |
- )" |
68 |
-RDEPEND="${DEPEND}" |
69 |
- |
70 |
-want_apache2 |
71 |
- |
72 |
-pkg_setup() { |
73 |
- depend.apache_pkg_setup |
74 |
- |
75 |
- enewgroup icingaweb2 |
76 |
- enewgroup icingacmd |
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.7.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild |
114 |
index 45655f2ebdb..4d66e260c40 100644 |
115 |
--- a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild |
116 |
+++ b/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild |
117 |
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then |
118 |
EGIT_BRANCH="master" |
119 |
else |
120 |
SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
121 |
- KEYWORDS="~amd64 ~x86" |
122 |
+ KEYWORDS="amd64 x86" |
123 |
fi |
124 |
|
125 |
LICENSE="GPL-2" |