gentoo auto-resync : 30:06:2024 - 08:00:50

5 files changed, 94 insertions, 12 deletions

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index c98c38d4d0d9..5602f0c7d714 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,7 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8 SHA512 3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
 DIST icingaweb2-2.12.1.tar.gz 6353911 BLAKE2B c1f52444c2ccc1eeafce89603564f21269607bc183a3189b80d93ccba5d621bf8c8bd79c75e5c9aaeb6672870923f99c98c7ebc469147125a803d16b00f9426d SHA512 71e6ad8f947ee47ff0bd3924920584c558fbd8e371f76adb83cc08e95442e792009af79280c484afe478cf1a176cf2812c6be661d838f61f044abdc106ca0999
-EBUILD icingaweb2-2.11.4-r1.ebuild 2437 BLAKE2B 87e8e5cc1c5683d1a79915030e9bd3f19fa9b9e8ace11bf886d7d5ad2949881b7155546dfcaa295afb9c0d512369798327d5184a9b6b21c6d66d24e0cd3315bd SHA512 cefa272a1f1f0fe8f561036ebf214ebc43035e999a6f4d728b19880714183128fe15186983eb0f95486060b61ecca0ac0aacff84a342ca2da9600da0245ea6fe
-EBUILD icingaweb2-2.12.1.ebuild 2466 BLAKE2B a9c8deb4cd9bf6c51dcd5329f491566881b9cc402baaac77a307ead2b16b9572707211474f5433ce5eda48fe5f8fdbf39c8cf122283e766c4c384bf94b6dcb92 SHA512 f8c9eb6d59d2275afa57975d654f988fa5f8c5e8b998f9d7d814a5f05c8952eccc71f3970c9cf93de7c2dcc307318ff54cacf550934afac58ae55146a07dc055
-EBUILD icingaweb2-9999.ebuild 2439 BLAKE2B f2133f8a710ac57cfa1461d2699aeb1346f70690f9155bf3db99248cef5a55cddb2b4945c35133fa0e29a624ee814c19ae286ab647abf11202a46c4fba3eea46 SHA512 7b92d046da4d6614a33b18106b4d7a5e76c8c8ee1be7e85d8035bfbde664a807a625b61f3759bd2c8969d41163f3b28ba599c8b717a1137058ea311a4997445b
+EBUILD icingaweb2-2.11.4-r1.ebuild 2428 BLAKE2B c2bdb9edc71912a503e09763f1d4e165f8b1f0f55f7e88e70a2d658b354b1ba09950d6d5b7418df74f83efd8c26c2f37bb9931253dc53fb68970112cfbf480c4 SHA512 c2302af01a8ef395f63749432e35ab49ef39aca31c4910ae41aaef0f61eb8d66b1e32803221ed37765e02cfc05312605b84feb3e126bfe7cec7d86dc3811aae4
+EBUILD icingaweb2-2.12.1-r1.ebuild 2576 BLAKE2B 46a48c04961f22f20971c12dd23f2bd90a252d68521628e4e61b385ec0536253d491cc52d3fe098eaefcfd3a2c89caf3a0bcfd4f2023685be96f1ee44bfa0fe5 SHA512 e0ef4fe6897ad46372b5a27a5c1b3c592fba6aba4a9833143dcb3ecc60b07bb454690830429df46120fbdfb9bd8c1086a0a685238e5c2cd4abb0f0fa7f74b666
+EBUILD icingaweb2-2.12.1.ebuild 2461 BLAKE2B 82e7165a8f7aaa96f31556d201cd35bf49a1f25b7f14c7d6e5b18527b6bf74b52637949d017ec6e30fcbb82e1057305849601f427fa9b29162298804965778f7 SHA512 a36e848c48a6bbcfa5917dd59024f7d6daef253336c65a71831eb7dbe4cf390fa96f40fe8792d129e2ed67c08a3ac9cdcbaebfd9d822b49a5e1225bf859cb014
+EBUILD icingaweb2-9999.ebuild 2427 BLAKE2B 3cab536ff0a9931c6809aaff94d65cc2c0d64d83be24a8ce6e4bdd16a4509724e82d3b652101e55a55cdbf3bbeee649b7f26e64be13504a7efa33994fd14a509 SHA512 a12f5e93bbc427ae97784ad4f10f44aa382cb90fd2fbf7b1d35220168589f04a654ab68a505eeac799fa94f43fafd67700505c509dbd371de145db00dfd4a5d8
 MISC metadata.xml 444 BLAKE2B bf24467286f442770ed78cb298cd0fc1d37786b06e85bbc4b20a8c750764e7a831828ebc9b7872772f0a286b12cb67491cb1f84f189cf00e2ec59a6b921e760f SHA512 55e57997695e09ad9cc8448030e8470a0e39a1cbc610f70e29c2a68a4f287e54cb816b0cd1ceec611112849ba97225a60560b67368fb3a6ed68a73a728d61d83
diff --git a/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild
index 84a84021e342..8df6a13afcc7 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit depend.apache multilib
+inherit depend.apache
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/"
diff --git a/www-apps/icingaweb2/icingaweb2-2.12.1-r1.ebuild b/www-apps/icingaweb2/icingaweb2-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..c049797b957d
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.12.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit depend.apache
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="https://icinga.com/"
+
+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 ~arm64 ~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: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.13.0
+		>=dev-libs/icinga-php-thirdparty-0.12.0
+		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"
+	fowners root:icingaweb2 "/usr/share/${PN}/bin/icingacli"
+}
+
+pkg_postinst() {
+	einfo "Run 'emerge --config =${CATEGORY}/${PF}' to finish setup."
+}
diff --git a/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
index 0a0ddca0fee2..bbe044604cc1 100644
--- a/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit depend.apache multilib
+inherit depend.apache
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
+HOMEPAGE="https://icinga.com/"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
@@ -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"
diff --git a/www-apps/icingaweb2/icingaweb2-9999.ebuild b/www-apps/icingaweb2/icingaweb2-9999.ebuild
index 9103daa5bbe2..94c0c09dab74 100644
--- a/www-apps/icingaweb2/icingaweb2-9999.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit depend.apache multilib
+inherit depend.apache
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/"
+HOMEPAGE="https://icinga.com/"
 
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3