[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2024-03-27 Thread Andreas Sturmlechner
commit: 06e0430747ee7d55f7f4c64c424b8b1e2c6fdacf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar  7 10:15:14 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 27 11:49:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e04307

net-analyzer/icinga2: drop 2.13.9

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/files/icinga2.initd   |  81 
 net-analyzer/icinga2/icinga2-2.13.9.ebuild | 146 -
 3 files changed, 228 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 231d217b5a24..5e6efce507f8 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/files/icinga2.initd 
b/net-analyzer/icinga2/files/icinga2.initd
deleted file mode 100644
index 7faff11137d4..
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-DAEMON="/usr/sbin/icinga2"
-ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf"
-ICINGA2_RUN_DIR="/run/icinga2"
-ICINGA2_STATE_DIR="/var/cache/icinga2"
-ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd"
-ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid"
-ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
-
-depend() {
-need net
-}
-
-checkconfig() {
-if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
-   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
-   eend 1
-fi
-
-ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
-checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
-
-if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
-eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
-return 1
-fi
-}
-
-start() {
-checkconfig || return 1
-
-ebegin "Starting icinga2"
-start-stop-daemon --start --exec "${DAEMON}" \
---pidfile "${ICINGA2_PID_FILE}" \
--- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
-fi
-eend $retval
-}
-
-stop() {
-ebegin "Stopping icinga2"
-start-stop-daemon \
---stop \
---pidfile $ICINGA2_PID_FILE \
---retry "SIGTERM/15 SIGKILL/30" \
---progress
-eend $?
-}
-
-reload() {
-checkconfig || return 1
-
-ebegin "Reloading icinga2"
-start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
-
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error reloading icinga2."
-fi
-eend $retval
-}

diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
deleted file mode 100644
index 1ce211b79dc7..
--- a/net-analyzer/icinga2/icinga2-2.13.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-03-18 Thread Matthew Thode
commit: f5149120d51eacc08501f41f2f462ab47e140ffb
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Mar 18 16:00:26 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Mar 18 16:00:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5149120

net-analyzer/icinga2: drop 2.14.1

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.14.1.ebuild | 146 -
 2 files changed, 147 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b84ccd3097b8..231d217b5a24 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
 DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
-DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 
8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418
 SHA512 
11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d
 DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/icinga2-2.14.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
deleted file mode 100644
index 1ce211b79dc7..
--- a/net-analyzer/icinga2/icinga2-2.14.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   app-alternatives/yacc
-   app-alternatives/lex"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   # only appends -flto
-   -DICINGA2_LTO_BUILD=OFF
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-02-21 Thread Matthew Thode
commit: 994b37da9e95bffe5ff51127da052734bc8f54e0
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Feb 21 20:15:43 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Feb 21 20:17:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994b37da

net-analyzer/icinga2: drop 2.14.0

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.14.0.ebuild | 146 -
 2 files changed, 147 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 835c5d317760..252622650579 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,4 @@
 DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
 DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
-DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285
 DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 
8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418
 SHA512 
11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d
 DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/icinga2-2.14.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
deleted file mode 100644
index 1ce211b79dc7..
--- a/net-analyzer/icinga2/icinga2-2.14.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   app-alternatives/yacc
-   app-alternatives/lex"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   # only appends -flto
-   -DICINGA2_LTO_BUILD=OFF
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-02-21 Thread Matthew Thode
commit: 7042b5a1fd3a71adc8ce76f612b24ce1e2d06dba
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Feb 21 20:16:10 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Feb 21 20:17:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7042b5a1

net-analyzer/icinga2: drop 2.13.8

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.8.ebuild | 146 -
 2 files changed, 147 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 252622650579..b84ccd3097b8 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
 DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 
8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418
 SHA512 
11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d
 DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/icinga2-2.13.8.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
deleted file mode 100644
index 1ce211b79dc7..
--- a/net-analyzer/icinga2/icinga2-2.13.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   app-alternatives/yacc
-   app-alternatives/lex"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   # only appends -flto
-   -DICINGA2_LTO_BUILD=OFF
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-02-18 Thread Matthew Thode
commit: 6d2edd1d16adbd699a543d0c4b6feb4749febc5c
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Feb 18 23:10:00 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Feb 18 23:10:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2edd1d

net-analyzer/icinga2: stabilize 2.14.2 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.14.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.14.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.2.ebuild
index ff31fb2aa214..1ce211b79dc7 100644
--- a/net-analyzer/icinga2/icinga2-2.14.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.2.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-01-21 Thread Matthew Thode
commit: 443d5d5c3b63b3958ada8766aa8464f3fc65a9b4
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 21 17:08:48 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jan 21 17:09:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443d5d5c

net-analyzer/icinga2: stabilize 2.13.9 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.13.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
index ff31fb2aa214..1ce211b79dc7 100644
--- a/net-analyzer/icinga2/icinga2-2.13.9.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-01-21 Thread Matthew Thode
commit: 6e74f7818fa598af9aa48e0384acea5659e2a2f7
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 21 17:09:21 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jan 21 17:09:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e74f781

net-analyzer/icinga2: stabilize 2.14.1 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.14.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.14.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
index ff31fb2aa214..1ce211b79dc7 100644
--- a/net-analyzer/icinga2/icinga2-2.14.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-01-18 Thread Matthew Thode
commit: b937b6c90a9f028eb71fcb1d75a6fdb1f8377961
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jan 19 01:28:21 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jan 19 01:28:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b937b6c9

net-analyzer/icinga2: add 2.14.2

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.14.2.ebuild | 146 +
 2 files changed, 147 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 9f83a7435ecc..835c5d317760 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,3 +2,4 @@ DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c7
 DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285
 DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 
8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418
 SHA512 
11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d
+DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B 
f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9
 SHA512 
a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57

diff --git a/net-analyzer/icinga2/icinga2-2.14.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.2.ebuild
new file mode 100644
index ..ff31fb2aa214
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.14.2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   app-alternatives/yacc
+   app-alternatives/lex"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   # only appends -flto
+   -DICINGA2_LTO_BUILD=OFF
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2024-01-12 Thread Michał Górny
commit: 89b4792e9819868f2089d3d7b47fa30b0d0875b0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Jan  7 13:50:46 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan 12 19:08:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b4792e

net-analyzer/icinga2: [QA] Remove invalid USE=lto

The USE=lto flag is only used to append -flto.  Remove it.

Signed-off-by: Michał Górny  gentoo.org>

 net-analyzer/icinga2/icinga2-2.13.8.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-2.13.9.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-2.14.0.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-2.14.1.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-.ebuild   | 5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.8.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
index 2c8028636725..1ce211b79dc7 100644
--- a/net-analyzer/icinga2/icinga2-2.13.8.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -60,7 +60,8 @@ src_configure() {
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-DUSE_SYSTEMD=$(usex systemd)
-DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
+   # only appends -flto
+   -DICINGA2_LTO_BUILD=OFF
)
# default to off if minimal, allow the flags to be set otherwise
if use minimal; then

diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
index 82e4d4c65992..ff31fb2aa214 100644
--- a/net-analyzer/icinga2/icinga2-2.13.9.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -60,7 +60,8 @@ src_configure() {
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-DUSE_SYSTEMD=$(usex systemd)
-DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
+   # only appends -flto
+   -DICINGA2_LTO_BUILD=OFF
)
# default to off if minimal, allow the flags to be set otherwise
if use minimal; then

diff --git a/net-analyzer/icinga2/icinga2-2.14.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
index 2c8028636725..1ce211b79dc7 100644
--- a/net-analyzer/icinga2/icinga2-2.14.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -60,7 +60,8 @@ src_configure() {
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-DUSE_SYSTEMD=$(usex systemd)
-DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
+   # only appends -flto
+   -DICINGA2_LTO_BUILD=OFF
)
# default to off if minimal, allow the flags to be set otherwise
if use minimal; then

diff --git a/net-analyzer/icinga2/icinga2-2.14.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
index 82e4d4c65992..ff31fb2aa214 100644
--- a/net-analyzer/icinga2/icinga2-2.14.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -60,7 +60,8 @@ src_configure() {
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-DUSE_SYSTEMD=$(usex systemd)
-DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
+   # only appends -flto
+   -DICINGA2_LTO_BUILD=OFF
)
# default to off if minimal, allow the flags to be set otherwise
if use minimal; then

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-12-21 Thread Matthew Thode
commit: 267da8263da6bfbd8e0bbe9ba271be8152920979
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 21 22:01:29 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 21 22:02:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267da826

net-analyzer/icinga2: add 2.14.1

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.14.1.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 45c16a483fcc..9f83a7435ecc 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
 DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285
+DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 
8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418
 SHA512 
11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d

diff --git a/net-analyzer/icinga2/icinga2-2.14.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
new file mode 100644
index ..06a84427309d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.14.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-12-21 Thread Matthew Thode
commit: ae354edffa2323c1fcf1d86ee3352afee7b7c4ab
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 21 22:00:20 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 21 22:02:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae354edf

net-analyzer/icinga2: add 2.13.9

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.9.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e2c4bdfd2f1e..45c16a483fcc 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
+DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 
3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265
 SHA512 
dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd
 DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285

diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
new file mode 100644
index ..06a84427309d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.9.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-09-13 Thread Matthew Thode
commit: 750b93048f54a65e626c40ae023240cdf3ba98e1
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Sep 13 18:51:46 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Sep 13 18:52:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750b9304

net-analyzer/icinga2: drop 2.13.7

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.7.ebuild | 145 -
 2 files changed, 146 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 650cccf6a3c4..e2c4bdfd2f1e 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
-DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 
0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9
 SHA512 
233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357
 DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
 DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285

diff --git a/net-analyzer/icinga2/icinga2-2.13.7.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
deleted file mode 100644
index 9c5f5a356fe9..
--- a/net-analyzer/icinga2/icinga2-2.13.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-08-13 Thread Matthew Thode
commit: 358917b116067903d417e672165be20fdfaf68c8
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Aug 13 20:28:26 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Aug 13 20:28:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358917b1

net-analyzer/icinga2: 2.13.8 2.14.0 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.13.8.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-2.14.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.8.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
index 06a84427309d..9c5f5a356fe9 100644
--- a/net-analyzer/icinga2/icinga2-2.13.8.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;

diff --git a/net-analyzer/icinga2/icinga2-2.14.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
index 06a84427309d..9c5f5a356fe9 100644
--- a/net-analyzer/icinga2/icinga2-2.14.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.14.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-07-13 Thread Matthew Thode
commit: f74b61f756a51b44ead224f51514d3cdcc444b23
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jul 13 16:19:01 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jul 13 16:19:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74b61f7

net-analyzer/icinga2: add 2.13.8, 2.14.0

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

 net-analyzer/icinga2/Manifest  |   2 +
 net-analyzer/icinga2/icinga2-2.13.8.ebuild | 145 +
 net-analyzer/icinga2/icinga2-2.14.0.ebuild | 145 +
 3 files changed, 292 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b0bf6d35d47a..650cccf6a3c4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,3 @@
 DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 
0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9
 SHA512 
233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357
+DIST icinga2-2.13.8.tar.gz 9674265 BLAKE2B 
8eebd3cd837bd6d03e9dc1060ef087bfc40c75be372a4d0f4da64d553c95e77c47a507202403249154f5b5f3f8a16c4be33cfa0eba555eb445d0892e15db736a
 SHA512 
c16ee7d4876a712da19aaf8c2e85093bd3a4e60bdb29471a33d1e5df3df43c0e9b3afab59f5bbf2b99d06f6c501d52a2759a4b7783f877f3a5c713f43fe683a5
+DIST icinga2-2.14.0.tar.gz 9389972 BLAKE2B 
f68d22e1494e9d835fe831e17863ace787b7bfc77c1b2aa9c9c4694e9fffbb5d54676bb2ce9c697d05f1b1e8557e8dd719723faac22fcb7eff2d4f1ee1e76f39
 SHA512 
5d0094f0b49cfcbb6f335f5fd6a9fd228bbbf4693f3c51f8664fcb5c2507b22fc1dbeaeed71c54a42c1305638b70865b7063e730c9eff7689873e0f2a6cc0285

diff --git a/net-analyzer/icinga2/icinga2-2.13.8.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
new file mode 100644
index ..06a84427309d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.8.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2023-04-21 Thread Conrad Kostecki
commit: 313e90af1c3da132445f2358da4a98f4d2bd8472
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Apr 21 14:32:07 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Apr 22 00:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313e90af

net-analyzer/icinga2: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30681
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../icinga2/files/icinga2-2.13.6-boost-1.81.patch  | 93 --
 1 file changed, 93 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch 
b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
deleted file mode 100644
index 426dc5a1daa5..
--- a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://bugs.gentoo.org/888063
-https://github.com/Icinga/icinga2/issues/9618
-https://github.com/Icinga/icinga2/pull/9624
-
-From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" 
-Date: Wed, 4 Jan 2023 17:02:19 +0100
-Subject: [PATCH 1/2] Handle boost::beast::http::basic_fields#set() signature
- change (v1.81)
-
-Make String convertible to boost::beast::string_view (always working),
-not boost::string_view (broken).
 a/lib/base/string.cpp
-+++ b/lib/base/string.cpp
-@@ -128,15 +128,15 @@ String::operator const std::string&() const
- }
- 
- /**
-- * Conversion function to boost::string_view.
-+ * Conversion function to boost::beast::string_view.
-  *
-  * This allows using String as the value for HTTP headers in 
boost::beast::http::basic_fields::set.
-  *
-- * @return A boost::string_view representing this string.
-+ * @return A boost::beast::string_view representing this string.
-  */
--String::operator boost::string_view() const
-+String::operator boost::beast::string_view() const
- {
--  return boost::string_view(m_Data);
-+  return boost::beast::string_view(m_Data);
- }
- 
- const char *String::CStr() const
 a/lib/base/string.hpp
-+++ b/lib/base/string.hpp
-@@ -5,6 +5,7 @@
- 
- #include "base/i2-base.hpp"
- #include "base/object.hpp"
-+#include 
- #include 
- #include 
- #include 
-@@ -73,7 +74,7 @@ class String
-   bool operator<(const String& rhs) const;
- 
-   operator const std::string&() const;
--  operator boost::string_view() const;
-+  operator boost::beast::string_view() const;
- 
-   const char *CStr() const;
- 
-
-From 99c2d69dc85dfcd044e4a83d4894aa52eedfe09d Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" 
-Date: Wed, 4 Jan 2023 17:34:49 +0100
-Subject: [PATCH 2/2] Handle boost::beast::http::basic_fields#operator[]()
- signature change (v1.81)
-
-Use always working std::string(x), not broken x.to_string().
-(x is a return value.)
 a/lib/remote/httphandler.cpp
-+++ b/lib/remote/httphandler.cpp
-@@ -58,7 +58,7 @@ void HttpHandler::ProcessRequest(
-   Dictionary::Ptr node = m_UrlTree;
-   std::vector handlers;
- 
--  Url::Ptr url = new Url(request.target().to_string());
-+  Url::Ptr url = new Url(std::string(request.target()));
-   auto& path (url->GetPath());
- 
-   for (std::vector::size_type i = 0; i <= path.size(); i++) {
 a/lib/remote/httpserverconnection.cpp
-+++ b/lib/remote/httpserverconnection.cpp
-@@ -246,7 +246,7 @@ bool HandleAccessControl(
-   if (!allowedOrigins.empty()) {
-   auto& origin (request[http::field::origin]);
- 
--  if (allowedOrigins.find(origin.to_string()) != 
allowedOrigins.end()) {
-+  if (allowedOrigins.find(std::string(origin)) != 
allowedOrigins.end()) {
-   
response.set(http::field::access_control_allow_origin, origin);
-   }
- 
-@@ -536,7 +536,7 @@ void 
HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
-   if (!authenticatedUser) {
-   CpuBoundWork fetchingAuthenticatedUser (yc);
- 
--  authenticatedUser = 
ApiUser::GetByAuthHeader(request[http::field::authorization].to_string());
-+  authenticatedUser = 
ApiUser::GetByAuthHeader(std::string(request[http::field::authorization]));
-   }
- 
-   Log logMsg (LogInformation, "HttpServerConnection");



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-04-20 Thread Matthew Thode
commit: 3d4e8adb3d61f603c590a7ee348ec7074f079a95
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Apr 20 03:34:41 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Apr 20 15:46:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d4e8adb

net-analyzer/icinga2: drop 2.13.6-r1

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

 net-analyzer/icinga2/Manifest |   1 -
 net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild | 149 --
 2 files changed, 150 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 080376e96fc4..b0bf6d35d47a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 
50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad
 SHA512 
5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
 DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 
0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9
 SHA512 
233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357

diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
deleted file mode 100644
index 6eb6102ef4c9..
--- a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-boost-1.81.patch
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-   fi
-
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-03-18 Thread Matthew Thode
commit: c413fdc3df2725a3e2848de5c9cadd3c2df1246a
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Mar 18 16:44:56 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Mar 18 16:45:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c413fdc3

net-analyzer/icinga2: remove systemd eclass import

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

 net-analyzer/icinga2/icinga2-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index e74ff9ec6c08..cf77ec3fb9e8 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake systemd
+inherit cmake
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-03-18 Thread Matthew Thode
commit: 9646028ce726a940756070ede2338470d12104ba
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Mar 18 16:35:23 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Mar 18 16:35:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9646028c

net-analyzer/icinga2: stabilize 2.13.7 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.13.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.7.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
index 06a84427309d..9c5f5a356fe9 100644
--- a/net-analyzer/icinga2/icinga2-2.13.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-03-18 Thread Matthew Thode
commit: 9258ac2355aaef05fce7c32e77f3365ba89910d5
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Mar 18 16:36:28 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Mar 18 16:36:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9258ac23

net-analyzer/icinga2: install small files all the time

remove the small-files warning, install vim/nano syntax

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

 net-analyzer/icinga2/icinga2-.ebuild | 18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 2c5482fe5a8f..e74ff9ec6c08 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.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
@@ -18,7 +18,7 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql +plugins postgres 
systemd"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
@@ -120,16 +120,12 @@ src_install() {
fperms ug+rwX,o-rwx /var/spool/icinga2
fperms ug+rwX,o-rwx /var/log/icinga2
 
-   if use vim-syntax; then
-   insinto /usr/share/vim/vimfiles
-   doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
-   doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
-   fi
+   insinto /usr/share/vim/vimfiles
+   doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+   doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
 
-   if use nano-syntax; then
-   insinto /usr/share/nano
-   doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
-   fi
+   insinto /usr/share/nano
+   doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-02-17 Thread Sam James
commit: d02761e91d6a0381a78588da2d37f8d82fd9a093
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 18 03:10:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 18 03:10:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02761e9

net-analyzer/icinga2: drop non-existent boost patch from 2.13.7

Closes: https://bugs.gentoo.org/895154
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/icinga2/icinga2-2.13.7.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.7.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
index 3b4c1eedf0be..06a84427309d 100644
--- a/net-analyzer/icinga2/icinga2-2.13.7.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
@@ -46,10 +46,6 @@ RDEPEND="
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
-PATCHES=(
-   "${FILESDIR}"/${P}-boost-1.81.patch
-)
-
 src_configure() {
local mycmakeargs=(
-DICINGA2_UNITY_BUILD=$(usex jumbo-build)



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-02-17 Thread Matthew Thode
commit: ecfda677d2479a95569550bc52a5d516c4a181bd
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Feb 17 18:35:47 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Feb 17 18:55:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfda677

net-analyzer/icinga2: add 2.13.7

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.7.ebuild | 149 +
 2 files changed, 150 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 77b6640673a6..080376e96fc4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 
50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad
 SHA512 
5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71
+DIST icinga2-2.13.7.tar.gz 9667526 BLAKE2B 
0c3e9736ac66bdcbb3f5d94cc132b3e7e49fdf472bfdbf6900651d72ee9dbea38a06fc9df7c2a266f183b11132391d8174f6d5bd5c5045c4566fb8c3fb28bab9
 SHA512 
233b8c712b6c36e4d9e970213fac30b65ce72a3e078bbd900c3262c2b7f2b9cf3c1e606d2deb0a60bbb5d5bd3ea1be42bb884b91fc5a9801f4d774ffa1167357

diff --git a/net-analyzer/icinga2/icinga2-2.13.7.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
new file mode 100644
index ..3b4c1eedf0be
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.7.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-boost-1.81.patch
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+   fi
+
+   keepdir /etc/icinga2
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-02-01 Thread Andreas Sturmlechner
commit: ef36cf23d295cc4940a58943faa039be33656fe2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan 27 21:08:51 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  1 19:26:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef36cf23

net-analyzer/icinga2: drop 2.13.6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-analyzer/icinga2/icinga2-2.13.6.ebuild | 145 -
 1 file changed, 145 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
deleted file mode 100644
index b95acf553b6c..
--- a/net-analyzer/icinga2/icinga2-2.13.6.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-   fi
-
-   keepdir /etc/icinga2
-   keepdir /var/lib/icinga2/api/zones
-   keepdir /var/lib/icinga2/api/repository
-   keepdir /var/lib/icinga2/api/log
-   keepdir /var/spool/icinga2/perfdata
-
-   rm -r "${D}/run" || die "failed to remove /run"
-   rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-   fowners -R icinga:icinga /etc/icinga2
-   fperms 0750 /etc/icinga2
-   fowners icinga:icinga /var/lib/icinga2
-   fowners -R icinga:icingacmd /var/lib/icinga2/api
-   fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
-   fowners -R icinga:icingacmd /var/lib/icinga2/certs
-   fowners icinga:icinga /var/spool/icinga2
-   fowners icinga:icinga /var/spool/icinga2/perfdata
-   fowners icinga:icingacmd /var/log/icinga2
-
-   fperms ug+rwX,o-rwx /etc/icinga2
-   fperms ug+rwX,o-rwx /var/lib/icinga2
-   fperms ug+rwX,o-rwx /var/spool/icinga2
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-01-14 Thread Sam James
commit: 2a0968d973600c6076ceb293c72687c79cda1522
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 22:47:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 22:47:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0968d9

net-analyzer/icinga2: Stabilize 2.13.6-r1 amd64, #890831

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
index 3b4c1eedf0be..b2529c883b46 100644
--- a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-01-14 Thread Sam James
commit: 8f7949b17a2afeda8846a35a202a8d5cb427f1f6
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 22:47:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 22:47:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7949b1

net-analyzer/icinga2: Stabilize 2.13.6-r1 x86, #890831

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
index b2529c883b46..6eb6102ef4c9 100644
--- a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2023-01-14 Thread Sam James
commit: 41387bfec00020779525cb7ae2f5549b90514e65
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 14 19:39:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 19:39:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41387bfe

net-analyzer/icinga2: fix build w/ boost-1.81

Closes: https://bugs.gentoo.org/888063
Signed-off-by: Sam James  gentoo.org>

 .../icinga2/files/icinga2-2.13.6-boost-1.81.patch  |  93 +
 net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild  | 149 +
 2 files changed, 242 insertions(+)

diff --git a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch 
b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
new file mode 100644
index ..426dc5a1daa5
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch
@@ -0,0 +1,93 @@
+https://bugs.gentoo.org/888063
+https://github.com/Icinga/icinga2/issues/9618
+https://github.com/Icinga/icinga2/pull/9624
+
+From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" 
+Date: Wed, 4 Jan 2023 17:02:19 +0100
+Subject: [PATCH 1/2] Handle boost::beast::http::basic_fields#set() signature
+ change (v1.81)
+
+Make String convertible to boost::beast::string_view (always working),
+not boost::string_view (broken).
+--- a/lib/base/string.cpp
 b/lib/base/string.cpp
+@@ -128,15 +128,15 @@ String::operator const std::string&() const
+ }
+ 
+ /**
+- * Conversion function to boost::string_view.
++ * Conversion function to boost::beast::string_view.
+  *
+  * This allows using String as the value for HTTP headers in 
boost::beast::http::basic_fields::set.
+  *
+- * @return A boost::string_view representing this string.
++ * @return A boost::beast::string_view representing this string.
+  */
+-String::operator boost::string_view() const
++String::operator boost::beast::string_view() const
+ {
+-  return boost::string_view(m_Data);
++  return boost::beast::string_view(m_Data);
+ }
+ 
+ const char *String::CStr() const
+--- a/lib/base/string.hpp
 b/lib/base/string.hpp
+@@ -5,6 +5,7 @@
+ 
+ #include "base/i2-base.hpp"
+ #include "base/object.hpp"
++#include 
+ #include 
+ #include 
+ #include 
+@@ -73,7 +74,7 @@ class String
+   bool operator<(const String& rhs) const;
+ 
+   operator const std::string&() const;
+-  operator boost::string_view() const;
++  operator boost::beast::string_view() const;
+ 
+   const char *CStr() const;
+ 
+
+From 99c2d69dc85dfcd044e4a83d4894aa52eedfe09d Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" 
+Date: Wed, 4 Jan 2023 17:34:49 +0100
+Subject: [PATCH 2/2] Handle boost::beast::http::basic_fields#operator[]()
+ signature change (v1.81)
+
+Use always working std::string(x), not broken x.to_string().
+(x is a return value.)
+--- a/lib/remote/httphandler.cpp
 b/lib/remote/httphandler.cpp
+@@ -58,7 +58,7 @@ void HttpHandler::ProcessRequest(
+   Dictionary::Ptr node = m_UrlTree;
+   std::vector handlers;
+ 
+-  Url::Ptr url = new Url(request.target().to_string());
++  Url::Ptr url = new Url(std::string(request.target()));
+   auto& path (url->GetPath());
+ 
+   for (std::vector::size_type i = 0; i <= path.size(); i++) {
+--- a/lib/remote/httpserverconnection.cpp
 b/lib/remote/httpserverconnection.cpp
+@@ -246,7 +246,7 @@ bool HandleAccessControl(
+   if (!allowedOrigins.empty()) {
+   auto& origin (request[http::field::origin]);
+ 
+-  if (allowedOrigins.find(origin.to_string()) != 
allowedOrigins.end()) {
++  if (allowedOrigins.find(std::string(origin)) != 
allowedOrigins.end()) {
+   
response.set(http::field::access_control_allow_origin, origin);
+   }
+ 
+@@ -536,7 +536,7 @@ void 
HttpServerConnection::ProcessMessages(boost::asio::yield_context yc)
+   if (!authenticatedUser) {
+   CpuBoundWork fetchingAuthenticatedUser (yc);
+ 
+-  authenticatedUser = 
ApiUser::GetByAuthHeader(request[http::field::authorization].to_string());
++  authenticatedUser = 
ApiUser::GetByAuthHeader(std::string(request[http::field::authorization]));
+   }
+ 
+   Log logMsg (LogInformation, "HttpServerConnection");

diff --git a/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
new file mode 100644
index ..3b4c1eedf0be
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2023-01-07 Thread Matthew Thode
commit: e6ecf39c56a39a5a26236e6d38fdc318c05dffe1
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Jan  7 19:34:17 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Jan  7 19:34:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ecf39c

net-analyzer/icinga2: drop 2.13.5

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.5.ebuild | 145 -
 2 files changed, 146 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0cd306438c7e..77b6640673a6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 
9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f
 SHA512 
7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d
 DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 
50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad
 SHA512 
5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71

diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.5.ebuild
deleted file mode 100644
index b95acf553b6c..
--- a/net-analyzer/icinga2/icinga2-2.13.5.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-   fi
-
-   keepdir /etc/icinga2
-   keepdir /var/lib/icinga2/api/zones
-   keepdir 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-12-07 Thread Matthew Thode
commit: 877cff4c26818cf840d434124798e39270a7556a
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec  7 19:13:08 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec  7 19:17:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877cff4c

net-analyzer/icinga2: stabilize 2.13.6 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.13.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
index 2c5482fe5a8f..b95acf553b6c 100644
--- a/net-analyzer/icinga2/icinga2-2.13.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-11-08 Thread Matthew Thode
commit: 48b03d794b6e7831804c3dc10049127f66451af6
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Nov  8 16:53:41 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Nov  8 16:57:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b03d79

net-analyzer/icinga2: add 2.13.6

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.6.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4f001e6bf3aa..0cd306438c7e 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 
9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f
 SHA512 
7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d
+DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 
50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad
 SHA512 
5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71

diff --git a/net-analyzer/icinga2/icinga2-2.13.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
new file mode 100644
index ..2c5482fe5a8f
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.6.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   dev-libs/boost:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+   fi
+
+   keepdir /etc/icinga2
+   keepdir /var/lib/icinga2/api/zones
+   keepdir 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-10-14 Thread Matthew Thode
commit: 8baa117114b796cfd98b97321f99bf94e0dfafa3
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 14 16:47:19 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 14 16:47:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8baa1171

net-analyzer/icinga2: drop 2.13.4

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.4.ebuild | 145 -
 2 files changed, 146 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e61495e85394..4f001e6bf3aa 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B 
fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec
 SHA512 
454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
 DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 
9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f
 SHA512 
7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d

diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
deleted file mode 100644
index b95acf553b6c..
--- a/net-analyzer/icinga2/icinga2-2.13.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   dev-libs/boost:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-   fi
-
-   keepdir /etc/icinga2
-   keepdir /var/lib/icinga2/api/zones
-   keepdir 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-09-13 Thread Matthew Thode
commit: e7471f9d1a23eb8d78528e33315d33a53772cec4
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Sep 13 16:31:37 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Sep 13 16:31:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7471f9d

net-analyzer/icinga2: stabilize 2.13.5 for amd64, x86

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

 net-analyzer/icinga2/icinga2-2.13.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.5.ebuild
index 2c5482fe5a8f..b95acf553b6c 100644
--- a/net-analyzer/icinga2/icinga2-2.13.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.5.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-08-31 Thread Matthew Thode
commit: 62d6f88b901f3f76160b31aed7c1edf58e9209d0
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Aug 31 15:37:02 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Aug 31 15:37:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d6f88b

net-analyzer/icinga2: drop 2.13.3

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.3.ebuild | 145 -
 2 files changed, 146 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f72c456fee3e..e61495e85394 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
-DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B 
f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72
 SHA512 
818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
 DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B 
fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec
 SHA512 
454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
 DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 
9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f
 SHA512 
7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d

diff --git a/net-analyzer/icinga2/icinga2-2.13.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
deleted file mode 100644
index 39584c5c24c3..
--- a/net-analyzer/icinga2/icinga2-2.13.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-08-16 Thread Matthew Thode
commit: 42158fb9b12c71cddee0509fb265ec3d1bfe481e
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Aug 13 18:10:19 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug 16 16:46:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42158fb9

net-analyzer/icinga2: add 2.13.5

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.5.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a09d4f7975b2..f72c456fee3e 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B 
f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72
 SHA512 
818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
 DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B 
fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec
 SHA512 
454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb
+DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 
9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f
 SHA512 
7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d

diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.5.ebuild
new file mode 100644
index ..d9cef157f92b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-07-31 Thread Matthew Thode
commit: 6856172592bf49f4a233dfa8fa8b6116f0ef764e
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Aug  1 03:11:48 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Aug  1 03:13:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68561725

net-analyzer/icinga2: 2.13.4 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.13.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
index d9cef157f92b..39584c5c24c3 100644
--- a/net-analyzer/icinga2/icinga2-2.13.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-06-30 Thread Matthew Thode
commit: bfbc07799e5bcdf49630d566316033a548d297eb
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 30 21:11:07 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jun 30 21:16:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfbc0779

net-analyzer/icinga2: 2.13.4 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.4.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 39ff02c1b6af..a09d4f7975b2 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B 
f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72
 SHA512 
818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743
+DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B 
fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec
 SHA512 
454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb

diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
new file mode 100644
index ..d9cef157f92b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+   fi
+
+   keepdir /etc/icinga2
+ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-06-14 Thread Matthew Thode
commit: 2e584f913851768415b2ad8a5af3ffef6e37d907
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun 14 22:33:23 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun 14 22:33:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e584f91

net-analyzer/icinga2: 2.13.2 cleanup

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

 net-analyzer/icinga2/Manifest |   2 -
 net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild | 151 --
 2 files changed, 153 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index d5c33e0b9c2a..39ff02c1b6af 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1 @@
-DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B 
c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d
 SHA512 
1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
-DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 
6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e
 SHA512 
39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
 DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B 
f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72
 SHA512 
818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
deleted file mode 100644
index f485dd354e56..
--- a/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch
 -> ${P}-9092.patch"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-   "${DISTDIR}/${P}-9092.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-05-17 Thread Matthew Thode
commit: 52818dbc3bba7a0e02769a76dc82b4fbc57f6d48
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat May 14 18:21:47 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue May 17 17:33:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52818dbc

net-analyzer/icinga2: 2.13.3 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.13.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
index d9cef157f92b..39584c5c24c3 100644
--- a/net-analyzer/icinga2/icinga2-2.13.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-04-14 Thread Matthew Thode
commit: c153f5d580e251d2baad4932156ef1d98c2b17cb
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Apr 14 16:25:47 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Apr 14 16:26:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c153f5d5

net-analyzer/icinga2: 2.13.3 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.3.ebuild | 145 +
 2 files changed, 146 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 257e30c33fe4..d5c33e0b9c2a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B 
c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d
 SHA512 
1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 
6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e
 SHA512 
39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906
+DIST icinga2-2.13.3.tar.gz 7529976 BLAKE2B 
f661919b0a7b420eba663d6cb01f2223c15b2be7f4ad649e1e09b7b4068d1122d63c6baac490ff3a0bd808066b759138748e70de364eea4d89f560168a448c72
 SHA512 
818eb565c6d46bfb538d70b9e33bb7424ab6fb98289da9eb947ec1f36b7e3b0e3869db789acd565b5e5b3d8b4819fe991000f4df362e28686dd9e3394cec3743

diff --git a/net-analyzer/icinga2/icinga2-2.13.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
new file mode 100644
index ..d9cef157f92b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-01-15 Thread Matthew Thode
commit: ddcb18f8d2d6e61f6bd78770a978656bdfcf4880
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Jan 15 17:51:42 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Jan 15 17:54:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcb18f8

net-analyzer/icinga2: 2.13.1 cleanup

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.1.ebuild | 147 -
 2 files changed, 148 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 5408437a5ecf..257e30c33fe4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
-DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B 
c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d
 SHA512 
1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 
6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e
 SHA512 
39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906

diff --git a/net-analyzer/icinga2/icinga2-2.13.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
deleted file mode 100644
index 3e79963a2e64..
--- a/net-analyzer/icinga2/icinga2-2.13.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2022-01-03 Thread Matthew Thode
commit: 836eb0586634c5d1a5da7e59775c9880c5c5c545
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jan  3 15:58:00 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jan  3 15:58:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836eb058

net-analyzer/icinga2: fix missing fowner on logdir

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

 .../icinga2/{icinga2-2.13.2-r2.ebuild => icinga2-2.13.2-r3.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
similarity index 98%
rename from net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild
rename to net-analyzer/icinga2/icinga2-2.13.2-r3.ebuild
index 4face498d405..f485dd354e56 100644
--- a/net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r3.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
@@ -119,6 +119,7 @@ src_install() {
fowners -R icinga:icingacmd /var/lib/icinga2/certs
fowners icinga:icinga /var/spool/icinga2
fowners icinga:icinga /var/spool/icinga2/perfdata
+   fowners icinga:icingacmd /var/log/icinga2
 
fperms ug+rwX,o-rwx /etc/icinga2
fperms ug+rwX,o-rwx /var/lib/icinga2



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-12-29 Thread Matthew Thode
commit: 9cd116618c6110a18eb9995a986f6c8aa63ce5ff
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 29 17:19:46 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec 29 17:19:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cd11661

net-analyzer/icinga2: update fowners to work with install wizard

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

 .../icinga2/{icinga2-2.13.2-r1.ebuild => icinga2-2.13.2-r2.ebuild} | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild
similarity index 96%
rename from net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
rename to net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild
index 17e94fe2b20f..4face498d405 100644
--- a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r2.ebuild
@@ -111,13 +111,14 @@ src_install() {
rm -r "${D}/run" || die "failed to remove /run"
rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
-   fowners root:icinga /etc/icinga2
+   fowners -R icinga:icinga /etc/icinga2
fperms 0750 /etc/icinga2
fowners icinga:icinga /var/lib/icinga2
-   fowners icinga:icinga /var/spool/icinga2
fowners -R icinga:icingacmd /var/lib/icinga2/api
+   fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+   fowners -R icinga:icingacmd /var/lib/icinga2/certs
+   fowners icinga:icinga /var/spool/icinga2
fowners icinga:icinga /var/spool/icinga2/perfdata
-   fowners icinga:icingacmd /var/log/icinga2
 
fperms ug+rwX,o-rwx /etc/icinga2
fperms ug+rwX,o-rwx /var/lib/icinga2



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-12-29 Thread Matthew Thode
commit: 29c0f4abdb1bd2638c84c0b946af174326f7d3dd
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 29 17:18:13 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Dec 29 17:18:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c0f4ab

net-analyzer/icinga2: update fowners to work with the install wizard

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

 net-analyzer/icinga2/icinga2-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index b2d610c7c413..da2f2e0ac156 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -105,11 +105,13 @@ src_install() {
rm -r "${D}/run" || die "failed to remove /run"
rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
-   fowners root:icinga /etc/icinga2
+   fowners -R icinga:icinga /etc/icinga2
fperms 0750 /etc/icinga2
fowners icinga:icinga /var/lib/icinga2
-   fowners icinga:icinga /var/spool/icinga2
fowners -R icinga:icingacmd /var/lib/icinga2/api
+   fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests
+   fowners -R icinga:icingacmd /var/lib/icinga2/certs
+   fowners icinga:icinga /var/spool/icinga2
fowners icinga:icinga /var/spool/icinga2/perfdata
fowners icinga:icingacmd /var/log/icinga2
 



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-12-14 Thread Matthew Thode
commit: e75775ffd0773438f7eec53264cf2f5813f91dda
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec 14 17:54:01 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec 14 17:54:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75775ff

net-analyzer/icinga2: 2.13.2 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
index a6919631d7f1..17e94fe2b20f 100644
--- a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake systemd
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz

https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch
 -> ${P}-9092.patch"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-11-28 Thread Matthew Thode
commit: e60b54f49fa11d375c741a65768b956398cd540e
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Nov 29 02:50:46 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Nov 29 02:51:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e60b54f4

net-analyzer/icinga2: clean up

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

 net-analyzer/icinga2/icinga2-2.13.2.ebuild | 147 -
 1 file changed, 147 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2.ebuild
deleted file mode 100644
index de80eb55dfc4..
--- a/net-analyzer/icinga2/icinga2-2.13.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
-   fi
-
-   keepdir /etc/icinga2
-   keepdir /var/lib/icinga2/api/zones
-   keepdir /var/lib/icinga2/api/repository
-   keepdir /var/lib/icinga2/api/log
-   keepdir /var/spool/icinga2/perfdata
-
-   rm -r "${D}/run" || die "failed to remove /run"
-   rm -r "${D}/var/cache" || die "failed to remove /var/cache"
-
-   fowners root:icinga /etc/icinga2
-   fperms 0750 /etc/icinga2
-   fowners icinga:icinga /var/lib/icinga2
-   fowners icinga:icinga /var/spool/icinga2
-   fowners -R icinga:icingacmd /var/lib/icinga2/api
-   fowners icinga:icinga /var/spool/icinga2/perfdata
-   fowners icinga:icingacmd /var/log/icinga2
-
-   fperms ug+rwX,o-rwx /etc/icinga2
-   fperms ug+rwX,o-rwx /var/lib/icinga2
-   fperms ug+rwX,o-rwx /var/spool/icinga2
-   fperms 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-11-28 Thread Matthew Thode
commit: f0e78a5a586bc856254ed40ffed7d2c0b10da4e3
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Nov 29 02:49:53 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Nov 29 02:51:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e78a5a

net-analyzer/icinga2: fix non-unity builds

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

 net-analyzer/icinga2/Manifest |   1 +
 net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild | 149 ++
 2 files changed, 150 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4365b10d153a..5408437a5ecf 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
+DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B 
c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d
 SHA512 
1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94
 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 
6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e
 SHA512 
39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906

diff --git a/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
new file mode 100644
index ..a6919631d7f1
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.2-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://github.com/Icinga/icinga2/commit/8cde21ddfd66a0fcfac704544a0fd7990cfc94ec.patch
 -> ${P}-9092.patch"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+   "${DISTDIR}/${P}-9092.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-11-13 Thread Matthew Thode
commit: eb92a576ec84dc783d578527c28aaa869d67fdae
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Nov 14 02:23:45 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Nov 14 02:23:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb92a576

net-analyzer/icinga2: 2.13.2 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.2.ebuild | 147 +
 2 files changed, 148 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e62b0f3dde8b..4365b10d153a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7
+DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 
6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e
 SHA512 
39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906

diff --git a/net-analyzer/icinga2/icinga2-2.13.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.2.ebuild
new file mode 100644
index ..de80eb55dfc4
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto schema/upgrade
+   dodoc 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-11-11 Thread Matthew Thode
commit: c1cbd96f361f2f5d82a03fc5f9882e6b53506670
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Nov 12 04:06:22 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Nov 12 04:06:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cbd96f

net-analyzer/icinga2: remove 2.12.4

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.12.4.ebuild | 147 -
 2 files changed, 148 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0743badb86d..e62b0f3dde8 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7

diff --git a/net-analyzer/icinga2/icinga2-2.12.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
deleted file mode 100644
index 3e79963a2e6..000
--- a/net-analyzer/icinga2/icinga2-2.12.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-   docinto schema/upgrade
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-10-20 Thread Matthew Thode
commit: d945921ecd56547100ec24d9d6a353c0adc804b2
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Oct 20 15:31:09 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Oct 20 15:34:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d945921e

net-analyzer/icinga2: clean up 2.13.0

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.13.0.ebuild | 147 -
 2 files changed, 148 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f159984d917..0743badb86d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
-DIST icinga2-2.13.0.tar.gz 7584525 BLAKE2B 
94c08030e508c35d610c12e9855015da35e4dd6a67614bc44ab5605ba61f9f3f9ddc4fec98be8534ae2e84d1d1c1065295b872c6a060a36e821f929c04a90172
 SHA512 
a3eb0166bb2851a7e6e795fc541b535db3ac2d8d9c2e4e72caf0472e54ac0ef110ea97a1c1c208b97c2b99e1ec51919a378bba68b21e770786074dcb1af4bd26
 DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7

diff --git a/net-analyzer/icinga2/icinga2-2.13.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
deleted file mode 100644
index de80eb55dfc..000
--- a/net-analyzer/icinga2/icinga2-2.13.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-09-20 Thread Matthew Thode
commit: 3b88b3d1c860269d8f7351737b884f6ccf3ce329
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Sep 20 21:31:09 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Sep 20 21:34:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b88b3d1

net-analyzer/icinga2: 2.13.1 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.13.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
index de80eb55dfc..3e79963a2e6 100644
--- a/net-analyzer/icinga2/icinga2-2.13.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-08-20 Thread Matthew Thode
commit: 13826a23b720f436032d519d0beac6b0cddd2b96
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Aug 20 17:05:30 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Aug 20 17:05:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13826a23

net-analyzer/icinga2: 2.13.1 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.1.ebuild | 147 +
 2 files changed, 148 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 56b4fd68624..f159984d917 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
 DIST icinga2-2.13.0.tar.gz 7584525 BLAKE2B 
94c08030e508c35d610c12e9855015da35e4dd6a67614bc44ab5605ba61f9f3f9ddc4fec98be8534ae2e84d1d1c1065295b872c6a060a36e821f929c04a90172
 SHA512 
a3eb0166bb2851a7e6e795fc541b535db3ac2d8d9c2e4e72caf0472e54ac0ef110ea97a1c1c208b97c2b99e1ec51919a378bba68b21e770786074dcb1af4bd26
+DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 
5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003
 SHA512 
450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7

diff --git a/net-analyzer/icinga2/icinga2-2.13.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
new file mode 100644
index 000..de80eb55dfc
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-08-03 Thread Matthew Thode
commit: e5336fc3e2e4f8b67a1432928b299ed7edb9abea
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  3 20:23:10 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug  3 20:23:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5336fc3

net-analyzer/icinga2: 2.13.0 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.13.0.ebuild | 147 +
 2 files changed, 148 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 3fd07f452f1..56b4fd68624 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b
+DIST icinga2-2.13.0.tar.gz 7584525 BLAKE2B 
94c08030e508c35d610c12e9855015da35e4dd6a67614bc44ab5605ba61f9f3f9ddc4fec98be8534ae2e84d1d1c1065295b872c6a060a36e821f929c04a90172
 SHA512 
a3eb0166bb2851a7e6e795fc541b535db3ac2d8d9c2e4e72caf0472e54ac0ef110ea97a1c1c208b97c2b99e1ec51919a378bba68b21e770786074dcb1af4bd26

diff --git a/net-analyzer/icinga2/icinga2-2.13.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
new file mode 100644
index 000..de80eb55dfc
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.13.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto schema/upgrade
+   dodoc 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2021-07-13 Thread Conrad Kostecki
commit: 4c492d4d300bdc3d6a56cd0f3067447e22d52280
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Jul 12 18:15:17 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jul 13 21:14:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c492d4d

net-analyzer/icinga2: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21614
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/icinga2-2.12.1-boost-1.74.0.patch| 436 -
 1 file changed, 436 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch 
b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
deleted file mode 100644
index e6ad4807993..000
--- a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
+++ /dev/null
@@ -1,436 +0,0 @@
-From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
-From: Louis Sautier 
-Date: Thu, 20 Aug 2020 18:25:48 +0200
-Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
- =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It was deprecated in
-https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc

- lib/base/utility.cpp | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
-index 1add7616c6..d8e6f20b0c 100644
 a/lib/base/utility.cpp
-+++ b/lib/base/utility.cpp
-@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const 
String& target)
- {
-   namespace fs = boost::filesystem;
- 
-+#if BOOST_VERSION >= 107400
-+  fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
-+#else /* BOOST_VERSION */
-   fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
-+#endif /* BOOST_VERSION */
- }
- 
- /*
-From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
-From: "Alexander A. Klimov" 
-Date: Wed, 26 Aug 2020 13:56:26 +0200
-Subject: [PATCH] Introduce HttpUtility::Set()
-
-refs #8185

- lib/cli/consolecommand.cpp   |  9 ---
- lib/perfdata/elasticsearchwriter.cpp | 13 -
- lib/perfdata/influxdbwriter.cpp  |  7 ++---
- lib/remote/configfileshandler.cpp|  4 +--
- lib/remote/eventshandler.cpp |  2 +-
- lib/remote/httpserverconnection.cpp  | 40 ++--
- lib/remote/httputility.cpp   |  4 +--
- lib/remote/httputility.hpp   | 28 +++
- lib/remote/infohandler.cpp   |  6 ++---
- plugins/check_nscp_api.cpp   |  9 ---
- 10 files changed, 77 insertions(+), 45 deletions(-)
-
-diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
-index 41b6590e4c..42c5c63133 100644
 a/lib/cli/consolecommand.cpp
-+++ b/lib/cli/consolecommand.cpp
-@@ -3,6 +3,7 @@
- #include "cli/consolecommand.hpp"
- #include "config/configcompiler.hpp"
- #include "remote/consolehandler.hpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "base/configwriter.hpp"
- #include "base/serializer.hpp"
-@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest()
- 
-   http::request request(http::verb::post, 
std::string(l_Url->Format(false)), 10);
- 
--  request.set(http::field::user_agent, "Icinga/DebugConsole/" + 
Application::GetAppVersion());
--  request.set(http::field::host, l_Url->GetHost() + ":" + 
l_Url->GetPort());
-+  HttpUtility::Set(request, http::field::user_agent, 
"Icinga/DebugConsole/" + Application::GetAppVersion());
-+  HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + 
l_Url->GetPort());
- 
--  request.set(http::field::accept, "application/json");
--  request.set(http::field::authorization, "Basic " + 
Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
-+  HttpUtility::Set(request, http::field::accept, "application/json");
-+  HttpUtility::Set(request, http::field::authorization, "Basic " + 
Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword()));
- 
-   try {
-   http::write(*l_TlsStream, request);
-diff --git a/lib/perfdata/elasticsearchwriter.cpp 
b/lib/perfdata/elasticsearchwriter.cpp
-index 6870198e45..3764bf536b 100644
 a/lib/perfdata/elasticsearchwriter.cpp
-+++ b/lib/perfdata/elasticsearchwriter.cpp
-@@ -2,6 +2,7 @@
- 
- #include "perfdata/elasticsearchwriter.hpp"
- #include "perfdata/elasticsearchwriter-ti.cpp"
-+#include "remote/httputility.hpp"
- #include "remote/url.hpp"
- #include "icinga/compatutility.hpp"
- #include "icinga/service.hpp"
-@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-06-28 Thread Matthew Thode
commit: 3358040ed16d9d0a1ad777cfeefe1aa8eebce96c
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jun 29 02:53:53 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Jun 29 02:54:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3358040e

net-analyzer/icinga2: 2.12.4 stable with cleanup

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.12.3.ebuild | 148 -
 net-analyzer/icinga2/icinga2-2.12.4.ebuild |   2 +-
 3 files changed, 1 insertion(+), 150 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bd822b23fcf..3fd07f452f1 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
 DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b

diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
deleted file mode 100644
index 60729607fd2..000
--- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres)
-   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
-   )
-   fi
-
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
-
-   if use mysql || use mariadb; then
-   docinto schema
-   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
-   docinto schema/upgrade
-   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
-   fi
-   if use postgres; then
-   docinto schema
-   newdoc 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-05-28 Thread Matthew Thode
commit: 4775db5849c2e64cd4a0e6b77b7a21c44ec33781
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri May 28 19:46:17 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 28 19:46:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4775db58

net-analyzer/icinga2: fix paching

closes: https://bugs.gentoo.org/792687
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 net-analyzer/icinga2/icinga2-2.12.4.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.12.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
index 655d8049880..de80eb55dfc 100644
--- a/net-analyzer/icinga2/icinga2-2.12.4.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
@@ -48,7 +48,6 @@ REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
 PATCHES=(
# https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-05-28 Thread Matthew Thode
commit: d0773ba2ddd7da40940873e9bbfa91be7b98b062
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri May 28 15:51:44 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 28 15:52:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0773ba2

net-analyzer/icinga2: 2.12.4 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.12.4.ebuild | 148 +
 2 files changed, 149 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e92368b9b6f..bd822b23fcf 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799
+DIST icinga2-2.12.4.tar.gz 7535804 BLAKE2B 
495a53fc0887ff2e1b5e058c52af63c155da600b4c82e38653a56c4b1dab497ef477254b19727c6c366b48c41a052b68c9910cb4bc4782605612a3d63ccf646c
 SHA512 
3a817eb6f1be256f6eca5136e3d74c49e1cc2a7af382a906abebc6d573579e755decf72bfce62fad48f9c5a37fe6bc304c5849d1008ab7ce4939213f720ab37b

diff --git a/net-analyzer/icinga2/icinga2-2.12.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
new file mode 100644
index 000..655d8049880
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
+   )
+   fi
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
+
+   if use mysql || use mariadb; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+   docinto 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-04-30 Thread Mikle Kolyada
commit: 5085c0b4e499296bf8ee551320a0e35d1d983ef8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Apr 30 18:45:08 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Apr 30 18:45:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5085c0b4

net-analyzer/icinga2: remove libressl support

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

 net-analyzer/icinga2/icinga2-2.12.3.ebuild | 7 +++
 net-analyzer/icinga2/icinga2-.ebuild   | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
index ad2f31c9b0f..60729607fd2 100644
--- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,12 +18,11 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
>=dev-libs/boost-1.66.0:=[context]
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index c19de03c6e7..b2d610c7c41 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,12 +18,11 @@ HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 
 # Add accounts to DEPEND because of fowners in src_install
 DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
>=dev-libs/boost-1.66.0:=[context]
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2021-01-24 Thread Matthew Thode
commit: 35662b97bb5556fa3801b9e2258e52c850adacb2
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 24 19:15:00 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jan 24 19:15:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35662b97

net-analyzer/icinga2: cleanup old

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

 net-analyzer/icinga2/Manifest  |   2 -
 net-analyzer/icinga2/icinga2-2.11.6.ebuild | 170 -
 net-analyzer/icinga2/icinga2-2.12.1.ebuild | 149 -
 3 files changed, 321 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a70f7885063..e92368b9b6f 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1 @@
-DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799

diff --git a/net-analyzer/icinga2/icinga2-2.11.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
deleted file mode 100644
index bb0f2605e73..000
--- a/net-analyzer/icinga2/icinga2-2.11.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-   )
-   fi
-   # LTO

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-12-24 Thread Matthew Thode
commit: 0f5fd7448b1180caddce77fde2105ea451442dbe
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 24 16:59:04 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 24 16:59:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5fd744

net-analyzer/icinga2: 2.12.3 stable amd64/x86 with cleanup

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.12.2.ebuild | 149 -
 net-analyzer/icinga2/icinga2-2.12.3.ebuild |   2 +-
 3 files changed, 1 insertion(+), 151 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 12422003c7a..a70f7885063 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
-DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 
58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187
 SHA512 
db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799

diff --git a/net-analyzer/icinga2/icinga2-2.12.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
deleted file mode 100644
index 8ec76ee82fa..000
--- a/net-analyzer/icinga2/icinga2-2.12.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-if [[ ${PV} !=  ]]; then
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-else
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="https://icinga.com/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl:=
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd"
-BDEPEND="
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-RDEPEND="
-   ${DEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-PATCHES=(
-   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
-   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
-   -DUSE_SYSTEMD=$(usex systemd)
-   -DLOGROTATE_HAS_SU=ON
-   -DICINGA2_LTO_BUILD=$(usex lto)
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-12-20 Thread Matthew Thode
commit: 8789f0d39925b8004ab901f3bb728e00ad0b66b0
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Dec 20 19:56:22 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Dec 20 19:57:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8789f0d3

net-analyzer/icinga2: 2.12.0 bump

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.12.0.ebuild | 170 -
 2 files changed, 171 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b9ff47926a4..12422003c7a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,4 @@
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 
58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187
 SHA512 
db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799

diff --git a/net-analyzer/icinga2/icinga2-2.12.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
deleted file mode 100644
index 72756f463b8..000
--- a/net-analyzer/icinga2/icinga2-2.12.0.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-12-15 Thread Matthew Thode
commit: 614ab7a83dc4191a4565afe7d7d3d0b813b7f9e8
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec 15 18:13:39 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec 15 20:12:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=614ab7a8

net-analyzer/icinga2: 2.12.3 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.12.3.ebuild | 149 +
 2 files changed, 150 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 31af930bde5..b9ff47926a4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,3 +2,4 @@ DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c5
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 
58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187
 SHA512 
db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136
+DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799

diff --git a/net-analyzer/icinga2/icinga2-2.12.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
new file mode 100644
index 000..8ec76ee82fa
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-11-24 Thread Matthew Thode
commit: 96fbd46eb640f77298bd709a4ae5385835e16fd8
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Nov 24 21:49:19 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Nov 24 21:50:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fbd46e

net-analyzer/icinga2: 2.12.2 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.12.2.ebuild | 149 +
 2 files changed, 150 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8c317436e01..31af930bde5 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
+DIST icinga2-2.12.2.tar.gz 7534173 BLAKE2B 
58aa25be81cfd9d674371dcd17043fbdd8fd9f03b2fdbe994101dfe6088ed289e64c213bb5ec1c62863fc2a5d015f2ee928a4bd45343eeead62aea3472faf187
 SHA512 
db61843f0ea0e05ea8c0ae035e6fdaf1ebc03115b0690a0465ef1847426656acd8ffc108e36056a46cfbc4eb9538c612bbb5adff2db72c9cc51330fcdd62c136

diff --git a/net-analyzer/icinga2/icinga2-2.12.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
new file mode 100644
index 000..8ec76ee82fa
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.12.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="https://icinga.com/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+RDEPEND="
+   ${DEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+PATCHES=(
+   # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875
+   "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
+   -DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-11-14 Thread Matthew Thode
commit: 62551f77264ffbdfd2e4d2dec680376a1d45b8fe
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Nov 14 23:02:38 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Nov 14 23:03:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62551f77

net-analyzer/icinga2: 2.12.1 stable amd64 / x86

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

 net-analyzer/icinga2/icinga2-2.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
index 8ec76ee82fa..ad2f31c9b0f 100644
--- a/net-analyzer/icinga2/icinga2-2.12.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
@@ -7,7 +7,7 @@ inherit cmake systemd
 
 if [[ ${PV} !=  ]]; then
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-10-16 Thread Louis Sautier
commit: 217678a0bb9254fb7b1c0070235c5cd946008ab1
Author: Louis Sautier  gentoo  org>
AuthorDate: Fri Oct 16 11:51:36 2020 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Fri Oct 16 11:52:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217678a0

net-analyzer/icinga2: fix USE=jumbo-build description

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier  gentoo.org>

 net-analyzer/icinga2/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/metadata.xml 
b/net-analyzer/icinga2/metadata.xml
index 15c8f7859e8..720f4e2e47b 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -8,7 +8,7 @@

Adds support for line-editing in the 
console
Adds support for link time optimization
-   Combine source files to speed up build 
process (may speed up build but requires more memory)
+   Combine source files to speed up build 
process, requires more memory
Allows for mailing of alerts
Enable support for the mariadb database 
backend
Adds support for syntax used in the 
nano editor



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/, net-analyzer/icinga2/files/

2020-10-16 Thread Louis Sautier
commit: 0b287203f0d9b05f226aa9b58018842cb8dbe199
Author: Louis Sautier  gentoo  org>
AuthorDate: Fri Oct 16 10:31:46 2020 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Fri Oct 16 11:49:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b287203

net-analyzer/icinga2: bump to 2.12.1, fix build with boost 1.74.0

Also:
* Switch to EAPI=7, cmake.eclass.
* Separate dependencies into DEPEND and BDEPEND.
* Move accounts to DEPEND because of fowners in src_install.
* Remove unused apache2 flag.
* Remove unused eutils, toolchain-funcs and wxwidgets inherits.
* Remove explicit git branch name.
* Remove pthread sed, should not be needed since
  
https://github.com/Icinga/icinga2/commit/9e9298f4face56f891054c25675b05e6f6771faa
* Simplify usex calls.
* Simplify USE=lto handling.
* Simplify schema install, properly set ICINGA2_WITH_MYSQL with USE=mariadb.
* Stop setting CMAKE_BUILD_TYPE to let the default "Gentoo" type be used.
* Let the eclass handle CMAKE_VERBOSE_MAKEFILE.
* Introduce USE=jumbo-build to optionally enable unity builds.
* Add sub-slot operator to dev-libs/yajl.
* Stop calling einstalldocs.
* Fix elog message, account for REPLACING_VERSIONS being a list.
* Update HOMEPAGE.

Closes: https://bugs.gentoo.org/738234
Closes: https://bugs.gentoo.org/665944
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier  gentoo.org>

 net-analyzer/icinga2/Manifest  |   1 +
 .../files/icinga2-2.12.1-boost-1.74.0.patch| 436 +
 net-analyzer/icinga2/icinga2-2.12.1.ebuild | 149 +++
 net-analyzer/icinga2/metadata.xml  |   1 +
 4 files changed, 587 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bff12455281..2a6c58ace85 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 
309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd
 SHA512 
22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
+DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529

diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch 
b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
new file mode 100644
index 000..e6ad4807993
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch
@@ -0,0 +1,436 @@
+From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
+From: Louis Sautier 
+Date: Thu, 20 Aug 2020 18:25:48 +0200
+Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
+ =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was deprecated in
+https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc
+---
+ lib/base/utility.cpp | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
+index 1add7616c6..d8e6f20b0c 100644
+--- a/lib/base/utility.cpp
 b/lib/base/utility.cpp
+@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const 
String& target)
+ {
+   namespace fs = boost::filesystem;
+ 
++#if BOOST_VERSION >= 107400
++  fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
++#else /* BOOST_VERSION */
+   fs::copy_file(fs::path(source.Begin(), source.End()), 
fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
++#endif /* BOOST_VERSION */
+ }
+ 
+ /*
+From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001
+From: "Alexander A. Klimov" 
+Date: Wed, 26 Aug 2020 13:56:26 +0200
+Subject: [PATCH] Introduce HttpUtility::Set()
+
+refs #8185
+---
+ lib/cli/consolecommand.cpp   |  9 ---
+ lib/perfdata/elasticsearchwriter.cpp | 13 -
+ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-10-16 Thread Louis Sautier
commit: 590afb58d9dbca67e9160a9f36f67f6181854ac9
Author: Louis Sautier  gentoo  org>
AuthorDate: Fri Oct 16 11:44:58 2020 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Fri Oct 16 11:49:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590afb58

net-analyzer/icinga2: sync live ebuild with 2.12.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier  gentoo.org>

 net-analyzer/icinga2/icinga2-.ebuild | 92 
 1 file changed, 33 insertions(+), 59 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index bb0f2605e73..c19de03c6e7 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit cmake systemd
+
 if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
 else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
+   inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
+HOMEPAGE="https://icinga.com/;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
+IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
 
-CDEPEND="
+# Add accounts to DEPEND because of fowners in src_install
+DEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=dev-libs/boost-1.66.0:=[context]
@@ -28,39 +29,27 @@ CDEPEND="
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
+   dev-libs/yajl:=
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd"
+BDEPEND="
sys-devel/bison
>=sys-devel/flex-2.5.35"
-
 RDEPEND="
-   ${CDEPEND}
+   ${DEPEND}
plugins? ( || (
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
acct-group/nagios"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
 src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
+   -DICINGA2_UNITY_BUILD=$(usex jumbo-build)
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
@@ -69,9 +58,10 @@ src_configure() {
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
-DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON
+   -DUSE_SYSTEMD=$(usex systemd)
-DLOGROTATE_HAS_SU=ON
+   -DICINGA2_LTO_BUILD=$(usex lto)
)
# default to off if minimal, allow the flags to be set otherwise
if use minimal; then
@@ -81,47 +71,26 @@ src_configure() {
)
else
mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-   )
-   fi
-   # LTO
-   if use lto; then
-   mycmakeargs+=(
-   -DICINGA2_LTO_BUILD=ON
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_LTO_BUILD=OFF
+   -DICINGA2_WITH_PGSQL=$(usex postgres)
+   -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb))
)
fi
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-   cd "${BUILDDIR}" || die
-
-   emake DESTDIR="${D}" install
-
-   einstalldocs
+   cmake_src_install
 
newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
-   if use mysql ; then
-   docinto schema
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-10-16 Thread Louis Sautier
commit: 3a6c8c8dc1d23ea065d2fe9282c1e06aff86ab6e
Author: Louis Sautier  gentoo  org>
AuthorDate: Fri Oct 16 11:46:56 2020 +
Commit: Louis Sautier  gentoo  org>
CommitDate: Fri Oct 16 11:49:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6c8c8d

net-analyzer/icinga2: remove old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier  gentoo.org>

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.11.5.ebuild | 170 -
 2 files changed, 171 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 2a6c58ace85..8c317436e01 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 
309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd
 SHA512 
22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
 DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
 DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529

diff --git a/net-analyzer/icinga2/icinga2-2.11.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
deleted file mode 100644
index 72756f463b8..000
--- a/net-analyzer/icinga2/icinga2-2.11.5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
- 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-10-14 Thread Matthew Thode
commit: 7cbdb4d7dbaee40c2f923e7c0a7eefd11cb6cc1f
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Oct 14 18:09:51 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Oct 14 18:10:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbdb4d7

net-analyzer/icinga2: 2.11.6 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.11.6.ebuild | 170 +
 2 files changed, 171 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index da76b6b8503..bff12455281 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 
309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd
 SHA512 
22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
+DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276

diff --git a/net-analyzer/icinga2/icinga2-2.11.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
new file mode 100644
index 000..bb0f2605e73
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+   )
+   fi
+   # LTO
+   if use lto; then
+   mycmakeargs+=(
+ 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-09-03 Thread Matthew Thode
commit: c5c0703ea502b98d37918249fcbfd91fec6dcd91
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep  4 02:34:46 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep  4 02:35:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c0703e

net-analyzer/icinga2: 2.11.4 cleanup

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.11.4.ebuild | 169 -
 2 files changed, 170 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c154ff99856..da76b6b8503 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,2 @@
-DIST icinga2-2.11.4.tar.gz 7476667 BLAKE2B 
99b004f12504dae57ae2eda37983ae17da359c6e6998d41bb408c11328d0e69b7dd87ee5bf888c64862d52fe198145e56b1ac24f53d06dfebd1241d16e61a016
 SHA512 
51b0170d334d4ebe2c9614e47f65a1ab59483b4d5de862ae3d90152bf547bfc0051d9fca2f6b86d301ec897980fdc0b503232eb6dd82ae603d8e809bd56b23c1
 DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 
309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd
 SHA512 
22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
 DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276

diff --git a/net-analyzer/icinga2/icinga2-2.11.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
deleted file mode 100644
index a98d579ea65..000
--- a/net-analyzer/icinga2/icinga2-2.11.4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-   )
-   fi
-   # LTO
-   if use lto; then
-   mycmakeargs+=(
-   -DICINGA2_LTO_BUILD=ON
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-09-03 Thread Matthew Thode
commit: d9e0ffeab02531cac12f0d3bb39657cd3c15ef41
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep  4 02:34:00 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep  4 02:35:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e0ffea

net-analyzer/icinga2: 2.11.5 2.12.0 stable amd64/x86

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

 net-analyzer/icinga2/icinga2-2.11.5.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-2.12.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.11.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
index bb0f2605e73..72756f463b8 100644
--- a/net-analyzer/icinga2/icinga2-2.11.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;

diff --git a/net-analyzer/icinga2/icinga2-2.12.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
index bb0f2605e73..72756f463b8 100644
--- a/net-analyzer/icinga2/icinga2-2.12.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-08-04 Thread Matthew Thode
commit: 43735fcae35f07f6a10546bff23888150cdbf880
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Aug  4 21:50:56 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Aug  4 21:51:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43735fca

net-analyzer/icinga2: w.11.5 and 2.12.0 bump

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

 net-analyzer/icinga2/Manifest   | 2 ++
 net-analyzer/icinga2/{icinga2-.ebuild => icinga2-2.11.5.ebuild} | 4 ++--
 net-analyzer/icinga2/{icinga2-.ebuild => icinga2-2.12.0.ebuild} | 4 ++--
 net-analyzer/icinga2/icinga2-.ebuild| 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index ee233074942..c154ff99856 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,3 @@
 DIST icinga2-2.11.4.tar.gz 7476667 BLAKE2B 
99b004f12504dae57ae2eda37983ae17da359c6e6998d41bb408c11328d0e69b7dd87ee5bf888c64862d52fe198145e56b1ac24f53d06dfebd1241d16e61a016
 SHA512 
51b0170d334d4ebe2c9614e47f65a1ab59483b4d5de862ae3d90152bf547bfc0051d9fca2f6b86d301ec897980fdc0b503232eb6dd82ae603d8e809bd56b23c1
+DIST icinga2-2.11.5.tar.gz 7478038 BLAKE2B 
309d090e9dab5fb79b411ee75bdcdc3351b559a434543937b3486bc0d45a25fc320609985e4130c2cca83972e4be15180f85bc4c78851fcecbc96ae523ca6bcd
 SHA512 
22b0902818ee840c5c50da3768d6fc6dadf574d8fb5884eb45a2184b9e516888caa2e09ece4f8880139fb0931f131786002f494de702925a6f458968c3cee144
+DIST icinga2-2.12.0.tar.gz 7530104 BLAKE2B 
6f4a37d638449596d163add4ee070d24c1eb5f483e32f6c666454353578e6399a04cda949cb51b135516be7b437196e5beeff0e5e24a7bc26b855de87e24a797
 SHA512 
2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-.ebuild
copy to net-analyzer/icinga2/icinga2-2.11.5.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66:=[context]
+   >=dev-libs/boost-1.66.0:=[context]
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
similarity index 98%
copy from net-analyzer/icinga2/icinga2-.ebuild
copy to net-analyzer/icinga2/icinga2-2.12.0.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.12.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66:=[context]
+   >=dev-libs/boost-1.66.0:=[context]
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 7243f8baa7c..bb0f2605e73 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-07-18 Thread Matthew Thode
commit: f225bb9e95f3e81452b0aea7ee3bd7fa5bd241fc
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Jul 18 22:03:10 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Jul 18 22:12:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f225bb9e

net-analyzer/icinga2: 2.11.4 bump

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.11.3.ebuild | 169 -
 net-analyzer/icinga2/icinga2-2.11.4.ebuild |   2 +-
 3 files changed, 1 insertion(+), 171 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 7032eeb3797..ee233074942 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1 @@
-DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B 
baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c
 SHA512 
616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1
 DIST icinga2-2.11.4.tar.gz 7476667 BLAKE2B 
99b004f12504dae57ae2eda37983ae17da359c6e6998d41bb408c11328d0e69b7dd87ee5bf888c64862d52fe198145e56b1ac24f53d06dfebd1241d16e61a016
 SHA512 
51b0170d334d4ebe2c9614e47f65a1ab59483b4d5de862ae3d90152bf547bfc0051d9fca2f6b86d301ec897980fdc0b503232eb6dd82ae603d8e809bd56b23c1

diff --git a/net-analyzer/icinga2/icinga2-2.11.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
deleted file mode 100644
index a98d579ea65..000
--- a/net-analyzer/icinga2/icinga2-2.11.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   acct-user/icinga
-   acct-group/icinga
-   acct-group/icingacmd
-   acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   -DICINGA2_WITH_MYSQL=OFF
-   -DICINGA2_WITH_PGSQL=OFF
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
-   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
-   )
-   fi
-   # LTO
-   if use lto; then
-   mycmakeargs+=(
-   -DICINGA2_LTO_BUILD=ON
-   )
-   else
-   mycmakeargs+=(
-   -DICINGA2_LTO_BUILD=OFF
-   )
-   fi
-
-   cmake-utils_src_configure
-}
-
-src_install() {
-   BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-06-19 Thread Matthew Thode
commit: a65ae6bd6e44d7b54bfdbbb34360ad58c52d514d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jun 19 15:49:37 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jun 19 15:50:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65ae6bd

net-analyzer/icinga2: 2.11.4 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.11.4.ebuild | 169 +
 2 files changed, 170 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 4e30586e35c..7032eeb3797 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B 
baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c
 SHA512 
616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1
+DIST icinga2-2.11.4.tar.gz 7476667 BLAKE2B 
99b004f12504dae57ae2eda37983ae17da359c6e6998d41bb408c11328d0e69b7dd87ee5bf888c64862d52fe198145e56b1ac24f53d06dfebd1241d16e61a016
 SHA512 
51b0170d334d4ebe2c9614e47f65a1ab59483b4d5de862ae3d90152bf547bfc0051d9fca2f6b86d301ec897980fdc0b503232eb6dd82ae603d8e809bd56b23c1

diff --git a/net-analyzer/icinga2/icinga2-2.11.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
new file mode 100644
index 000..42ebd83d611
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd
+   acct-group/nagios"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+   )
+   fi
+   # LTO
+   if use lto; then
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=ON
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=OFF
+   )
+   fi
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+   cd "${BUILDDIR}" || die
+
+   emake DESTDIR="${D}" install
+
+

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-04-04 Thread Matthew Thode
commit: 82196216f4ce4aacfa12ff9051ee739b93b76c95
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Apr  4 19:47:25 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Apr  4 21:05:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82196216

net-analyzer/icinga2: 2.11.3 stable amd64 / x86 with cleanup

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

 net-analyzer/icinga2/Manifest  |   3 -
 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 170 -
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 169 
 net-analyzer/icinga2/icinga2-2.11.2.ebuild | 169 
 net-analyzer/icinga2/icinga2-2.11.3.ebuild |   2 +-
 5 files changed, 1 insertion(+), 512 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 9de32456b1a..4e30586e35c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1 @@
-DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
-DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
-DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B 
b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16
 SHA512 
88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
 DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B 
baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c
 SHA512 
616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
deleted file mode 100644
index 5ca081b6660..000
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1:=
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-03-04 Thread Matthew Thode
commit: 475a0b267898fbfe225bd246e8642f2e19f6963b
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Mar  4 16:53:40 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Mar  4 17:11:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475a0b26

net-analyzer/icinga2: 2.11.3 bump

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

 net-analyzer/icinga2/Manifest   |  1 +
 .../{icinga2-.ebuild => icinga2-2.11.3.ebuild}  | 21 ++---
 net-analyzer/icinga2/icinga2-.ebuild| 14 +++---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 7b7205bdb68..9de32456b1a 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B 
b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16
 SHA512 
88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
+DIST icinga2-2.11.3.tar.gz 7475785 BLAKE2B 
baabe8c90170a7b2ddb3ae7e95ef3cd042e64f68dbfdb50f5a981bc63ae5aa1e8ec4082729456d1b3fc02c0c74a98e15383cc56e56c53a2ab6181db94125365c
 SHA512 
616e938fabaa6565fb9ac4824649c09801dd53b3517c0a9b5b62307293bc838377c18818cc13dd40e240902f02455c421d433b6ee54671403598c5b7aeb78ea1

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
similarity index 92%
copy from net-analyzer/icinga2/icinga2-.ebuild
copy to net-analyzer/icinga2/icinga2-2.11.3.ebuild
index 92b7c65b3f1..42ebd83d611 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.3.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
EGIT_BRANCH="master"
 fi
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66:=[context]
+   >=dev-libs/boost-1.66.0:=[context]
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )
@@ -41,7 +41,11 @@ RDEPEND="
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
-   mail? ( virtual/mailx )"
+   mail? ( virtual/mailx )
+   acct-user/icinga
+   acct-group/icinga
+   acct-group/icingacmd
+   acct-group/nagios"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 
@@ -49,10 +53,6 @@ want_apache2
 
 pkg_setup() {
depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
 }
 
 src_configure() {
@@ -68,7 +68,6 @@ src_configure() {
-DICINGA2_USER=icinga
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
-   -DICINGA2_RUNDIR=/run
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-DUSE_SYSTEMD=$(usex systemd ON OFF)
-DLOGROTATE_HAS_SU=ON
@@ -134,7 +133,7 @@ src_install() {
keepdir /var/lib/icinga2/api/log
keepdir /var/spool/icinga2/perfdata
 
-   rm -r "${D}/run" || die "failed to remove /run"
+   rm -r "${D}/var/run" || die "failed to remove /var/run"
rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
fowners root:icinga /etc/icinga2

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-02-17 Thread Matthew Thode
commit: 3cb7e18ccc73d320423f8b6840a63b596ccc6ee0
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Feb 17 23:29:12 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Feb 17 23:37:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb7e18c

net-analyzer/icinga2: remove dep on icinga

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

 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 5 ++---
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 5 ++---
 net-analyzer/icinga2/icinga2-2.11.2.ebuild | 5 ++---
 net-analyzer/icinga2/icinga2-.ebuild   | 5 ++---
 net-analyzer/icinga2/metadata.xml  | 1 -
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 88849f9e78f..5ca081b6660 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -42,8 +42,7 @@ RDEPEND="
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
+   mail? ( virtual/mailx )"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index 36b37867296..6c9a7ab3cdf 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
+   mail? ( virtual/mailx )"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 

diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index 1af87fa28ec..ec0fd092da5 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
+   mail? ( virtual/mailx )"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 157a2ed119e..92b7c65b3f1 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://icinga.org/icinga2;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
 WX_GTK_VER="3.0"
 
 CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/monitoring-plugins
net-analyzer/nagios-plugins
) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
+   mail? ( virtual/mailx )"
 
 REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
 

diff --git a/net-analyzer/icinga2/metadata.xml 
b/net-analyzer/icinga2/metadata.xml
index 6c4dccde701..2916a688675 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -6,7 +6,6 @@
Matthew Thode


-   Adds support for the old interface
Adds support for line-editing in the 
console
Adds support for link time optimization
Allows for mailing of alerts



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2020-02-08 Thread David Seifert
commit: 74caa6219da1f4bf5ddb243dadd8861609ccee73
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb  8 17:05:40 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  8 17:05:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74caa621

net-analyzer/icinga2: [QA] Remove unnecessary -DCMAKE_INSTALL_PREFIX arguments

Signed-off-by: David Seifert  gentoo.org>

 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 1 -
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 1 -
 net-analyzer/icinga2/icinga2-2.11.2.ebuild | 1 -
 net-analyzer/icinga2/icinga2-.ebuild   | 1 -
 4 files changed, 4 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 688e1fd1f38..7ac8f150a99 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -63,7 +63,6 @@ src_configure() {
-DICINGA2_UNITY_BUILD=FALSE
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index d287bf41cef..366f6b20e82 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -62,7 +62,6 @@ src_configure() {
-DICINGA2_UNITY_BUILD=FALSE
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2

diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index c01fcf4d1cd..65f6fb4f7fb 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -62,7 +62,6 @@ src_configure() {
-DICINGA2_UNITY_BUILD=FALSE
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 39558b4834e..1f48b8612c0 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -62,7 +62,6 @@ src_configure() {
-DICINGA2_UNITY_BUILD=FALSE
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-12-16 Thread Matthew Thode
commit: fe8651068ff3f480703cb4262a36208948846873
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Dec 16 17:37:06 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Dec 16 17:37:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe865106

net-analyzer/icinga2: switch to /run more completely

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

 net-analyzer/icinga2/icinga2-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 31e997e9e6a..39558b4834e 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -70,6 +70,7 @@ src_configure() {
-DICINGA2_USER=icinga
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
+   -DICINGA2_RUNDIR=/run
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-DUSE_SYSTEMD=$(usex systemd ON OFF)
-DLOGROTATE_HAS_SU=ON
@@ -135,7 +136,7 @@ src_install() {
keepdir /var/lib/icinga2/api/log
keepdir /var/spool/icinga2/perfdata
 
-   rm -r "${D}/var/run" || die "failed to remove /var/run"
+   rm -r "${D}/run" || die "failed to remove /run"
rm -r "${D}/var/cache" || die "failed to remove /var/cache"
 
fowners root:icinga /etc/icinga2



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-11-22 Thread Matthew Thode
commit: c043d1afead1045b04860a97f28026e7800c6531
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Nov 22 16:09:23 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Nov 22 16:09:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c043d1af

net-analyzer/icinga2: 2.11.2 stable amd64/x86 with cleanup

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

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 171 -
 net-analyzer/icinga2/icinga2-2.11.2.ebuild |   2 +-
 3 files changed, 1 insertion(+), 173 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index d187f9ce81b..7b7205bdb68 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
-DIST icinga2-2.11.0.tar.gz 7472579 BLAKE2B 
36fd54e1067e6e61ab642debaa3589e6885e0be2f68d2a2bea0d03d3149ecc8bfc985ea7806b89a3b95662b03b2fc8695ae62a0036783a9f40d759e823d116fa
 SHA512 
2526c622f00c355aa255fc42d0350bd5eb3fc270e7b4e3c3dcab575b4f7b7e03580d742064c2c3e143f302757fd997078ca12cb01575c78f79ae5616251262e2
 DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B 
b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16
 SHA512 
88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d

diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
deleted file mode 100644
index cb76f2a6cf7..000
--- a/net-analyzer/icinga2/icinga2-2.11.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66.0:=[context]
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-10-18 Thread Matthew Thode
commit: 1c9c97e4aebdfbd451fd6cfb9d90b1bc75a41eba
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 18 15:30:40 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 18 16:02:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9c97e4

net-analyzer/icinga2: 2.11.1 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.11.1.ebuild | 171 +
 2 files changed, 172 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0bcf3d6f374..792ecd588db 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 DIST icinga2-2.11.0.tar.gz 7472579 BLAKE2B 
36fd54e1067e6e61ab642debaa3589e6885e0be2f68d2a2bea0d03d3149ecc8bfc985ea7806b89a3b95662b03b2fc8695ae62a0036783a9f40d759e823d116fa
 SHA512 
2526c622f00c355aa255fc42d0350bd5eb3fc270e7b4e3c3dcab575b4f7b7e03580d742064c2c3e143f302757fd997078ca12cb01575c78f79ae5616251262e2
+DIST icinga2-2.11.1.tar.gz 7475972 BLAKE2B 
448c43c42c44e15f313aae61be33c6fce858bf2bcd588d83986f0b3804f89a0ab7ae4a1fdb1750558c5a649ea0a05368a2dcf20d06cfc2093fd6c05840bace23
 SHA512 
7b57b97ab2be4f70fc29aa3d40d4fac24c8a353406c44d41c45dffc6ab930184d92a4887936ee5d8b42c986188bfb371701cc1499aed747e084cefa6448a438a

diff --git a/net-analyzer/icinga2/icinga2-2.11.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.1.ebuild
new file mode 100644
index 000..cb76f2a6cf7
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.66.0:=[context]
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-23 Thread Matthew Thode
commit: d9b4f8d1a1a813c7356723abc12d98e3134503ae
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Sep 23 15:22:52 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Sep 23 15:23:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b4f8d1

net-analyzer/icinga2: remove cap on boost

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

 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
index 238cca62c36..cb76f2a6cf7 100644
--- a/net-analyzer/icinga2/icinga2-2.11.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
@@ -24,7 +24,6 @@ CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=dev-libs/boost-1.66.0:=[context]
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-22 Thread Matthew Thode
commit: 88f20115574f83da8068a36059f6a30e7244c657
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Sep 22 06:05:37 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Sep 22 06:07:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f20115

net-analyzer/icinga2: update boost dep to depend on context flag

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

 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 5 +++--
 net-analyzer/icinga2/icinga2-.ebuild   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
index 3ec54860fd1..238cca62c36 100644
--- a/net-analyzer/icinga2/icinga2-2.11.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
@@ -23,7 +23,8 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.66:=
+   >=dev-libs/boost-1.66.0:=[context]
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-21 Thread Matthew Thode
commit: 7eb1249535c8526faebb363a84f715f6eb86bd50
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Sep 21 16:28:07 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Sep 21 16:28:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb12495

net-analyzer/icinga2: fixed the dep on boost (requires a min of 1.66)

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

 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
index a250b183b14..3ec54860fd1 100644
--- a/net-analyzer/icinga2/icinga2-2.11.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1:=
+   >=dev-libs/boost-1.66:=
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index a250b183b14..3ec54860fd1 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1:=
+   >=dev-libs/boost-1.66:=
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-20 Thread Matthew Thode
commit: 3c99b4df871a92e1fc9ebf1f4fcd95a8b4789776
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Sep 20 21:06:55 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Sep 20 21:07:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c99b4df

net-analyzer/icinga2: 2.11.0 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.11.0.ebuild | 171 +
 2 files changed, 172 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 1467cbda0be..0bcf3d6f374 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
+DIST icinga2-2.11.0.tar.gz 7472579 BLAKE2B 
36fd54e1067e6e61ab642debaa3589e6885e0be2f68d2a2bea0d03d3149ecc8bfc985ea7806b89a3b95662b03b2fc8695ae62a0036783a9f40d759e823d116fa
 SHA512 
2526c622f00c355aa255fc42d0350bd5eb3fc270e7b4e3c3dcab575b4f7b7e03580d742064c2c3e143f302757fd997078ca12cb01575c78f79ae5616251262e2

diff --git a/net-analyzer/icinga2/icinga2-2.11.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
new file mode 100644
index 000..a250b183b14
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.11.0.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1:=
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-17 Thread Matthew Thode
commit: cc4b82436a745c0a8f87615017e1c8e2489f8df0
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Sep 17 15:44:29 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Sep 17 15:44:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc4b8243

net-analyzer/icinga2: depend on boost subslot

Fixes: https://bugs.gentoo.org/694616
Package-Manager: Portage-2.3.69, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 2 +-
 net-analyzer/icinga2/icinga2-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 45914f5d789..688e1fd1f38 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -24,7 +24,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
+   >=dev-libs/boost-1.58-r1:=
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index 7d8f56dd9e4..d287bf41cef 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
+   >=dev-libs/boost-1.58-r1:=
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index d8066e1db2f..a250b183b14 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -23,7 +23,7 @@ WX_GTK_VER="3.0"
 CDEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
+   >=dev-libs/boost-1.58-r1:=
console? ( dev-libs/libedit )
mariadb? ( dev-db/mariadb-connector-c:= )
mysql? ( dev-db/mysql-connector-c:= )



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-09-01 Thread Matthew Thode
commit: 9ba07b467183b1221b2d54c829b39b7f67fc0427
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Sep  1 18:45:29 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Sep  1 18:47:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba07b46

net-analyzer/icinga2: 2.10.6 stable amd64 and x86

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

 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 3 +--
 net-analyzer/icinga2/icinga2-.ebuild   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index 8a9695a5e27..7d8f56dd9e4 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -5,12 +5,11 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
EGIT_BRANCH="master"
-   KEYWORDS=""
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index 913217ef694..d8066e1db2f 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,6 @@ else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
EGIT_BRANCH="master"
-   KEYWORDS=""
 fi
 
 DESCRIPTION="Distributed, general purpose, network monitoring engine"



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-07-31 Thread Matthew Thode
commit: 3701f980625f0bd14d28b7509935e293c5027a7c
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Jul 31 15:32:39 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Jul 31 15:36:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3701f980

net-analyzer/icinga2: 2.10.6 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.6.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 180268e443c..1467cbda0be 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
+DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B 
a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce
 SHA512 
ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d

diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
new file mode 100644
index 000..8a9695a5e27
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+   )
+   fi
+   # LTO
+   if use lto; then
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=ON
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=OFF
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-06-23 Thread Matthew Thode
commit: eff2131ce92483e3e3367ac2bdafc390334664ca
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Jun 24 00:13:21 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Jun 24 00:15:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff2131c

net-analyzer/icinga2: 2.10.5 stable with cleanup

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

 net-analyzer/icinga2/Manifest  |   2 -
 net-analyzer/icinga2/icinga2-2.10.4.ebuild | 172 
 net-analyzer/icinga2/icinga2-2.10.5.ebuild |   2 +-
 net-analyzer/icinga2/icinga2-2.8.4.ebuild  | 176 -
 net-analyzer/icinga2/metadata.xml  |   1 -
 5 files changed, 1 insertion(+), 352 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c9cf2e377c6..180268e443c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1 @@
-DIST icinga2-2.10.4.tar.gz 5129248 BLAKE2B 
420330cfdbecce98e9b825527c38d4606c0f3e3a74c6798b7012dae2c4ebc583317e60a91c7966d68de17359b6af676f5accd71d0fece505a17a3ca92f00e05e
 SHA512 
7277dd315541341ee68f2e83035210c233d6556d36c26d3211b85e2d43759627c73e881edac8e5e1d266c6b1eef19c5e1eeb8e5a77a237e688039ba88a58438c
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
-DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114

diff --git a/net-analyzer/icinga2/icinga2-2.10.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.4.ebuild
deleted file mode 100644
index 45914f5d789..000
--- a/net-analyzer/icinga2/icinga2-2.10.4.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-   -DCMAKE_INSTALL_SYSCONFDIR=/etc
-   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
-   -DICINGA2_USER=icinga
-   -DICINGA2_GROUP=icingacmd
-   -DICINGA2_COMMAND_GROUP=icingacmd
-   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-   -DUSE_SYSTEMD=$(usex systemd ON OFF)
-   -DLOGROTATE_HAS_SU=ON
-   )
-   # default to off if minimal, allow the flags to be set otherwise
-   if use minimal; then
-   mycmakeargs+=(
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-05-24 Thread Matthew Thode
commit: 79226a674f40c26971cd274d95921b1706cbcece
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri May 24 18:12:16 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 24 18:13:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79226a67

net-analyzer/icinga2: 2.10.5 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.5.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bfc1c879afa..c9cf2e377c6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.10.4.tar.gz 5129248 BLAKE2B 
420330cfdbecce98e9b825527c38d4606c0f3e3a74c6798b7012dae2c4ebc583317e60a91c7966d68de17359b6af676f5accd71d0fece505a17a3ca92f00e05e
 SHA512 
7277dd315541341ee68f2e83035210c233d6556d36c26d3211b85e2d43759627c73e881edac8e5e1d266c6b1eef19c5e1eeb8e5a77a237e688039ba88a58438c
+DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 
7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a
 SHA512 
c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114

diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
new file mode 100644
index 000..8a9695a5e27
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/

2019-03-30 Thread Matthew Thode
commit: c83a82109aac924c7c574e5dee27f1ac509a64a0
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Mar 30 15:51:31 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Mar 30 21:22:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83a8210

net-analyzer/icinga2: remove unused file

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 net-analyzer/icinga2/files/icinga2.initd-2 | 91 --
 1 file changed, 91 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2.initd-2 
b/net-analyzer/icinga2/files/icinga2.initd-2
deleted file mode 100644
index b12716d4d44..000
--- a/net-analyzer/icinga2/files/icinga2.initd-2
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-# Set defaults, see /etc/conf.d/icinga2 to override
-: ${DAEMON:=/usr/sbin/icinga2}
-: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
-: ${ICINGA2_RUN_DIR:=/run/icinga2}
-: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
-: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
-: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
-: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
-: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
-: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
-: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
-: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
-: ${ICINGA2_USER:=icinga}
-: ${ICINGA2_GROUP:=icingacmd}
-: ${ICINGA2_COMMAND_GROUP:=icingacmd}
-
-ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
-
-depend() {
-need net
-}
-
-checkconfig() {
-if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
-   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
-   eend 1
-fi
-
-ICINGA2_USER=$($DAEMON variable get --current RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
-checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
-checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
-
-if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
-eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
-return 1
-fi
-}
-
-start() {
-checkconfig || return 1
-
-ebegin "Starting icinga2"
-start-stop-daemon --start --exec "${DAEMON}" \
---pidfile "${ICINGA2_PID_FILE}" \
--- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
-fi
-eend $retval
-}
-
-stop() {
-ebegin "Stopping icinga2"
-start-stop-daemon \
---stop \
---pidfile $ICINGA2_PID_FILE \
---retry "SIGTERM/15 SIGKILL/30" \
---progress
-eend $?
-}
-
-reload() {
-checkconfig || return 1
-
-ebegin "Reloading icinga2"
-start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
-
-local retval=$?
-if [ $retval -ne 0 ]; then
-ewarn "Error reloading icinga2."
-fi
-eend $retval
-}



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-03-26 Thread Matthew Thode
commit: 75af28bcc0607df827f9e93427f6d12984f18083
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Mar 26 15:44:50 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Mar 26 15:54:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75af28bc

net-analyzer/icinga2: 2.10.4 stable amd64/x86 with cleanup

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

 net-analyzer/icinga2/Manifest|   3 -
 net-analyzer/icinga2/icinga2-2.10.2.ebuild   | 172 ---
 net-analyzer/icinga2/icinga2-2.10.3.ebuild   | 172 ---
 net-analyzer/icinga2/icinga2-2.10.4.ebuild   |   2 +-
 net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild | 172 ---
 net-analyzer/icinga2/icinga2-2.9.1.ebuild| 163 -
 6 files changed, 1 insertion(+), 683 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 777d630cff7..bfc1c879afa 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,2 @@
-DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B 
f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121
 SHA512 
2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
-DIST icinga2-2.10.3.tar.gz 4421984 BLAKE2B 
130279f3fbe90e9cc311d98ca8ff879c3dca34b61e8e8b3f7db30b7cb116361decf2e8fcc44c34bab863ef654a345f7cafc14c0179ec83dc3a2fe84ef103575e
 SHA512 
c3b4b6e66889e30ed5c73b3adf55bec9c547f4f3a81a5511b981d8e6d4b1e370bc71263b3249b625769cea1d13de5aa62f3c039ac5315013c13bc02009e70967
 DIST icinga2-2.10.4.tar.gz 5129248 BLAKE2B 
420330cfdbecce98e9b825527c38d4606c0f3e3a74c6798b7012dae2c4ebc583317e60a91c7966d68de17359b6af676f5accd71d0fece505a17a3ca92f00e05e
 SHA512 
7277dd315541341ee68f2e83035210c233d6556d36c26d3211b85e2d43759627c73e881edac8e5e1d266c6b1eef19c5e1eeb8e5a77a237e688039ba88a58438c
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
-DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/icinga2-2.10.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
deleted file mode 100644
index e19f3c3869b..000
--- a/net-analyzer/icinga2/icinga2-2.10.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-03-20 Thread Matthew Thode
commit: 85e58a6302ecedddf70df5f8b8805275b9b4be74
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Mar 20 23:30:34 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Mar 20 23:35:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e58a63

net-analyzer/icinga2: 2.10.4 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.4.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c43274b9ab1..777d630cff7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,5 @@
 DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B 
f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121
 SHA512 
2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
 DIST icinga2-2.10.3.tar.gz 4421984 BLAKE2B 
130279f3fbe90e9cc311d98ca8ff879c3dca34b61e8e8b3f7db30b7cb116361decf2e8fcc44c34bab863ef654a345f7cafc14c0179ec83dc3a2fe84ef103575e
 SHA512 
c3b4b6e66889e30ed5c73b3adf55bec9c547f4f3a81a5511b981d8e6d4b1e370bc71263b3249b625769cea1d13de5aa62f3c039ac5315013c13bc02009e70967
+DIST icinga2-2.10.4.tar.gz 5129248 BLAKE2B 
420330cfdbecce98e9b825527c38d4606c0f3e3a74c6798b7012dae2c4ebc583317e60a91c7966d68de17359b6af676f5accd71d0fece505a17a3ca92f00e05e
 SHA512 
7277dd315541341ee68f2e83035210c233d6556d36c26d3211b85e2d43759627c73e881edac8e5e1d266c6b1eef19c5e1eeb8e5a77a237e688039ba88a58438c
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/icinga2-2.10.4.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.4.ebuild
new file mode 100644
index 000..8a9695a5e27
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.4.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2019-02-26 Thread Matthew Thode
commit: a3213b773f228b3f67da986f4b58e934b7083f86
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Feb 26 23:32:37 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Feb 26 23:32:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3213b77

net-analyzer/icinga2: 2.10.3 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.3.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index bc5a3c1deb2..c43274b9ab1 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
 DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B 
f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121
 SHA512 
2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
+DIST icinga2-2.10.3.tar.gz 4421984 BLAKE2B 
130279f3fbe90e9cc311d98ca8ff879c3dca34b61e8e8b3f7db30b7cb116361decf2e8fcc44c34bab863ef654a345f7cafc14c0179ec83dc3a2fe84ef103575e
 SHA512 
c3b4b6e66889e30ed5c73b3adf55bec9c547f4f3a81a5511b981d8e6d4b1e370bc71263b3249b625769cea1d13de5aa62f3c039ac5315013c13bc02009e70967
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/icinga2-2.10.3.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.3.ebuild
new file mode 100644
index 000..8a9695a5e27
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-12-13 Thread Matthew Thode
commit: 1cc0006790932eeaa449a6d31e32525f9495787e
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 13 17:11:09 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 13 17:11:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cc00067

net-analyzer/icinga2: 2.10.2 stable amd64 and x86 with some cleanup

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

 net-analyzer/icinga2/Manifest |   2 -
 net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild | 172 --
 net-analyzer/icinga2/icinga2-2.10.2.ebuild|   2 +-
 net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild  | 164 
 net-analyzer/icinga2/icinga2-2.9.2.ebuild | 172 --
 5 files changed, 1 insertion(+), 511 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 71d7a365614..bc5a3c1deb2 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,3 @@
-DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B 
60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178
 SHA512 
88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B 
f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121
 SHA512 
2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
-DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B 
edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6
 SHA512 
75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99

diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
deleted file mode 100644
index e19f3c3869b..000
--- a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
-   console? ( dev-libs/libedit )
-   mariadb? ( dev-db/mariadb-connector-c:= )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   dev-libs/yajl"
-
-DEPEND="
-   ${CDEPEND}
-   sys-devel/bison
-   >=sys-devel/flex-2.5.35"
-
-RDEPEND="
-   ${CDEPEND}
-   plugins? ( || (
-   net-analyzer/monitoring-plugins
-   net-analyzer/nagios-plugins
-   ) )
-   mail? ( virtual/mailx )
-   classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-   depend.apache_pkg_setup
-   enewgroup icinga
-   enewgroup icingacmd
-   enewgroup nagios  # for plugins
-   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_configure() {
-   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
-   local mycmakeargs=(
-   -DICINGA2_UNITY_BUILD=FALSE
-   -DCMAKE_VERBOSE_MAKEFILE=ON
-   -DCMAKE_BUILD_TYPE=None
-   -DCMAKE_INSTALL_PREFIX=/usr
-  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-11-14 Thread Matthew Thode
commit: e0e5fed1829734d519ebb9915491da637d2bb83c
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Nov 14 11:20:22 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Wed Nov 14 11:20:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e5fed1

net-analyzer/icinga2: 2.10.2 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.2.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index b0895c99616..71d7a365614 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,5 @@
 DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B 
60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178
 SHA512 
88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
+DIST icinga2-2.10.2.tar.gz 4408535 BLAKE2B 
f650826feee13695c42d7e6ced45e3009ac607d6af0bcb16c3f93f8099017a74de40e33deefaffb230a519f9dabf410c03745309d203ede71a4d7076ba8c9121
 SHA512 
2fb30673fbeef395a43eb7947c0c0217d7c0fc9c149bb244d16dae461dd5728a2540e88bcb351bac2ec5d58d6896f8a4789ced5647cdac8cecf0623fff12054b
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B 
edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6
 SHA512 
75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99

diff --git a/net-analyzer/icinga2/icinga2-2.10.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
new file mode 100644
index 000..913217ef694
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-10-22 Thread Matthew Thode
commit: 3bf198014bcdb7cc9fb7910ae839ef11e9df8cc4
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Oct 22 16:07:47 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Oct 22 16:08:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bf19801

net-analyzer/icinga2: 2.10.1-r1 stable amd64 and x86

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

 net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
index 913217ef694..e19f3c3869b 100644
--- a/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 if [[ ${PV} !=  ]]; then
inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 else
inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2018-10-20 Thread Matthew Thode
commit: 11648313f20e3a3a175832764755c373edc71ec0
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Oct 20 17:05:34 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Oct 20 17:05:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11648313

net-analyzer/icinga2: update init script

Do not require icinga2 to run before we start it.

Closes: https://bugs.gentoo.org/668506
Signed-off-by: Matthew Thode  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/icinga2/Manifest  |   1 -
 net-analyzer/icinga2/files/icinga2.initd-3 |  12 +-
 ...2-2.10.0-r1.ebuild => icinga2-2.10.1-r1.ebuild} |   0
 net-analyzer/icinga2/icinga2-2.10.1.ebuild | 172 -
 4 files changed, 1 insertion(+), 184 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 8d1baa7dc18..b0895c99616 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,3 @@
-DIST icinga2-2.10.0.tar.gz 2227324 BLAKE2B 
fdbcb84d11b867e06804a2528ee3579dfd15df72bbe5f3b4334ee38282b710701889def9f4b44613c0196ea49f13466de86103f65049cf16f491c6f28b9390d1
 SHA512 
0997461371440521cfbb13d29f6801e889b423d46a4fb792edef5191db3cf39503b4452823fcd78a0d0934072eb7df53b17a56b6bae7c1fb21412f7022d4d0a5
 DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B 
60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178
 SHA512 
88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533

diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 
b/net-analyzer/icinga2/files/icinga2.initd-3
index 46990e3e4e2..5af259d5ddf 100644
--- a/net-analyzer/icinga2/files/icinga2.initd-3
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -32,20 +32,10 @@ checkconfig() {
eend 1
 fi
 
-ICINGA2_USER=$($DAEMON variable get RunAsUser)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
-return 1
-fi
-ICINGA2_GROUP=$($DAEMON variable get RunAsGroup)
-if [ $? != 0 ]; then
-eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
-return 1
-fi
-
 checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
 checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
 checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CACHE_DIR
 
 if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
 eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."

diff --git a/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild
similarity index 100%
rename from net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
rename to net-analyzer/icinga2/icinga2-2.10.1-r1.ebuild

diff --git a/net-analyzer/icinga2/icinga2-2.10.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1.ebuild
deleted file mode 100644
index 913217ef694..000
--- a/net-analyzer/icinga2/icinga2-2.10.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-if [[ ${PV} !=  ]]; then
-   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
-   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
-   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
-   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
-   EGIT_BRANCH="master"
-   KEYWORDS=""
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
-   >=dev-libs/boost-1.58-r1
-   console? ( dev-libs/libedit )
-   mariadb? ( 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-10-19 Thread Matthew Thode
commit: 4e8ef75b148093639aaeeaa08a472813c0111e91
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 19 19:38:21 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 19 19:38:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8ef75b

net-analyzer/icinga2: 2.10.1 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.1.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index c1f230d8b10..8d1baa7dc18 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,4 +1,5 @@
 DIST icinga2-2.10.0.tar.gz 2227324 BLAKE2B 
fdbcb84d11b867e06804a2528ee3579dfd15df72bbe5f3b4334ee38282b710701889def9f4b44613c0196ea49f13466de86103f65049cf16f491c6f28b9390d1
 SHA512 
0997461371440521cfbb13d29f6801e889b423d46a4fb792edef5191db3cf39503b4452823fcd78a0d0934072eb7df53b17a56b6bae7c1fb21412f7022d4d0a5
+DIST icinga2-2.10.1.tar.gz 4406432 BLAKE2B 
60f63faabed43f9a99f313e3835c15afab9d70e1335f987f431f3187907fedb94451457fe4652886e950b1b058952957832bc7fb5ad5e8f6f4f1f47d4178
 SHA512 
88e0ef1dfd93a399535f3238cb675e86159ca23d1abfd78009797c3533d10ac5c5167008ff04dfc64d4b9f225e75d85947ce85c5a941250699c0d772be9c0aeb
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B 
edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6
 SHA512 
75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99

diff --git a/net-analyzer/icinga2/icinga2-2.10.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.1.ebuild
new file mode 100644
index 000..913217ef694
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/files/, net-analyzer/icinga2/

2018-10-14 Thread Matthew Thode
commit: e66a341ec02cfbb13ac0875fd0c2ea55a1212f09
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Oct 14 18:38:17 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Oct 14 18:40:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66a341e

net-analyzer/icinga2: update init script

Closes: https://bugs.gentoo.org/668506
Signed-off-by: Matthew Thode  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/icinga2/files/icinga2.initd-3 | 91 ++
 ...nga2-2.10.0.ebuild => icinga2-2.10.0-r1.ebuild} |  2 +-
 net-analyzer/icinga2/icinga2-.ebuild   |  4 +-
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga2/files/icinga2.initd-3 
b/net-analyzer/icinga2/files/icinga2.initd-3
new file mode 100644
index 000..46990e3e4e2
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2.initd-3
@@ -0,0 +1,91 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+# Set defaults, see /etc/conf.d/icinga2 to override
+: ${DAEMON:=/usr/sbin/icinga2}
+: ${ICINGA2_CONFIG_FILE:=/etc/icinga2/icinga2.conf}
+: ${ICINGA2_RUN_DIR:=/run/icinga2}
+: ${ICINGA2_STATE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_PID_FILE:=${ICINGA2_RUN_DIR}/icinga2.pid}
+: ${ICINGA2_CMD_DIR:=${ICINGA2_RUN_DIR}/cmd}
+: ${ICINGA2_LOG_DIR:=/var/log/icinga2}
+: ${ICINGA2_ERROR_LOG:=/var/log/icinga2/error.log}
+: ${ICINGA2_STARTUP_LOG:=/var/log/icinga2/startup.log}
+: ${ICINGA2_LOG:=/var/log/icinga2/icinga2.log}
+: ${ICINGA2_CACHE_DIR:=/var/cache/icinga2}
+: ${ICINGA2_USER:=icinga}
+: ${ICINGA2_GROUP:=icingacmd}
+: ${ICINGA2_COMMAND_GROUP:=icingacmd}
+
+ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
+
+depend() {
+need net
+}
+
+checkconfig() {
+if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then
+   ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
+   eend 1
+fi
+
+ICINGA2_USER=$($DAEMON variable get RunAsUser)
+if [ $? != 0 ]; then
+eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'."
+return 1
+fi
+ICINGA2_GROUP=$($DAEMON variable get RunAsGroup)
+if [ $? != 0 ]; then
+eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'."
+return 1
+fi
+
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR
+checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR
+
+if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 
2>&1; then
+eerror "Icinga2 detected configuration errors. Check 
'$ICINGA2_STARTUP_LOG' for details."
+return 1
+fi
+}
+
+start() {
+checkconfig || return 1
+
+ebegin "Starting icinga2"
+start-stop-daemon --start --exec "${DAEMON}" \
+--pidfile "${ICINGA2_PID_FILE}" \
+-- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
+fi
+eend $retval
+}
+
+stop() {
+ebegin "Stopping icinga2"
+start-stop-daemon \
+--stop \
+--pidfile $ICINGA2_PID_FILE \
+--retry "SIGTERM/15 SIGKILL/30" \
+--progress
+eend $?
+}
+
+reload() {
+checkconfig || return 1
+
+ebegin "Reloading icinga2"
+start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE"
+
+local retval=$?
+if [ $retval -ne 0 ]; then
+ewarn "Error reloading icinga2."
+fi
+eend $retval
+}

diff --git a/net-analyzer/icinga2/icinga2-2.10.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
similarity index 98%
rename from net-analyzer/icinga2/icinga2-2.10.0.ebuild
rename to net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
index e5caea793dd..913217ef694 100644
--- a/net-analyzer/icinga2/icinga2-2.10.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.0-r1.ebuild
@@ -109,7 +109,7 @@ src_install() {
 
einstalldocs
 
-   newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
if use mysql ; then
docinto schema

diff --git a/net-analyzer/icinga2/icinga2-.ebuild 
b/net-analyzer/icinga2/icinga2-.ebuild
index c0f291e4ea2..913217ef694 100644
--- a/net-analyzer/icinga2/icinga2-.ebuild
+++ b/net-analyzer/icinga2/icinga2-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -109,7 +109,7 @@ src_install() {
 
einstalldocs
 
-   newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+   newinitd "${FILESDIR}"/icinga2.initd-3 icinga2
 
if use mysql ; then
docinto schema



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-10-11 Thread Matthew Thode
commit: bc3b58305a22daf77d7d8af9239862df5def5322
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 12 02:52:21 2018 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 12 02:54:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc3b5830

net-analyzer/icinga2: 2.10.0 bump

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

 net-analyzer/icinga2/Manifest  |   1 +
 net-analyzer/icinga2/icinga2-2.10.0.ebuild | 172 +
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 497f53e4a70..c1f230d8b10 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1,4 @@
+DIST icinga2-2.10.0.tar.gz 2227324 BLAKE2B 
fdbcb84d11b867e06804a2528ee3579dfd15df72bbe5f3b4334ee38282b710701889def9f4b44613c0196ea49f13466de86103f65049cf16f491c6f28b9390d1
 SHA512 
0997461371440521cfbb13d29f6801e889b423d46a4fb792edef5191db3cf39503b4452823fcd78a0d0934072eb7df53b17a56b6bae7c1fb21412f7022d4d0a5
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
 DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B 
edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6
 SHA512 
75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99

diff --git a/net-analyzer/icinga2/icinga2-2.10.0.ebuild 
b/net-analyzer/icinga2/icinga2-2.10.0.ebuild
new file mode 100644
index 000..e5caea793dd
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.10.0.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-09-26 Thread Matt Thode
commit: 06619d56dacddce51c22193da28bd699b02ce489
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Sep 26 17:48:42 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Sep 26 17:49:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06619d56

net-analyzer/icinga2: 2.9.2 bump

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-analyzer/icinga2/Manifest |   1 +
 net-analyzer/icinga2/icinga2-2.9.2.ebuild | 172 ++
 2 files changed, 173 insertions(+)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 81abc5d3d4c..497f53e4a70 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,2 +1,3 @@
 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B 
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
 SHA512 
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
 DIST icinga2-2.9.1.tar.gz 2193190 BLAKE2B 
29be491c4b43e218ef8aaa2128822040ccb0989e91d83f033cf7873216e4307cdbc8ee9052d79fd0c396efeb68759acc97938e3ee596e0820e3f6c8f73bc
 SHA512 
1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
+DIST icinga2-2.9.2.tar.gz 2194226 BLAKE2B 
edf3309711657437439db907f39d9dd04b57ae6b245f4299cfdfc9e8c27d18bdfa704dc5c1459a94d47985103979915a5d2d8594072586cf908e5f8a9d209ee6
 SHA512 
75a638a37f66a68f47ec161be4bcadbd1ca0e121143528d08d83170209e0b117fa12b1b9a03d1c1550f495bfd0509ca15f4d80be618177f2791b7a1a69308f99

diff --git a/net-analyzer/icinga2/icinga2-2.9.2.ebuild 
b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
new file mode 100644
index 000..e5caea793dd
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+  

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/

2018-09-12 Thread Matt Thode
commit: 62334d13b81cd608986742c76b7cb49d785d44b1
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Sep 12 18:25:12 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Sep 12 18:25:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62334d13

net-analyzer/icinga2: revbump for mysql changes

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild | 172 +++
 1 file changed, 172 insertions(+)

diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild 
b/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild
new file mode 100644
index 000..c0f291e4ea2
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.1-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} !=  ]]; then
+   inherit cmake-utils depend.apache eutils systemd toolchain-funcs user 
wxwidgets
+   SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+   inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
user wxwidgets
+   EGIT_REPO_URI="https://github.com/Icinga/icinga2.git;
+   EGIT_BRANCH="master"
+   KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   >=dev-libs/boost-1.58-r1
+   console? ( dev-libs/libedit )
+   mariadb? ( dev-db/mariadb-connector-c:= )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   dev-libs/yajl"
+
+DEPEND="
+   ${CDEPEND}
+   sys-devel/bison
+   >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+   ${CDEPEND}
+   plugins? ( || (
+   net-analyzer/monitoring-plugins
+   net-analyzer/nagios-plugins
+   ) )
+   mail? ( virtual/mailx )
+   classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+   depend.apache_pkg_setup
+   enewgroup icinga
+   enewgroup icingacmd
+   enewgroup nagios  # for plugins
+   enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+   sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+   local mycmakeargs=(
+   -DICINGA2_UNITY_BUILD=FALSE
+   -DCMAKE_VERBOSE_MAKEFILE=ON
+   -DCMAKE_BUILD_TYPE=None
+   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_SYSCONFDIR=/etc
+   -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+   -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+   -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+   -DICINGA2_USER=icinga
+   -DICINGA2_GROUP=icingacmd
+   -DICINGA2_COMMAND_GROUP=icingacmd
+   -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+   -DUSE_SYSTEMD=$(usex systemd ON OFF)
+   -DLOGROTATE_HAS_SU=ON
+   )
+   # default to off if minimal, allow the flags to be set otherwise
+   if use minimal; then
+   mycmakeargs+=(
+   -DICINGA2_WITH_MYSQL=OFF
+   -DICINGA2_WITH_PGSQL=OFF
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+   -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+   )
+   fi
+   # LTO
+   if use lto; then
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=ON
+   )
+   else
+   mycmakeargs+=(
+   -DICINGA2_LTO_BUILD=OFF
+   )
+   fi
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+   cd "${BUILDDIR}" || die
+
+   emake DESTDIR="${D}" install
+
+   einstalldocs
+
+   newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+
+   if use mysql ; then
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use mariadb ; then  # same as mysql
+   docinto schema
+   newdoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+   docinto schema/upgrade
+   dodoc 
"${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+   fi
+   if use postgres ; 

  1   2   >