[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2024-03-16 Thread Joonas Niilola
commit: 064056064b8ecf908d57298826d1ea8eb9c0fe5a
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Feb 14 03:32:14 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 09:26:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06405606

www-apps/icingaweb2-module-director: : update dependencies

Signed-off-by: Anton Fischl  fischl-online.de>
Closes: https://github.com/gentoo/gentoo/pull/35295
Signed-off-by: Joonas Niilola  gentoo.org>

 .../icingaweb2-module-director-.ebuild| 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
index 370c6d78fa9b..7e4d8a5a4368 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,11 +18,14 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-# Dependencies according to 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md
-IUSE="php_targets_php8-1"
+# Dependencies according to
+# 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md.d/From-Source.md
+IUSE="php_targets_php8-1 php_targets_php8-2 php_targets_php8-3"
 
 PHP_DEPEND="
php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
+   php_targets_php8-2? ( dev-lang/php:8.2[curl,iconv,pcntl,posix,sockets] )
+   php_targets_php8-3? ( dev-lang/php:8.3[curl,iconv,pcntl,posix,sockets] )
 "
 DEPEND="
acct-group/icingaweb2
@@ -31,9 +34,9 @@ DEPEND="
 RDEPEND="
${PHP_DEPEND}
${DEPEND}
-   >=www-apps/icingaweb2-module-incubator-0.18.0
-   >=dev-libs/icinga-php-library-0.5.0
-   >=dev-libs/icinga-php-thirdparty-0.9.0
+   >=www-apps/icingaweb2-module-incubator-0.22.0
+   >=dev-libs/icinga-php-library-0.13.0
+   >=dev-libs/icinga-php-thirdparty-0.12.0
>=www-apps/icingaweb2-2.9.0
 "
 
@@ -60,9 +63,9 @@ pkg_postinst() {
# numbers, even though in practice it is typically just one.
local oldver
for oldver in ${REPLACING_VERSIONS}; do
-   if ver_test "${oldver}" -lt "1.10.0"; then
+   if ver_test "${oldver}" -lt "1.11.0"; then
ewarn "You are upgrading from ${oldver} to ${PVR}"
-   ewarn "please read 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md#upgrade-to-1.10.x;
+   ewarn "please read 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md#upgrade-to-1.11.x;
ewarn "for breaking changes"
ewarn
ewarn "Also, don't forget to upgrade database schema."



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2024-03-16 Thread Joonas Niilola
commit: fb3ee481feff5cbae667ddb7ec62d7a6599a8018
Author: Anton Fischl  fischl-online  de>
AuthorDate: Tue Feb 13 05:51:19 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 09:26:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3ee481

www-apps/icingaweb2-module-director: add 1.11.1, drop 1.11.0

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest | 2 +-
 ...rector-1.11.0.ebuild => icingaweb2-module-director-1.11.1.ebuild} | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index b063fce962f0..d785fb822d0e 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1 @@
-DIST icingaweb2-module-director-1.11.0.tar.gz 3465395 BLAKE2B 
8d0dcb590c3a735bcd279bf044c354b34f2f1edbc238a71236ec60e1e915660b80230c5076234cd6fb75fc7ec0ab1a8df967092c3f2f1c5e9305033b04236bf4
 SHA512 
1709920489248e7b6a84ffaa50996c9c061e04e744224fabc48a8885c30ed136cd0eb6db1a5e9a7bb3e07302b733554afa27060295b2ecea25f3416646656285
+DIST icingaweb2-module-director-1.11.1.tar.gz 3468031 BLAKE2B 
9c532a1c940c18e3dfa6961aa0734256a71d5431e1439f0bb3e9099772c05896e387885164e77ad4710e1ebbebbef8c160b46448945312aa37dd72924b12c03e
 SHA512 
8fe55c71518693cfc1f67cf5b9ef7396686cf94b6c7c8cc9efbc8dd855ba2f81d05611bc082acbbcac0046aab7bc94668442e5ee738f1b731958c9e5e44212e9

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.1.ebuild
similarity index 92%
rename from 
www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild
rename to 
www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.1.ebuild
index c6b6e7186f8f..7e4d8a5a4368 100644
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.1.ebuild
@@ -20,11 +20,12 @@ LICENSE="GPL-2"
 SLOT="0"
 # Dependencies according to
 # 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md.d/From-Source.md
-IUSE="php_targets_php8-1 php_targets_php8-2"
+IUSE="php_targets_php8-1 php_targets_php8-2 php_targets_php8-3"
 
 PHP_DEPEND="
php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
php_targets_php8-2? ( dev-lang/php:8.2[curl,iconv,pcntl,posix,sockets] )
+   php_targets_php8-3? ( dev-lang/php:8.3[curl,iconv,pcntl,posix,sockets] )
 "
 DEPEND="
acct-group/icingaweb2
@@ -33,7 +34,7 @@ DEPEND="
 RDEPEND="
${PHP_DEPEND}
${DEPEND}
-   >=www-apps/icingaweb2-module-incubator-0.20.0
+   >=www-apps/icingaweb2-module-incubator-0.22.0
>=dev-libs/icinga-php-library-0.13.0
>=dev-libs/icinga-php-thirdparty-0.12.0
>=www-apps/icingaweb2-2.9.0



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2024-03-16 Thread Joonas Niilola
commit: 4cff04e304a94e79a15d8a69d30b392b175213a2
Author: Anton Fischl  fischl-online  de>
AuthorDate: Tue Feb 13 05:49:38 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 09:26:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cff04e3

www-apps/icingaweb2-module-incubator: add 0.22.0, drop 0.20.0

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  | 2 +-
 ...cubator-0.20.0.ebuild => icingaweb2-module-incubator-0.22.0.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
index 3c29424763a0..47b45c3c31d3 100644
--- a/www-apps/icingaweb2-module-incubator/Manifest
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -1 +1 @@
-DIST icingaweb2-module-incubator-0.20.0.tar.gz 223234 BLAKE2B 
bac5ef347007275b386d75f76c388f5500488aa1303fd212c4cbcc45f81199e4d1268442c77f0e44cad37dae9b12259cd6d341339d16fcad03c3c414bffdd26d
 SHA512 
f561d9caffd6d72603debddf61181fa45b43aa4dc44d50749ed5e175c9a3ad169943cb59cfb74e890241cc0af3de0610a1747faa5c14c89ed3ab0b3e3c00da0e
+DIST icingaweb2-module-incubator-0.22.0.tar.gz 223603 BLAKE2B 
339beff83920470411ccc7292477bb3eb279f90371fbba096cb9d7f3d794b57d9d6bb325745678bf52a254439a1908ac180feda35ad0710b0c14910c863d239f
 SHA512 
dd282751b3a6b213d83d48aca1343294373f34d737899d7589329dde830337bddfd2f53eaed8a4b4f4895b1ec8494732dfddca871eead179ebe4d9ec5a14bee7

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.22.0.ebuild
similarity index 86%
rename from 
www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
rename to 
www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.22.0.ebuild
index 04f149583a4a..95cc46968864 100644
--- 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.22.0.ebuild
@@ -11,11 +11,12 @@ S="${WORKDIR}/${PN}-${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="php_targets_php8-1 php_targets_php8-2"
+IUSE="php_targets_php8-1 php_targets_php8-2 php_targets_php8-3"
 
 PHP_DEPEND="
php_targets_php8-1? ( dev-lang/php:8.1[curl] )
php_targets_php8-2? ( dev-lang/php:8.2[curl] )
+   php_targets_php8-3? ( dev-lang/php:8.3[curl] )
 "
 RDEPEND="
${PHP_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2024-01-16 Thread Matthew Thode
commit: ed34e99ae3504de1fdcc953f143ec16e63910b1b
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jan 16 21:29:45 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jan 16 21:29:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed34e99a

www-apps/icingaweb2: drop 2.12.0

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.12.0.ebuild | 80 
 2 files changed, 81 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 48883f3d17e5..421f828ec4af 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
-DIST icingaweb2-2.12.0.tar.gz 6354699 BLAKE2B 
a3d5af224a85278dbc244877fc8699617ff770a82e56f65c1e642eb23afd883b01d445d479319e9376b9a45e97d4ba028305c2773623b75464b19b1c00c12e72
 SHA512 
8e03c80ae0f4730307f606bcfed57978fea59d7917f2d505b063c29e05d913e047b6975bfc56673c0e71464a09578983d63a88c8efd35b1c80abb0d15384c275
 DIST icingaweb2-2.12.1.tar.gz 6353911 BLAKE2B 
c1f52444c2ccc1eeafce89603564f21269607bc183a3189b80d93ccba5d621bf8c8bd79c75e5c9aaeb6672870923f99c98c7ebc469147125a803d16b00f9426d
 SHA512 
71e6ad8f947ee47ff0bd3924920584c558fbd8e371f76adb83cc08e95442e792009af79280c484afe478cf1a176cf2812c6be661d838f61f044abdc106ca0999

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
deleted file mode 100644
index 0a0ddca0fee2..
--- a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 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} == * ]];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: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-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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2024-01-11 Thread Joonas Niilola
commit: cbdcbdde703a0c12b45d5400d7c4b1d86a21faaa
Author: Anton Fischl  fischl-online  de>
AuthorDate: Sun Nov  5 09:00:16 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 11 14:05:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdcbdde

www-apps/icingaweb2-module-director: add 1.11.0

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 +
 .../icingaweb2-module-director-1.11.0.ebuild   | 77 ++
 2 files changed, 78 insertions(+)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 6ab8916c3280..455f35328ab3 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-director-1.10.2.tar.gz 3114956 BLAKE2B 
d050c501682ac3c1481d8710a3fc64642d0b18e92448bf05cd4a51e8a660c7a9abf571937a559a2dadd949535fca04feb1004a8613de7e4d0bbe54db5a377a25
 SHA512 
b301b71abada8c8722c03717a9def17c8ae53c951c83d5ef3a62f758fb93dd814d1b61d450987ddd0d8d3631145637dc6b26884134019e320cdd28cdedbc9794
+DIST icingaweb2-module-director-1.11.0.tar.gz 3465395 BLAKE2B 
8d0dcb590c3a735bcd279bf044c354b34f2f1edbc238a71236ec60e1e915660b80230c5076234cd6fb75fc7ec0ab1a8df967092c3f2f1c5e9305033b04236bf4
 SHA512 
1709920489248e7b6a84ffaa50996c9c061e04e744224fabc48a8885c30ed136cd0eb6db1a5e9a7bb3e07302b733554afa27060295b2ecea25f3416646656285

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild
new file mode 100644
index ..c6b6e7186f8f
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.11.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://github.com/Icinga/icingaweb2-module-director/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/${PN}.git;
+else
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# Dependencies according to
+# 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md.d/From-Source.md
+IUSE="php_targets_php8-1 php_targets_php8-2"
+
+PHP_DEPEND="
+   php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
+   php_targets_php8-2? ( dev-lang/php:8.2[curl,iconv,pcntl,posix,sockets] )
+"
+DEPEND="
+   acct-group/icingaweb2
+   acct-user/icingadirector
+"
+RDEPEND="
+   ${PHP_DEPEND}
+   ${DEPEND}
+   >=www-apps/icingaweb2-module-incubator-0.20.0
+   >=dev-libs/icinga-php-library-0.13.0
+   >=dev-libs/icinga-php-thirdparty-0.12.0
+   >=www-apps/icingaweb2-2.9.0
+"
+
+src_install() {
+   insinto /usr/share/icingaweb2/modules/${PN##*-}/
+   doins -r .
+
+   exeinto /usr/share/icingaweb2/bin/
+   doexe "${FILESDIR}"/icinga-director.sh
+
+   doinitd "${FILESDIR}"/director
+
+   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() {
+   # According to PMS this can be a space-separated list of version
+   # numbers, even though in practice it is typically just one.
+   local oldver
+   for oldver in ${REPLACING_VERSIONS}; do
+   if ver_test "${oldver}" -lt "1.11.0"; then
+   ewarn "You are upgrading from ${oldver} to ${PVR}"
+   ewarn "please read 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md#upgrade-to-1.11.x;
+   ewarn "for breaking changes"
+   ewarn
+   ewarn "Also, don't forget to upgrade database schema."
+   ewarn "Otherwise icingaweb2-module-director will not 
work!"
+   ewarn "(Web GUI => Configuration => Modules => director 
=> Configuration)"
+   ewarn
+   break
+   fi
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2024-01-11 Thread Joonas Niilola
commit: 48d09f299c2cd1e14b86c5385ffcd7ae64105429
Author: Anton Fischl  fischl-online  de>
AuthorDate: Sun Nov  5 09:03:36 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 11 14:05:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d09f29

www-apps/icingaweb2-module-director: drop 1.10.2

Signed-off-by: Anton Fischl  fischl-online.de>
Closes: https://github.com/gentoo/gentoo/pull/33675
Signed-off-by: Joonas Niilola  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 -
 .../icingaweb2-module-director-1.10.2.ebuild   | 75 --
 2 files changed, 76 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 455f35328ab3..b063fce962f0 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-director-1.10.2.tar.gz 3114956 BLAKE2B 
d050c501682ac3c1481d8710a3fc64642d0b18e92448bf05cd4a51e8a660c7a9abf571937a559a2dadd949535fca04feb1004a8613de7e4d0bbe54db5a377a25
 SHA512 
b301b71abada8c8722c03717a9def17c8ae53c951c83d5ef3a62f758fb93dd814d1b61d450987ddd0d8d3631145637dc6b26884134019e320cdd28cdedbc9794
 DIST icingaweb2-module-director-1.11.0.tar.gz 3465395 BLAKE2B 
8d0dcb590c3a735bcd279bf044c354b34f2f1edbc238a71236ec60e1e915660b80230c5076234cd6fb75fc7ec0ab1a8df967092c3f2f1c5e9305033b04236bf4
 SHA512 
1709920489248e7b6a84ffaa50996c9c061e04e744224fabc48a8885c30ed136cd0eb6db1a5e9a7bb3e07302b733554afa27060295b2ecea25f3416646656285

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild
deleted file mode 100644
index 370c6d78fa9b..
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://github.com/Icinga/icingaweb2-module-director/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/${PN}.git;
-else
-   KEYWORDS="~amd64 ~x86"
-   SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# Dependencies according to 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md
-IUSE="php_targets_php8-1"
-
-PHP_DEPEND="
-   php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
-"
-DEPEND="
-   acct-group/icingaweb2
-   acct-user/icingadirector
-"
-RDEPEND="
-   ${PHP_DEPEND}
-   ${DEPEND}
-   >=www-apps/icingaweb2-module-incubator-0.18.0
-   >=dev-libs/icinga-php-library-0.5.0
-   >=dev-libs/icinga-php-thirdparty-0.9.0
-   >=www-apps/icingaweb2-2.9.0
-"
-
-src_install() {
-   insinto /usr/share/icingaweb2/modules/${PN##*-}/
-   doins -r .
-
-   exeinto /usr/share/icingaweb2/bin/
-   doexe "${FILESDIR}"/icinga-director.sh
-
-   doinitd "${FILESDIR}"/director
-
-   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() {
-   # According to PMS this can be a space-separated list of version
-   # numbers, even though in practice it is typically just one.
-   local oldver
-   for oldver in ${REPLACING_VERSIONS}; do
-   if ver_test "${oldver}" -lt "1.10.0"; then
-   ewarn "You are upgrading from ${oldver} to ${PVR}"
-   ewarn "please read 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md#upgrade-to-1.10.x;
-   ewarn "for breaking changes"
-   ewarn
-   ewarn "Also, don't forget to upgrade database schema."
-   ewarn "Otherwise icingaweb2-module-director will not 
work!"
-   ewarn "(Web GUI => Configuration => Modules => director 
=> Configuration)"
-   ewarn
-   break
-   fi
-   done
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2024-01-11 Thread Joonas Niilola
commit: 4205d1d6bececd2e079e8a1ba260b9de5ab70872
Author: Anton Fischl  fischl-online  de>
AuthorDate: Sun Nov  5 08:45:54 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 11 14:05:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4205d1d6

www-apps/icingaweb2-module-incubator: 0.20.0: add PHP 8.2 support

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../icingaweb2-module-incubator-0.20.0.ebuild| 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
index 6f2dc11b33ee..04f149583a4a 100644
--- 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,11 @@ S="${WORKDIR}/${PN}-${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="php_targets_php8-1"
+IUSE="php_targets_php8-1 php_targets_php8-2"
 
 PHP_DEPEND="
php_targets_php8-1? ( dev-lang/php:8.1[curl] )
+   php_targets_php8-2? ( dev-lang/php:8.2[curl] )
 "
 RDEPEND="
${PHP_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-12-16 Thread Matthew Thode
commit: 8368093fb37161b1958a244eed6c939c952fad69
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Dec 16 15:03:04 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Dec 16 15:03:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8368093f

www-apps/icingaweb2: stabilize 2.12.1 for amd64, x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
index 882211be2144..0a0ddca0fee2 100644
--- a/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-11-16 Thread Matthew Thode
commit: 8165ba0b55aae01ecb0a0cc8ec06bb0a42cd1cbd
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Nov 16 19:14:12 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Nov 16 19:14:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8165ba0b

www-apps/icingaweb2: add 2.12.1

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.12.1.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 71d91e8475e6..48883f3d17e5 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
 DIST icingaweb2-2.12.0.tar.gz 6354699 BLAKE2B 
a3d5af224a85278dbc244877fc8699617ff770a82e56f65c1e642eb23afd883b01d445d479319e9376b9a45e97d4ba028305c2773623b75464b19b1c00c12e72
 SHA512 
8e03c80ae0f4730307f606bcfed57978fea59d7917f2d505b063c29e05d913e047b6975bfc56673c0e71464a09578983d63a88c8efd35b1c80abb0d15384c275
+DIST icingaweb2-2.12.1.tar.gz 6353911 BLAKE2B 
c1f52444c2ccc1eeafce89603564f21269607bc183a3189b80d93ccba5d621bf8c8bd79c75e5c9aaeb6672870923f99c98c7ebc469147125a803d16b00f9426d
 SHA512 
71e6ad8f947ee47ff0bd3924920584c558fbd8e371f76adb83cc08e95442e792009af79280c484afe478cf1a176cf2812c6be661d838f61f044abdc106ca0999

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
new file mode 100644
index ..882211be2144
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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} == * ]];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: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-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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-10-22 Thread Matthew Thode
commit: b8a2ca7af4a86a3858446e14fc50654c38e47bc2
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Oct 22 17:38:04 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Oct 22 17:38:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a2ca7a

www-apps/icingaweb2: stabilize 2.12.0 for amd64, x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
index 882211be2144..0a0ddca0fee2 100644
--- a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-09-29 Thread Matthew Thode
commit: 2eeb46586c1ba7bcfc05ab4a380333dc7dcbd3d2
Author: Anton Fischl  fischl-online  de>
AuthorDate: Fri Sep 29 16:09:07 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep 29 16:49:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eeb4658

www-apps/icingaweb2: correct 2.12.0 dependencies

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.12.0.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
index 9103daa5bbe2..882211be2144 100644
--- a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
@@ -28,11 +28,11 @@ 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-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}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-09-22 Thread Matthew Thode
commit: e06292114145b75201a3113625ea6be2f069433d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep 22 21:15:09 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep 22 21:15:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0629211

www-apps/icingaweb2: add 2.12.0

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.12.0.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 1426da1d3bef..71d91e8475e6 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae
+DIST icingaweb2-2.12.0.tar.gz 6354699 BLAKE2B 
a3d5af224a85278dbc244877fc8699617ff770a82e56f65c1e642eb23afd883b01d445d479319e9376b9a45e97d4ba028305c2773623b75464b19b1c00c12e72
 SHA512 
8e03c80ae0f4730307f606bcfed57978fea59d7917f2d505b063c29e05d913e047b6975bfc56673c0e71464a09578983d63a88c8efd35b1c80abb0d15384c275

diff --git a/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
new file mode 100644
index ..9103daa5bbe2
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.12.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 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} == * ]];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: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-libs/icinga-php-library-0.8.1
+   >=dev-libs/icinga-php-thirdparty-0.11.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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2023-09-13 Thread David Seifert
commit: 05df16d8ce37b4419ea746f0d86d56a530541356
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:45 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05df16d8

www-apps/icingaweb2-module-director: add 1.10.2

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 +
 .../icingaweb2-module-director-1.10.2.ebuild   | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index a938d4bbdc6f..0430fb2a2a22 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1,2 @@
+DIST icingaweb2-module-director-1.10.2.tar.gz 3114956 BLAKE2B 
d050c501682ac3c1481d8710a3fc64642d0b18e92448bf05cd4a51e8a660c7a9abf571937a559a2dadd949535fca04feb1004a8613de7e4d0bbe54db5a377a25
 SHA512 
b301b71abada8c8722c03717a9def17c8ae53c951c83d5ef3a62f758fb93dd814d1b61d450987ddd0d8d3631145637dc6b26884134019e320cdd28cdedbc9794
 DIST icingaweb2-module-director-1.9.1.tar.gz 3095028 BLAKE2B 
497dfc2f4a6f3f7f11c75dc4b934f54f4ff7e0644d97637bcd3a932e88e8bc719290b87be93ce15a6160966f8e1d959cfd6b150a9f630f13d6ea1e455753e776
 SHA512 
0fa0da31b1d8899ee127f6c2e6f4ee243dc21fc9516cec70a687a78188c84d0de4bddb1ad20e1b0c22200d4219407bc7d128be7063eeeb5e0eb48f0054846f79

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild
new file mode 100644
index ..370c6d78fa9b
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.10.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://github.com/Icinga/icingaweb2-module-director/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/${PN}.git;
+else
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# Dependencies according to 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md
+IUSE="php_targets_php8-1"
+
+PHP_DEPEND="
+   php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
+"
+DEPEND="
+   acct-group/icingaweb2
+   acct-user/icingadirector
+"
+RDEPEND="
+   ${PHP_DEPEND}
+   ${DEPEND}
+   >=www-apps/icingaweb2-module-incubator-0.18.0
+   >=dev-libs/icinga-php-library-0.5.0
+   >=dev-libs/icinga-php-thirdparty-0.9.0
+   >=www-apps/icingaweb2-2.9.0
+"
+
+src_install() {
+   insinto /usr/share/icingaweb2/modules/${PN##*-}/
+   doins -r .
+
+   exeinto /usr/share/icingaweb2/bin/
+   doexe "${FILESDIR}"/icinga-director.sh
+
+   doinitd "${FILESDIR}"/director
+
+   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() {
+   # According to PMS this can be a space-separated list of version
+   # numbers, even though in practice it is typically just one.
+   local oldver
+   for oldver in ${REPLACING_VERSIONS}; do
+   if ver_test "${oldver}" -lt "1.10.0"; then
+   ewarn "You are upgrading from ${oldver} to ${PVR}"
+   ewarn "please read 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/05-Upgrading.md#upgrade-to-1.10.x;
+   ewarn "for breaking changes"
+   ewarn
+   ewarn "Also, don't forget to upgrade database schema."
+   ewarn "Otherwise icingaweb2-module-director will not 
work!"
+   ewarn "(Web GUI => Configuration => Modules => director 
=> Configuration)"
+   ewarn
+   break
+   fi
+   done
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2023-09-13 Thread David Seifert
commit: f40655f37d4539a5f6c29fd2a973b302066c9ced
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:49 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f40655f3

www-apps/icingaweb2-module-incubator: drop 0.17.0

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  |  1 -
 .../icingaweb2-module-incubator-0.17.0.ebuild  | 28 --
 2 files changed, 29 deletions(-)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
index 1dc774c17c0d..3c29424763a0 100644
--- a/www-apps/icingaweb2-module-incubator/Manifest
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-incubator-0.17.0.tar.gz 67 BLAKE2B 
e64942fe68d91ea720520bd8c8682328b9a78137e80726bb5bd563a98b809af1a0ec63cff753b955ef0b0f9af9c93389e90fd6bfe5d4eb531030ad6cbea6bc62
 SHA512 
711de5bde4681dd4d788165b4b1351c0eb4c61e417c6405bc0920ce0f4505fdc2167e070941708d4a19a0135fefd1accf1b5103d59367bef27bba87efe68285c
 DIST icingaweb2-module-incubator-0.20.0.tar.gz 223234 BLAKE2B 
bac5ef347007275b386d75f76c388f5500488aa1303fd212c4cbcc45f81199e4d1268442c77f0e44cad37dae9b12259cd6d341339d16fcad03c3c414bffdd26d
 SHA512 
f561d9caffd6d72603debddf61181fa45b43aa4dc44d50749ed5e175c9a3ad169943cb59cfb74e890241cc0af3de0610a1747faa5c14c89ed3ab0b3e3c00da0e

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
deleted file mode 100644
index c2af240e5fcc..
--- 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Libraries useful for Icinga Web 2"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-incubator/;
-KEYWORDS="amd64 x86"
-MY_PN="icingaweb2-module-incubator"
-SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.6.0
-   >=www-apps/icingaweb2-2.6.0
-   || (
-   dev-lang/php:7.3[curl]
-   dev-lang/php:7.4[curl]
-   dev-lang/php:8.0[curl]
-   )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto "/usr/share/icingaweb2/modules/incubator/"
-   doins -r "${S}"/*
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2023-09-13 Thread David Seifert
commit: fb01548d95a932010581a303ae3cc4f4f1ac8d2f
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:48 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb01548d

www-apps/icingaweb2-module-incubator: add 0.20.0

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  |  1 +
 .../icingaweb2-module-incubator-0.20.0.ebuild  | 29 ++
 2 files changed, 30 insertions(+)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
index 61f84221b224..1dc774c17c0d 100644
--- a/www-apps/icingaweb2-module-incubator/Manifest
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-incubator-0.17.0.tar.gz 67 BLAKE2B 
e64942fe68d91ea720520bd8c8682328b9a78137e80726bb5bd563a98b809af1a0ec63cff753b955ef0b0f9af9c93389e90fd6bfe5d4eb531030ad6cbea6bc62
 SHA512 
711de5bde4681dd4d788165b4b1351c0eb4c61e417c6405bc0920ce0f4505fdc2167e070941708d4a19a0135fefd1accf1b5103d59367bef27bba87efe68285c
+DIST icingaweb2-module-incubator-0.20.0.tar.gz 223234 BLAKE2B 
bac5ef347007275b386d75f76c388f5500488aa1303fd212c4cbcc45f81199e4d1268442c77f0e44cad37dae9b12259cd6d341339d16fcad03c3c414bffdd26d
 SHA512 
f561d9caffd6d72603debddf61181fa45b43aa4dc44d50749ed5e175c9a3ad169943cb59cfb74e890241cc0af3de0610a1747faa5c14c89ed3ab0b3e3c00da0e

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
new file mode 100644
index ..6f2dc11b33ee
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.20.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Bleeding edge Icinga Web 2 libraries"
+HOMEPAGE="https://github.com/Icinga/icingaweb2-module-incubator/;
+SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="php_targets_php8-1"
+
+PHP_DEPEND="
+   php_targets_php8-1? ( dev-lang/php:8.1[curl] )
+"
+RDEPEND="
+   ${PHP_DEPEND}
+   >=www-apps/icingaweb2-2.9.0
+   >=dev-libs/icinga-php-thirdparty-0.8.0
+   >=dev-libs/icinga-php-library-0.5.0
+"
+
+src_install() {
+   insinto /usr/share/icingaweb2/modules/${PN##*-}/
+   doins -r .
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/files/, www-apps/icingaweb2-module-director/

2023-09-13 Thread David Seifert
commit: 465e4825788695ac53930c04e576cd0ab111fb5b
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:44 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465e4825

www-apps/icingaweb2-module-director: update 

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-director/files/director | 23 +++
 .../files/icinga-director.sh   |  2 +
 .../icingaweb2-module-director-.ebuild | 75 ++
 3 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/files/director 
b/www-apps/icingaweb2-module-director/files/director
new file mode 100644
index ..b2721d1e8dcd
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/files/director
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+
+description="Icinga2 Director Daemon"
+supervisor=supervise-daemon
+respawn_period="${respawn_period:-30}"
+term_type="${term_type:-linux}"
+command=/usr/share/icingaweb2/bin/icinga-director.sh
+pidfile="/run/${RC_SVCNAME}.pid"
+command_user="nobody:icingaweb2"
+
+depend() {
+need apache2 mysql php-fpm icinga2
+}
+
+start_pre() {
+chgrp icingaweb2 /usr/share/icingaweb2/bin/icingacli
+export EINFO_QUIET="${quiet:-yes}"
+}
+
+stop_pre()
+{
+export EINFO_QUIET="${quiet:-yes}"
+}

diff --git a/www-apps/icingaweb2-module-director/files/icinga-director.sh 
b/www-apps/icingaweb2-module-director/files/icinga-director.sh
new file mode 100644
index ..f0a9db21a368
--- /dev/null
+++ b/www-apps/icingaweb2-module-director/files/icinga-director.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+/usr/share/icingaweb2/bin/icingacli director daemon run

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
index c9a76d37b383..370c6d78fa9b 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
@@ -1,50 +1,75 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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}" ==  ]]; then
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://github.com/Icinga/icingaweb2-module-director/;
+
+if [[ ${PV} == * ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
+   EGIT_REPO_URI="https://github.com/Icinga/${PN}.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}"
+   SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
+# Dependencies according to 
https://github.com/Icinga/icingaweb2-module-director/blob/master/doc/02-Installation.md
+IUSE="php_targets_php8-1"
 
-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]
-   )
+PHP_DEPEND="
+   php_targets_php8-1? ( dev-lang/php:8.1[curl,iconv,pcntl,posix,sockets] )
+"
+DEPEND="
acct-group/icingaweb2
-   acct-user/icingadirector"
-RDEPEND="${DEPEND}"
+   acct-user/icingadirector
+"
+RDEPEND="
+   ${PHP_DEPEND}
+   ${DEPEND}
+   >=www-apps/icingaweb2-module-incubator-0.18.0
+   >=dev-libs/icinga-php-library-0.5.0
+   >=dev-libs/icinga-php-thirdparty-0.9.0
+   >=www-apps/icingaweb2-2.9.0
+"
 
 src_install() {
-   insinto "/usr/share/icingaweb2/modules/director/"
-   doins -r "${S}"/*
+   insinto /usr/share/icingaweb2/modules/${PN##*-}/
+   doins -r .
+
+   exeinto /usr/share/icingaweb2/bin/
+   doexe "${FILESDIR}"/icinga-director.sh
+
+   doinitd "${FILESDIR}"/director
+
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" \
+   contrib/systemd/icinga-director.service > 
"${T}"/icinga-director.service \
|| die "failed to patch icinga-director.service"
-   systemd_dounit "${T}/icinga-director.service"
+   systemd_dounit 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2023-09-13 Thread David Seifert
commit: f65a1ad2792f0147af07e28f4799e07a14504a87
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:47 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65a1ad2

www-apps/icingaweb2-module-incubator: change maintainer

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-incubator/metadata.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2-module-incubator/metadata.xml 
b/www-apps/icingaweb2-module-incubator/metadata.xml
index 5c76f7a3fc67..26f29ca0aebe 100644
--- a/www-apps/icingaweb2-module-incubator/metadata.xml
+++ b/www-apps/icingaweb2-module-incubator/metadata.xml
@@ -2,7 +2,14 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   prometheanf...@gentoo.org
-   Matthew Thode
+   git...@fischl-online.de
+   Anton Fischl

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Icinga/icingaweb2-module-incubator
+   
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2023-09-13 Thread David Seifert
commit: 65680e3d457333bdd01468d75f547b3b86fb9efc
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:46 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65680e3d

www-apps/icingaweb2-module-director: drop 1.9.1

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 -
 .../icingaweb2-module-director-1.9.1.ebuild| 47 --
 2 files changed, 48 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 0430fb2a2a22..6ab8916c3280 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,2 +1 @@
 DIST icingaweb2-module-director-1.10.2.tar.gz 3114956 BLAKE2B 
d050c501682ac3c1481d8710a3fc64642d0b18e92448bf05cd4a51e8a660c7a9abf571937a559a2dadd949535fca04feb1004a8613de7e4d0bbe54db5a377a25
 SHA512 
b301b71abada8c8722c03717a9def17c8ae53c951c83d5ef3a62f758fb93dd814d1b61d450987ddd0d8d3631145637dc6b26884134019e320cdd28cdedbc9794
-DIST icingaweb2-module-director-1.9.1.tar.gz 3095028 BLAKE2B 
497dfc2f4a6f3f7f11c75dc4b934f54f4ff7e0644d97637bcd3a932e88e8bc719290b87be93ce15a6160966f8e1d959cfd6b150a9f630f13d6ea1e455753e776
 SHA512 
0fa0da31b1d8899ee127f6c2e6f4ee243dc21fc9516cec70a687a78188c84d0de4bddb1ad20e1b0c22200d4219407bc7d128be7063eeeb5e0eb48f0054846f79

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
deleted file mode 100644
index 6309c4fc7e09..
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 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}" ==  ]]; 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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2023-09-13 Thread David Seifert
commit: e85a59ab223ed5fda328f1adfa98a7ba594adf11
Author: Anton Fischl  fischl-online  de>
AuthorDate: Wed Sep 13 09:25:43 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Sep 13 09:25:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e85a59ab

www-apps/icingaweb2-module-director: change maintainer

Signed-off-by: Anton Fischl  fischl-online.de>
Signed-off-by: David Seifert  gentoo.org>

 www-apps/icingaweb2-module-director/metadata.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/metadata.xml 
b/www-apps/icingaweb2-module-director/metadata.xml
index 5c76f7a3fc67..2f3d4eb71b7b 100644
--- a/www-apps/icingaweb2-module-director/metadata.xml
+++ b/www-apps/icingaweb2-module-director/metadata.xml
@@ -2,7 +2,14 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   prometheanf...@gentoo.org
-   Matthew Thode
+   git...@fischl-online.de
+   Anton Fischl

+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Icinga/icingaweb2-module-director
+   
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-03-27 Thread Matthew Thode
commit: f96d209ecb2b85ecaf6ef41538f5eeb8560922e4
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Mar 27 17:25:04 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Mar 27 17:25:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f96d209e

www-apps/icingaweb2: drop 2.11.3

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.11.3.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index fe91cef3af63..1426da1d3bef 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-2.11.3.tar.gz 11437384 BLAKE2B 
d77dfc6cb0640dcdae0206597ff7704fbebdc603672ed0ec1002dd2b125c23981d070b9a45c7363744856bc9313fd6c3f1f6310f1344ca268defc0677fd6c3bd
 SHA512 
e3277f4b0136dfe5ca48fb52ee85414205433aa5aac5e4db5acbaeb0c8a84591270253cc7b195d107458e8d37d6b5994dab6fdfa941234fd4fb3a451ce5aa839
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
deleted file mode 100644
index 947ab19c3d4b..
--- a/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 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} == * ]];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-lang/php:8.1[apache2?,cli,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
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-02-27 Thread Matthew Thode
commit: 6288222b78c06792ba231978e29571b40ae91fd4
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Feb 28 04:58:15 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Feb 28 04:58:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6288222b

www-apps/icingaweb2: stabilize 2.11.4 for amd64, x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.11.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
index 98d89648bfc1..947ab19c3d4b 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-02-15 Thread Matthew Thode
commit: e7437bae8e3d1cba4e92f4a1a991f54139b8cbbd
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Feb 16 00:33:06 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Feb 16 00:33:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7437bae

www-apps/icingaweb2: drop 2.11.2

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.11.2.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 779f492245f0..fe91cef3af63 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
-DIST icingaweb2-2.11.2.tar.gz 11412429 BLAKE2B 
76d47cfa3558ff647b425c725dae40e10359ec6aa117cb5f7dc615dff98bf9e4e2b73b21bb37f02e9c0737d2d734f816532edc3da34fb3f52238eae676b611bc
 SHA512 
c316b918c7c2bdd77b5815ba1b4f52604f9fd3801f8a4896ae416d27b2979238fb2ae619cb0048048c99c69fbc28352f57cd73f118d7afc84fbe0668b85b59e1
 DIST icingaweb2-2.11.3.tar.gz 11437384 BLAKE2B 
d77dfc6cb0640dcdae0206597ff7704fbebdc603672ed0ec1002dd2b125c23981d070b9a45c7363744856bc9313fd6c3f1f6310f1344ca268defc0677fd6c3bd
 SHA512 
e3277f4b0136dfe5ca48fb52ee85414205433aa5aac5e4db5acbaeb0c8a84591270253cc7b195d107458e8d37d6b5994dab6fdfa941234fd4fb3a451ce5aa839
 DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
deleted file mode 100644
index 427ea0f05350..
--- a/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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-lang/php:8.1[apache2?,cli,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
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-01-27 Thread Matthew Thode
commit: 01fc6402428f5a9ae1725df8950912af6ea3250d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jan 27 18:54:35 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jan 27 19:01:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fc6402

www-apps/icingaweb2: add 2.11.4

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.11.4.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 769bd986825a..779f492245f0 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.11.2.tar.gz 11412429 BLAKE2B 
76d47cfa3558ff647b425c725dae40e10359ec6aa117cb5f7dc615dff98bf9e4e2b73b21bb37f02e9c0737d2d734f816532edc3da34fb3f52238eae676b611bc
 SHA512 
c316b918c7c2bdd77b5815ba1b4f52604f9fd3801f8a4896ae416d27b2979238fb2ae619cb0048048c99c69fbc28352f57cd73f118d7afc84fbe0668b85b59e1
 DIST icingaweb2-2.11.3.tar.gz 11437384 BLAKE2B 
d77dfc6cb0640dcdae0206597ff7704fbebdc603672ed0ec1002dd2b125c23981d070b9a45c7363744856bc9313fd6c3f1f6310f1344ca268defc0677fd6c3bd
 SHA512 
e3277f4b0136dfe5ca48fb52ee85414205433aa5aac5e4db5acbaeb0c8a84591270253cc7b195d107458e8d37d6b5994dab6fdfa941234fd4fb3a451ce5aa839
+DIST icingaweb2-2.11.4.tar.gz 11381515 BLAKE2B 
e524d04fd027377685826e1e3ff4a73efb040f8736d35fa496cf190a69dc2e6fedd82f678d5994d66a450efaff77764fd6a9504823ba17897506ff3d923566d8
 SHA512 
3012e75c35f3070a5dfcb356ed499f247651c99b7f39faf1917ade4568f5ba15a2820ff63cab2583748cdb7d158f86b7b87bf8f4c934d3bd6526929dd57e1eae

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
new file mode 100644
index ..98d89648bfc1
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.11.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 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} == * ]];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-lang/php:8.1[apache2?,cli,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
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-01-15 Thread Matthew Thode
commit: c8fe862178fe815c70023c8c65688d0655594088
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 15 19:45:39 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jan 15 19:45:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fe8621

www-apps/icingaweb2: stabilize 2.11.3 for amd64, x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.11.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
index 60f9756ef763..947ab19c3d4b 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2023-01-05 Thread Matthew Thode
commit: b18a5dcce75fc1faef7045fd246eeb23f2cd9b29
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jan  6 04:34:26 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jan  6 04:34:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b18a5dcc

www-apps/icingaweb2: drop 2.11.1

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.11.1.ebuild | 82 
 2 files changed, 83 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index fa7a0d5f5c9d..769bd986825a 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
-DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
 DIST icingaweb2-2.11.2.tar.gz 11412429 BLAKE2B 
76d47cfa3558ff647b425c725dae40e10359ec6aa117cb5f7dc615dff98bf9e4e2b73b21bb37f02e9c0737d2d734f816532edc3da34fb3f52238eae676b611bc
 SHA512 
c316b918c7c2bdd77b5815ba1b4f52604f9fd3801f8a4896ae416d27b2979238fb2ae619cb0048048c99c69fbc28352f57cd73f118d7afc84fbe0668b85b59e1
 DIST icingaweb2-2.11.3.tar.gz 11437384 BLAKE2B 
d77dfc6cb0640dcdae0206597ff7704fbebdc603672ed0ec1002dd2b125c23981d070b9a45c7363744856bc9313fd6c3f1f6310f1344ca268defc0677fd6c3bd
 SHA512 
e3277f4b0136dfe5ca48fb52ee85414205433aa5aac5e4db5acbaeb0c8a84591270253cc7b195d107458e8d37d6b5994dab6fdfa941234fd4fb3a451ce5aa839

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
deleted file mode 100644
index 427ea0f05350..
--- a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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-lang/php:8.1[apache2?,cli,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
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-12-15 Thread Matthew Thode
commit: 846d700a815b108df5df4fc7bc89e4774ed3af40
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 15 17:43:47 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 15 17:43:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=846d700a

www-apps/icingaweb2: add 2.11.3

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.11.3.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 74da71f9ecf9..fa7a0d5f5c9d 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
 DIST icingaweb2-2.11.2.tar.gz 11412429 BLAKE2B 
76d47cfa3558ff647b425c725dae40e10359ec6aa117cb5f7dc615dff98bf9e4e2b73b21bb37f02e9c0737d2d734f816532edc3da34fb3f52238eae676b611bc
 SHA512 
c316b918c7c2bdd77b5815ba1b4f52604f9fd3801f8a4896ae416d27b2979238fb2ae619cb0048048c99c69fbc28352f57cd73f118d7afc84fbe0668b85b59e1
+DIST icingaweb2-2.11.3.tar.gz 11437384 BLAKE2B 
d77dfc6cb0640dcdae0206597ff7704fbebdc603672ed0ec1002dd2b125c23981d070b9a45c7363744856bc9313fd6c3f1f6310f1344ca268defc0677fd6c3bd
 SHA512 
e3277f4b0136dfe5ca48fb52ee85414205433aa5aac5e4db5acbaeb0c8a84591270253cc7b195d107458e8d37d6b5994dab6fdfa941234fd4fb3a451ce5aa839

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
new file mode 100644
index ..60f9756ef763
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.11.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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} == * ]];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-lang/php:8.1[apache2?,cli,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
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-12-05 Thread Matthew Thode
commit: 08f9120176293b19ccae7eacfd6ba328e873a354
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec  6 01:20:18 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec  6 01:20:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f91201

www-apps/icingaweb2: stabilize 2.11.2 for amd64, x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
index 60f9756ef763..427ea0f05350 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-11-05 Thread Matthew Thode
commit: 71006c31eef6f196534871211de231774587f635
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Nov  6 04:57:32 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Nov  6 05:02:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71006c31

www-apps/icingaweb2: add 2.11.2

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.11.2.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index dbb1f290c5ed..74da71f9ecf9 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997
+DIST icingaweb2-2.11.2.tar.gz 11412429 BLAKE2B 
76d47cfa3558ff647b425c725dae40e10359ec6aa117cb5f7dc615dff98bf9e4e2b73b21bb37f02e9c0737d2d734f816532edc3da34fb3f52238eae676b611bc
 SHA512 
c316b918c7c2bdd77b5815ba1b4f52604f9fd3801f8a4896ae416d27b2979238fb2ae619cb0048048c99c69fbc28352f57cd73f118d7afc84fbe0668b85b59e1

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
new file mode 100644
index ..60f9756ef763
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.11.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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} == * ]];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-lang/php:8.1[apache2?,cli,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
+   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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/

2022-11-01 Thread Matthew Thode
commit: 0417dcdf485ccec0a0d1f5deef3011c33524e71b
Author: Tomáš Mózes  gmail  com>
AuthorDate: Tue Nov  1 16:16:56 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Nov  1 19:03:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0417dcdf

www-apps/icingaweb2-module-graphite: add 1.2.1

Closes: https://bugs.gentoo.org/879005
Signed-off-by: Tomáš Mózes  gmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-graphite/Manifest   |  1 +
 .../icingaweb2-module-graphite-1.2.1.ebuild| 26 ++
 2 files changed, 27 insertions(+)

diff --git a/www-apps/icingaweb2-module-graphite/Manifest 
b/www-apps/icingaweb2-module-graphite/Manifest
index 2ad6732bb275..dac94fda0edc 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-graphite-1.1.0.tar.gz 331879 BLAKE2B 
11e34a5daf5aab583e349297aa612880c782b3cba4514c87e5c2f025fda52e98db1e81eeea3652c070cf075fda87c37a1dc6f5cf870fc57e2fb7594a3e39dfaf
 SHA512 
3c37ef9571f086373e063f8397953605005ae5eeceadc7bfc6beb10168b71f5fbe4e58f3dc6ba9fd5a5e274097c8d881489f8d2772985343b9c8a0f5db9558ed
+DIST icingaweb2-module-graphite-1.2.1.tar.gz 345797 BLAKE2B 
6fca4f36b1945c2d2d12ae963c61b76662b69d216eb01c5fd3f3a21703fc25c4b4d24e9b9506d43b1250128fbeaade23e4d54cf16179d9653c114c91fa56fc8c
 SHA512 
63459f2b8be698e58e4d5fdfb2366e1dca7a1727f9c597f027a5d2ebf273df511cc082404efcf993042dfa5d5c468c7440df87820c4c916e0b5f7221f2a64cf8

diff --git 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.2.1.ebuild 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.2.1.ebuild
new file mode 100644
index ..23db2f2931de
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/;
+if [[ "${PV}" ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git;
+else
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.0
+   >=www-apps/icingaweb2-2.5.0"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   insinto "/usr/share/icingaweb2/modules/graphite/"
+   doins -r "${S}"/*
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-09-08 Thread Matthew Thode
commit: 5f06aecaf476aa6d0bd45c1ef66b5f62637c345d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep  9 04:45:19 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep  9 04:48:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f06aeca

www-apps/icingaweb2-module-director: drop 1.8.1

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 -
 .../icingaweb2-module-director-1.8.1.ebuild| 47 --
 2 files changed, 48 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 499d19ecbf4e..a938d4bbdc6f 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-director-1.8.1.tar.gz 3045604 BLAKE2B 
b94d870f23f6267250ed1b2165e0960e7a2f6df1b7545a7c22697af1fbc6ec0f0a7d04e92a410c33450613e95fca1c3dbb9db6f974d30a528856a60169a31bf2
 SHA512 
89fe35061deecd212576b6363289daa433c9664b95221c74a684a88e07ebd36d3b55b4a767f6caefeadb3679c5aa0787b1129f08b6d0fd698e5a2d5b17a3a2d1
 DIST icingaweb2-module-director-1.9.1.tar.gz 3095028 BLAKE2B 
497dfc2f4a6f3f7f11c75dc4b934f54f4ff7e0644d97637bcd3a932e88e8bc719290b87be93ce15a6160966f8e1d959cfd6b150a9f630f13d6ea1e455753e776
 SHA512 
0fa0da31b1d8899ee127f6c2e6f4ee243dc21fc9516cec70a687a78188c84d0de4bddb1ad20e1b0c22200d4219407bc7d128be7063eeeb5e0eb48f0054846f79

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
deleted file mode 100644
index 6309c4fc7e09..
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 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}" ==  ]]; 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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2022-09-08 Thread Matthew Thode
commit: a133b26d381ce8edf5e645e1c77686a90d0ad3b4
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep  9 04:44:47 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep  9 04:48:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a133b26d

www-apps/icingaweb2-module-incubator: drop 0.11.0

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  |  1 -
 .../icingaweb2-module-incubator-0.11.0.ebuild  | 28 --
 2 files changed, 29 deletions(-)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
index 9ae67253f4b7..61f84221b224 100644
--- a/www-apps/icingaweb2-module-incubator/Manifest
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-incubator-0.11.0.tar.gz 219239 BLAKE2B 
32c194a4343dc706a56d86c8db33efc99cec3ee93d3929ee962f81623e2a4cd1277131ceae34c4f040ce1b69e4e1b004cc1202cb42639e25e56513e857b1292a
 SHA512 
e8de6a685f87e70bfc689b0e2bd9fd8c1917996a43ed675399da0a6f6c208f062e20072338e329d57b507ac300ae59a1d18c23f0bd17d4394d2e3fef3b159cff
 DIST icingaweb2-module-incubator-0.17.0.tar.gz 67 BLAKE2B 
e64942fe68d91ea720520bd8c8682328b9a78137e80726bb5bd563a98b809af1a0ec63cff753b955ef0b0f9af9c93389e90fd6bfe5d4eb531030ad6cbea6bc62
 SHA512 
711de5bde4681dd4d788165b4b1351c0eb4c61e417c6405bc0920ce0f4505fdc2167e070941708d4a19a0135fefd1accf1b5103d59367bef27bba87efe68285c

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
deleted file mode 100644
index 0ec8c4a6c39c..
--- 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Libraries useful for Icinga Web 2"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-incubator/;
-KEYWORDS="~amd64 ~x86"
-MY_PN="icingaweb2-module-incubator"
-SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.6.0
-   >=www-apps/icingaweb2-2.6.0
-   || (
-   dev-lang/php:7.3[curl]
-   dev-lang/php:7.4[curl]
-   dev-lang/php:8.0[curl]
-   )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto "/usr/share/icingaweb2/modules/incubator/"
-   doins -r "${S}"/*
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-08-31 Thread Matthew Thode
commit: 991cc68a553c623919d2a5e09d54ce9c9cd2f207
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Aug 31 15:38:09 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Aug 31 15:38:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991cc68a

www-apps/icingaweb2: drop 2.10.3, 2.11.0

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  2 -
 www-apps/icingaweb2/icingaweb2-2.10.3.ebuild | 81 ---
 www-apps/icingaweb2/icingaweb2-2.11.0.ebuild | 82 
 3 files changed, 165 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index b02485d79127..dbb1f290c5ed 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1 @@
-DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
-DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B 
f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191
 SHA512 
e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
deleted file mode 100644
index eb5a96a535d5..
--- a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-08-10 Thread Matthew Thode
commit: 9c0b0ef34f467fcf5bf88e05439cf1c360c351d9
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 11 00:29:58 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Aug 11 00:30:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c0b0ef3

www-apps/icingaweb2: fix deps on icinga libs

Closes: https://bugs.gentoo.org/864403
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.11.0.ebuild | 4 ++--
 www-apps/icingaweb2/icingaweb2-2.11.1.ebuild | 4 ++--
 www-apps/icingaweb2/icingaweb2-.ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
index 859522be43f0..427ea0f05350 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
@@ -33,8 +33,8 @@ 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-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
-   dev-libs/icinga-php-library
-   dev-libs/icinga-php-thirdparty
+   >=dev-libs/icinga-php-library-0.8.1
+   >=dev-libs/icinga-php-thirdparty-0.11.0
acct-group/icingacmd
acct-group/icingaweb2"
 RDEPEND="${DEPEND}"

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
index 859522be43f0..427ea0f05350 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
@@ -33,8 +33,8 @@ 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-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
-   dev-libs/icinga-php-library
-   dev-libs/icinga-php-thirdparty
+   >=dev-libs/icinga-php-library-0.8.1
+   >=dev-libs/icinga-php-thirdparty-0.11.0
acct-group/icingacmd
acct-group/icingaweb2"
 RDEPEND="${DEPEND}"

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index 078757090855..60f9756ef763 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -33,8 +33,8 @@ 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-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
-   dev-libs/icinga-php-library
-   dev-libs/icinga-php-thirdparty
+   >=dev-libs/icinga-php-library-0.8.1
+   >=dev-libs/icinga-php-thirdparty-0.11.0
acct-group/icingacmd
acct-group/icingaweb2"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-08-08 Thread Matthew Thode
commit: bb7b1ce2993926c263c14282895d9d5ade1cbef0
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  9 01:10:28 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug  9 01:10:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7b1ce2

www-apps/icingaweb2-module-director: 1.9.1 stable amd64/x86

Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
index c9c0c1eaca8f..6309c4fc7e09 100644
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
 else
-   KEYWORDS="~amd64 ~x86"
+   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}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2022-08-08 Thread Matthew Thode
commit: e6cd7b31346cd8c0005562eba54cd30f192e7264
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  9 01:09:22 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug  9 01:09:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cd7b31

www-apps/icingaweb2-module-incubator: 0.17.0 stable amd64/x86

Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2-module-incubator-0.17.0.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
index 1a9efed8514f..c2af240e5fcc 100644
--- 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DESCRIPTION="Libraries useful for Icinga Web 2"
 HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-incubator/;
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 MY_PN="icingaweb2-module-incubator"
 SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-08-08 Thread Matthew Thode
commit: 4b8158e5fe2779731da6f6a7b2be39f7ab981ada
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  9 01:06:28 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug  9 01:07:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8158e5

www-apps/icingaweb2: drop 2.10.1

2.11.1 stable amd64/x86

Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.10.1.ebuild | 81 
 www-apps/icingaweb2/icingaweb2-2.11.1.ebuild |  2 +-
 3 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index d3b01f4a0c86..b02485d79127 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,3 @@
-DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
 DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
 DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B 
f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191
 SHA512 
e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
deleted file mode 100644
index eb5a96a535d5..
--- a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-07-31 Thread Matthew Thode
commit: ba4b694cbc16d66ad4708f8b5291819b5cd53ba3
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Aug  1 03:13:14 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Aug  1 03:13:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4b694c

www-apps/icingaweb2: 2.11.0 stable amd64/x86

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
index 078757090855..859522be43f0 100644
--- a/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-07-16 Thread Matthew Thode
commit: ae00dc0089665ae031ec7b5b4e6b7fa5a1d3a347
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jul 17 03:07:40 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jul 17 03:07:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae00dc00

www-apps/icingaweb2: 2.10.3 stable amd64/x86

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.10.2.ebuild | 81 
 www-apps/icingaweb2/icingaweb2-2.10.3.ebuild |  2 +-
 3 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 41e9abbaac7b..d3b01f4a0c86 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,5 +1,4 @@
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
-DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 
4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297
 SHA512 
e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
 DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
 DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B 
f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191
 SHA512 
e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
 DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
deleted file mode 100644
index 1c12f98d4b39..
--- a/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-07-07 Thread Matthew Thode
commit: 4f6f8132cce5369d5332a032ecce7dcea984ceda
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jul  7 15:54:37 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jul  7 15:56:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6f8132

www-apps/icingaweb2-module-director: 1.9.1 bump

Closes: https://bugs.gentoo.org/856679
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 +
 .../icingaweb2-module-director-1.9.1.ebuild| 47 ++
 2 files changed, 48 insertions(+)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 2c2b18489f72..499d19ecbf4e 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-director-1.8.1.tar.gz 3045604 BLAKE2B 
b94d870f23f6267250ed1b2165e0960e7a2f6df1b7545a7c22697af1fbc6ec0f0a7d04e92a410c33450613e95fca1c3dbb9db6f974d30a528856a60169a31bf2
 SHA512 
89fe35061deecd212576b6363289daa433c9664b95221c74a684a88e07ebd36d3b55b4a767f6caefeadb3679c5aa0787b1129f08b6d0fd698e5a2d5b17a3a2d1
+DIST icingaweb2-module-director-1.9.1.tar.gz 3095028 BLAKE2B 
497dfc2f4a6f3f7f11c75dc4b934f54f4ff7e0644d97637bcd3a932e88e8bc719290b87be93ce15a6160966f8e1d959cfd6b150a9f630f13d6ea1e455753e776
 SHA512 
0fa0da31b1d8899ee127f6c2e6f4ee243dc21fc9516cec70a687a78188c84d0de4bddb1ad20e1b0c22200d4219407bc7d128be7063eeeb5e0eb48f0054846f79

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
new file mode 100644
index ..c9c0c1eaca8f
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 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}" ==  ]]; 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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-07-07 Thread Matthew Thode
commit: b4958d98994d79cc401b8af371d78f1239c32f3e
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jul  7 15:49:29 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jul  7 15:56:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4958d98

www-apps/icingaweb2: 2.11.1 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.11.1.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 8232c190adc2..41e9abbaac7b 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -2,3 +2,4 @@ DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf8081
 DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 
4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297
 SHA512 
e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
 DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
 DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B 
f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191
 SHA512 
e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e
+DIST icingaweb2-2.11.1.tar.gz 11410186 BLAKE2B 
6211dac560ab7acd4b37b056ab32fa73d21521f5bb02509b63d703e986761e617c1304ff71c22fc1b0d820cabf4e1264d13847142daee7da5cc5644fb4164a67
 SHA512 
3df41958de29e6099acfbf002b9cf68da535cfd5400397e03d3ea59083ee68b8084c1cea85ae31cb6134cef2a2b39c18b53cabcbdf436e7ddc14f0ddbcd61997

diff --git a/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
new file mode 100644
index ..078757090855
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.11.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 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} == * ]];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-lang/php:8.1[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}"
+
+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
+  

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2022-07-07 Thread Matthew Thode
commit: 9ae235095d40d06efba654b7c94c3434b3028017
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jul  7 15:56:30 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jul  7 15:56:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae23509

www-apps/icingaweb2-module-incubator: 0.17.0 bump

Closes: https://bugs.gentoo.org/856682
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  |  1 +
 .../icingaweb2-module-incubator-0.17.0.ebuild  | 28 ++
 2 files changed, 29 insertions(+)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
index e64b530c115b..9ae67253f4b7 100644
--- a/www-apps/icingaweb2-module-incubator/Manifest
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-incubator-0.11.0.tar.gz 219239 BLAKE2B 
32c194a4343dc706a56d86c8db33efc99cec3ee93d3929ee962f81623e2a4cd1277131ceae34c4f040ce1b69e4e1b004cc1202cb42639e25e56513e857b1292a
 SHA512 
e8de6a685f87e70bfc689b0e2bd9fd8c1917996a43ed675399da0a6f6c208f062e20072338e329d57b507ac300ae59a1d18c23f0bd17d4394d2e3fef3b159cff
+DIST icingaweb2-module-incubator-0.17.0.tar.gz 67 BLAKE2B 
e64942fe68d91ea720520bd8c8682328b9a78137e80726bb5bd563a98b809af1a0ec63cff753b955ef0b0f9af9c93389e90fd6bfe5d4eb531030ad6cbea6bc62
 SHA512 
711de5bde4681dd4d788165b4b1351c0eb4c61e417c6405bc0920ce0f4505fdc2167e070941708d4a19a0135fefd1accf1b5103d59367bef27bba87efe68285c

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
new file mode 100644
index ..1a9efed8514f
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.17.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Libraries useful for Icinga Web 2"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-incubator/;
+KEYWORDS="~amd64 ~x86"
+MY_PN="icingaweb2-module-incubator"
+SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.6.0
+   >=www-apps/icingaweb2-2.6.0
+   || (
+   dev-lang/php:7.3[curl]
+   dev-lang/php:7.4[curl]
+   dev-lang/php:8.0[curl]
+   )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   insinto "/usr/share/icingaweb2/modules/incubator/"
+   doins -r "${S}"/*
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-06-30 Thread Matthew Thode
commit: 3efa1b2401e48d80089154cb650cb5680b7125e4
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 30 21:12:56 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jun 30 21:16:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efa1b24

www-apps/icingaweb2: 2.10.3 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.10.3.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 82019955a3ba..59d41d9bb025 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
 DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 
4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297
 SHA512 
e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
+DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
new file mode 100644
index ..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-06-30 Thread Matthew Thode
commit: e0fc8d4b06d4c225a5ba80580dcbb714c33c822e
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 30 21:16:22 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jun 30 21:16:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fc8d4b

www-apps/icingaweb2: 2.11.0 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest   | 1 +
 .../icingaweb2/{icingaweb2-.ebuild => icingaweb2-2.11.0.ebuild}| 3 ++-
 www-apps/icingaweb2/icingaweb2-.ebuild | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 59d41d9bb025..8232c190adc2 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,4 @@
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
 DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 
4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297
 SHA512 
e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00
 DIST icingaweb2-2.10.3.tar.gz 11490948 BLAKE2B 
ab7c3d0772224162f8eb106618c10398737f163850ef82f2d1ca75c6fc07b2640b2bed813a7007866886ddf7b5a20cf631ea95164b0e3c3d051d70f62f3a660d
 SHA512 
f881f91ffaf46a8e5be67414c8d38982132085dfba56a7c1033b2d2e1689de2f37a00e83d3890410f03dc5f12101d051dc8d75617d952c30d487f98e5cc78067
+DIST icingaweb2-2.11.0.tar.gz 11411511 BLAKE2B 
f7b550a73bd0ff9770700a3a8cab1b02c88a57ed4bbb2e120df379bf897fb21d838a968f9d4d83e6a38d32578655d2670734f66e3c0dc8215fe5295d46ebc191
 SHA512 
e76e01262cb5b4ac43504349262660d85306205e0599bb0c8afd6a1d9f3240d659dd5cfdc35a6b9e2498ad16864a6024d0dac46faed4473da70be461a1db9f8e

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
similarity index 94%
copy from www-apps/icingaweb2/icingaweb2-.ebuild
copy to www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
index c00a171bba00..078757090855 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1

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-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
dev-libs/icinga-php-library
dev-libs/icinga-php-thirdparty

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index c00a171bba00..078757090855 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1

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-lang/php:8.1[apache2?,cli,fpm?,gd,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)
dev-libs/icinga-php-library
dev-libs/icinga-php-thirdparty



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-06-16 Thread Matthew Thode
commit: d60a34bdeca2577740b7eb609abf59063cb8d56a
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 16 23:24:21 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jun 16 23:24:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60a34bd

www-apps/icingaweb2: 2.10.2 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.10.2.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 6d21e3cb3463..82019955a3ba 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
+DIST icingaweb2-2.10.2.tar.gz 11489780 BLAKE2B 
4135e798afba7e7ea457ac00add5cd4ff14d9572ce6ffa50c8dc29ba43435e9305b9c2f52187bc50fc25f3def730c01c682a9ef80afdc79676a5d0c27dd87297
 SHA512 
e0e7f4f24c5609ccc0b1b0773fc018632bdd8d879311968e7b72cca1a856f227af3e6ff3e916b8bcdfc8c24c60d32008c6fee53ebac8d3a08328ded88baa3c00

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
new file mode 100644
index ..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-06-07 Thread Matthew Thode
commit: 7041bf861b2afd5a15f1e9f8981d7c3403fbdb8d
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun  7 21:08:26 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun  7 21:08:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7041bf86

www-apps/icingaweb2: 2.10.0 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 -
 www-apps/icingaweb2/icingaweb2-2.10.0.ebuild | 81 
 2 files changed, 82 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 55e68f854999..6d21e3cb3463 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B 
bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966
 SHA512 
e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
deleted file mode 100644
index eb5a96a535d5..
--- a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-05-09 Thread Matthew Thode
commit: 020b86c238e6fa66f64a3cf8b8e5bc3fc07abc23
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon May  9 14:53:03 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon May  9 14:53:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020b86c2

www-apps/icingaweb2: 2.9.6 cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 -
 www-apps/icingaweb2/icingaweb2-2.9.6.ebuild | 81 -
 2 files changed, 82 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 00051e768457..55e68f854999 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
 DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B 
bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966
 SHA512 
e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
 DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
-DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 
696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5
 SHA512 
507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
deleted file mode 100644
index eb5a96a535d5..
--- a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-05-07 Thread Matthew Thode
commit: 54a7fdff2f268ecb8098a1a715c16714bf26ca21
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat May  7 15:55:59 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat May  7 15:58:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a7fdff

www-apps/icingaweb2: 2.10.1 stable amd64/x86

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-04-24 Thread Matthew Thode
commit: c8dacbad816b36140fd5469d45a89a768918c1dd
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Apr 25 03:36:41 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Apr 25 03:36:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8dacbad

www-apps/icingaweb2: 2.10.0 stable amd64/x86

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-04-07 Thread Matthew Thode
commit: 036840e4348977f9d4b88848b2a71ade0ac647a2
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Apr  8 04:00:02 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr  8 04:02:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036840e4

www-apps/icingaweb2: 2.10.1 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.10.1.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 6ddfc6950ec3..00051e768457 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B 
bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966
 SHA512 
e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
+DIST icingaweb2-2.10.1.tar.gz 11490414 BLAKE2B 
897d5dcb4774db42651b53937f2bf80810b9a8d3eccb10bb733ce7b083e4eeea5673ee7cab75d24602871b72d44d84f7c1a6faec28c1ff4d2bd404a7d39d7ba2
 SHA512 
ba77ddeb27fb0ab1c6f7a77020eb9490803e1bf2d37186c7efc06bd250301a7d50f669699196d3a3208da9d5606edc787f62f34cdd15343e2c55020b77e485d8
 DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 
696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5
 SHA512 
507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
new file mode 100644
index ..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-04-05 Thread Brian Evans
commit: 75cfd1f79f3ccfc485ca2fbbe54da6babdec0f16
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Apr  5 18:59:37 2022 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Apr  5 18:59:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cfd1f7

www-apps/icingaweb2-module-director: Drop old

Required for PHP 7.3 removal

Signed-off-by: Brian Evans  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 -
 .../icingaweb2-module-director-1.8.0.ebuild| 34 --
 2 files changed, 35 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 1b6a70ca56c3..2c2b18489f72 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,2 +1 @@
-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

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
deleted file mode 100644
index 3d7195bd09f8..
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/;
-if [[ "${PV}" ==  ]]; 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.4.3
-   >=www-apps/icingaweb2-2.2.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]
-   )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto "/usr/share/icingaweb2/modules/director/"
-   doins -r "${S}"/*
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-03-24 Thread Matthew Thode
commit: b5cf91dd6a1cd23cb7be4272a28629c1d8972ecb
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar 24 15:46:25 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Mar 24 15:47:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cf91dd

www-apps/icingaweb2: 2.10.0 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 www-apps/icingaweb2/icingaweb2-2.10.0.ebuild | 81 
 2 files changed, 82 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 5e05a3512b06..6ddfc6950ec3 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
+DIST icingaweb2-2.10.0.tar.gz 11491028 BLAKE2B 
bee48e59ec7d0a564e7056986a84fda9639e61ed82ea65d35da310916e7058837fc146ee06f2c044748f72424198dc42f75b32de4b6ab39f673e2a9bbaf46966
 SHA512 
e26a4382970ece503c18ac9f93bb9e7ac24fd827dd84fd04352aeeff796ab58dac747840c6153cea5711d548603f219ba32aeffe76d87359ea72f2d3a598468b
 DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 
696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5
 SHA512 
507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4

diff --git a/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
new file mode 100644
index ..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.10.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-03-09 Thread Matthew Thode
commit: 5bfaa270db0bc9b0b07f5e3bdeee31246ba6e0c9
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar 10 03:18:02 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Mar 10 03:22:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfaa270

www-apps/icingaweb2: 2.9.6 fast stable for path traversal bug

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
index 1c12f98d4b39..eb5a96a535d5 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-03-09 Thread Matthew Thode
commit: 2674f01e3f1634d58dd88cba23be7387d3d6de14
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar 10 03:18:19 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Mar 10 03:22:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2674f01e

www-apps/icingaweb2: clean up

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest   |  1 -
 www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild | 81 --
 2 files changed, 82 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 90a6947a3522..5e05a3512b06 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B 
cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51
 SHA512 
1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb
 DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 
696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5
 SHA512 
507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild
deleted file mode 100644
index 1ef7a422fe00..
--- a/www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild
+++ /dev/null
@@ -1,81 +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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-03-09 Thread Matthew Thode
commit: ce85cb5d3d80ebf73eab3111384ec3b17fbcb032
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar 10 03:17:06 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Mar 10 03:21:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce85cb5d

www-apps/icingaweb2: 2.9.6 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.9.6.ebuild | 81 +
 2 files changed, 82 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 07fbe2f2da87..90a6947a3522 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B 
cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51
 SHA512 
1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb
+DIST icingaweb2-2.9.6.tar.gz 12313930 BLAKE2B 
696b882fc1bb0fd0452dca9e8b13b336181d953c05ab43c1db38073aa817496ca431dfb0f68adab0a6eae7c2238878dda98a57d8b69b2bc19ed94f1afbd26fe5
 SHA512 
507ce9ab8e31f0afc19de173c56e9ce2986c9c2e945ff3516e005b49a69993ccb00ec53d4c53bc0beee865cebc533b4b91b0d7707abf9d30d4cb76b7545fb6a4

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
new file mode 100644
index ..1c12f98d4b39
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-03-03 Thread Jakov Smolić
commit: 8069f2fe3ce6f825a14899c344662f8968d48753
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar  3 18:17:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar  3 18:17:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8069f2fe

www-apps/icingaweb2-module-director: Stabilize 1.8.1 x86, #831740

Signed-off-by: Jakov Smolić  gentoo.org>

 .../icingaweb2-module-director/icingaweb2-module-director-1.8.1.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index a9afdf74c7ab..6309c4fc7e09 100644
--- 
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
@@ -10,7 +10,7 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
 else
-   KEYWORDS="amd64 ~x86"
+   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}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2022-03-03 Thread Jakov Smolić
commit: 0f1986b5c185b18235d45e36f9d557f43f2f6e89
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Mar  3 18:17:33 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Mar  3 18:17:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1986b5

www-apps/icingaweb2-module-director: Stabilize 1.8.1 amd64, #831740

Signed-off-by: Jakov Smolić  gentoo.org>

 .../icingaweb2-module-director-1.8.1.ebuild   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 0d9d32306e89..a9afdf74c7ab 100644
--- 
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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
 else
-   KEYWORDS="~amd64 ~x86"
+   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}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-01-18 Thread Matthew Thode
commit: 064c0ec71ca34af67e60b64a97ff503ed1a80221
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jan 18 18:44:20 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jan 18 18:44:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064c0ec7

www-apps/icingaweb2: 2.9.4 cleanup

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 -
 www-apps/icingaweb2/icingaweb2-2.9.4.ebuild | 80 -
 2 files changed, 81 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index e07dcc070afd..07fbe2f2da87 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-2.9.4.tar.gz 12314780 BLAKE2B 
3ecce619c27dc560b8da3155d008c3f3ab07b7ea0e6a66d0cbc3886becee8f1cf2f99e2cb7d79e2776be09b3bda82da2574d280dc26e41ea8d2ac568354c694a
 SHA512 
77e446c9b48e9db7817fd6a46a6be9f57dfb21278066cce70f6c85d04f04200ec862c3c29c93d62fa3d0468973ddfc04eac5aa957677ec02d09eb13a3aee4265
 DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B 
cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51
 SHA512 
1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
deleted file mode 100644
index 977d8fee7bb4..
--- a/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
+++ /dev/null
@@ -1,80 +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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2022-01-11 Thread Matthew Thode
commit: 69369e0a8365480b654dd15070ba4df0e01da3ee
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jan 11 16:18:18 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jan 11 16:18:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69369e0a

www-apps/icingaweb2: 2.9.3 clean up

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest   |  1 -
 www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 51e0978ccfbc..e07dcc070afd 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
-DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B 
fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377
 SHA512 
46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
 DIST icingaweb2-2.9.4.tar.gz 12314780 BLAKE2B 
3ecce619c27dc560b8da3155d008c3f3ab07b7ea0e6a66d0cbc3886becee8f1cf2f99e2cb7d79e2776be09b3bda82da2574d280dc26e41ea8d2ac568354c694a
 SHA512 
77e446c9b48e9db7817fd6a46a6be9f57dfb21278066cce70f6c85d04f04200ec862c3c29c93d62fa3d0468973ddfc04eac5aa957677ec02d09eb13a3aee4265
 DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B 
cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51
 SHA512 
1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
deleted file mode 100644
index 977d8fee7bb4..
--- a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,80 +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} == * ]];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
-   dev-libs/icinga-php-thirdparty
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-12-29 Thread Matthew Thode
commit: b325428abdd0071c336886651d60e2b862e3d952
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 29 17:14:32 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec 29 17:14:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b325428a

www-apps/icingaweb2: manage group of icingaweb2 icingacli

Closes: https://bugs.gentoo.org/830215
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2/{icingaweb2-2.9.5.ebuild => icingaweb2-2.9.5-r1.ebuild}   | 1 +
 www-apps/icingaweb2/icingaweb2-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild
similarity index 97%
rename from www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild
index 977d8fee7bb4..1ef7a422fe00 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.5-r1.ebuild
@@ -73,6 +73,7 @@ src_install() {
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() {

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index dcfe13e3b7d0..c00a171bba00 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -73,6 +73,7 @@ src_install() {
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() {



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2021-12-29 Thread Matthew Thode
commit: 8cf828ed23a1999fda0541f41929e48368cbb57f
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 29 17:10:59 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec 29 17:10:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf828ed

www-apps/icingaweb2-module-director: add better doc links

link to upstream docs for install/upgrade

Bug: https://bugs.gentoo.org/802276
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2-module-director-.ebuild   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
index 0d9d32306e89..c9a76d37b383 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
@@ -43,5 +43,8 @@ src_install() {
 }
 
 pkg_postinst() {
-   elog "Enable and start the icinga-director.service systemd service."
+   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;
 }



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-incubator/

2021-12-28 Thread Matthew Thode
commit: 7e4ffdbc2151d949e67915b32ec51613a40e453d
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec 28 21:23:17 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec 28 21:25:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4ffdbc

www-apps/icingaweb2-module-incubator: add 0.11.0

Bug: https://bugs.gentoo.org/802276
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-incubator/Manifest  |  1 +
 .../icingaweb2-module-incubator-0.11.0.ebuild  | 28 ++
 www-apps/icingaweb2-module-incubator/metadata.xml  |  8 +++
 3 files changed, 37 insertions(+)

diff --git a/www-apps/icingaweb2-module-incubator/Manifest 
b/www-apps/icingaweb2-module-incubator/Manifest
new file mode 100644
index ..e64b530c115b
--- /dev/null
+++ b/www-apps/icingaweb2-module-incubator/Manifest
@@ -0,0 +1 @@
+DIST icingaweb2-module-incubator-0.11.0.tar.gz 219239 BLAKE2B 
32c194a4343dc706a56d86c8db33efc99cec3ee93d3929ee962f81623e2a4cd1277131ceae34c4f040ce1b69e4e1b004cc1202cb42639e25e56513e857b1292a
 SHA512 
e8de6a685f87e70bfc689b0e2bd9fd8c1917996a43ed675399da0a6f6c208f062e20072338e329d57b507ac300ae59a1d18c23f0bd17d4394d2e3fef3b159cff

diff --git 
a/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
new file mode 100644
index ..0ec8c4a6c39c
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Libraries useful for Icinga Web 2"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-incubator/;
+KEYWORDS="~amd64 ~x86"
+MY_PN="icingaweb2-module-incubator"
+SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> 
${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.6.0
+   >=www-apps/icingaweb2-2.6.0
+   || (
+   dev-lang/php:7.3[curl]
+   dev-lang/php:7.4[curl]
+   dev-lang/php:8.0[curl]
+   )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   insinto "/usr/share/icingaweb2/modules/incubator/"
+   doins -r "${S}"/*
+}

diff --git a/www-apps/icingaweb2-module-incubator/metadata.xml 
b/www-apps/icingaweb2-module-incubator/metadata.xml
new file mode 100644
index ..5c76f7a3fc67
--- /dev/null
+++ b/www-apps/icingaweb2-module-incubator/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   prometheanf...@gentoo.org
+   Matthew Thode
+   
+



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2021-12-28 Thread Matthew Thode
commit: 054fcbd12a115dc36b047d8426a83820d65bfa98
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec 28 21:21:00 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec 28 21:25:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054fcbd1

www-apps/icingaweb2-module-director: 1.8.1 bump

Bug: https://bugs.gentoo.org/802276
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 +
 .../icingaweb2-module-director-1.8.1.ebuild| 47 ++
 .../icingaweb2-module-director-.ebuild | 31 +-
 3 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 2231e10fbdd1..1b6a70ca56c3 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1,2 @@
 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

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 ..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}" ==  ]]; 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-.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
index eab3c4caccb8..0d9d32306e89 100644
--- a/www-apps/icingaweb2-module-director/icingaweb2-module-director-.ebuild
+++ b/www-apps/icingaweb2-module-director/icingaweb2-module-director-.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}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
@@ -18,17 +19,29 @@ 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]
+   

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-12-18 Thread Matthew Thode
commit: b2e7f1dc81af2711dcdd05bc544aa9efd3587629
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Dec 18 18:56:23 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Dec 18 18:56:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e7f1dc

www-apps/icingaweb2: 2.9.5 stable amd64/x86

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
index dcfe13e3b7d0..977d8fee7bb4 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-12-11 Thread Matthew Thode
commit: b0e5467362e6129e834923fb7dbaa298c9dc69ad
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Dec 11 19:44:37 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Dec 11 20:21:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e54673

www-apps/icingaweb2: 2.9.4 stable amd64/x86

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
index dcfe13e3b7d0..977d8fee7bb4 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-11-18 Thread Matthew Thode
commit: 0483f2ac9d52da3435f3f009e08aba951fcfbc42
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Nov 19 01:17:56 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Nov 19 01:18:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0483f2ac

www-apps/icingaweb2: 2.9.5 bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.9.5.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index f7793b59cc6e..51e0978ccfbc 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B 
fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377
 SHA512 
46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
 DIST icingaweb2-2.9.4.tar.gz 12314780 BLAKE2B 
3ecce619c27dc560b8da3155d008c3f3ab07b7ea0e6a66d0cbc3886becee8f1cf2f99e2cb7d79e2776be09b3bda82da2574d280dc26e41ea8d2ac568354c694a
 SHA512 
77e446c9b48e9db7817fd6a46a6be9f57dfb21278066cce70f6c85d04f04200ec862c3c29c93d62fa3d0468973ddfc04eac5aa957677ec02d09eb13a3aee4265
+DIST icingaweb2-2.9.5.tar.gz 12313426 BLAKE2B 
cd044651128a560590a71a795e3ef55160db6ad8ac84cee8865258ea31747b1f1fcdc4ffab45f8e410ff7ed2d9db7c56bc3f10d856e2f0063f9608d485aa2c51
 SHA512 
1fa6f33c38283f0440e969ef5cd6f4aee088bfa473a7e738e70b73b19d9a512834bc6fc98b41352b8c54b3e0aa295404ab8a68d2c5009345010adfc7fe4f0abb

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
new file mode 100644
index ..dcfe13e3b7d0
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.5.ebuild
@@ -0,0 +1,80 @@
+# 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-11-11 Thread Matthew Thode
commit: f613e3039f2295a128f6373a4cc952be27b9836e
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Nov 11 21:57:16 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Nov 11 21:57:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613e303

www-apps/icingaweb2: 2.9.4 bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.9.4.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 321c373425f..f7793b59cc6 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-2.9.3.tar.gz 12307606 BLAKE2B 
fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377
 SHA512 
46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0
+DIST icingaweb2-2.9.4.tar.gz 12314780 BLAKE2B 
3ecce619c27dc560b8da3155d008c3f3ab07b7ea0e6a66d0cbc3886becee8f1cf2f99e2cb7d79e2776be09b3bda82da2574d280dc26e41ea8d2ac568354c694a
 SHA512 
77e446c9b48e9db7817fd6a46a6be9f57dfb21278066cce70f6c85d04f04200ec862c3c29c93d62fa3d0468973ddfc04eac5aa957677ec02d09eb13a3aee4265

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
new file mode 100644
index 000..dcfe13e3b7d
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.9.4.ebuild
@@ -0,0 +1,80 @@
+# 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} == * ]];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
+   dev-libs/icinga-php-thirdparty
+   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."
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-11-07 Thread Matthew Thode
commit: 7d78fe9d317ddfa34497be4375449500c95dcf77
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Nov  7 15:46:24 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Nov  7 15:46:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d78fe9d

www-apps/icingaweb2: fix php deps for 

Closes: https://bugs.gentoo.org/822255
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index 57d38cb0ba0..dcfe13e3b7d 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -30,6 +30,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (

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
dev-libs/icinga-php-thirdparty



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-10-11 Thread Matthew Thode
commit: 45c94b1f058575827bef6696f93ec8d6bdc33404
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Oct 11 14:27:29 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Oct 11 14:27:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c94b1f

www-apps/icingaweb2: 2.8.3 / 2.8.4 clean up

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  2 -
 www-apps/icingaweb2/icingaweb2-2.8.3.ebuild | 77 -
 www-apps/icingaweb2/icingaweb2-2.8.4.ebuild | 77 -
 3 files changed, 156 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index a53777cd1d5..321c373425f 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1 @@
-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.3.tar.gz 12307606 BLAKE2B 
fddd72823674ae64191bf55f0dc378ef50cd7849a18199310fbe25446aff3e0c325b20aa0244c751b07852d3cca81ecdaba02c3250eb77b36645829d7da61377
 SHA512 
46ae2790743fb5e0a80861da522cfa2783d181ec056135e97949fffbc3ca821f778033db9e276e824430a6b7a1dd842f387b599fa70072e63fb6ebd74dd2bfc0

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
deleted file mode 100644
index 8ce45462266..000
--- a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
+++ /dev/null
@@ -1,77 +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} == * ]];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]
-   )
-   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.8.4.ebuild 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-09-13 Thread Matthew Thode
commit: 73903d25af8192de597c44ff0e26405feab12c35
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Sep 13 13:54:52 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Sep 13 13:55:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73903d25

www-apps/icingaweb2: 2.8.2 2.9.2 cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest   |  2 -
 www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild | 77 -
 www-apps/icingaweb2/icingaweb2-2.9.2-r2.ebuild | 80 --
 3 files changed, 159 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 26d88dd2bf3..a53777cd1d5 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,5 +1,3 @@
-DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 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.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.8.2-r1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
deleted file mode 100644
index 8ce45462266..000
--- a/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,77 +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} == * ]];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]
-   )
-   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
-

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-09-11 Thread Matthew Thode
commit: 155beb52323e396cc7f44ee54ae991bdd69aaeeb
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Sep 12 00:43:29 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Sep 12 00:43:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155beb52

www-apps/icingaweb2: 2.9.3 stable amd64 / x86

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
index dcfe13e3b7d..977d8fee7bb 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.3-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-08-16 Thread Matthew Thode
commit: 34b96c61b15ceacc83a4ca1eac7be94e59c05bb9
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug 17 02:18:51 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug 17 02:18:51 2021 +
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  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-.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 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 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..000
--- 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} == * ]];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:* )
-   || (
-   

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-08-16 Thread Matthew Thode
commit: 95b91c396b5674287effe6fff665c9ac7f294d10
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Aug 16 18:59:29 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Aug 16 19:01:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b91c39

www-apps/icingaweb2: add icinga-php-library dep

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.0.ebuild  | 1 +
 .../icingaweb2/{icingaweb2-2.9.2.ebuild => icingaweb2-2.9.2-r1.ebuild}   | 1 +
 .../icingaweb2/{icingaweb2-2.9.3.ebuild => icingaweb2-2.9.3-r1.ebuild}   | 1 +
 www-apps/icingaweb2/icingaweb2-.ebuild   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
index 84db9d6e071..c8d8ff1da0a 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.0.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-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}"

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild
similarity index 98%
rename from www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.2-r1.ebuild
index 640ed5a5bf3..52b7997eb8b 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.2-r1.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-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}"

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild
similarity index 98%
rename from www-apps/icingaweb2/icingaweb2-2.9.3.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.3-r1.ebuild
index 84db9d6e071..c8d8ff1da0a 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.3-r1.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-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}"

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index c5f119e375d..d37234041e8 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -31,6 +31,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1

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-libs/icinga-php-library
acct-group/icingacmd
acct-group/icingaweb2"
 RDEPEND="${DEPEND}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-08-13 Thread Matthew Thode
commit: 148a9bd9cf705f04afef569f45a526936c811a7c
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Aug 13 15:35:31 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Aug 13 15:36:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148a9bd9

www-apps/icingaweb2: 2.8.3 and 2.9.2 stable amd64 x86

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.8.3.ebuild | 2 +-
 www-apps/icingaweb2/icingaweb2-2.9.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
index c5f119e375d..8ce45462266 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} == * ]];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 84db9d6e071..640ed5a5bf3 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} == * ]];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"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-08-11 Thread Matthew Thode
commit: 88044f6a1469458f0b533fe84a2facaff5e3c0b2
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Aug 11 14:32:27 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Aug 11 14:35:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88044f6a

www-apps/icingaweb2: 2.9.3 bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.9.3.ebuild | 78 +
 2 files changed, 79 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 28aabbaeec3..e89dde707b2 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -3,3 +3,4 @@ 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

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 000..84db9d6e071
--- /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} == * ]];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
+  

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/

2021-08-06 Thread Matthew Thode
commit: 02b95799b8d96c2b5b9cdfc143087b63fdf00150
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Aug  6 15:12:57 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Aug  6 15:12:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b95799

www-apps/icingaweb2-module-graphite: 1.0.1 cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-graphite/Manifest   |  1 -
 .../icingaweb2-module-graphite-1.0.1-r1.ebuild | 26 --
 2 files changed, 27 deletions(-)

diff --git a/www-apps/icingaweb2-module-graphite/Manifest 
b/www-apps/icingaweb2-module-graphite/Manifest
index 63edf590b63..2ad6732bb27 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B 
e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac
 SHA512 
1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
 DIST icingaweb2-module-graphite-1.1.0.tar.gz 331879 BLAKE2B 
11e34a5daf5aab583e349297aa612880c782b3cba4514c87e5c2f025fda52e98db1e81eeea3652c070cf075fda87c37a1dc6f5cf870fc57e2fb7594a3e39dfaf
 SHA512 
3c37ef9571f086373e063f8397953605005ae5eeceadc7bfc6beb10168b71f5fbe4e58f3dc6ba9fd5a5e274097c8d881489f8d2772985343b9c8a0f5db9558ed

diff --git 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
deleted file mode 100644
index 3fa010ff83b..000
--- 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Icinga Web 2 plugin for Graphite"
-HOMEPAGE="https://www.icinga.com/docs/graphite/latest/;
-if [[ "${PV}" ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git;
-else
-   KEYWORDS="amd64 x86"
-   SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=net-analyzer/icinga2-2.4.0
-   >=www-apps/icingaweb2-2.5.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto "/usr/share/icingaweb2/modules/graphite/"
-   doins -r "${S}"/*
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2021-08-06 Thread Matthew Thode
commit: a523d527d6cab565a3578f000adb3cdd4e25f556
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Aug  6 15:12:21 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Aug  6 15:12:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a523d527

www-apps/icingaweb2-module-director: 1.6.2 cleanup

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 -
 .../icingaweb2-module-director-1.6.2.ebuild| 34 --
 2 files changed, 35 deletions(-)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index 5a2dbdfbad0..2231e10fbdd 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 
3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b
 SHA512 
693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
 DIST icingaweb2-module-director-1.8.0.tar.gz 3042572 BLAKE2B 
e29ac535c8975f79abfa086ce54e2b78e3f1a992858ec83e902c5e8e72a447f7436a1a9876c1b7237a14d08c54dec12069e9c57231b23c4fd203be3f6f2635b8
 SHA512 
e33cc49c8255aa3693f73693d874ca5e00a9d95fe3d737c457473d8c5b37f36faf44bbc7f608ba03be79d5a6fd032e5ffd8fbc824eda1831422f837040b0c400

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
deleted file mode 100644
index 2f84950d9e8..000
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.6.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Icinga Web 2 plugin for configuration"
-HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/;
-if [[ "${PV}" ==  ]]; 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.4.3
-   >=www-apps/icingaweb2-2.2.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]
-   )"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   insinto "/usr/share/icingaweb2/modules/director/"
-   doins -r "${S}"/*
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-28 Thread Matthew Thode
commit: 594fe2e17ef6453ebbe5a9d0da13eeae8e8dce0e
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 28 16:13:11 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 28 16:13:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594fe2e1

www-apps/icingaweb2: 2.9.2 bump (postgresql compat fix)

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest| 2 +-
 .../icingaweb2/{icingaweb2-2.9.1.ebuild => icingaweb2-2.9.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 93325f9e88a..28aabbaeec3 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -2,4 +2,4 @@ DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15
 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.1.tar.gz 12303053 BLAKE2B 
aa90b4a9de89dda35d790a002230b14da2b64a155bb6742cb6425a49225fd7b34d0fe84d4184ee6835077c591862df10851ac8ccecf12253694180e455ef0665
 SHA512 
050eaecd68f40330ed3d1bf044d99af003f1867057c9fb0b51125490135d173ea076dc93c901b656942debc128d893db02e98e207de3b5d16ee3e6bb85f46702
+DIST icingaweb2-2.9.2.tar.gz 12304718 BLAKE2B 
ba5d0872318a504d25b614825008e90cabd4680b30686d90ad438408e4a248f9dc2ef9410c5405da7efac949c6c41d89c64604b18c6d86f9ba479c99a8daff9a
 SHA512 
67268544db0c267f9522b2105db52d87967835279eb621b79827b7b1b80a327b69348c849e4d3716a9cd26dfaef31a06b5ba125d30a48c3f5686dcf4c7a7a959

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.2.ebuild
similarity index 100%
rename from www-apps/icingaweb2/icingaweb2-2.9.1.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.9.2.ebuild



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-28 Thread Matthew Thode
commit: 1596402a82a2502ad87ac44ac68e275db0d089e6
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 28 16:10:46 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 28 16:11:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1596402a

www-apps/icingaweb2: 2.8.4 and 2.9.1 bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  2 +
 www-apps/icingaweb2/icingaweb2-2.8.4.ebuild | 77 
 www-apps/icingaweb2/icingaweb2-2.9.1.ebuild | 78 +
 3 files changed, 157 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index b68f250d6c8..93325f9e88a 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,5 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 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.1.tar.gz 12303053 BLAKE2B 
aa90b4a9de89dda35d790a002230b14da2b64a155bb6742cb6425a49225fd7b34d0fe84d4184ee6835077c591862df10851ac8ccecf12253694180e455ef0665
 SHA512 
050eaecd68f40330ed3d1bf044d99af003f1867057c9fb0b51125490135d173ea076dc93c901b656942debc128d893db02e98e207de3b5d16ee3e6bb85f46702

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
new file mode 100644
index 000..c5f119e375d
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.4.ebuild
@@ -0,0 +1,77 @@
+# 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} == * ]];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]
+   )
+   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
+   

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-13 Thread Matthew Thode
commit: 1b381caa8b38d317ad1ee0b0bd72add458f85a4d
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 14 04:31:42 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 14 04:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b381caa

www-apps/icingaweb2: 2.9.0 fix php8 dep (remove json flag)

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
index 2a18a8e21d9..84db9d6e071 100644
--- a/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.9.0.ebuild
@@ -30,7 +30,7 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
|| (

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



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-13 Thread Matthew Thode
commit: 8e481fd285962e6aff4a78cbfba904b3e616bffa
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 14 04:00:02 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 14 04:00:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e481fd2

www-apps/icingaweb2: 2.9.0 bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  2 +
 www-apps/icingaweb2/icingaweb2-2.8.3.ebuild | 77 
 www-apps/icingaweb2/icingaweb2-2.9.0.ebuild | 78 +
 3 files changed, 157 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 69e960c2ff6..b68f250d6c8 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1 +1,3 @@
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 SHA512 
252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
+DIST icingaweb2-2.8.3.tar.gz 8514052 BLAKE2B 
507753833ed8a0de816651f3fdb06f3fdf04b3fa9c43fad5046c28924c93f3c3e491d9a4e1532f08ac0d6abe97c1343b85cdb23de9ece9f16858b91886283e9c
 SHA512 
236385dc54dbd11d8e100059bb7e29b3a4efc23888f187e13e563510dfb1f3d20e5c4107e2dadfa6842e6689aaa21d4e9465abd0a234c52229354f43ec44cfb4
+DIST icingaweb2-2.9.0.tar.gz 10895850 BLAKE2B 
cf0f1375e3eb29ddbbf6691afd1c240ae1431b7dd82bd591dd3fe135602d1eabc418c6279fe7bd8f8e519f264b69a9da8bb1d09d286f37aa2f7e5ed21ddacd5a
 SHA512 
d8f2817c025160cd8f59f33d678ca6eea9b893b80ca5c45c719d8778269da46322e720a1c73d7bcd7be73a07f08dbe279ffb78220f2a6c00f7e07e9f0f88d4d4

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
new file mode 100644
index 000..c5f119e375d
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.3.ebuild
@@ -0,0 +1,77 @@
+# 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} == * ]];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]
+   )
+   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.0.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-10 Thread Conrad Kostecki
commit: a98ff20198b33d334cb0f38e07bc8e9dea218e75
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jul 10 14:25:53 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jul 10 14:25:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a98ff201

www-apps/icingaweb2: drop die

Removing added 'die', as it would fail.

Closes: https://bugs.gentoo.org/801415
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild | 12 ++--
 www-apps/icingaweb2/icingaweb2-.ebuild | 12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
index cffc856a67d..8ce45462266 100644
--- a/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
@@ -40,8 +40,8 @@ want_apache2
 pkg_setup() {
depend.apache_pkg_setup
 
-   use nginx && usermod -a -G icingacmd,icingaweb2 nginx || die
-   use apache2 && usermod -a -G icingacmd,icingaweb2 apache || die
+   use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+   use apache2 && usermod -a -G icingacmd,icingaweb2 apache
 }
 
 pkg_config() {
@@ -50,16 +50,16 @@ pkg_config() {
else
einfo "Running first time setup ..."
einfo "Creating configuration directory ..."
-   /usr/share/${PN}/bin/icingacli setup config directory || die
+   /usr/share/${PN}/bin/icingacli setup config directory
einfo "Creating authentication token for web setup ..."
-   /usr/share/${PN}/bin/icingacli setup token create || die
+   /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 || die
+   /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 || die
+   /usr/share/${PN}/bin/icingacli setup config webserver 
nginx --document-root /usr/share/${PN}/public
fi
fi
einfo "All done."

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index f0757e1ba82..c5f119e375d 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -40,8 +40,8 @@ want_apache2
 pkg_setup() {
depend.apache_pkg_setup
 
-   use nginx && usermod -a -G icingacmd,icingaweb2 nginx || die
-   use apache2 && usermod -a -G icingacmd,icingaweb2 apache || die
+   use nginx && usermod -a -G icingacmd,icingaweb2 nginx
+   use apache2 && usermod -a -G icingacmd,icingaweb2 apache
 }
 
 pkg_config() {
@@ -50,16 +50,16 @@ pkg_config() {
else
einfo "Running first time setup ..."
einfo "Creating configuration directory ..."
-   /usr/share/${PN}/bin/icingacli setup config directory || die
+   /usr/share/${PN}/bin/icingacli setup config directory
einfo "Creating authentication token for web setup ..."
-   /usr/share/${PN}/bin/icingacli setup token create || die
+   /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 || die
+   /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 || die
+   /usr/share/${PN}/bin/icingacli setup config webserver 
nginx --document-root /usr/share/${PN}/public
fi
fi
einfo "All done."



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-09 Thread Conrad Kostecki
commit: 1fd1b2cd4dabb15ddf05b4d89b3dcd08a8e37f47
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jul 10 00:08:24 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jul 10 00:08:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd1b2cd

www-apps/icingaweb2: drop old version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apps/icingaweb2/icingaweb2-2.8.2.ebuild | 80 -
 1 file changed, 80 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
deleted file mode 100644
index 2fbd8e31845..000
--- a/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache multilib
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-
-if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
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]
-   )
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2021-07-09 Thread Conrad Kostecki
commit: 4ab982611b81ffd8406caf9407842ded4887e347
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Jul 10 00:07:37 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jul 10 00:07:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab98261

www-apps/icingaweb2: migrate to GLEP 81

Also migrated to EAPI 7 and dropped old nonexistent PHP versions in
tree.

Closes: https://bugs.gentoo.org/781593
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...web2-.ebuild => icingaweb2-2.8.2-r1.ebuild} | 28 ++
 www-apps/icingaweb2/icingaweb2-.ebuild | 26 ++--
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
similarity index 72%
copy from www-apps/icingaweb2/icingaweb2-.ebuild
copy to www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
index 70eeef62f5d..cffc856a67d 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.8.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit depend.apache multilib user
+inherit depend.apache multilib
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/;
@@ -14,7 +14,7 @@ if [[ ${PV} == * ]];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"
@@ -28,11 +28,11 @@ 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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]

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]
+   )
+   acct-group/icingacmd
+   acct-group/icingaweb2"
 RDEPEND="${DEPEND}"
 
 want_apache2
@@ -40,10 +40,8 @@ want_apache2
 pkg_setup() {
depend.apache_pkg_setup
 
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   use nginx && usermod -a -G icingacmd,icingaweb2 nginx
-   use apache2 && usermod -a -G icingacmd,icingaweb2 apache
+   use nginx && usermod -a -G icingacmd,icingaweb2 nginx || die
+   use apache2 && usermod -a -G icingacmd,icingaweb2 apache || die
 }
 
 pkg_config() {
@@ -52,16 +50,16 @@ pkg_config() {
else
einfo "Running first time setup ..."
einfo "Creating configuration directory ..."
-   /usr/share/${PN}/bin/icingacli setup config directory
+   /usr/share/${PN}/bin/icingacli setup config directory || die
einfo "Creating authentication token for web setup ..."
-   /usr/share/${PN}/bin/icingacli setup token create
+   /usr/share/${PN}/bin/icingacli setup token create || die
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
+   /usr/share/${PN}/bin/icingacli setup config webserver 
apache --document-root /usr/share/${PN}/public || die
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
+   /usr/share/${PN}/bin/icingacli setup config webserver 
nginx --document-root /usr/share/${PN}/public || die
fi
fi
einfo "All done."

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index 70eeef62f5d..f0757e1ba82 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit depend.apache multilib user
+inherit depend.apache multilib
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/

2021-07-05 Thread Matthew Thode
commit: 6b84531107cca92ebfeb3b167e688b32a458a52e
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jul  5 19:55:19 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jul  5 20:01:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b845311

www-apps/icingaweb2-module-graphite: 1.1.0 stable amd64/x86

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
index 507832c1b08..82bd6e6ed2c 100644
--- 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
+++ 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git;
 else
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2021-07-05 Thread Matthew Thode
commit: 33df63f8f3939e084015ee44b9b941a5cb2b2adf
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jul  5 19:52:04 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jul  5 20:01:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33df63f8

www-apps/icingaweb2-module-director: 1.8.0 stable amd64/x86

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 .../icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
index 890743ae7e0..3d7195bd09f 100644
--- 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-director.git;
 else
-   KEYWORDS="~amd64 ~x86"
+   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}"



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/

2021-06-07 Thread Matthew Thode
commit: 8f464cf40869b81cd360c7f9179c8539e3090820
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun  8 02:55:58 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun  8 02:56:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f464cf4

www-apps/icingaweb2-module-graphite: 1.1.0 bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-graphite/Manifest   |  1 +
 .../icingaweb2-module-graphite-1.1.0.ebuild| 26 ++
 2 files changed, 27 insertions(+)

diff --git a/www-apps/icingaweb2-module-graphite/Manifest 
b/www-apps/icingaweb2-module-graphite/Manifest
index 72dd4c96786..63edf590b63 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B 
e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac
 SHA512 
1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
+DIST icingaweb2-module-graphite-1.1.0.tar.gz 331879 BLAKE2B 
11e34a5daf5aab583e349297aa612880c782b3cba4514c87e5c2f025fda52e98db1e81eeea3652c070cf075fda87c37a1dc6f5cf870fc57e2fb7594a3e39dfaf
 SHA512 
3c37ef9571f086373e063f8397953605005ae5eeceadc7bfc6beb10168b71f5fbe4e58f3dc6ba9fd5a5e274097c8d881489f8d2772985343b9c8a0f5db9558ed

diff --git 
a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
new file mode 100644
index 000..507832c1b08
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/;
+if [[ "${PV}" ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git;
+else
+   KEYWORDS="~amd64 ~x86"
+   SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=net-analyzer/icinga2-2.4.0
+   >=www-apps/icingaweb2-2.5.0"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   insinto "/usr/share/icingaweb2/modules/graphite/"
+   doins -r "${S}"/*
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-director/

2021-06-07 Thread Matthew Thode
commit: c738fb4e40476a36153783605fca94cedd79e0f3
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun  8 02:54:22 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun  8 02:56:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c738fb4e

www-apps/icingaweb2-module-director: 1.8.0 bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2-module-director/Manifest   |  1 +
 .../icingaweb2-module-director-1.8.0.ebuild| 34 ++
 2 files changed, 35 insertions(+)

diff --git a/www-apps/icingaweb2-module-director/Manifest 
b/www-apps/icingaweb2-module-director/Manifest
index f1b0b64a25c..5a2dbdfbad0 100644
--- a/www-apps/icingaweb2-module-director/Manifest
+++ b/www-apps/icingaweb2-module-director/Manifest
@@ -1 +1,2 @@
 DIST icingaweb2-module-director-1.6.2.tar.gz 2772722 BLAKE2B 
3d51f68469cd4ddf45f6bc62f76ad1f4c8d7d7bec36cc33022f1e0761334707bb345c87bc9f0e1276010e4a643867f1e1a6ea7c53a6fa28dd33e810089b7840b
 SHA512 
693a2aca10e25f99fcf9ada4babb031d682b577b82098185259991214ac7d7662c494b58cf52284569dbca90c8eafa522177b6c64dd817912dafd20b4d7109cb
+DIST icingaweb2-module-director-1.8.0.tar.gz 3042572 BLAKE2B 
e29ac535c8975f79abfa086ce54e2b78e3f1a992858ec83e902c5e8e72a447f7436a1a9876c1b7237a14d08c54dec12069e9c57231b23c4fd203be3f6f2635b8
 SHA512 
e33cc49c8255aa3693f73693d874ca5e00a9d95fe3d737c457473d8c5b37f36faf44bbc7f608ba03be79d5a6fd032e5ffd8fbc824eda1831422f837040b0c400

diff --git 
a/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
new file mode 100644
index 000..890743ae7e0
--- /dev/null
+++ 
b/www-apps/icingaweb2-module-director/icingaweb2-module-director-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Icinga Web 2 plugin for configuration"
+HOMEPAGE="https://dev.icinga.org/projects/icingaweb2-module-director/;
+if [[ "${PV}" ==  ]]; 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.4.3
+   >=www-apps/icingaweb2-2.2.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]
+   )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   insinto "/usr/share/icingaweb2/modules/director/"
+   doins -r "${S}"/*
+}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2020-10-20 Thread Matthew Thode
commit: 7427922822ae6c8dc14ec001d6f76e77339e2b70
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Oct 20 15:40:29 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Oct 20 15:40:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74279228

www-apps/icingaweb2: remove 2.7

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 -
 www-apps/icingaweb2/icingaweb2-2.7.4.ebuild | 79 -
 2 files changed, 80 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index dfb00b7ea2e..69e960c2ff6 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1 @@
-DIST icingaweb2-2.7.4.tar.gz 8388685 BLAKE2B 
b179820828631bc65140bfc81908c267fb7ee0b5cd3e1edbafc1edf583718b478061beb66931cdb3ff8b0243d7205600d5549d7db1838650be0cb4fdae0e38bd
 SHA512 
e8864a3aa03b902ba31dcec4c3ef2c87eeab8f885020b6b6b1bd97d90be1e8645c3e56b8e32d42f3379fc43f338c31cb2fb1114a1ef2fd97f33b344068771c78
 DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 SHA512 
252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
deleted file mode 100644
index 261a6839860..000
--- a/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-
-if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   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."
-}



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2020-08-20 Thread Matthew Thode
commit: dc8d4f59587f2e7e88c1cb174a4337aa47cd5adb
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 20 15:36:01 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Aug 20 15:36:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8d4f59

www-apps/icingaweb2: 2.8.2 and 2.7.4 bump for CVE-2020-24368

Package-Manager: Portage-3.0.4, Repoman-2.3.23
RepoMan-Options: --force
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest  | 4 ++--
 .../icingaweb2/{icingaweb2-2.7.3.ebuild => icingaweb2-2.7.4.ebuild}   | 2 +-
 .../icingaweb2/{icingaweb2-2.8.1.ebuild => icingaweb2-2.8.2.ebuild}   | 0
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index d82920fc8dd..dfb00b7ea2e 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,2 @@
-DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
-DIST icingaweb2-2.8.1.tar.gz 8513180 BLAKE2B 
ee386e1a7cdba73d1ee7f7196fe0a759bdb1ddae6bb5d225b9a6ceabf0b638f8d0e9f9d963635339951ea668b0fefd6569ba58797289990f4b63a4c65f0559b3
 SHA512 
4c8aaeebd96f484cac5b62c5bdc871b06c2d0a9194e3067d6dd439ce9132c913971d0a625cf32c231fe4fa3644a9cdbe25ae2211a81e572bcb7fef95d528cca8
+DIST icingaweb2-2.7.4.tar.gz 8388685 BLAKE2B 
b179820828631bc65140bfc81908c267fb7ee0b5cd3e1edbafc1edf583718b478061beb66931cdb3ff8b0243d7205600d5549d7db1838650be0cb4fdae0e38bd
 SHA512 
e8864a3aa03b902ba31dcec4c3ef2c87eeab8f885020b6b6b1bd97d90be1e8645c3e56b8e32d42f3379fc43f338c31cb2fb1114a1ef2fd97f33b344068771c78
+DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 
7e6a4457467a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9
 SHA512 
252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
similarity index 98%
rename from www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
index 4d66e260c40..261a6839860 100644
--- a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
similarity index 100%
rename from www-apps/icingaweb2/icingaweb2-2.8.1.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.8.2.ebuild



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2020-07-02 Thread Matthew Thode
commit: ee6f13a05a1b51eaaf8c91b274e6fbcf7d176eea
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jul  2 23:49:03 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jul  2 23:54:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6f13a0

www-apps/icingaweb2: 2.8.1 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  2 -
 www-apps/icingaweb2/icingaweb2-2.7.1.ebuild | 79 
 www-apps/icingaweb2/icingaweb2-2.8.0.ebuild | 80 -
 www-apps/icingaweb2/icingaweb2-2.8.1.ebuild |  2 +-
 4 files changed, 1 insertion(+), 162 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 8aea70bd03f..d82920fc8dd 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,2 @@
-DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
-DIST icingaweb2-2.8.0.tar.gz 8512745 BLAKE2B 
efcaa75c571b723b59d6d8d305ca541923499d4b083cfabf6f0ced116a6e47bd2e0ed512bdf9043ea47a7931f8e3f567a3b5ffca328076e90ed860ef84df2bfc
 SHA512 
d9cf34284dcc924e758bafbe6169522193f935810b835d005b20d0b9af9c6bf7fd20475b7deea53a18067368e07e89656c7e75f51c5a5313d570836e50e3b638
 DIST icingaweb2-2.8.1.tar.gz 8513180 BLAKE2B 
ee386e1a7cdba73d1ee7f7196fe0a759bdb1ddae6bb5d225b9a6ceabf0b638f8d0e9f9d963635339951ea668b0fefd6569ba58797289990f4b63a4c65f0559b3
 SHA512 
4c8aaeebd96f484cac5b62c5bdc871b06c2d0a9194e3067d6dd439ce9132c913971d0a625cf32c231fe4fa3644a9cdbe25ae2211a81e572bcb7fef95d528cca8

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
deleted file mode 100644
index 4d66e260c40..000
--- a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-
-if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   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
-  

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2020-06-29 Thread Matthew Thode
commit: 1034cfdcc76121da5843798a08cfebaa226385eb
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jun 29 21:47:34 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jun 29 21:47:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1034cfdc

www-apps/icingaweb2: 2.8.1 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.8.1.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 4de25c04922..8aea70bd03f 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,4 @@
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
 DIST icingaweb2-2.8.0.tar.gz 8512745 BLAKE2B 
efcaa75c571b723b59d6d8d305ca541923499d4b083cfabf6f0ced116a6e47bd2e0ed512bdf9043ea47a7931f8e3f567a3b5ffca328076e90ed860ef84df2bfc
 SHA512 
d9cf34284dcc924e758bafbe6169522193f935810b835d005b20d0b9af9c6bf7fd20475b7deea53a18067368e07e89656c7e75f51c5a5313d570836e50e3b638
+DIST icingaweb2-2.8.1.tar.gz 8513180 BLAKE2B 
ee386e1a7cdba73d1ee7f7196fe0a759bdb1ddae6bb5d225b9a6ceabf0b638f8d0e9f9d963635339951ea668b0fefd6569ba58797289990f4b63a4c65f0559b3
 SHA512 
4c8aaeebd96f484cac5b62c5bdc871b06c2d0a9194e3067d6dd439ce9132c913971d0a625cf32c231fe4fa3644a9cdbe25ae2211a81e572bcb7fef95d528cca8

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild
new file mode 100644
index 000..cff8286
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/;
+
+if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
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]
+   )
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2020-06-09 Thread Matthew Thode
commit: 474cb7b11a3f5329d0603622cd06bed45e830c07
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun  9 17:51:11 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun  9 17:51:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474cb7b1

www-apps/icingaweb2: 2.8.0 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.8.0.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 2de5e7cba50..4de25c04922 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
+DIST icingaweb2-2.8.0.tar.gz 8512745 BLAKE2B 
efcaa75c571b723b59d6d8d305ca541923499d4b083cfabf6f0ced116a6e47bd2e0ed512bdf9043ea47a7931f8e3f567a3b5ffca328076e90ed860ef84df2bfc
 SHA512 
d9cf34284dcc924e758bafbe6169522193f935810b835d005b20d0b9af9c6bf7fd20475b7deea53a18067368e07e89656c7e75f51c5a5313d570836e50e3b638

diff --git a/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild
new file mode 100644
index 000..cff8286
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/;
+
+if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
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]
+   )
+   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}"/*
+   

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-11-18 Thread Matthew Thode
commit: 32d8ebde3f01f441f6d6b28191b9288c7334f9e2
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Nov 18 15:23:13 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Nov 18 15:28:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d8ebde

www-apps/icingaweb2: 2.7.3 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.76, Repoman-2.3.18
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 -
 www-apps/icingaweb2/icingaweb2-2.6.3.ebuild | 79 -
 www-apps/icingaweb2/icingaweb2-2.7.3.ebuild |  2 +-
 3 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index ad6384a490d..2de5e7cba50 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
-DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
 DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb

diff --git a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
deleted file mode 100644
index 4d66e260c40..000
--- a/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-
-if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-10-18 Thread Matthew Thode
commit: de8394e029d2e975ae7aa3a57bf44350111adc27
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 18 15:45:32 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 18 16:02:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8394e0

www-apps/icingaweb2: 2.7.3 bump with cleanup of 2.7.2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest| 2 +-
 .../icingaweb2/{icingaweb2-2.7.2.ebuild => icingaweb2-2.7.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 69c58e6175a..ad6384a490d 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,3 @@
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
-DIST icingaweb2-2.7.2.tar.gz 8389920 BLAKE2B 
6acdc87b782bc0b745d5abd6734328763523e97296c3da34a16b62141c400c6082a6a8c45be360ad9792b36ea613579137fdcd41f3ad95a9728f8637a2d61789
 SHA512 
b14419b1194ce091e106990b0249c84fcde906ec8bd9d42683ea5d6c2e5f5083e593d61744421f87efdcd8218f55ce60bf5bc18ba92368ba176a2cf348aa7423
+DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 
8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359
 SHA512 
eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
similarity index 100%
rename from www-apps/icingaweb2/icingaweb2-2.7.2.ebuild
rename to www-apps/icingaweb2/icingaweb2-2.7.3.ebuild



[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-10-17 Thread Matthew Thode
commit: 9ddc97dbebce8980a98303c0319e79857b5fc22a
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 18 04:08:45 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 18 04:20:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddc97db

www-apps/icingaweb2: 2.7.2 bump

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.7.2.ebuild | 79 +
 2 files changed, 80 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index f7e414987a9..69c58e6175a 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6
+DIST icingaweb2-2.7.2.tar.gz 8389920 BLAKE2B 
6acdc87b782bc0b745d5abd6734328763523e97296c3da34a16b62141c400c6082a6a8c45be360ad9792b36ea613579137fdcd41f3ad95a9728f8637a2d61789
 SHA512 
b14419b1194ce091e106990b0249c84fcde906ec8bd9d42683ea5d6c2e5f5083e593d61744421f87efdcd8218f55ce60bf5bc18ba92368ba176a2cf348aa7423

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.2.ebuild
new file mode 100644
index 000..45655f2ebdb
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.7.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/;
+
+if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+
+   enewgroup icingaweb2
+   enewgroup icingacmd
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-09-01 Thread Matthew Thode
commit: 5f1aa46edc50091d34528215ffd802637295a293
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Sep  1 18:47:09 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Sep  1 18:47:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1aa46e

www-apps/icingaweb2: 2.7.1 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  2 -
 www-apps/icingaweb2/icingaweb2-2.6.2.ebuild | 81 -
 www-apps/icingaweb2/icingaweb2-2.7.0.ebuild | 79 
 www-apps/icingaweb2/icingaweb2-2.7.1.ebuild |  2 +-
 4 files changed, 1 insertion(+), 163 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 24f9c84b750..f7e414987a9 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,4 +1,2 @@
-DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 
2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a
 SHA512 
f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
-DIST icingaweb2-2.7.0.tar.gz 8332315 BLAKE2B 
7295208ef1805bd42fd7e173b238c3e939d499e79f674b7b4e4111e33f76bc5dac303216755997808fa7ad043ece3c5c17a158b5531647187135748c0fdcf846
 SHA512 
37bb15eebfc68bbdf4a20131d279d9696587d265084fcfb9b1c52d52d4f91a2cc04ff1b9ab1a2db5177250ad4baf9e9fbcfafc069645d9aaf297b9667b471994
 DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6

diff --git a/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild
deleted file mode 100644
index da0929cc43f..000
--- a/www-apps/icingaweb2/icingaweb2-2.6.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-   dev-php/pecl-imagick
-   pdf? ( media-gfx/imagemagick[png] )
-   apache2? (
-   >=www-servers/apache-2.4.0
-   || (
-   
dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )
-   )
-   nginx? (
-   >=www-servers/nginx-1.7.0:*
-   || (
-   
dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )
-   )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   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
-

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-08-15 Thread Matthew Thode
commit: 2ef666422e30a7c95b30838374f340f0daaba79f
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 15 16:37:56 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Aug 15 16:38:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef66642

www-apps/icingaweb2: 2.7.1 bump

Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.7.1.ebuild | 79 +
 2 files changed, 80 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index c9b35e260ce..24f9c84b750 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,4 @@
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 
2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a
 SHA512 
f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
 DIST icingaweb2-2.7.0.tar.gz 8332315 BLAKE2B 
7295208ef1805bd42fd7e173b238c3e939d499e79f674b7b4e4111e33f76bc5dac303216755997808fa7ad043ece3c5c17a158b5531647187135748c0fdcf846
 SHA512 
37bb15eebfc68bbdf4a20131d279d9696587d265084fcfb9b1c52d52d4f91a2cc04ff1b9ab1a2db5177250ad4baf9e9fbcfafc069645d9aaf297b9667b471994
+DIST icingaweb2-2.7.1.tar.gz 8389123 BLAKE2B 
f5e469c1fde2b7bc2c22f898a5fb5370ca3788571501f070ed56b32afe8a155aafe70a06bbe09b77cd996725c3e176363aaf0fa885bc843102c56ddfa14da11d
 SHA512 
0300e483e83699a79750dcfd4467a151fcfa95a1eb8735e8d0d8e5d59595ad252b630add3cb462fa4c115b2891f9ab904739ee36d5eb7fcdfb489c9d7658f1b6

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
new file mode 100644
index 000..45655f2ebdb
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.7.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/;
+
+if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+
+   enewgroup icingaweb2
+   enewgroup icingacmd
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-07-31 Thread Matthew Thode
commit: c25de3536ca4497e1c636f6f8b123debdf2f43fe
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 31 15:36:15 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 31 15:36:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25de353

www-apps/icingaweb2: 2.7.0 bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest|  1 +
 www-apps/icingaweb2/icingaweb2-2.7.0.ebuild | 79 +
 2 files changed, 80 insertions(+)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 73ca8149879..c9b35e260ce 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 
2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a
 SHA512 
f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710
+DIST icingaweb2-2.7.0.tar.gz 8332315 BLAKE2B 
7295208ef1805bd42fd7e173b238c3e939d499e79f674b7b4e4111e33f76bc5dac303216755997808fa7ad043ece3c5c17a158b5531647187135748c0fdcf846
 SHA512 
37bb15eebfc68bbdf4a20131d279d9696587d265084fcfb9b1c52d52d4f91a2cc04ff1b9ab1a2db5177250ad4baf9e9fbcfafc069645d9aaf297b9667b471994

diff --git a/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild
new file mode 100644
index 000..45655f2ebdb
--- /dev/null
+++ b/www-apps/icingaweb2/icingaweb2-2.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit depend.apache eutils multilib user
+
+DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
+HOMEPAGE="http://www.icinga.org/;
+
+if [[ ${PV} == * ]];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:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+
+   enewgroup icingaweb2
+   enewgroup icingacmd
+   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 

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-05-24 Thread Matthew Thode
commit: 70017b248843eb16cd0a5c80a6ec2a6613ef2aec
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri May 24 18:13:23 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 24 18:13:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70017b24

www-apps/icingaweb2: 2.6.3 stable amd64 and x86 with cleanup

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest   |  1 -
 www-apps/icingaweb2/icingaweb2-2.6.1.ebuild| 81 --
 www-apps/icingaweb2/icingaweb2-2.6.2-r1.ebuild | 71 --
 www-apps/icingaweb2/icingaweb2-2.6.3.ebuild|  2 +-
 4 files changed, 1 insertion(+), 154 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 7dfed7aa6c3..73ca8149879 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,3 +1,2 @@
-DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B 
ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffcad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392
 SHA512 
f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 
2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a
 SHA512 
f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
 DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710

diff --git a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
deleted file mode 100644
index 0bf5ea9d946..000
--- a/www-apps/icingaweb2/icingaweb2-2.6.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit depend.apache eutils multilib user
-
-DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://codeload.github.com/Icinga/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="apache2 ldap mysql nginx pdf postgres"
-REQUIRED_USE="^^ ( apache2 nginx )"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=net-analyzer/icinga2-2.1.1
-   dev-php/pecl-imagick
-   pdf? ( media-gfx/imagemagick[png] )
-   apache2? (
-   >=www-servers/apache-2.4.0
-   || (
-   
dev-lang/php:5.6[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.0[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )
-   )
-   nginx? (
-   >=www-servers/nginx-1.7.0:*
-   || (
-   
dev-lang/php:5.6[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.0[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.1[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.2[apache2?,cli,fpm,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   )
-   )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-
-   enewgroup icingaweb2
-   enewgroup icingacmd
-   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:"
-   

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2/

2019-04-25 Thread Matthew Thode
commit: f492b32ef9a46090b8ffb359c4509c2e71b33217
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Apr 25 15:44:42 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Apr 25 15:54:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f492b32e

www-apps/icingaweb2: 2.6.3 bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode  gentoo.org>

 www-apps/icingaweb2/Manifest |  1 +
 .../{icingaweb2-.ebuild => icingaweb2-2.6.3.ebuild}  | 16 +++-
 www-apps/icingaweb2/icingaweb2-.ebuild   | 16 +++-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index d851b530ca4..7dfed7aa6c3 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,2 +1,3 @@
 DIST icingaweb2-2.6.1.tar.gz 8165384 BLAKE2B 
ea9b499f7da9fbdbe8340443f02b5a9fc348549bbffcad63ac1e04c12ff45e5337418f1714b1d76af3818e9733bb0eb51a6bfbc39a7d1eb4820af8747392
 SHA512 
f2ac728abde9795e578b7d512f5b87e3307faed35a5413aaa2d3a958b57389c5297a124b530667aa248ee368aafaf3875097fa8e27b4c3090bb64badc7c329b7
 DIST icingaweb2-2.6.2.tar.gz 8171965 BLAKE2B 
2a7ebe4ee84ea311a1e0cac14021db66c0950be74d5984bb055983cd24e0277b43945f0b78ee98edb123412dfd116f875803c988612cd2a8b247f36b7c55f04a
 SHA512 
f5fffbec237b892dbcfeee75a23ba26005cad9b4a1505a4d500bcbd16a8fa29125ed255ee320d3efcd8e43dcfb835244234a5607c562dd8bebe871d1a356b520
+DIST icingaweb2-2.6.3.tar.gz 8174959 BLAKE2B 
6301a0a509031828b8db886e4ab060596f2239de4e65fe714d98a8f8f73305a1116b534f5c2747ab78446ff39b34fa96fe4eae758942aab2de4946c7cf1cdbcb
 SHA512 
f1d14c7ed87cd677a1c4ac03fd6a54514e7e4693000215e0e1628b0480c738848858546e54866eda3a55b4e7c35b5837ad01dc08b5b76502e24d5a727e271710

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
similarity index 86%
copy from www-apps/icingaweb2/icingaweb2-.ebuild
copy to www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
index 03a2c2bd75d..45655f2ebdb 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.6.3.ebuild
@@ -3,18 +3,24 @@
 
 EAPI="6"
 
-inherit depend.apache eutils git-r3 multilib user
+inherit depend.apache eutils multilib user
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/;
-EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git;
-EGIT_BRANCH="master"
+
+if [[ ${PV} == * ]];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 )"
-KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
dev-php/pecl-imagick
@@ -23,9 +29,9 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
nginx? ( >=www-servers/nginx-1.7.0:* )
|| (

dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
-   
dev-lang/php:7.0[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]

dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]

dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
+   
dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml]
)"
 RDEPEND="${DEPEND}"
 

diff --git a/www-apps/icingaweb2/icingaweb2-.ebuild 
b/www-apps/icingaweb2/icingaweb2-.ebuild
index 03a2c2bd75d..45655f2ebdb 100644
--- a/www-apps/icingaweb2/icingaweb2-.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-.ebuild
@@ -3,18 +3,24 @@
 
 EAPI="6"
 
-inherit depend.apache eutils git-r3 multilib user
+inherit depend.apache eutils multilib user
 
 DESCRIPTION="Icinga Web 2 - Frontend for icinga2"
 HOMEPAGE="http://www.icinga.org/;
-EGIT_REPO_URI="https://github.com/Icinga/icingaweb2.git;
-EGIT_BRANCH="master"
+
+if [[ ${PV} == * ]];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 )"
-KEYWORDS=""
 
 DEPEND=">=net-analyzer/icinga2-2.1.1
dev-php/pecl-imagick
@@ -23,9 +29,9 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
nginx? ( 

  1   2   >