gentoo resync : 04.01.2022

3 files changed, 75 insertions, 10 deletions

diff --git a/www-apps/icingaweb2-module-director/Manifest b/www-apps/icingaweb2-module-director/Manifest
index 9c6612fa6a3a..8663f6e664c1 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,4 +1,6 @@
 DIST icingaweb2-module-director-1.8.0.tar.gz 3042572 BLAKE2B e29ac535c8975f79abfa086ce54e2b78e3f1a992858ec83e902c5e8e72a447f7436a1a9876c1b7237a14d08c54dec12069e9c57231b23c4fd203be3f6f2635b8 SHA512 e33cc49c8255aa3693f73693d874ca5e00a9d95fe3d737c457473d8c5b37f36faf44bbc7f608ba03be79d5a6fd032e5ffd8fbc824eda1831422f837040b0c400
+DIST icingaweb2-module-director-1.8.1.tar.gz 3045604 BLAKE2B b94d870f23f6267250ed1b2165e0960e7a2f6df1b7545a7c22697af1fbc6ec0f0a7d04e92a410c33450613e95fca1c3dbb9db6f974d30a528856a60169a31bf2 SHA512 89fe35061deecd212576b6363289daa433c9664b95221c74a684a88e07ebd36d3b55b4a767f6caefeadb3679c5aa0787b1129f08b6d0fd698e5a2d5b17a3a2d1
 EBUILD icingaweb2-module-director-1.8.0.ebuild 850 BLAKE2B 22fffaad05127803aaa4e4c8ef6a2dc469022a19860f8099da3c1f3105bc66c1ee0f6596f29185e6b24416c74b54e15fb047118d93e2ac01ab244fb36adc2cbe SHA512 41dce56439bcc6908f5b08347ba6e9ff9c12cf8b06d25d47dec2c823de9bb45d0310681091c63b1be34ebc9b34a7a40c7ac6b15d3ac654866a843b6d7101819c
-EBUILD icingaweb2-module-director-9999.ebuild 852 BLAKE2B 1ea6bb826157c55611c75431ad8479d165174a0f741bed61f9de0e21b4c719080182aa671d7c8751d9c350e796da9647ca44fc916de70266f5cab8d8542665aa SHA512 16f2166e547f92549aa815710e78da502b2e958a7568d2ec73591c0e025cd0ef48c82cc10672cc7e6b09cc7d96a6ec42df6666cd0d4d420056080336310545e8
+EBUILD icingaweb2-module-director-1.8.1.ebuild 1408 BLAKE2B cd488bdf7800c32907e28acd1cbfc73d95c5bae084974b4b548897d8d89de8415d268f6ad456bb9cd46a89fc1f98e21b1f63369ede691639b6135049c248cfb5 SHA512 f152681584f7c31ea55179120c85685cc7ab6fc2a82adc06c9e57941587a5ecd47212180facd65efbc102bbc2ad46e7cdf95e729dfd9251f8ccc2be0bab2ea1e
+EBUILD icingaweb2-module-director-9999.ebuild 1612 BLAKE2B 6d6142623270679ab94332570d39fd33409a1770d94326108f93e2f17870aef7aea401b6d35a54583b4487fdd2e819947d716fd34eef7981620ab3c5be6f686e SHA512 9d717bc7601e5e4c43ca8f149b25d8ad3dfa04e6745178aab3feff87ef5d2a7b37ba8b0476a92d14b2ae2d05f28a9c54241e6609f3a8ed2932aaf2bbb65d73e6
 MISC metadata.xml 255 BLAKE2B 7788f736048880a23aeeb4baf5daf3bf65fd82dc4e6f56e63d2897a055acebf8ac480d249f297ec54cae1cc44031435effd37165455a16c62ca7acc6be63cf21 SHA512 6069c94a7b02290a08fe052105613139fccd952f5507bac994d2fd9aa4359e9b1b76e5fb0f1111474594d3d25ef6d5ac54b93d611f3512ef9bcbe5cf28f5f35e
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild
new file mode 100644
index 000000000000..0d9d32306e89
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
+inherit systemd
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	MY_PN="icingaweb2-module-director"
+	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.6.0
+	>=www-apps/icingaweb2-2.6.0
+	|| (
+		dev-lang/php:7.3[curl,iconv,pcntl,posix,sockets]
+		dev-lang/php:7.4[curl,iconv,pcntl,posix,sockets]
+		dev-lang/php:8.0[curl,iconv,pcntl,posix,sockets]
+	)
+	acct-group/icingaweb2
+	acct-user/icingadirector"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto "/usr/share/icingaweb2/modules/director/"
+	doins -r "${S}"/*
+	keepdir /var/lib/${PN}
+	fowners icingadirector:icingaweb2 /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+	sed -e "s|/usr/bin/icingacli|/usr/share/icingaweb2/bin/icingacli|g" \
+		contrib/systemd/icinga-director.service > "${T}/icinga-director.service" \
+		|| die "failed to patch icinga-director.service"
+	systemd_dounit "${T}/icinga-director.service"
+}
+
+pkg_postinst() {
+	elog "Enable and start the icinga-director.service systemd service."
+}
diff --git a/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
index eab3c4caccb8..c9a76d37b383 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Icinga Web 2 plugin for configuration"
 HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/"
+inherit systemd
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git"
@@ -18,17 +19,32 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=net-analyzer/icinga2-2.4.3
-	>=www-apps/icingaweb2-2.2.0
+DEPEND=">=net-analyzer/icinga2-2.6.0
+	>=www-apps/icingaweb2-2.6.0
 	|| (
-		dev-lang/php:5.6[curl]
-		dev-lang/php:7.1[curl]
-		dev-lang/php:7.2[curl]
-		dev-lang/php:7.3[curl]
-	)"
+		dev-lang/php:7.3[curl,iconv,pcntl,posix,sockets]
+		dev-lang/php:7.4[curl,iconv,pcntl,posix,sockets]
+		dev-lang/php:8.0[curl,iconv,pcntl,posix,sockets]
+	)
+	acct-group/icingaweb2
+	acct-user/icingadirector"
 RDEPEND="${DEPEND}"
 
 src_install() {
 	insinto "/usr/share/icingaweb2/modules/director/"
 	doins -r "${S}"/*
+	keepdir /var/lib/${PN}
+	fowners icingadirector:icingaweb2 /var/lib/${PN}
+	fperms 0750 /var/lib/${PN}
+	sed -e "s|/usr/bin/icingacli|/usr/share/icingaweb2/bin/icingacli|g" \
+		contrib/systemd/icinga-director.service > "${T}/icinga-director.service" \
+		|| die "failed to patch icinga-director.service"
+	systemd_dounit "${T}/icinga-director.service"
+}
+
+pkg_postinst() {
+	elog "Please see the following documentation for installation"
+	elog "https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md"
+	elog "or upgrading"
+	elog "https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md"
 }