From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1695921-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 20AA81581F3
for <garchives@archives.gentoo.org>; Sun, 1 Dec 2024 11:54:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0ED99E0837;
Sun, 1 Dec 2024 11:54:38 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E5CD0E0837
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Dec 2024 11:54:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E0327341707
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Dec 2024 11:54:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E6F11EC5
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Dec 2024 11:54:34 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1733053932.1328bf4ba014697a30ee78192c46a77ddd73badd.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apps/icingaweb2/icingaweb2-2.12.1-r2.ebuild www-apps/icingaweb2/icingaweb2-9999.ebuild
X-VCS-Directories: www-apps/icingaweb2/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1328bf4ba014697a30ee78192c46a77ddd73badd
X-VCS-Branch: master
Date: Sun, 1 Dec 2024 11:54:34 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7156bf2b-cc52-44a6-b27f-1503e5fd5ae1
X-Archives-Hash: 3af64280220007cd919a4e81d5cc4008
commit: 1328bf4ba014697a30ee78192c46a77ddd73badd
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Nov 8 15:37:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 1 11:52:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1328bf4b
www-apps/icingaweb2: [QA] BannedEapiCommand
Misses migration after acct-user got introduced.
Use the new `icingaweb2` USE-flag for acct-user/apache and acct-user/nginx in
RDEPEND.
Adjust pkg_setup() to match.
BannedEapiCommand
'usermod' banned in EAPI 7, used on line 45 'usermod -a -G icingacmd,icingaweb2
nginx'
Closes: https://bugs.gentoo.org/857645
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...eb2-9999.ebuild => icingaweb2-2.12.1-r2.ebuild} | 25 ++++++++++------------
www-apps/icingaweb2/icingaweb2-9999.ebuild | 25 ++++++++++------------
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-2.12.1-r2.ebuild
similarity index 77%
copy from www-apps/icingaweb2/icingaweb2-9999.ebuild
copy to www-apps/icingaweb2/icingaweb2-2.12.1-r2.ebuild
index 94c0c09dab74..6edcd93d9770 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.12.1-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit depend.apache
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_BRANCH="master"
else
SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="GPL-2"
@@ -28,24 +28,21 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
apache2-server? ( >=www-servers/apache-2.4.0 )
nginx? ( >=www-servers/nginx-1.7.0:* )
|| (
- dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
- dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.1[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.2[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.3[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
- >=dev-libs/icinga-php-library-0.8.1
- >=dev-libs/icinga-php-thirdparty-0.11.0
+ >=dev-libs/icinga-php-library-0.13.0
+ >=dev-libs/icinga-php-thirdparty-0.12.0
acct-group/icingacmd
acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ apache2? ( acct-user/apache[icingaweb2] )
+ nginx? ( acct-user/nginx[icingaweb2] )
+"
want_apache2
-pkg_setup() {
- depend.apache_pkg_setup
-
- use nginx && usermod -a -G icingacmd,icingaweb2 nginx
- use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
pkg_config() {
if [[ -d /etc/icingaweb2 ]] ; then
einfo "Updating existing installation ..."
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 94c0c09dab74..6edcd93d9770 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit depend.apache
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_BRANCH="master"
else
SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
LICENSE="GPL-2"
@@ -28,24 +28,21 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
apache2-server? ( >=www-servers/apache-2.4.0 )
nginx? ( >=www-servers/nginx-1.7.0:* )
|| (
- dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
- dev-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.1[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.2[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+ dev-lang/php:8.3[apache2?,cli,curl,fileinfo,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
- >=dev-libs/icinga-php-library-0.8.1
- >=dev-libs/icinga-php-thirdparty-0.11.0
+ >=dev-libs/icinga-php-library-0.13.0
+ >=dev-libs/icinga-php-thirdparty-0.12.0
acct-group/icingacmd
acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ apache2? ( acct-user/apache[icingaweb2] )
+ nginx? ( acct-user/nginx[icingaweb2] )
+"
want_apache2
-pkg_setup() {
- depend.apache_pkg_setup
-
- use nginx && usermod -a -G icingacmd,icingaweb2 nginx
- use apache2 && usermod -a -G icingacmd,icingaweb2 apache
-}
-
pkg_config() {
if [[ -d /etc/icingaweb2 ]] ; then
einfo "Updating existing installation ..."