From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 023B4138334 for ; Tue, 1 Jan 2019 17:10:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84B4AE0B66; Tue, 1 Jan 2019 17:10:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D65BE0B66 for ; Tue, 1 Jan 2019 17:10:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E54A335CF4 for ; Tue, 1 Jan 2019 17:10:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B581518 for ; Tue, 1 Jan 2019 17:10:12 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1546362599.39efcf28f6569cf785a7ff1aedf4390e8c6f4825.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/icingaweb2/icingaweb2-9999.ebuild www-apps/icingaweb2/metadata.xml X-VCS-Directories: www-apps/icingaweb2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 39efcf28f6569cf785a7ff1aedf4390e8c6f4825 X-VCS-Branch: master Date: Tue, 1 Jan 2019 17:10:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ccdf1c39-b13c-407f-85a9-45c7c9cff357 X-Archives-Hash: 255d62277cd0257076f289a455490e6e commit: 39efcf28f6569cf785a7ff1aedf4390e8c6f4825 Author: Matthew Thode gentoo org> AuthorDate: Tue Jan 1 17:09:17 2019 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Jan 1 17:09:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39efcf28 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 gentoo.org> www-apps/icingaweb2/icingaweb2-9999.ebuild | 8 ++++---- www-apps/icingaweb2/metadata.xml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild index 4d8e67f6cc5..03a2c2bd75d 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 8f0ec860cd1..c6478777dd2 100644 --- a/www-apps/icingaweb2/metadata.xml +++ b/www-apps/icingaweb2/metadata.xml @@ -9,6 +9,7 @@ Icinga Web 2 - Frontend for icinga2 + Adds support for the apache2-server Adds support for nginx Adds FPM support to php