From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1313488-garchives=archives.gentoo.org@lists.gentoo.org>
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 D4675158F56
for <garchives@archives.gentoo.org>; Tue, 17 Aug 2021 02:19:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2D6F5E0814;
Tue, 17 Aug 2021 02:19:01 +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 F3E48E0814
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Aug 2021 02:19:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 A4D1B33BEB8
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Aug 2021 02:18:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4444F4A2
for <gentoo-commits@lists.gentoo.org>; Tue, 17 Aug 2021 02:18:58 +0000 (UTC)
From: "Matthew Thode" <prometheanfire@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, "Matthew Thode" <prometheanfire@gentoo.org>
Message-ID: <1629166731.34b96c61b15ceacc83a4ca1eac7be94e59c05bb9.prometheanfire@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-apps/icingaweb2/Manifest www-apps/icingaweb2/icingaweb2-2.9.0.ebuild www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild www-apps/icingaweb2/icingaweb2-9999.ebuild
X-VCS-Directories: www-apps/icingaweb2/
X-VCS-Committer: prometheanfire
X-VCS-Committer-Name: Matthew Thode
X-VCS-Revision: 34b96c61b15ceacc83a4ca1eac7be94e59c05bb9
X-VCS-Branch: master
Date: Tue, 17 Aug 2021 02:18:58 +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: e3a34a22-cf11-47b8-a1e6-44f2f33f9ac6
X-Archives-Hash: c4731fbea8b7b53f038e6d06e57fbd3f
commit: 34b96c61b15ceacc83a4ca1eac7be94e59c05bb9
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 02:18:51 2021 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 02:18:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b96c61
www-apps/icingaweb2: added another missing dep
Bug: https://bugs.gentoo.org/802213
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
www-apps/icingaweb2/Manifest | 1 -
...-2.9.2-r1.ebuild => icingaweb2-2.9.2-r2.ebuild} | 1 +
www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild | 79 ----------------------
...eb2-2.9.0.ebuild => icingaweb2-2.9.3-r2.ebuild} | 1 +
www-apps/icingaweb2/icingaweb2-9999.ebuild | 1 +
5 files changed, 3 insertions(+), 80 deletions(-)
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index e89dde707b2..26d88dd2bf3 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,5 @@
DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c SHA512 236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
DIST icingaweb2-2.8.4.tar.gz 8514585 BLAKE2B 1c331d45152a94dcaf21509e36ecd9c90c840f41bf14d102910e65fce28994bb7db3319c39e5d5740638a673c74b84b54d803b97d91cb8968260174b2437a7ca SHA512 7f136f7901db8398fab85fef079d4e5af1662c13c5c107d3c1c10e022186bdca29d3b144f937e40e470975b97bd98215ec3e0c7f2b6127a6a74143fbe0e1882c
-DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a SHA512 d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4
DIST icingaweb2-2.9.2.tar.gz 12304718 BLAKE2B ba5d0872318a504d25b614825008e90cabd4680b30686d90ad438408e4a248f9dc2ef9410c5405da7efac949c6c41d89c64604b18c6d86f9ba479c99a8daff9a SHA512 67268544db0c267f9522b2105db52d87967835279eb621b79827b7b1b80a327b69348c849e4d3716a9cd26dfaef31a06b5ba125d30a48c3f5686dcf4c7a7a959
DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377 SHA512 46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild
similarity index 98%
rename from www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild
index 52b7997eb8b..977d8fee7bb 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild
@@ -33,6 +33,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
dev-libs/icinga-php-library
+ dev-libs/icinga-php-thirdparty
acct-group/icingacmd
acct-group/icingaweb2"
RDEPEND="${DEPEND}"
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild
deleted file mode 100644
index c8d8ff1da0a..00000000000
--- a/www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
-
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git"
- EGIT_BRANCH="master"
-else
- SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 apache2-server fpm ldap mysql nginx pdf postgres"
-REQUIRED_USE="( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
- dev-php/pecl-imagick
- pdf? ( media-gfx/imagemagick[png] )
- apache2-server? ( >=www-servers/apache-2.4.0 )
- nginx? ( >=www-servers/nginx-1.7.0:* )
- || (
- dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
- dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
- dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
- )
- dev-libs/icinga-php-library
- acct-group/icingacmd
- acct-group/icingaweb2"
-RDEPEND="${DEPEND}"
-
-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 ..."
- else
- einfo "Running first time setup ..."
- einfo "Creating configuration directory ..."
- /usr/share/${PN}/bin/icingacli setup config directory
- einfo "Creating authentication token for web setup ..."
- /usr/share/${PN}/bin/icingacli setup token create
- if use apache2 ; then
- einfo "The following might be useful for your Apache2 configuration:"
- /usr/share/${PN}/bin/icingacli setup config webserver apache --document-root /usr/share/${PN}/public
- fi
- if use nginx ; then
- einfo "The following might be useful for your NGinx configuration:"
- /usr/share/${PN}/bin/icingacli setup config webserver nginx --document-root /usr/share/${PN}/public
- fi
- fi
- einfo "All done."
-}
-
-src_install() {
- insinto "/usr/share/${PN}"
- doins -r "${S}"/*
- fperms -R a+rX "/usr/share/${PN}/public/"
- fperms u+x,g+x "/usr/share/${PN}/bin/icingacli"
-}
-
-pkg_postinst() {
- einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
-}
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
similarity index 98%
rename from www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
index c8d8ff1da0a..dcfe13e3b7d 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
@@ -33,6 +33,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
dev-lang/php:8.0[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
dev-libs/icinga-php-library
+ dev-libs/icinga-php-thirdparty
acct-group/icingacmd
acct-group/icingaweb2"
RDEPEND="${DEPEND}"
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index d37234041e8..57d38cb0ba0 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -32,6 +32,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
dev-lang/php:7.4[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
dev-libs/icinga-php-library
+ dev-libs/icinga-php-thirdparty
acct-group/icingacmd
acct-group/icingaweb2"
RDEPEND="${DEPEND}"