| 1 |
commit: 697a3f45907d7dfc72a3d3462f2a742735814f25 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 30 22:44:33 2018 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 30 22:44:52 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697a3f45 |
| 7 |
|
| 8 |
www-apps/icingaweb2: simplify depends |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/674102 |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
www-apps/icingaweb2/icingaweb2-9999.ebuild | 28 +++++++++------------------- |
| 15 |
www-apps/icingaweb2/metadata.xml | 1 + |
| 16 |
2 files changed, 10 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 19 |
index 97c2252b8de..4d8e67f6cc5 100644 |
| 20 |
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 21 |
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI="6" |
| 28 |
@@ -12,30 +12,20 @@ EGIT_BRANCH="master" |
| 29 |
|
| 30 |
LICENSE="GPL-2" |
| 31 |
SLOT="0" |
| 32 |
-IUSE="apache2 ldap mysql nginx pdf postgres" |
| 33 |
+IUSE="apache2 fpm ldap mysql nginx pdf postgres" |
| 34 |
REQUIRED_USE="^^ ( apache2 nginx )" |
| 35 |
KEYWORDS="" |
| 36 |
|
| 37 |
DEPEND=">=net-analyzer/icinga2-2.1.1 |
| 38 |
dev-php/pecl-imagick |
| 39 |
pdf? ( media-gfx/imagemagick[png] ) |
| 40 |
- apache2? ( |
| 41 |
- >=www-servers/apache-2.4.0 |
| 42 |
- || ( |
| 43 |
- dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 44 |
- dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 45 |
- dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 46 |
- dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 47 |
- ) |
| 48 |
- ) |
| 49 |
- nginx? ( |
| 50 |
- >=www-servers/nginx-1.7.0:* |
| 51 |
- || ( |
| 52 |
- dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 53 |
- dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 54 |
- dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 55 |
- dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 56 |
- ) |
| 57 |
+ apache2? ( >=www-servers/apache-2.4.0 ) |
| 58 |
+ nginx? ( >=www-servers/nginx-1.7.0:* ) |
| 59 |
+ || ( |
| 60 |
+ dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 61 |
+ dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 62 |
+ dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 63 |
+ dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] |
| 64 |
)" |
| 65 |
RDEPEND="${DEPEND}" |
| 66 |
|
| 67 |
|
| 68 |
diff --git a/www-apps/icingaweb2/metadata.xml b/www-apps/icingaweb2/metadata.xml |
| 69 |
index 1a95653552c..8f0ec860cd1 100644 |
| 70 |
--- a/www-apps/icingaweb2/metadata.xml |
| 71 |
+++ b/www-apps/icingaweb2/metadata.xml |
| 72 |
@@ -10,5 +10,6 @@ |
| 73 |
</longdescription> |
| 74 |
<use> |
| 75 |
<flag name="nginx">Adds support for nginx</flag> |
| 76 |
+ <flag name="fpm">Adds FPM support to php</flag> |
| 77 |
</use> |
| 78 |
</pkgmetadata> |
Archives