1 |
commit: 39efcf28f6569cf785a7ff1aedf4390e8c6f4825 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 1 17:09:17 2019 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 1 17:09:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39efcf28 |
7 |
|
8 |
www-apps/icingaweb2: serparate usage of apache2 flag |
9 |
|
10 |
Bug: https://bugs.gentoo.org/674102 |
11 |
|
12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
13 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
14 |
|
15 |
www-apps/icingaweb2/icingaweb2-9999.ebuild | 8 ++++---- |
16 |
www-apps/icingaweb2/metadata.xml | 1 + |
17 |
2 files changed, 5 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
20 |
index 4d8e67f6cc5..03a2c2bd75d 100644 |
21 |
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild |
22 |
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2018 Gentoo Authors |
25 |
+# Copyright 1999-2019 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI="6" |
29 |
@@ -12,14 +12,14 @@ EGIT_BRANCH="master" |
30 |
|
31 |
LICENSE="GPL-2" |
32 |
SLOT="0" |
33 |
-IUSE="apache2 fpm ldap mysql nginx pdf postgres" |
34 |
-REQUIRED_USE="^^ ( apache2 nginx )" |
35 |
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres" |
36 |
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )" |
37 |
KEYWORDS="" |
38 |
|
39 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
40 |
dev-php/pecl-imagick |
41 |
pdf? ( media-gfx/imagemagick[png] ) |
42 |
- apache2? ( >=www-servers/apache-2.4.0 ) |
43 |
+ apache2-server? ( >=www-servers/apache-2.4.0 ) |
44 |
nginx? ( >=www-servers/nginx-1.7.0:* ) |
45 |
|| ( |
46 |
dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
47 |
|
48 |
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml |
49 |
index 8f0ec860cd1..c6478777dd2 100644 |
50 |
--- a/www-apps/icingaweb2/metadata.xml |
51 |
+++ b/www-apps/icingaweb2/metadata.xml |
52 |
@@ -9,6 +9,7 @@ |
53 |
Icinga Web 2 - Frontend for icinga2 |
54 |
</longdescription> |
55 |
<use> |
56 |
+ <flag name="apache2-server">Adds support for the apache2-server</flag> |
57 |
<flag name="nginx">Adds support for nginx</flag> |
58 |
<flag name="fpm">Adds FPM support to php</flag> |
59 |
</use> |