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 ..."
