gentoo resync : 14.08.2021

4 files changed, 84 insertions, 4 deletions

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 5ba6e8ef7265..93435c6f9e97 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -3,10 +3,12 @@ DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 507753833ed8a0de816651f3fdb06f3fdf0
 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
 EBUILD icingaweb2-2.8.2-r1.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
-EBUILD icingaweb2-2.8.3.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
+EBUILD icingaweb2-2.8.3.ebuild 2309 BLAKE2B 3fcaed75fcbb6cd194810b19f9a1f47394a4a4e41aff82598152b224f937faa156a8142e63018e140c430be2fc38deb2f86e09001540fd2ea85dd252d9f21882 SHA512 ce4a4933dc9c5e6a05639be9c92199cf83a5a9690f5fde5fac7a9ba68c816308d7c0977544bdf8b0d04124ebd5df13ef54393c0e984d15fdc937f735e7327a0a
 EBUILD icingaweb2-2.8.4.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 EBUILD icingaweb2-2.9.0.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
-EBUILD icingaweb2-2.9.2.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
+EBUILD icingaweb2-2.9.2.ebuild 2408 BLAKE2B ec65e06704f9cea38494b602aee9e405b58563ee7cac3cc60bbf1ebbe0cdce42a20322a6db76ddee1dbc55edf2e819f4b66adfadc7688052c3e10a26118f2942 SHA512 4071797d9f254ea103d0ade5fbfc451b868626b7bf271b4d36ba40ba38d16c482cbee842d7cc3c19d2d1ca9d788a7c2f274bead0b5abdd5011f84ff2a627777b
+EBUILD icingaweb2-2.9.3.ebuild 2410 BLAKE2B 5308c70815caf5d6246345ef85953dbced9f959d936504296e05aabf54047dbda5a5b4645c7656fefa19aaec26699412df47335e983acdfb3699c916beb13583 SHA512 9b37521628b155a9cf17da90c2690c106dbda1f0b5b3155687bc854b4304505e490d3636e3acf30270b112e863825b364c7d6071fbdfdcc436bb6095e7ecb0e6
 EBUILD icingaweb2-9999.ebuild 2311 BLAKE2B fa669bbc37e8a8445563d4a1b248be139030ab8807b272efdd720abaeb2aa2904c4befbb2699582114232bb247673e46589800b7e74cb53bf9803f4af6bf0c65 SHA512 b68aacddeba57332a45ea1382d4e8d1272f5ab38611e175865836335b382a27fda740aa834b777b0a070abc3d1a38b560426bf2455adddd020346e727d9f0ffb
 MISC metadata.xml 443 BLAKE2B 408760755558425f54f2a06aace2d16f0dfb1f585b9226d5745e69dddd020116ffe8f64f475205ed5454f1cac25b3c3ade29aad2e404d39bccc0697be89287f1 SHA512 81020a9b2ca89e23526a3d46de4f845ab433c66989db2483a9cfdfb8ae998c00b24b7acb8211c3041d43685742bd6f2f58762d0ac93608263c0cdfe83bba4128
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
index c5f119e375d9..8ce454622665 100644
--- a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
@@ -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 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
index 84db9d6e0716..640ed5a5bf33 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
@@ -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 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.9.3.ebuild
new file mode 100644
index 000000000000..84db9d6e0716
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.3.ebuild
@@ -0,0 +1,78 @@
+# 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]
+		)
+		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."
+}