From c63f4a246e95abf95b57cb950f9dfeb3deda94c4 Mon Sep 17 00:00:00 2001 From: Anton Fischl Date: Fri, 12 Aug 2022 16:48:14 +0200 Subject: [PATCH] www-apps/icingaweb2-module-fileshipper: fix PHP dependencies Signed-off-by: Anton Fischl --- profiles/icinga/package.use | 2 +- ...icingaweb2-module-fileshipper-1.2.0.ebuild | 35 +++++++++++++------ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/profiles/icinga/package.use b/profiles/icinga/package.use index 416cdf1..851c07e 100644 --- a/profiles/icinga/package.use +++ b/profiles/icinga/package.use @@ -8,7 +8,7 @@ x11-libs/gdk-pixbuf jpeg # Anton Fischl (2022-05-03) # whole block is needed for www-apps/icingaweb2 www-apps/icingaweb2 apache2 apache2-server fpm mysql pdf -dev-lang/php apache2 cli fpm gd intl mysql nls pdo sockets ssl xslt xml curl pcntl +dev-lang/php apache2 cli fpm gd intl mysql nls pdo sockets ssl xslt xml curl pcntl zip app-eselect/eselect-php apache2 fpm # for dev-php/pecl-imagick media-gfx/imagemagick -openmp png diff --git a/www-apps/icingaweb2-module-fileshipper/icingaweb2-module-fileshipper-1.2.0.ebuild b/www-apps/icingaweb2-module-fileshipper/icingaweb2-module-fileshipper-1.2.0.ebuild index cacc707..3a811b0 100644 --- a/www-apps/icingaweb2-module-fileshipper/icingaweb2-module-fileshipper-1.2.0.ebuild +++ b/www-apps/icingaweb2-module-fileshipper/icingaweb2-module-fileshipper-1.2.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Create top-level views of your applications in a graphical editor." HOMEPAGE="https://github.com/Icinga/icingaweb2-module-fileshipper" @@ -17,14 +17,29 @@ fi LICENSE="GPL-2" SLOT="0" -DEPEND=">=net-analyzer/icinga2-2.4.3 - >=www-apps/icingaweb2-2.2.0 - || ( - dev-lang/php:7.3[curl] - dev-lang/php:7.4[curl] - dev-lang/php:8.0[curl] - )" -RDEPEND="${DEPEND}" +IUSE="php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 yaml xlsx xml" +PHP_DEPEND=" + php_targets_php7-4? ( + yaml? ( dev-php/pecl-yaml ) + xlsx? ( dev-lang/php:7.4[zip] ) + dev-lang/php:7.4[xml?] + ) + php_targets_php8-0? ( + yaml? ( dev-php/pecl-yaml ) + xlsx? ( dev-lang/php:8.0[zip] ) + dev-lang/php:8.0[xml?] + ) + php_targets_php8-1? ( + yaml? ( dev-php/pecl-yaml ) + xlsx? ( dev-lang/php:8.1[zip] ) + dev-lang/php:8.1[xml?] + ) +" +RDEPEND=" + www-apps/icingaweb2-module-director + ${PHP_DEPEND} + " +BDEPEND="" src_install() { insinto "/usr/share/icingaweb2/modules/${PN##*-}/"