[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

["Matthew Thode" <prometheanfire@gentoo.org>]

commit:     697a3f45907d7dfc72a3d3462f2a742735814f25
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 30 22:44:33 2018 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 30 22:44:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697a3f45

www-apps/icingaweb2: simplify depends

Bug: https://bugs.gentoo.org/674102
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 www-apps/icingaweb2/icingaweb2-9999.ebuild | 28 +++++++++-------------------
 www-apps/icingaweb2/metadata.xml           |  1 +
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 97c2252b8de..4d8e67f6cc5 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,30 +12,20 @@ EGIT_BRANCH="master"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
+IUSE="apache2 fpm ldap mysql nginx pdf postgres"
 REQUIRED_USE="^^ ( apache2 nginx )"
 KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
 		dev-php/pecl-imagick
 		pdf? ( media-gfx/imagemagick[png] )
-		apache2? (
-			>=www-servers/apache-2.4.0
-			|| (
-				dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
-		)
-		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]
-				dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-				dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-			)
+		apache2? ( >=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]
+			dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+			dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
 		)"
 RDEPEND="${DEPEND}"
 

diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml
index 1a95653552c..8f0ec860cd1 100644
--- a/www-apps/icingaweb2/metadata.xml
+++ b/www-apps/icingaweb2/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="nginx">Adds support for nginx</flag>
+		<flag name="fpm">Adds FPM support to php</flag>
 	</use>
 </pkgmetadata>