summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2019-01-01 11:09:17 -0600
committerMatthew Thode <prometheanfire@gentoo.org>2019-01-01 11:09:59 -0600
commit39efcf28f6569cf785a7ff1aedf4390e8c6f4825 (patch)
tree64d64ecb1566f60db4be286e706949b6262a0eef
parentapp-arch/xar: fix compatibility with openssl-1.0 (diff)
downloadgentoo-39efcf28f6569cf785a7ff1aedf4390e8c6f4825.tar.gz
gentoo-39efcf28f6569cf785a7ff1aedf4390e8c6f4825.tar.bz2
gentoo-39efcf28f6569cf785a7ff1aedf4390e8c6f4825.zip
www-apps/icingaweb2: serparate usage of apache2 flag
Bug: https://bugs.gentoo.org/674102 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
-rw-r--r--www-apps/icingaweb2/icingaweb2-9999.ebuild8
-rw-r--r--www-apps/icingaweb2/metadata.xml1
2 files changed, 5 insertions, 4 deletions
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 4d8e67f6cc57..03a2c2bd75d6 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -12,14 +12,14 @@ EGIT_BRANCH="master"
LICENSE="GPL-2"
SLOT="0"
-IUSE="apache2 fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
+IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
+REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
KEYWORDS=""
DEPEND=">=net-analyzer/icinga2-2.1.1
dev-php/pecl-imagick
pdf? ( media-gfx/imagemagick[png] )
- apache2? ( >=www-servers/apache-2.4.0 )
+ apache2-server? ( >=www-servers/apache-2.4.0 )
nginx? ( >=www-servers/nginx-1.7.0:* )
|| (
dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
index 8f0ec860cd1d..c6478777dd22 100644
--- a/www-apps/icingaweb2/metadata.xml
+++ b/www-apps/icingaweb2/metadata.xml
@@ -9,6 +9,7 @@
Icinga Web 2 - Frontend for icinga2
</longdescription>
<use>
+ <flag name="apache2-server">Adds support for the apache2-server</flag>
<flag name="nginx">Adds support for nginx</flag>
<flag name="fpm">Adds FPM support to php</flag>
</use>